Fav fix

src/app/header/progress-bar/progress-bar.component.html

@@ -1,5 +1,13 @@
 <div
-  *ngIf="isLoadingResultPage || isLoadingMetaData || isLoadingCabinet || isLoadingAdminData || isLoadingMainPage"
+  *ngIf="
+    isLoadingResultPage ||
+    isLoadingMetaData ||
+    isLoadingCabinet ||
+    isLoadingAdminData ||
+    isLoadingMainPage ||
+    isLoadingProvider ||
+    isAutorizationLoading
+  "
   class="progress-bar">
   <mat-progress-bar mode="indeterminate"> </mat-progress-bar>
 </div>

src/app/header/progress-bar/progress-bar.component.ts

@@ -1,3 +1,5 @@
+import { RegistrationState } from 'src/app/shared/store/registration.state';
+import { ProviderState } from './../../shared/store/provider.state';
 import { MainPageState } from 'src/app/shared/store/main-page.state';
 import { Component, OnInit, OnDestroy } from '@angular/core';
 import { Select } from '@ngxs/store';
@@ -24,13 +26,19 @@ export class ProgressBarComponent implements OnInit, OnDestroy {
   isLoadingAdminData$: Observable<boolean>;
   @Select(MainPageState.isLoadingData)
   isLoadingMainPage$: Observable<boolean>;
+  @Select(ProviderState.isLoading)
+  isLoadingProvider$: Observable<boolean>;
+  @Select(RegistrationState.isAutorizationLoading)
+  isAutorizationLoading$: Observable<boolean>;
 
   isLoadingResultPage: boolean;
   isLoadingCabinet: boolean;
   isLoadingMetaData: boolean;
   isLoadingAdminData: boolean;
   isLoadingNotifications: boolean;
   isLoadingMainPage: boolean;
+  isAutorizationLoading: boolean;
+  isLoadingProvider: boolean;
 
   private destroy$: Subject<boolean> = new Subject<boolean>();
 
@@ -42,16 +50,30 @@ export class ProgressBarComponent implements OnInit, OnDestroy {
       this.isLoadingMetaData$,
       this.isLoadingCabinet$,
       this.isLoadingAdminData$,
-      this.isLoadingMainPage$
+      this.isLoadingMainPage$,
+      this.isAutorizationLoading$,
+      this.isLoadingProvider$,
     ])
       .pipe(takeUntil(this.destroy$), delay(0))
-      .subscribe(([isLoadingResult, isLoadingMeta, isLoadingCabinet, isLoadingAdminData, isLoadingMainPage]) => {
-        this.isLoadingResultPage = isLoadingResult;
-        this.isLoadingMetaData = isLoadingMeta;
-        this.isLoadingCabinet = isLoadingCabinet;
-        this.isLoadingAdminData = isLoadingAdminData;
-        this.isLoadingMainPage = isLoadingMainPage;
-      });
+      .subscribe(
+        ([
+          isLoadingResult,
+          isLoadingMeta,
+          isLoadingCabinet,
+          isLoadingAdminData,
+          isLoadingMainPage,
+          isAutorizationLoading,
+          isLoadingProvider,
+        ]) => {
+          this.isLoadingResultPage = isLoadingResult;
+          this.isLoadingMetaData = isLoadingMeta;
+          this.isLoadingCabinet = isLoadingCabinet;
+          this.isLoadingAdminData = isLoadingAdminData;
+          this.isLoadingMainPage = isLoadingMainPage;
+          this.isAutorizationLoading = isAutorizationLoading;
+          this.isLoadingProvider = isLoadingProvider;
+        }
+      );
   }
 
   ngOnDestroy(): void {

src/app/shared/components/workshop-card/workshop-card.component.html

@@ -86,7 +86,7 @@
 <ng-template #favorite>
   <div
     class="actions_btn action-icon favorite-icon"
-    (click)="role === Role.parent && onDisLike(this.favoriteWorkshopId?.id)">
+    (click)="role === Role.parent && onDisLike()">
     <mat-icon>favorite</mat-icon>
   </div>
 </ng-template>

src/app/shared/components/workshop-card/workshop-card.component.ts

@@ -38,10 +38,12 @@ export class WorkshopCardComponent implements OnInit, OnDestroy {
   readonly recruitmentStatusUkr = RecruitmentStatusUkr;
   readonly modalConfirmationType = ModalConfirmationType;
 
-  isFavorite: boolean;
+  isFavorite = false;
   canChangeWorkshopStatus: boolean;
   workshopData: ProviderWorkshopCard | WorkshopCard;
 
+  private favoriteWorkshopId: string;
+
   @Input() set workshop(workshop: WorkshopCard) {
     this.workshopData = workshop;
     this.imagesService.setWorkshopCoverImage(workshop);
@@ -95,9 +97,9 @@ export class WorkshopCardComponent implements OnInit, OnDestroy {
     this.isFavorite = !this.isFavorite;
   }
 
-  onDisLike(id: string): void {
+  onDisLike(): void {
     this.store.dispatch([
-      new DeleteFavoriteWorkshop(id),
+      new DeleteFavoriteWorkshop(this.favoriteWorkshopId),
       new ShowMessageBar({ message: `Гурток ${this.workshopData.title} видалено з Улюблених`, type: 'success' }),
     ]);
     this.isFavorite = !this.isFavorite;
@@ -139,7 +141,11 @@ export class WorkshopCardComponent implements OnInit, OnDestroy {
         filter((favorites: Favorite[]) => !!favorites)
       )
       .subscribe((favorites: Favorite[]) => {
-        this.isFavorite = !!favorites.find((item: Favorite) => item.workshopId === this.workshopData.workshopId);
+        const favorite = favorites.find((item: Favorite) => item.workshopId === this.workshopData.workshopId);
+        if (!!favorite) {
+          this.favoriteWorkshopId = favorite.id;
+          this.isFavorite = true;
+        }
       });
   }
 }

src/app/shell/main/main.component.ts

@@ -5,7 +5,7 @@ import { FilterState } from 'src/app/shared/store/filter.state';
 import { RegistrationState } from '../../shared/store/registration.state';
 import { DirectionsStatistic } from 'src/app/shared/models/category.model';
 import { WorkshopCard } from '../../shared/models/workshop.model';
-import { filter, takeUntil } from 'rxjs/operators';
+import { filter, take, takeUntil } from 'rxjs/operators';
 import { UserState } from 'src/app/shared/store/user.state';
 import { Favorite } from 'src/app/shared/models/favorite.model';
 import { Role } from 'src/app/shared/enum/role';
@@ -74,8 +74,8 @@ export class MainComponent implements OnInit, OnDestroy {
     if (role === Role.parent) {
       this.favoriteWorkshops$
         .pipe(
+          take(1),
           filter((favorite: Favorite[]) => !!favorite?.length || favorite === null),
-          takeUntil(this.destroy$)
         )
         .subscribe((favorite: Favorite[]) => this.getMainPageData());
     } else {