added missing susbcription and clean up #449

Author: Shayan1375

src/app/modules/data-query/data-query/data-selection/action-bar/data-selection-action-bar.component.ts

@@ -1,5 +1,6 @@
 import { CCDLUploadService } from 'src/app/service/Upload/CCDLUpload.service';
 import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core';
+import { DataSelectionFactoryService } from 'src/app/service/DataSelection/DataSelection.factory.service';
 import { DataSelectionProviderService } from 'src/app/modules/data-selection/services/DataSelectionProvider.service';
 import { DownloadCRDTLService } from 'src/app/service/Download/DownloadCRDTL.service';
 import { DownloadDataSelectionComponent } from '../download-data-selection/download-data-selection.component';
@@ -9,8 +10,6 @@ import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
 import { NavigationHelperService } from 'src/app/service/NavigationHelper.service';
 import { Observable, Subscription } from 'rxjs';
 import { SnackbarService } from 'src/app/shared/service/Snackbar/Snackbar.service';
-import { DataSelectionFactoryService } from 'src/app/service/DataSelection/DataSelection.factory.service';
-import { is } from 'cypress/types/bluebird';
 
 @Component({
   selector: 'num-data-selection-action-bar',
@@ -25,6 +24,8 @@ export class DataSelectionActionBarComponent implements OnDestroy, OnInit {
 
   downloadSubscription: Subscription;
 
+  mainProfileSubscription: Subscription;
+
   constructor(
     public elementRef: ElementRef,
     private dataSelectionProviderService: DataSelectionProviderService,
@@ -45,17 +46,17 @@ export class DataSelectionActionBarComponent implements OnDestroy, OnInit {
   }
 
   ngOnDestroy(): void {
-    if (this.subscription) {
-      this.subscription?.unsubscribe();
-    }
+    this.mainProfileSubscription?.unsubscribe();
+    this.subscription?.unsubscribe();
   }
 
   public editDataSelection() {
     this.navigationHelperService.navigateToDataSelectionEditor();
   }
 
   public createNewDataSelection() {
-    this.dataSelectionFactoryService.instantiate();
+    this.mainProfileSubscription?.unsubscribe();
+    this.dataSelectionFactoryService.instantiate().subscribe();
     this.navigationHelperService.navigateToDataSelectionSearch();
   }
 

src/app/service/DataSelection/DataSelection.factory.service.ts

@@ -1,5 +1,6 @@
 import { DataSelection } from 'src/app/model/DataSelection/DataSelection';
 import { DataSelectionMainProfileInitializerService } from '../DataSelectionMainProfileInitializerService';
+import { DataSelectionProfile } from 'src/app/model/DataSelection/Profile/DataSelectionProfile';
 import { DataSelectionProviderService } from 'src/app/modules/data-selection/services/DataSelectionProvider.service';
 import { Injectable } from '@angular/core';
 import { map, Observable, take } from 'rxjs';
@@ -19,18 +20,15 @@ export class DataSelectionFactoryService {
   ) {}
 
   public instantiate(): Observable<DataSelection> {
-    const dataSelection = this.createEmptyDataSelection();
-    this.setDataSelectionProvider(dataSelection);
-
     return this.loadMainProfile().pipe(
-      map((mainProfile) => this.setProfileInDataSelection(dataSelection, mainProfile))
+      map((mainProfile: DataSelectionProfile) => {
+        const dataSelection = this.setProfileInDataSelection(mainProfile);
+        this.setDataSelectionProvider(dataSelection);
+        return dataSelection;
+      })
     );
   }
 
-  private createEmptyDataSelection(): DataSelection {
-    return new DataSelection([], uuidv4());
-  }
-
   private setDataSelectionProvider(dataSelection: DataSelection): void {
     this.dataSelectionProviderService.setDataSelectionByUID(
       dataSelection.getId(),
@@ -40,10 +38,11 @@ export class DataSelectionFactoryService {
   }
 
   private loadMainProfile() {
-    return this.dataSelectionMainProfileInitializerService.initializePatientProfile().pipe(take(1));
+    return this.dataSelectionMainProfileInitializerService.initializePatientProfile();
   }
 
-  private setProfileInDataSelection(dataSelection: DataSelection, mainProfile: any): DataSelection {
+  private setProfileInDataSelection(mainProfile: DataSelectionProfile): DataSelection {
+    const dataSelection = new DataSelection([], uuidv4());
     dataSelection.setProfiles([mainProfile]);
     return dataSelection;
   }