Merge pull request #3433 from ita-social-projects/refactor-deprecated…

…-subscribe

refactor: Deprecated .subscribe() signature

src/app/app.module.ts

@@ -38,17 +38,17 @@ export function appInitializerFactory(translate: TranslateService, injector: Inj
 
         const selectedLanguage = languageService.getCurrentLanguage();
 
-        translate.use(selectedLanguage).subscribe(
-          () => {
+        translate.use(selectedLanguage).subscribe({
+          next: () => {
             console.log(`Successfully initialized '${selectedLanguage}' language.`);
           },
-          (err) => {
+          error: (err) => {
             console.error(`Problem with '${selectedLanguage}' language initialization.`, { err });
           },
-          () => {
+          complete: () => {
             resolve(null);
           }
-        );
+        });
       });
     });
 }

src/app/main/component/auth/components/confirm-restore-password/confirm-restore-password.component.ts

@@ -85,17 +85,17 @@ export class ConfirmRestorePasswordComponent implements OnInit {
     this.restoreDto.password = this.confirmRestorePasswordForm.value.password;
     this.restoreDto.token = this.token;
     this.restoreDto.isUbs = this.isUbs;
-    this.changePasswordService.restorePassword(this.restoreDto).subscribe(
-      (data) => {
+    this.changePasswordService.restorePassword(this.restoreDto).subscribe({
+      next: (data) => {
         this.form = data;
         this.router.navigate(this.isUbs ? ['ubs'] : ['']);
         this.snackBar.openSnackBar(this.isUbs ? 'successConfirmPasswordUbs' : 'successConfirmPassword');
       },
-      (error) => {
+      error: (error) => {
         this.form = error;
         this.snackBar.openSnackBar('sendNewLetter');
       }
-    );
+    });
   }
 
   setPasswordBackendErr(): void {

src/app/main/component/auth/components/sign-up/sign-up.component.ts

@@ -111,14 +111,14 @@ export class SignUpComponent implements OnInit, OnDestroy, OnChanges {
     this.userOwnSignUpService
       .signUp(userOwnRegister, this.currentLanguage)
       .pipe(takeUntil(this.destroy))
-      .subscribe(
-        (data: SuccessSignUpDto) => {
+      .subscribe({
+        next: (data: SuccessSignUpDto) => {
           this.onSubmitSuccess(data);
         },
-        (error: HttpErrorResponse) => {
+        error: (error: HttpErrorResponse) => {
           this.onSubmitError(error);
         }
-      );
+      });
   }
 
   signUpWithGoogle(): void {

src/app/main/component/home/components/eco-events/eco-events.component.ts

@@ -20,13 +20,13 @@ export class EcoEventsComponent implements OnInit {
   }
 
   private loadLatestNews(): void {
-    this.newsService.loadLatestNews().subscribe(
-      (data: NewsDto[]) => {
+    this.newsService.loadLatestNews().subscribe({
+      next: (data: NewsDto[]) => {
         this.latestNews = data;
       },
-      (error) => {
+      error: (error) => {
         throw error;
       }
-    );
+    });
   }
 }

src/app/main/component/user/components/habit/add-new-habit/habit-invite-friends/habit-invite-friends-pop-up/habit-invite-friends-pop-up.component.ts

@@ -78,15 +78,15 @@ export class HabitInviteFriendsPopUpComponent implements OnInit, OnDestroy {
   inviteFriends(event: Event) {
     event.preventDefault();
     if (this.habitId && this.selectedFriends.length) {
-      this.userFriendsService.inviteFriendsToHabit(this.habitId, this.selectedFriends).subscribe(
-        () => {
+      this.userFriendsService.inviteFriendsToHabit(this.habitId, this.selectedFriends).subscribe({
+        next: () => {
           this.invitationSent = true;
           this.setAddedFriends();
         },
-        (error) => {
+        error: (error) => {
           this.snackBar.openSnackBar('snack-bar.error.default');
         }
-      );
+      });
     }
   }
 

src/app/main/component/user/components/habit/user-log-component/user-log.component.ts

@@ -23,15 +23,15 @@ export class UserLogComponent implements OnInit {
 
   ngOnInit() {
     this.retrieveUserLog();
-    this.habitStatisticService.habitStatistics.subscribe(
-      () => {
+    this.habitStatisticService.habitStatistics.subscribe({
+      next: () => {
         this.retrieveUserLog();
       },
-      (error) => {
+      error: (error) => {
         this.hasStatistic = false;
         console.log('Error!', error);
       }
-    );
+    });
   }
 
   nowDate() {
@@ -57,17 +57,17 @@ export class UserLogComponent implements OnInit {
   }
 
   private retrieveUserLog() {
-    this.$userLog = this.habitStatisticService.getUserLog().subscribe(
-      (data) => {
+    this.$userLog = this.habitStatisticService.getUserLog().subscribe({
+      next: (data) => {
         this.hasStatistic = true;
         this.$creationDate = data.creationDate;
         this.initializeNotTakenItemsStatistics(data);
       },
-      (error) => {
+      error: (error) => {
         this.hasStatistic = false;
         console.log('Error!', error);
       }
-    );
+    });
   }
 
   private initializeNotTakenItemsStatistics(data: any) {

src/app/main/component/user/components/profile/users-friends/friend-dashboard/all-friends/all-friends.component.ts

@@ -68,19 +68,19 @@ export class AllFriendsComponent implements OnInit, OnDestroy {
       this.userFriendsService
         .getFriendsByName(value)
         .pipe(takeUntil(this.destroy$))
-        .subscribe(
-          (data: FriendArrayModel) => {
+        .subscribe({
+          next: (data: FriendArrayModel) => {
             this.emptySearchList = !data.page.length;
             this.friends = data.page;
             this.isFetching = false;
             this.searchMode = false;
           },
-          (error) => {
+          error: (error) => {
             this.matSnackBar.openSnackBar('snack-bar.error.default');
             this.isFetching = false;
             this.searchMode = false;
           }
-        );
+        });
     } else {
       this.searchMode = false;
       this.emptySearchList = false;

src/app/main/service/habit-statistic/habit-statistic.service.ts

@@ -34,23 +34,23 @@ export class HabitStatisticService implements OnLogout {
   }
 
   loadHabitStatistics(language: string) {
-    this.http.get<HabitDto[]>(`${userLink}/${this.userId}/habits?language=${language}`).subscribe(
-      (data) => {
+    this.http.get<HabitDto[]>(`${userLink}/${this.userId}/habits?language=${language}`).subscribe({
+      next: (data) => {
         this.dataStore.habitStatistics = data;
         this.$habitStatistics.next({ ...this.dataStore }.habitStatistics);
       },
-      () => console.log('Can not load habit statistic.')
-    );
+      error: () => console.log('Can not load habit statistic.')
+    });
   }
 
   loadAvailableHabits(language: string) {
-    this.http.get<AvailableHabitDto[]>(`${userLink}/${this.userId}/habit-dictionary/available?language=${language}`).subscribe(
-      (data) => {
+    this.http.get<AvailableHabitDto[]>(`${userLink}/${this.userId}/habit-dictionary/available?language=${language}`).subscribe({
+      next: (data) => {
         this.dataStore.availableHabits = data;
         this.$availableHabits.next({ ...this.dataStore }.availableHabits);
       },
-      () => console.log('Can not load available habits.')
-    );
+      error: () => console.log('Can not load available habits.')
+    });
   }
 
   setNewHabitsState(args) {
@@ -62,27 +62,27 @@ export class HabitStatisticService implements OnLogout {
   }
 
   createHabits(language: string) {
-    this.http.post<any>(`${userLink}/${this.userId}/habit?language=${language}`, this.dataStore.newHabits).subscribe(
-      () => {
+    this.http.post<any>(`${userLink}/${this.userId}/habit?language=${language}`, this.dataStore.newHabits).subscribe({
+      next: () => {
         this.clearDataStore(language);
       },
-      () => console.log('Can not assign new habit for this user')
-    );
+      error: () => console.log('Can not assign new habit for this user')
+    });
   }
 
   deleteHabit(habitId: number, language: string) {
-    this.http.delete<any>(`${userLink}/${this.userId}/habit/${habitId}`).subscribe(
-      () => {
+    this.http.delete<any>(`${userLink}/${this.userId}/habit/${habitId}`).subscribe({
+      next: () => {
         this.loadAvailableHabits(language);
         this.loadHabitStatistics(language);
       },
-      () => console.log('Can not remove habit for this user')
-    );
+      error: () => console.log('Can not remove habit for this user')
+    });
   }
 
   updateHabitStatistic(habitStatisticDto: HabitStatisticsDto) {
-    this.http.patch<HabitStatisticsDto>(`${habitStatisticLink}${habitStatisticDto.id}`, habitStatisticDto).subscribe(
-      (data) => {
+    this.http.patch<HabitStatisticsDto>(`${habitStatisticLink}${habitStatisticDto.id}`, habitStatisticDto).subscribe({
+      next: (data) => {
         let index: number;
 
         this.dataStore.habitStatistics.forEach((item, i) => {
@@ -100,15 +100,15 @@ export class HabitStatisticService implements OnLogout {
           }
         });
       },
-      () => console.log('Can not update habit statistic')
-    );
+      error: () => console.log('Can not update habit statistic')
+    });
   }
 
   createHabitStatistic(habitStatistics: HabitStatisticsDto) {
     const toSend: any = habitStatistics;
     toSend.createdOn = new Date().toISOString();
-    this.http.post<HabitStatisticsDto>(`${habitStatisticLink}`, toSend).subscribe(
-      (data) => {
+    this.http.post<HabitStatisticsDto>(`${habitStatisticLink}`, toSend).subscribe({
+      next: (data) => {
         this.dataStore.habitStatistics.forEach((habit, habitIndex) => {
           if (habit.id === habitStatistics.habitId) {
             habit.habitStatistics.forEach((stat, statIndex) => {
@@ -126,8 +126,8 @@ export class HabitStatisticService implements OnLogout {
           }
         });
       },
-      () => console.log('Can not create habit statistic')
-    );
+      error: () => console.log('Can not create habit statistic')
+    });
   }
 
   getUserLog(): Observable<any> {

src/app/ubs/ubs-admin/components/add-payment/add-payment.component.ts

@@ -207,16 +207,16 @@ export class AddPaymentComponent implements OnInit, OnDestroy {
         ),
         takeUntil(this.destroySub)
       )
-      .subscribe(
-        (data: IPaymentInfoDto) => {
+      .subscribe({
+        next: (data: IPaymentInfoDto) => {
           data.amount /= 100;
           this.dialogRef.close(data);
         },
-        (err) => {
+        error: (err) => {
           console.error('error', err);
           this.isUploading = false;
         }
-      );
+      });
   }
 
   filesDropped(files: FileHandle[]): void {
@@ -342,14 +342,14 @@ export class AddPaymentComponent implements OnInit, OnDestroy {
           this.orderService
             .deleteManualPayment(this.payment.id)
             .pipe(takeUntil(this.destroySub))
-            .subscribe(
-              () => {
+            .subscribe({
+              next: () => {
                 this.dialogRef.close(this.payment.id);
               },
-              () => {
+              error: () => {
                 this.isDeleting = false;
               }
-            );
+            });
         }
       });
   }

src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-edit-form/ubs-admin-employee-edit-form.component.ts

@@ -133,12 +133,12 @@ export class UbsAdminEmployeeEditFormComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    this.employeeService.getAllPositions().subscribe(
-      (roles) => {
+    this.employeeService.getAllPositions().subscribe({
+      next: (roles) => {
         this.roles = roles;
       },
-      (error) => console.error('Observer for role got an error: ' + error)
-    );
+      error: (error) => console.error('Observer for role got an error: ' + error)
+    });
     this.store
       .select((state: IAppState): Employees => state.employees.employees)
       .pipe(skip(1))

src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee-permissions-form/ubs-admin-employee-permissions-form.component.ts

@@ -143,17 +143,17 @@ export class UbsAdminEmployeePermissionsFormComponent implements OnInit, OnDestr
       .filter(([, selected]) => selected)
       .map(([perm]) => perm);
 
-    this.employeeService.updatePermissions(this.employee.email, selectedPermissions).subscribe(
-      () => {
+    this.employeeService.updatePermissions(this.employee.email, selectedPermissions).subscribe({
+      next: () => {
         this.isUpdating = false;
         this.snackBar.openSnackBar('successUpdateUbsData');
         this.dialogRef.close(true);
       },
-      (error) => {
+      error: (error) => {
         this.snackBar.openSnackBar('error', error);
         this.dialogRef.close(false);
       }
-    );
+    });
   }
 
   managePermissionSettings(actionType: string): void {

src/app/ubs/ubs-admin/components/ubs-admin-employee/ubs-admin-employee.component.ts

@@ -202,15 +202,15 @@ export class UbsAdminEmployeeComponent implements OnInit, OnDestroy {
     this.ubsAdminEmployeeService
       .getAllPositions()
       .pipe(takeUntil(this.destroy$))
-      .subscribe(
-        (roles) => {
+      .subscribe({
+        next: (roles) => {
           this.employeePositions = roles;
           this.positionName = this.employeePositions.map((position: EmployeePositions) =>
             this.languageService.getLangValue(position.name, position.nameEn)
           );
         },
-        (error) => console.error('Observer for role got an error: ' + error)
-      );
+        error: (error) => console.error('Observer for role got an error: ' + error)
+      });
   }
 
   getContacts(): void {

src/app/ubs/ubs-admin/components/ubs-admin-notification/ubs-admin-notification.component.ts

@@ -86,12 +86,12 @@ export class UbsAdminNotificationComponent implements OnInit, OnDestroy {
     this.notificationsService
       .getNotificationTemplate(id)
       .pipe(take(1))
-      .subscribe(
-        (notification: NotificationTemplate) => {
+      .subscribe({
+        next: (notification: NotificationTemplate) => {
           this.notification = formatUnixCron(notification);
         },
-        () => this.navigateToNotificationList()
-      );
+        error: () => this.navigateToNotificationList()
+      });
   }
 
   navigateToNotificationList(): void {