Handle isLoading logic

open-learning-exchange · Jan 6, 2025 · 0de9e41 · 0de9e41
1 parent e444d7f
commit 0de9e41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/src/app/users/users-achievements/users-achievements-update.component.html b/src/app/users/users-achievements/users-achievements-update.component.html
@@ -1,9 +1,7 @@
 <mat-toolbar>
-    <button mat-icon-button (click)="goBack()"><mat-icon>arrow_back</mat-icon></button>
-    <span *ngIf="!isLoading">
-      <span *ngIf="achievementNotFound" i18n>Add Achievements</span>
-      <span *ngIf="!achievementNotFound" i18n>Edit Achievements</span>
-  </span>
+  <button mat-icon-button (click)="goBack()"><mat-icon>arrow_back</mat-icon></button>
+  <span *ngIf="achievementNotFound" i18n>Add Achievements</span>
+  <span *ngIf="!achievementNotFound" i18n>Edit Achievements</span>
 </mat-toolbar>
 
 <div class="planet-users-achievements-update space-container">

diff --git a/src/app/users/users-achievements/users-achievements-update.component.ts b/src/app/users/users-achievements/users-achievements-update.component.ts
@@ -25,7 +25,6 @@ export class UsersAchievementsUpdateComponent implements OnInit, OnDestroy {
   docInfo = { '_id': this.user._id + '@' + this.configuration.code, '_rev': undefined };
   readonly dbName = 'achievements';
   achievementNotFound = false;
-  isLoading = true;
   editForm: FormGroup;
   profileForm: FormGroup;
   private onDestroy$ = new Subject<void>();
@@ -64,7 +63,6 @@ export class UsersAchievementsUpdateComponent implements OnInit, OnDestroy {
         catchError(() => this.usersAchievementsService.getAchievements(this.user._id))
       )
       .subscribe((achievements) => {
-        this.isLoading = false;
         this.editForm.patchValue(achievements);
         this.editForm.controls.achievements = this.fb.array(achievements.achievements || []);
         this.editForm.controls.references = this.fb.array(achievements.references || []);
@@ -78,7 +76,6 @@ export class UsersAchievementsUpdateComponent implements OnInit, OnDestroy {
       }, (error) => {
         console.log(error);
         this.achievementNotFound = true;
-        this.isLoading = false;
       });
 
     this.planetStepListService.stepMoveClick$.pipe(takeUntil(this.onDestroy$)).subscribe(