fix: fixed loading coumpound resources #DEV-3096 (#1326)

dasch-swiss · Dec 20, 2023 · 490513e · 490513e
1 parent 1b1fd77
commit 490513e
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/apps/dsp-app/src/app/workspace/resource/resource.component.ts b/apps/dsp-app/src/app/workspace/resource/resource.component.ts
@@ -302,9 +302,9 @@ export class ResourceComponent implements OnChanges, OnDestroy {
               // this is a compound object
               this.compoundPosition = new DspCompoundPosition(countQuery.numberOfResults);
               this.compoundNavigation(1);
+            } else {
+              this.loading = false;
             }
-
-            this.loading = false;
             this._cdr.markForCheck();
           },
           (error: ApiResponseError) => {
@@ -388,6 +388,8 @@ export class ResourceComponent implements OnChanges, OnDestroy {
         ) {
           this.getIncomingRegions(this.incomingResource, 0);
         }
+
+        this._cdr.markForCheck();
       },
       (error: ApiResponseError) => {
         this._errorHandler.showMessage(error);
@@ -585,8 +587,8 @@ export class ResourceComponent implements OnChanges, OnDestroy {
           } else {
             this.loading = false;
             this.representationsToDisplay = [];
-            this._cdr.markForCheck();
           }
+          this._cdr.markForCheck();
         },
         (error: ApiResponseError) => {
           this._errorHandler.showMessage(error);
@@ -642,6 +644,7 @@ export class ResourceComponent implements OnChanges, OnDestroy {
         // prepare regions to be displayed
         // triggers ngOnChanges of StillImageComponent
         this.representationsToDisplay = this.collectRepresentationsAndAnnotations(resource);
+        this._cdr.markForCheck();
       },
       (error: ApiResponseError) => {
         this._errorHandler.showMessage(error);