fix services of program & project to signals, add service for kanban on signals, dto's for project

Author: Awakich

projects/social_platform/src/app/office/features/detail/detail.component.html

@@ -86,8 +86,8 @@
           } } @if (isUserMember && !isUserManager && !isUserExpert) {
           <app-button
             size="medium"
-            [style.opacity]="registerDateExpired || isProjectAssigned ? '0.5' : '1'"
-            [disabled]="!!registerDateExpired || isProjectAssigned"
+            [style.opacity]="registerDateExpired() || isProjectAssigned ? '0.5' : '1'"
+            [disabled]="registerDateExpired() || isProjectAssigned"
             [appearance]="isProjectAssigned ? 'outline' : 'inline'"
             (click)="toggleSubmitProjectModal()"
             customTypographyClass="text-body-12 bar__add-project"

projects/social_platform/src/app/office/features/detail/detail.component.ts

@@ -1,7 +1,15 @@
 /** @format */
 
 import { CommonModule, Location } from "@angular/common";
-import { ChangeDetectorRef, Component, inject, OnDestroy, OnInit, signal } from "@angular/core";
+import {
+  ChangeDetectorRef,
+  Component,
+  computed,
+  inject,
+  OnDestroy,
+  OnInit,
+  signal,
+} from "@angular/core";
 import { ButtonComponent, InputComponent } from "@ui/components";
 import { BackComponent, IconComponent } from "@uilib";
 import { ModalComponent } from "@ui/components/modal/modal.component";
@@ -64,6 +72,8 @@ export class DeatilComponent implements OnInit, OnDestroy {
   private readonly cdRef = inject(ChangeDetectorRef);
 
   // Основные данные(типы данных, данные)
+  readonly registerDateExpired = this.programDataService.registerDateExpired;
+
   info = signal<any | undefined>(undefined);
   profile?: User;
   listType: "project" | "program" | "profile" = "project";
@@ -88,7 +98,6 @@ export class DeatilComponent implements OnInit, OnDestroy {
 
   // Сторонние переменные для работы с роутингом или доп проверок
   backPath?: string;
-  registerDateExpired?: boolean;
   isInProject?: boolean;
 
   isSended = false;
@@ -422,31 +431,15 @@ export class DeatilComponent implements OnInit, OnDestroy {
 
   private initializeInfo() {
     if (this.listType === "project") {
-      const projectSub$ = this.projectDataService.project$
-        .pipe(filter(project => !!project))
-        .subscribe(project => {
-          this.info.set(project);
-
-          if (project?.partnerProgram) {
-            this.isEditDisable = project.partnerProgram?.isSubmitted;
-          }
-        });
+      const project = this.projectDataService.project;
+      this.info = project;
 
-      this.isInProfileInfo();
+      this.isEditDisable = this.info()?.partnerProgram?.isSubmitted ?? false;
 
-      this.subscriptions.push(projectSub$);
+      this.isInProfileInfo();
     } else if (this.listType === "program") {
-      const program$ = this.programDataService.program$
-        .pipe(
-          filter(program => !!program),
-          tap(program => {
-            if (program) {
-              this.info.set(program);
-              this.registerDateExpired = Date.now() > Date.parse(program.datetimeRegistrationEnds);
-            }
-          })
-        )
-        .subscribe();
+      const program = this.programDataService.program;
+      this.info = program;
 
       const profileDataSub$ = this.authService.profile.pipe(filter(user => !!user)).subscribe({
         next: user => {
@@ -462,7 +455,6 @@ export class DeatilComponent implements OnInit, OnDestroy {
         },
       });
 
-      this.subscriptions.push(program$);
       this.subscriptions.push(memeberProjects$);
       this.subscriptions.push(profileDataSub$);
     } else {

projects/social_platform/src/app/office/models/goals.model.ts

@@ -17,7 +17,7 @@ class ResponsibleInfo {
   avatar!: string | null;
 }
 
-export class GoalPostForm {
+export class GoalDto {
   id?: number;
   title!: string;
   completionDate!: string;

projects/social_platform/src/app/office/models/partner.model.ts

@@ -6,15 +6,15 @@ interface Company {
   inn: string;
 }
 
-export interface Partner {
-  id: number;
-  projecId: number;
-  company: Company;
-  contribution: string;
-  decisionMaker: number;
+export class Partner {
+  id!: number;
+  projecId!: number;
+  company!: Company;
+  contribution!: string;
+  decisionMaker!: number;
 }
 
-export interface PartnerPostForm {
+export interface PartnerDto {
   name: string;
   inn: string;
   contribution: string;

projects/social_platform/src/app/office/models/resource.model.ts

@@ -8,7 +8,7 @@ export interface Resource {
   partnerCompany: number;
 }
 
-export interface ResourcePostForm {
+export interface ResourceDto {
   projectId: number;
   type: string;
   description: string;

projects/social_platform/src/app/office/models/tag.model.ts

@@ -1,7 +1,7 @@
 /** @format */
 
-export interface Tag {
-  id: number;
-  name: string;
-  color: string;
+export class Tag {
+  id!: number;
+  name!: string;
+  color!: string;
 }

projects/social_platform/src/app/office/program/detail/main/main.component.ts

@@ -41,7 +41,6 @@ import { AsyncPipe } from "@angular/common";
 import { AvatarComponent } from "@uilib";
 import { NewsCardComponent } from "@office/features/news-card/news-card.component";
 import { TruncatePipe } from "projects/core/src/lib/pipes/truncate.pipe";
-import { NewsCardComponent } from "@office/features/news-card/news-card.component";
 
 @Component({
   selector: "app-main",
@@ -227,7 +226,7 @@ export class ProgramDetailMainComponent implements OnInit, OnDestroy {
   }
 
   @ViewChild(NewsFormComponent) newsFormComponent?: NewsFormComponent;
-  @ViewChild(ProgramNewsCardComponent) ProgramNewsCardComponent?: ProgramNewsCardComponent;
+  @ViewChild(NewsCardComponent) ProgramNewsCardComponent?: NewsCardComponent;
   @ViewChild("descEl") descEl?: ElementRef;
 
   onNewsInVew(entries: IntersectionObserverEntry[]): void {

projects/social_platform/src/app/office/program/services/program-data.service.ts

@@ -1,17 +1,27 @@
 /** @format */
 
-import { Injectable } from "@angular/core";
-import { BehaviorSubject } from "rxjs";
+import { computed, Injectable, signal } from "@angular/core";
 import { Program } from "../models/program.model";
 
 @Injectable({
   providedIn: "root",
 })
 export class ProgramDataService {
-  private programSubject$ = new BehaviorSubject<Program | undefined>(undefined);
-  program$ = this.programSubject$.asObservable();
+  program = signal<Program | undefined>(undefined);
 
   setProgram(program: Program): void {
-    return this.programSubject$.next(program);
+    return this.program.set(program);
   }
+
+  programDateFinished = computed(() => {
+    const program = this.program();
+    return program?.datetimeFinished ? Date.now() > Date.parse(program.datetimeFinished) : false;
+  });
+
+  registerDateExpired = computed(() => {
+    const program = this.program();
+    return program?.datetimeRegistrationEnds
+      ? Date.now() > Date.parse(program.datetimeRegistrationEnds)
+      : false;
+  });
 }

projects/social_platform/src/app/office/program/shared/rating-card/rating-card.component.ts

@@ -146,7 +146,8 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
 
   isProjectCriterias = signal(0);
 
-  programDateFinished = signal(false);
+  readonly programDateFinished = this.programDataService.programDateFinished;
+  readonly program = this.programDataService.program;
 
   desktopMode$: Observable<boolean> = this.breakpointObserver
     .observe("(min-width: 920px)")
@@ -161,19 +162,6 @@ export class RatingCardComponent implements OnInit, AfterViewInit, OnDestroy {
       this.projectRated.set(isScored);
     }
 
-    const program$ = this.programDataService.program$
-      .pipe(
-        filter(program => !!program),
-        tap(program => {
-          if (program && program.datetimeFinished) {
-            this.programDateFinished.set(Date.now() > Date.parse(program.datetimeFinished));
-          }
-        })
-      )
-      .subscribe();
-
-    this.subscriptions$().push(program$);
-
     const profileId$ = this.authService.profile.subscribe({
       next: profile => {
         this.profile.set(profile);

projects/social_platform/src/app/office/projects/detail/chat/chat.component.html

@@ -1,5 +1,5 @@
 <!-- @format -->
-@if (project) {
+@if (project()) {
 <div class="chat-page">
   <div class="chat-page__main main">
     @if (!messages.length) {
@@ -30,7 +30,7 @@ <h2 class="info__title text-body-12">участники</h2>
         <i appIcon icon="team" appSquare="12"></i>
       </header>
       <ul class="info__list">
-        @for (member of project.collaborators; track member.userId) {
+        @for (member of project()?.collaborators; track member.userId) {
         <li class="info__item">
           <a class="member" [routerLink]="['/office/profile', member.userId]">
             <app-avatar class="member__avatar" [url]="member.avatar" [size]="30"></app-avatar>