fix tests

SchweizerischeBundesbahnen · Jun 17, 2024 · f7141f3 · f7141f3
1 parent c68d576
commit f7141f3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/projects/scion/workbench/src/lib/routing/workbench-layout-differ.ts b/projects/scion/workbench/src/lib/routing/workbench-layout-differ.ts
@@ -22,10 +22,12 @@ export class WorkbenchLayoutDiffer {
 
   private _partsDiffer: IterableDiffer<string>;
   private _viewsDiffer: IterableDiffer<ViewId>;
+  private _viewsInLayoutDiffer: IterableDiffer<ViewId>;
 
   constructor(differs: IterableDiffers) {
     this._partsDiffer = differs.find([]).create<string>();
     this._viewsDiffer = differs.find([]).create<ViewId>();
+    this._viewsInLayoutDiffer = differs.find([]).create<ViewId>();
   }
 
   /**
@@ -43,6 +45,7 @@ export class WorkbenchLayoutDiffer {
     return new WorkbenchLayoutDiff({
       parts: this._partsDiffer.diff(parts),
       views: this._viewsDiffer.diff(views),
+      viewsInLayout: this._viewsInLayoutDiffer.diff(workbenchLayout?.views().map(view => view.id) ?? []),
     });
   }
 }
@@ -58,12 +61,18 @@ export class WorkbenchLayoutDiff {
   public readonly addedViews = new Array<ViewId>();
   public readonly removedViews = new Array<ViewId>();
 
-  constructor(changes: {parts: IterableChanges<string> | null; views: IterableChanges<ViewId> | null}) {
+  public readonly addedViewsInLayout = new Array<ViewId>();
+  public readonly removedViewsInLayout = new Array<ViewId>();
+
+  constructor(changes: {parts: IterableChanges<string> | null; views: IterableChanges<ViewId> | null; viewsInLayout: IterableChanges<ViewId> | null}) {
     changes.parts?.forEachAddedItem(({item}) => this.addedParts.push(item));
     changes.parts?.forEachRemovedItem(({item}) => this.removedParts.push(item));
 
     changes.views?.forEachAddedItem(({item}) => this.addedViews.push(item));
     changes.views?.forEachRemovedItem(({item}) => this.removedViews.push(item));
+
+    changes.viewsInLayout?.forEachAddedItem(({item}) => this.addedViewsInLayout.push(item));
+    changes.viewsInLayout?.forEachRemovedItem(({item}) => this.removedViewsInLayout.push(item));
   }
 
   public toString(): string {

diff --git a/projects/scion/workbench/src/lib/routing/workbench-url-observer.service.ts b/projects/scion/workbench/src/lib/routing/workbench-url-observer.service.ts
@@ -278,11 +278,11 @@ export class WorkbenchUrlObserver {
   private updateViewRegistry(): void {
     const {layoutDiff, layout} = this._workbenchRouter.getCurrentNavigationContext();
 
-    layoutDiff.addedViews.forEach(viewId => {
+    layoutDiff.addedViewsInLayout.forEach(viewId => {
       this._logger.debug(() => `Constructing ɵWorkbenchView [viewId=${viewId}]`, LoggerNames.LIFECYCLE);
       this._viewRegistry.register(this.createWorkbenchView(viewId, layout));
     });
-    layoutDiff.removedViews.forEach(viewId => {
+    layoutDiff.removedViewsInLayout.forEach(viewId => {
       this._logger.debug(() => `Destroying ɵWorkbenchView [viewId=${viewId}]`, LoggerNames.LIFECYCLE);
       this._viewRegistry.unregister(viewId);
     });