Update URL paths and remove unused code

google · Dec 11, 2024 · f1ee798 · f1ee798
1 parent 093c337
commit f1ee798
Show file tree

Hide file tree

Showing 25 changed files with 144 additions and 1,159 deletions.
diff --git a/web/src/app/components/job-list-item/job-list-item.component.spec.ts b/web/src/app/components/job-list-item/job-list-item.component.spec.ts
@@ -257,6 +257,6 @@ describe('JobListItemComponent', () => {
 
     expect(
       navigationServiceSpy.selectLocationOfInterest
-    ).toHaveBeenCalledOnceWith(loiId);
+    ).toHaveBeenCalledOnceWith(surveyId, loiId);
   });
 });
diff --git a/web/src/app/components/job-list-item/job-list-item.component.ts b/web/src/app/components/job-list-item/job-list-item.component.ts
@@ -120,13 +120,6 @@ export class JobListItemComponent implements OnInit, OnDestroy {
     );
   }
 
-  onJobListSelect(): void | undefined {
-    if (!this.job?.id) {
-      return;
-    }
-    this.navigationService.showLocationOfInterestList(this.job.id);
-  }
-
   isSelectedLoi(node: DynamicFlatNode): boolean {
     return node.loi?.id === this.loiId;
   }
@@ -136,8 +129,11 @@ export class JobListItemComponent implements OnInit, OnDestroy {
   }
 
   selectLoi(node: DynamicFlatNode) {
-    if (this.isLoiNode(node)) {
-      this.navigationService.selectLocationOfInterest(node.loi!.id);
+    if (this.surveyId && this.isLoiNode(node)) {
+      this.navigationService.selectLocationOfInterest(
+        this.surveyId,
+        node.loi!.id
+      );
     }
   }
 

diff --git a/web/src/app/pages/main-page-container/main-page/main-page.component.spec.ts b/web/src/app/pages/main-page-container/main-page/main-page.component.spec.ts
@@ -65,7 +65,6 @@ describe('MainPageComponent', () => {
 
     const navigationService = {
       getSurveyId$: () => NEVER,
-      getJobId$: () => NEVER,
       getLocationOfInterestId$: () => NEVER,
       getSubmissionId$: () => NEVER,
     };

diff --git a/web/src/app/pages/main-page-container/main-page/main-page.component.ts b/web/src/app/pages/main-page-container/main-page/main-page.component.ts
@@ -65,12 +65,6 @@ export class MainPageComponent implements OnInit {
           id => id === NavigationService.JOB_ID_NEW && this.showTitleDialog()
         )
     );
-    // Show job dialog when non-null job id set in URL.
-    this.subscription.add(
-      this.navigationService
-        .getJobId$()
-        .subscribe(id => id && this.showEditJobDialog(id))
-    );
     // Show loi details when non-null LOI id set in URL.
     // Show submission details when submission id set in URL.
     this.subscription.add(
@@ -103,23 +97,6 @@ export class MainPageComponent implements OnInit {
     });
   }
 
-  private showEditJobDialog(jobId: string) {
-    this.activeSurvey$.pipe(take(1)).subscribe(survey =>
-      this.dialog.open(JobDialogComponent, {
-        autoFocus: jobId === NavigationService.JOB_ID_NEW,
-        data: {
-          surveyId:
-            survey.state === SurveyState.UNSAVED
-              ? NavigationService.SURVEY_ID_NEW
-              : survey.id,
-          createJob: jobId === NavigationService.SURVEY_ID_NEW,
-          job: survey.jobs?.get(jobId),
-        },
-        panelClass: 'job-dialog-container',
-      })
-    );
-  }
-
   private loadLocationOfInterestDetails(loiId: string) {
     this.loiService.selectLocationOfInterest(loiId);
   }

diff --git a/web/src/app/pages/main-page-container/main-page/map/map.component.spec.ts b/web/src/app/pages/main-page-container/main-page/map/map.component.spec.ts
@@ -83,8 +83,9 @@ describe('MapComponent', () => {
     'job002 name',
     /* tasks= */ Map()
   );
+  const surveyId = 'survey001';
   const mockSurvey = new Survey(
-    'survey001',
+    surveyId,
     'title1',
     'description1',
     /* jobs= */ Map({
@@ -391,7 +392,7 @@ describe('MapComponent', () => {
 
     expect(
       navigationServiceSpy.selectLocationOfInterest
-    ).toHaveBeenCalledOnceWith(poiId1);
+    ).toHaveBeenCalledOnceWith(surveyId, poiId1);
   });
 
   it('should select loi when polygon is clicked', () => {
@@ -402,7 +403,7 @@ describe('MapComponent', () => {
 
     expect(
       navigationServiceSpy.selectLocationOfInterest
-    ).toHaveBeenCalledOnceWith(polygonLoiId1);
+    ).toHaveBeenCalledOnceWith(surveyId, polygonLoiId1);
   });
 
   it('should enlarge the stroke weight of the polygon when loi is selected', fakeAsync(() => {
@@ -613,7 +614,7 @@ describe('MapComponent', () => {
 
     expect(
       navigationServiceSpy.selectLocationOfInterest
-    ).toHaveBeenCalledOnceWith(polygonLoiId1);
+    ).toHaveBeenCalledOnceWith(surveyId, polygonLoiId1);
   }));
 
   it('should add marker when map clicked and edit mode is "AddPoint"', fakeAsync(() => {

diff --git a/web/src/app/pages/main-page-container/main-page/map/map.component.ts b/web/src/app/pages/main-page-container/main-page/map/map.component.ts
@@ -261,6 +261,8 @@ export class MapComponent implements AfterViewInit, OnChanges, OnDestroy {
         const geometryType = (taskResult?.value as Geometry)?.geometryType;
         if (geometryType === GeometryType.POINT) {
           const marker = this.addSubmissionMarkerToMap(
+            this.submission!.loiId!,
+            this.submission!.id!,
             task.id,
             taskResult!.value as Point,
             this.submission?.job?.color,
@@ -269,6 +271,8 @@ export class MapComponent implements AfterViewInit, OnChanges, OnDestroy {
           this.markers.set(task.id, marker);
         } else if (geometryType === GeometryType.POLYGON) {
           const polygon = this.addSubmissionPolygonToMap(
+            this.submission!.loiId!,
+            this.submission!.id!,
             task.id,
             taskResult!.value as Polygon,
             this.submission?.job?.color
@@ -323,6 +327,7 @@ export class MapComponent implements AfterViewInit, OnChanges, OnDestroy {
         );
         if (newLocationOfInterest) {
           this.navigationService.selectLocationOfInterest(
+            this.lastFitSurveyId,
             newLocationOfInterest.id
           );
         }
@@ -505,28 +510,44 @@ export class MapComponent implements AfterViewInit, OnChanges, OnDestroy {
    * Adds new marker that represents a geometry based task submission to existing map
    */
   private addSubmissionMarkerToMap(
+    loiId: string,
+    submissionId: string,
     taskId: string,
     geometry: Point,
     color: string | undefined,
     markerText: string
   ): google.maps.marker.AdvancedMarkerElement {
     const marker = this.addMarkerToMap(taskId, geometry, color, markerText);
-    marker.addListener('click', () => this.onSubmissionGeometryClick(taskId));
+    marker.addListener('click', () =>
+      this.onSubmissionGeometryClick(loiId, submissionId, taskId)
+    );
     return marker;
   }
 
   private onLocationOfInterestMarkerClick(loiId: string) {
     if (this.disableMapClicks) {
       return;
     }
-    this.navigationService.selectLocationOfInterest(loiId);
+    this.navigationService.selectLocationOfInterest(
+      this.lastFitSurveyId,
+      loiId
+    );
   }
 
-  private onSubmissionGeometryClick(taskId: string) {
+  private onSubmissionGeometryClick(
+    loiId: string,
+    submissionId: string,
+    taskId: string
+  ) {
     if (this.disableMapClicks) {
       return;
     }
-    this.navigationService.showSubmissionDetailWithHighlightedTask(taskId);
+    this.navigationService.showSubmissionDetailWithHighlightedTask(
+      this.lastFitSurveyId,
+      loiId,
+      submissionId,
+      taskId
+    );
   }
 
   private onMarkerDragStart(
@@ -614,6 +635,8 @@ export class MapComponent implements AfterViewInit, OnChanges, OnDestroy {
   }
 
   private selectSubmissionTask(taskId: string | null) {
+    if (!taskId) return;
+
     if (taskId === this.selectedSubmissionTaskId) {
       return;
     }
@@ -722,14 +745,18 @@ export class MapComponent implements AfterViewInit, OnChanges, OnDestroy {
    * Adds new polygon that represents a geometry based task submission to existing map
    */
   private addSubmissionPolygonToMap(
+    loiId: string,
+    submissionId: string,
     taskId: string,
     polygonModel: Polygon,
     color: string | undefined
   ): google.maps.Polygon {
     const polygon = this.addPolygonToMap(polygonModel, color);
     polygon.set('id', taskId);
     polygon.set('color', color);
-    polygon.addListener('click', () => this.onSubmissionGeometryClick(taskId));
+    polygon.addListener('click', () =>
+      this.onSubmissionGeometryClick(loiId, submissionId, taskId)
+    );
     return polygon;
   }
 
@@ -763,7 +790,11 @@ export class MapComponent implements AfterViewInit, OnChanges, OnDestroy {
     const loi = LocationOfInterest.getSmallestByArea(candidateLois);
 
     this.zone.run(() => {
-      if (loi) this.navigationService.selectLocationOfInterest(loi.id);
+      if (loi)
+        this.navigationService.selectLocationOfInterest(
+          this.lastFitSurveyId,
+          loi.id
+        );
     });
   }
 

diff --git a/...pages/main-page-container/main-page/secondary-side-panel/loi-panel/loi-panel.component.ts b/...pages/main-page-container/main-page/secondary-side-panel/loi-panel/loi-panel.component.ts
@@ -40,6 +40,7 @@ export class LocationOfInterestPanelComponent implements OnInit, OnDestroy {
   name!: string | null;
   icon!: string;
   iconColor!: string;
+  surveyId!: string;
   submissions!: List<Submission>;
   isLoading = true;
 
@@ -56,8 +57,9 @@ export class LocationOfInterestPanelComponent implements OnInit, OnDestroy {
       this.surveyService
         .getActiveSurvey$()
         .pipe(
-          switchMap(survey =>
-            this.loiService.getSelectedLocationOfInterest$().pipe(
+          switchMap(survey => {
+            this.surveyId = survey.id;
+            return this.loiService.getSelectedLocationOfInterest$().pipe(
               switchMap(loi => {
                 this.iconColor = survey.getJob(loi.jobId)!.color!;
                 this.loi = loi;
@@ -66,8 +68,8 @@ export class LocationOfInterestPanelComponent implements OnInit, OnDestroy {
 
                 return this.submissionService.getSubmissions$();
               })
-            )
-          )
+            );
+          })
         )
         .subscribe(submissions => {
           this.submissions = submissions;
@@ -77,7 +79,11 @@ export class LocationOfInterestPanelComponent implements OnInit, OnDestroy {
   }
 
   onSelectSubmission(submissionId: string) {
-    this.navigationService.showSubmissionDetail(this.loi.id, submissionId);
+    this.navigationService.showSubmissionDetail(
+      this.surveyId,
+      this.loi.id,
+      submissionId
+    );
   }
 
   onClosePanel() {

diff --git a/...ages/main-page-container/main-page/secondary-side-panel/secondary-side-panel.component.ts b/...ages/main-page-container/main-page/secondary-side-panel/secondary-side-panel.component.ts
@@ -34,19 +34,22 @@ export class SecondarySidePanelComponent {
   readonly sideNavMode = SideNavMode;
   readonly sideNavMode$: Observable<SideNavMode>;
 
-  locationOfInterestId = '';
-  submissionId = '';
+  locationOfInterestId: string | null = '';
+  submissionId: string | null = '';
 
   constructor(
     private route: ActivatedRoute,
     private navigationService: NavigationService
   ) {
     this.subscription.add(
-      this.route.fragment.subscribe(() => {
-        this.locationOfInterestId =
-          this.navigationService.getLocationOfInterestId() || '';
+      this.navigationService.getLocationOfInterestId$().subscribe(loiId => {
+        this.locationOfInterestId = loiId;
+      })
+    );
 
-        this.submissionId = this.navigationService.getSubmissionId() || '';
+    this.subscription.add(
+      this.navigationService.getSubmissionId$().subscribe(submissionId => {
+        this.submissionId = submissionId;
       })
     );
 

diff --git a/...e-container/main-page/secondary-side-panel/submission-panel/submission-panel.component.ts b/...e-container/main-page/secondary-side-panel/submission-panel/submission-panel.component.ts
@@ -40,6 +40,7 @@ export class SubmissionPanelComponent implements OnInit, OnDestroy {
   submission: Submission | null = null;
   tasks?: List<Task>;
   selectedTaskId: string | null = null;
+  surveyId: string | null = null;
   firebaseURLs = new Map<string, string>();
   isLoading = true;
 
@@ -52,6 +53,11 @@ export class SubmissionPanelComponent implements OnInit, OnDestroy {
   ) {}
 
   ngOnInit() {
+    this.subscription.add(
+      this.navigationService.getSurveyId$().subscribe(surveyId => {
+        this.surveyId = surveyId;
+      })
+    );
     this.subscription.add(
       this.submissionService.getSelectedSubmission$().subscribe(submission => {
         if (submission instanceof Submission) {
@@ -92,7 +98,10 @@ export class SubmissionPanelComponent implements OnInit, OnDestroy {
   }
 
   navigateToSubmissionList() {
-    this.navigationService.selectLocationOfInterest(this.submission!.loiId);
+    this.navigationService.selectLocationOfInterest(
+      this.surveyId!,
+      this.submission!.loiId
+    );
   }
 
   getTaskSubmissionResult({id: taskId}: Task): Result | undefined {
@@ -147,7 +156,12 @@ export class SubmissionPanelComponent implements OnInit, OnDestroy {
   }
 
   selectGeometry(task: Task): void {
-    this.navigationService.showSubmissionDetailWithHighlightedTask(task.id);
+    this.navigationService.showSubmissionDetailWithHighlightedTask(
+      this.surveyId!,
+      this.submission!.loiId!,
+      this.submission!.id!,
+      task.id
+    );
   }
 
   ngOnDestroy(): void {

diff --git a/.../pages/main-page-container/main-page/side-panel/loi-panel/_loi-panel.component-theme.scss b/.../pages/main-page-container/main-page/side-panel/loi-panel/_loi-panel.component-theme.scss