Merge branch 'main' into feature/dev-4504-page-is-not-refreshed-after…

…-resource-is-erased-or-deleted
dasch-swiss · Feb 26, 2025 · f50c0bc · f50c0bc
2 parents 02d120f + 768f687
commit f50c0bc
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 18 deletions.
diff --git a/libs/vre/resource-editor/resource-editor/src/lib/compound/compound-slider.component.ts b/libs/vre/resource-editor/resource-editor/src/lib/compound/compound-slider.component.ts
@@ -30,12 +30,12 @@ import { CompoundService } from './compound.service';
 })
 export class CompoundSliderComponent {
   get compoundNavigation() {
-    return this.compoungService.compoundPosition;
+    return this.compoundService.compoundPosition!;
   }
 
   openPage(page: number) {
-    this.compoungService.openPage(page);
+    this.compoundService.openPage(page);
   }
 
-  constructor(public compoungService: CompoundService) {}
+  constructor(public compoundService: CompoundService) {}
 }
diff --git a/libs/vre/resource-editor/resource-editor/src/lib/compound/compound.service.ts b/libs/vre/resource-editor/resource-editor/src/lib/compound/compound.service.ts
@@ -1,6 +1,7 @@
 import { ChangeDetectorRef, Inject, Injectable } from '@angular/core';
 import { KnoraApiConnection, ReadResource, ReadResourceSequence, SystemPropertyDefinition } from '@dasch-swiss/dsp-js';
 import { DspApiConnectionToken } from '@dasch-swiss/vre/core/config';
+import { AppError } from '@dasch-swiss/vre/core/error-handler';
 import { GetAttachedProjectAction, GetAttachedUserAction } from '@dasch-swiss/vre/core/state';
 import { RegionService } from '@dasch-swiss/vre/resource-editor/representations';
 import { DspCompoundPosition, DspResource, GenerateProperty } from '@dasch-swiss/vre/shared/app-common';
@@ -13,12 +14,12 @@ import { BehaviorSubject } from 'rxjs';
  */
 @Injectable()
 export class CompoundService {
-  compoundPosition!: DspCompoundPosition;
+  compoundPosition?: DspCompoundPosition;
 
   incomingResource = new BehaviorSubject<DspResource | undefined>(undefined);
   incomingResource$ = this.incomingResource.asObservable();
 
-  private _resource!: DspResource;
+  private _resource?: DspResource;
 
   constructor(
     @Inject(DspApiConnectionToken)
@@ -35,23 +36,33 @@ export class CompoundService {
     this.openPage(_compound.page);
   }
 
+  reset() {
+    this.compoundPosition = undefined;
+    this._resource = undefined;
+    this.incomingResource.next(undefined);
+  }
+
   openPage(page: number) {
+    if (!this.compoundPosition) {
+      throw new AppError('Compound position is not set');
+    }
+
     this.compoundPosition.page = page;
-    this._loadIncomingResourcesPage();
+    this._loadIncomingResourcesPage(this.compoundPosition);
   }
 
-  private _loadIncomingResourcesPage(): void {
+  private _loadIncomingResourcesPage(compoundPosition: DspCompoundPosition): void {
     this._incomingService
-      .getStillImageRepresentationsForCompoundResource(this._resource.res.id, this.compoundPosition.offset)
+      .getStillImageRepresentationsForCompoundResource(this._resource!.res.id, compoundPosition.offset)
       .subscribe(res => {
         const incomingImageRepresentations = res as ReadResourceSequence;
 
         if (incomingImageRepresentations.resources.length === 0) {
           this.incomingResource.next(undefined);
           return;
         }
-        this._resource.incomingRepresentations = incomingImageRepresentations.resources;
-        this._loadIncomingResource(this._resource.incomingRepresentations[this.compoundPosition.position].id);
+        this._resource!.incomingRepresentations = incomingImageRepresentations.resources;
+        this._loadIncomingResource(this._resource!.incomingRepresentations[compoundPosition.position].id);
       });
   }
 

diff --git a/libs/vre/resource-editor/resource-editor/src/lib/resource-fetcher.component.ts b/libs/vre/resource-editor/resource-editor/src/lib/resource-fetcher.component.ts
@@ -41,12 +41,6 @@ export class ResourceFetcherComponent implements OnChanges, OnDestroy {
     });
   }
 
-  /**
-   * Reload the editor with the new resource.
-   * Note: The double detection is necessary to reload the entire editor.
-   * @param resource
-   * @private
-   */
   private _reloadEditor(resource: DspResource) {
     this.resource = resource;
     this._cdr.detectChanges();

diff --git a/libs/vre/resource-editor/resource-editor/src/lib/resource-tabs.component.ts b/libs/vre/resource-editor/resource-editor/src/lib/resource-tabs.component.ts
@@ -36,7 +36,7 @@ import { CompoundService } from './compound/compound.service';
         <app-annotation-tab *ngIf="regionsCount > 0" [resource]="resource" />
       </mat-tab>
 
-      <mat-tab label="Segments" *ngIf="segmentsService.segments && segmentsService.segments.length > 0">
+      <mat-tab label="Segments" *ngIf="segmentsService.segments.length > 0">
         <ng-template matTabLabel>
           <span [matBadge]="segmentsService.segments.length" matBadgeColor="primary" matBadgeOverlap="false">
             Segments

diff --git a/libs/vre/resource-editor/resource-editor/src/lib/resource.component.ts b/libs/vre/resource-editor/resource-editor/src/lib/resource.component.ts
@@ -28,7 +28,7 @@ import { CompoundService } from './compound/compound.service';
 export class ResourceComponent implements OnChanges {
   @Input({ required: true }) resource!: DspResource;
   representationsToDisplay!: ReadFileValue;
-  isCompoundNavigation = false;
+  isCompoundNavigation!: boolean;
   resourceIsObjectWithoutRepresentation!: boolean;
 
   constructor(
@@ -40,6 +40,9 @@ export class ResourceComponent implements OnChanges {
   ) {}
 
   ngOnChanges() {
+    this._compoundService.reset();
+    this.isCompoundNavigation = false;
+
     this.resourceIsObjectWithoutRepresentation = this._isObjectWithoutRepresentation(this.resource);
     this._onInit(this.resource);
   }