resolve for dataselection profiles

Author: Shayan1375

src/app/modules/data-selection/components/search/search.component.ts

@@ -22,6 +22,7 @@ import { TreeNode } from 'src/app/shared/models/TreeNode/TreeNodeInterface';
 import { DataSelectionProfile } from 'src/app/model/DataSelection/Profile/DataSelectionProfile';
 import { DataSelectionProviderService } from '../../services/DataSelectionProvider.service';
 import { NavigationHelperService } from 'src/app/service/NavigationHelper.service';
+import { ActivatedRoute } from '@angular/router';
 
 @Component({
   selector: 'num-search-data-selection',
@@ -55,7 +56,8 @@ export class SearchDataSelectionComponent implements OnInit, AfterViewInit, OnDe
     private dataSelectionProviderService: DataSelectionProviderService,
     private activeDataSelectionService: ActiveDataSelectionService,
     private selectedDataSelectionProfileService: SelectedDataSelectionProfileService,
-    private navigationHelperService: NavigationHelperService
+    private navigationHelperService: NavigationHelperService,
+    private activeRoute: ActivatedRoute
   ) {}
 
   ngOnInit(): void {
@@ -66,13 +68,9 @@ export class SearchDataSelectionComponent implements OnInit, AfterViewInit, OnDe
       this.selectedDataSelectionProfileService.getSelectedProfiles();
 
     this.handleSelectedItemsSubscription();
-    this.dataSelectionProfileTreeSubscription = this.dataSelectionProfileTreeService
-      .fetchProfileTree()
-      .subscribe((tree) => {
-        const treeNodes = tree.getTreeNode();
-        const rootNode = DataSelectionTreeAdapter.fromTree(tree.getTreeNode());
-        this.trees = rootNode;
-      });
+    const tree = this.activeRoute.snapshot.data.preLoadDataSelectionData;
+    const rootNode = DataSelectionTreeAdapter.fromTree(tree.getTreeNode());
+    this.trees = rootNode;
   }
 
   /**

src/app/modules/data-selection/data-selection-routing.module.ts

@@ -3,6 +3,7 @@ import { NgModule } from '@angular/core';
 import { RouterModule, Routes } from '@angular/router';
 import { SearchDataSelectionComponent } from './components/search/search.component';
 import { PathSegments } from 'src/app/app-paths';
+import { DataSelectionProfileResolverService } from 'src/app/service/Resolver/DataSelectionProfileResolver.servcie';
 
 const routes: Routes = [
   {
@@ -14,6 +15,9 @@ const routes: Routes = [
   {
     path: PathSegments.search,
     component: SearchDataSelectionComponent,
+    resolve: {
+      preLoadDataSelectionData: DataSelectionProfileResolverService,
+    },
     data: { animation: 'Data_Selection_Search', title: 'TAB_TITLE.DATA_SELECTION.SEARCH' },
   },
   {

src/app/service/Resolver/CriteriaSearchDataResolver.service.ts

@@ -9,7 +9,7 @@ import { Observable } from 'rxjs';
 export class CriteriaSearchDataResolverService {
   constructor(private searchService: SearchService) {}
 
-  resolve(): Observable<SearchTermResultList> {
+  public resolve(): Observable<SearchTermResultList> {
     return this.searchService.searchCriteria('');
   }
 }

src/app/service/Resolver/CriteriaSearchFilterResolver.service.ts

@@ -9,7 +9,7 @@ import { SearchTermFilter } from 'src/app/model/ElasticSearch/ElasticSearchFilte
 export class CriteriaSearchFilterResolverService {
   constructor(private searchFilterService: SearchFilterService) {}
 
-  resolve(): Observable<Array<SearchTermFilter>> {
+  public resolve(): Observable<Array<SearchTermFilter>> {
     return this.searchFilterService.fetchFilters();
   }
 }

src/app/service/Resolver/DataSelectionProfileResolver.servcie.ts

@@ -0,0 +1,15 @@
+import { DataSelectionProfileTree } from 'src/app/model/DataSelection/ProfileTree/DataSelectionProfileTree';
+import { DataSelectionProfileTreeService } from '../DataSelection/CreateDataselectionProfileTree';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class DataSelectionProfileResolverService {
+  constructor(private dataSelectionProfileTreeService: DataSelectionProfileTreeService) {}
+
+  public resolve(): Observable<DataSelectionProfileTree> {
+    return this.dataSelectionProfileTreeService.fetchProfileTree();
+  }
+}

src/app/shared/models/SearchFilter/CriteriaSearchFilterAdapter.ts

@@ -6,7 +6,6 @@ import { TerminologySystemDictionary } from 'src/app/model/Utilities/Terminology
 
 export class CriteriaSearchFilterAdapter {
   public static convertToFilterValues(filter: SearchTermFilter): SearchFilter {
-    console.log('Converting SearchTermFilter to SearchFilter:', filter);
     const searchFilterValues: SearchFilterValues[] = filter
       .getValues()
       .map((filterValue: SearchTermFilterValues) =>