fix: handle inner subscriptions

Author: lorenzomiscoli

src/app/layouts/notes/components/notes-archive/notes-archive.component.ts

@@ -37,9 +37,9 @@ export class NotesArchiveComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     this.findSettings();
     this.findArchived();
-    this.notesService.notesUpdated$.pipe(takeUntil(this.destroy$), switchMap(() => {
+    this.notesService.notesUpdated$.pipe(switchMap(() => {
       return this.notesService.findArchived();
-    })).subscribe(notes => this.notes = notes);
+    }), takeUntil(this.destroy$)).subscribe(notes => this.notes = notes);
     this.handleBackButton();
   }
 

src/app/layouts/notes/components/notes-calendar/notes-calendar.component.ts

@@ -95,8 +95,8 @@ export class NotesCalendarComponent implements OnInit, ViewWillEnter, ViewWillLe
   }
 
   private findCreationDatesOnNotesUpdate(): void {
-    this.notesService.notesUpdated$.pipe(takeUntil(this.destroy$),
-      switchMap(() => this.findCreationDates()), switchMap(() => this.findByCreationDate())).subscribe();
+    this.notesService.notesUpdated$.pipe(switchMap(() => this.findCreationDates()),
+      switchMap(() => this.findByCreationDate()), takeUntil(this.destroy$)).subscribe();
   }
 
   private setHighlightedDates(notesDates: { creationDate: string }[]): void {

src/app/layouts/notes/components/notes-categories-selected-header/notes-categories-selected-header.component.ts

@@ -122,13 +122,13 @@ export class NotesCategoriesSelectedHeaderComponent implements OnInit, OnDestroy
       return false;
     }
     const id = this.getSelectedCategories()[0].id;
-    this.notesCategoryService.existsByIdNotAndName(id, value.nameUpdate).pipe(takeUntil(this.destroy$), switchMap(isPresent => {
+    this.notesCategoryService.existsByIdNotAndName(id, value.nameUpdate).pipe(switchMap(isPresent => {
       if (isPresent) {
         throw { isPresent: true };
       } else {
         return this.notesCategoryService.update(id, value.nameUpdate)
       }
-    })).subscribe({
+    }), takeUntil(this.destroy$)).subscribe({
       next: () => {
         this.getSelectedCategories()[0].name = value.nameUpdate;
       },

src/app/layouts/notes/components/notes-categories/notes-categories.component.ts

@@ -51,10 +51,10 @@ export class NotesCategoriesComponent implements OnInit, OnDestroy {
 
   private getAllCategories(): void {
     this.isLoading = true;
-    this.notesService.count().pipe(takeUntil(this.destroy$), switchMap(notesCount => {
+    this.notesService.count().pipe(switchMap(notesCount => {
       this.totalNotes = notesCount.totalNotes;
       return this.notesCategoryService.findAll();
-    }), map(categories => this.mapCategories(categories)), finalize(() => this.isLoading = false))
+    }), map(categories => this.mapCategories(categories)), finalize(() => this.isLoading = false), takeUntil(this.destroy$))
       .subscribe((categories) => this.categories = categories);
   }
 
@@ -156,13 +156,13 @@ export class NotesCategoriesComponent implements OnInit, OnDestroy {
       this.showError(this.translateService.instant("categoryCannotBeEmpty"));
       return false;
     }
-    this.notesCategoryService.existsByName(value.nameInsert).pipe(takeUntil(this.destroy$), switchMap(isPresent => {
+    this.notesCategoryService.existsByName(value.nameInsert).pipe(switchMap(isPresent => {
       if (isPresent) {
         throw { isPresent: true };
       } else {
         return this.notesCategoryService.insert(value.nameInsert);
       }
-    })).subscribe(({
+    }), takeUntil(this.destroy$)).subscribe(({
       next: (id) => {
         this.categories.push({ id: id, name: value.nameInsert, notesCount: 0, isSelected: false });
       },

src/app/layouts/notes/components/notes-list/notes-list.component.ts

@@ -68,16 +68,16 @@ export class NotesListComponent implements OnInit, ViewWillEnter, ViewWillLeave
   }
 
   private findNotesOnCategorySelection(): void {
-    this.notesCategoryService.selectedCategory$.pipe(takeUntil(this.destroy$), switchMap((categoryId) => {
+    this.notesCategoryService.selectedCategory$.pipe(switchMap((categoryId) => {
       this.categoryId = categoryId;
       return this.findNotes();
-    })).subscribe(notes => this.notes = notes);
+    }), takeUntil(this.destroy$)).subscribe(notes => this.notes = notes);
   }
 
   private findNotesOnNotesUpdate(): void {
-    this.notesService.notesUpdated$.pipe(takeUntil(this.destroy$), switchMap(() => {
+    this.notesService.notesUpdated$.pipe(switchMap(() => {
       return this.findNotes();
-    })).subscribe(notes => this.notes = notes);
+    }), takeUntil(this.destroy$)).subscribe(notes => this.notes = notes);
   }
 
   private findNotes(): Observable<Note[]> {

src/app/layouts/notes/components/notes-save/notes-save.component.ts

@@ -167,9 +167,9 @@ export class NotesSaveComponent implements OnInit, OnDestroy, ViewDidEnter {
     const creationDate = this.creationDate ? this.creationDate : new Date().toISOString();
     const categoryId: number | undefined = this.notesCategoryService.selectedCategory$.value;
     this.notesService.insert(creationDate, categoryId)
-      .pipe(takeUntil(this.destroy$), switchMap(id => {
+      .pipe(switchMap(id => {
         return this.notesService.findById(id);
-      })).subscribe((note) => {
+      }), takeUntil(this.destroy$)).subscribe((note) => {
         note = note as Note;
         this.id = note.id;
         this.note = note;
@@ -219,7 +219,7 @@ export class NotesSaveComponent implements OnInit, OnDestroy, ViewDidEnter {
   public share(): void {
     const value = this.form.value.value ? toHTML(this.form.value.value) : '';
     from(Share.canShare())
-      .pipe(takeUntil(this.destroy$), switchMap((shareResult: CanShareResult) => {
+      .pipe(switchMap((shareResult: CanShareResult) => {
         if (shareResult.value) {
           return Share.share({
             title: this.form.value.title,
@@ -231,7 +231,7 @@ export class NotesSaveComponent implements OnInit, OnDestroy, ViewDidEnter {
           this.isToastOpen = true;
           return of()
         }
-      })).subscribe();
+      }), takeUntil(this.destroy$)).subscribe();
   }
 
 }

src/app/layouts/notes/components/notes-trash/notes-trash.component.ts

@@ -37,9 +37,9 @@ export class NotesTrashComponent implements OnInit, OnDestroy {
   ngOnInit(): void {
     this.findSettings();
     this.findDeleted();
-    this.notesService.notesUpdated$.pipe(takeUntil(this.destroy$), switchMap(() => {
+    this.notesService.notesUpdated$.pipe(switchMap(() => {
       return this.notesService.findDeleted();
-    })).subscribe(notes => this.notes = notes);
+    }), takeUntil(this.destroy$)).subscribe(notes => this.notes = notes);
     this.handleBackButton();
   }