used urlparams instead of computed

Author: rfontanarosa

web/src/app/components/job-list-item/job-list-item.component.ts

@@ -39,8 +39,7 @@ export class JobListItemComponent implements OnInit, OnDestroy {
   @Input() job?: Job;
   @Input() actionsType: JobListItemActionsType = JobListItemActionsType.MENU;
 
-  private surveyIdSignal = this.navigationService.getSurveyId();
-  private loiIdSignal = this.navigationService.getLoiId();
+  private urlParamsSignal = this.navigationService.getUrlParams();
 
   surveyId?: string | null;
   loiId?: string | null;
@@ -72,8 +71,9 @@ export class JobListItemComponent implements OnInit, OnDestroy {
     this.dataSource = new DynamicDataSource(this.treeControl, this.loiService);
 
     effect(() => {
-      this.surveyId = this.surveyIdSignal();
-      this.loiId = this.loiIdSignal();
+      const {surveyId, loiId} = this.urlParamsSignal();
+      this.surveyId = surveyId;
+      this.loiId = loiId;
     });
   }
 

web/src/app/pages/main-page-container/main-page/main-page.component.ts

@@ -39,8 +39,7 @@ import {TitleDialogComponent} from './title-dialog/title-dialog.component';
   styleUrls: ['./main-page.component.scss'],
 })
 export class MainPageComponent implements OnInit {
-  private loiIdSignal = this.navigationService.getLoiId();
-  private submissionIdSignal = this.navigationService.getSubmissionId();
+  private urlParamsSignal = this.navigationService.getUrlParams();
 
   activeSurvey$: Observable<Survey>;
   subscription: Subscription = new Subscription();
@@ -58,8 +57,7 @@ export class MainPageComponent implements OnInit {
     this.activeSurvey$ = this.surveyService.getActiveSurvey$();
 
     effect(() => {
-      const loiId = this.loiIdSignal();
-      const submissionId = this.submissionIdSignal();
+      const {loiId, submissionId} = this.urlParamsSignal();
       if (loiId) this.loiService.selectLocationOfInterest(loiId);
       if (submissionId) this.submissionService.selectSubmission(submissionId);
     });
@@ -84,14 +82,14 @@ export class MainPageComponent implements OnInit {
     );
   }
 
-  ngOnDestroy() {
-    this.subscription.unsubscribe();
-  }
-
   private showTitleDialog() {
     this.dialog.open(TitleDialogComponent, {
       width: '500px',
       disableClose: true,
     });
   }
+
+  ngOnDestroy() {
+    this.subscription.unsubscribe();
+  }
 }