From b2b6e5d278d13a444726a04060763fdddf5b7cd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Thu, 14 Mar 2024 09:49:52 +0100 Subject: [PATCH] rename to merged containers --- ...ace-view-edit-content-no-router.element.ts | 2 +- .../block-workspace-view-edit-tab.element.ts | 2 +- .../edit/block-workspace-view-edit.element.ts | 2 +- ...t-type-container-structure-helper.class.ts | 20 +++++++++---------- .../content-type-design-editor-tab.element.ts | 2 +- .../content-type-design-editor.element.ts | 2 +- ...ocument-workspace-view-edit-tab.element.ts | 2 +- .../document-workspace-view-edit.element.ts | 2 +- .../media-workspace-view-edit-tab.element.ts | 2 +- .../edit/media-workspace-view-edit.element.ts | 2 +- ...mber-workspace-view-content-tab.element.ts | 2 +- .../member-workspace-view-content.element.ts | 2 +- 12 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts index 4e67d8888e..f4d7f0f520 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.ts @@ -37,7 +37,7 @@ export class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitEleme this.#tabsStructureHelper.setIsRoot(true); this.#tabsStructureHelper.setContainerChildType('Tab'); - this.observe(this.#tabsStructureHelper.containers, (tabs) => { + this.observe(this.#tabsStructureHelper.mergedContainers, (tabs) => { this._tabs = tabs; this._checkDefaultTabName(); }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts index 29b08a19e6..3cd4aec6d8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit-tab.element.ts @@ -82,7 +82,7 @@ export class UmbBlockWorkspaceViewEditTabElement extends UmbLitElement { if (!this.#blockWorkspace || !this.#managerName) return; this.#groupStructureHelper.setStructureManager(this.#blockWorkspace[this.#managerName].structure); this.observe( - this.#groupStructureHelper.containers, + this.#groupStructureHelper.mergedContainers, (groups) => { this._groups = groups; }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts index c671edc40d..077a0adcde 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/views/edit/block-workspace-view-edit.element.ts @@ -74,7 +74,7 @@ export class UmbBlockWorkspaceViewEditElement extends UmbLitElement implements U 'observeGroups', ); this.observe( - this.#tabsStructureHelper.containers, + this.#tabsStructureHelper.mergedContainers, (tabs) => { this._tabs = tabs; this._createRoutes(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-container-structure-helper.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-container-structure-helper.class.ts index 2d3fc0f280..cbd8bfdc6e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-container-structure-helper.class.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/structure/content-type-container-structure-helper.class.ts @@ -29,8 +29,8 @@ export class UmbContentTypeContainerStructureHelper([], (x) => x.id); - readonly containers = this.#containers.asObservable(); + #mergedContainers = new UmbArrayState([], (x) => x.id); + readonly mergedContainers = this.#mergedContainers.asObservable(); // Owner containers are containers owned by the owner Content Type (The specific one up for editing) private _ownerContainers: UmbPropertyTypeContainerModel[] = []; @@ -44,7 +44,7 @@ export class UmbContentTypeContainerStructureHelper (a.sortOrder || 0) - (b.sortOrder || 0)); + this.#mergedContainers.sortBy((a, b) => (a.sortOrder || 0) - (b.sortOrder || 0)); } public setStructureManager(structure: UmbContentTypePropertyStructureManager) { @@ -115,18 +115,18 @@ export class UmbContentTypeContainerStructureHelper { this._ownerContainers = []; - this.#containers.setValue([]); + this.#mergedContainers.setValue([]); // Stop observing a the previous _parentMatchingContainers... this._parentMatchingContainers.forEach((container) => { this.removeControllerByAlias('_observeParentHasProperties_' + container.id); @@ -169,7 +169,7 @@ export class UmbContentTypeContainerStructureHelper { this._ownerContainers = containers ?? []; - this.#containers.setValue(this.#filterNonOwnerContainers(this.#containers.getValue())); + this.#mergedContainers.setValue(this.#filterNonOwnerContainers(this.#mergedContainers.getValue())); }, '_observeOwnerContainers', ); @@ -179,7 +179,7 @@ export class UmbContentTypeContainerStructureHelper { // First we will filter out non-owner containers: - const old = this.#containers.getValue(); + const old = this.#mergedContainers.getValue(); // Then filter out the containers that are in the new list, either based on id or a match on name & type. // Matching on name & type will result in the latest being the one we include, notice will only counts for non-owner containers. const oldFiltered = old.filter( @@ -189,7 +189,7 @@ export class UmbContentTypeContainerStructureHelper i === cons.findIndex((y) => y.name === x.name && y.type === x.type), ); - this.#containers.setValue(this.#filterNonOwnerContainers(rootContainers)); + this.#mergedContainers.setValue(this.#filterNonOwnerContainers(rootContainers)); }, '_observeRootContainers', ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-tab.element.ts index 0ca38a3ab7..4f0258668e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-tab.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-tab.element.ts @@ -145,7 +145,7 @@ export class UmbContentTypeDesignEditorTabElement extends UmbLitElement { '_observeIsSorting', ); }); - this.observe(this.#groupStructureHelper.containers, (groups) => { + this.observe(this.#groupStructureHelper.mergedContainers, (groups) => { this._groups = groups; this.#sorter.setModel(this._groups); }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts index 87de4532d7..cbdd66fffb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor.element.ts @@ -122,7 +122,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements this._tabsStructureHelper.setIsRoot(true); this._tabsStructureHelper.setContainerChildType('Tab'); - this.observe(this._tabsStructureHelper.containers, (tabs) => { + this.observe(this._tabsStructureHelper.mergedContainers, (tabs) => { this._tabs = tabs; this._tabs.forEach((tab) => { this.#updateCachedTabElementId(tab.name ?? '', tab.id); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts index dd7f8b91ff..8897650307 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit-tab.element.ts @@ -51,7 +51,7 @@ export class UmbDocumentWorkspaceViewEditTabElement extends UmbLitElement { this.consumeContext(UMB_DOCUMENT_WORKSPACE_CONTEXT, (workspaceContext) => { this.#groupStructureHelper.setStructureManager(workspaceContext.structure); }); - this.observe(this.#groupStructureHelper.containers, (groups) => { + this.observe(this.#groupStructureHelper.mergedContainers, (groups) => { this._groups = groups; }); this.observe(this.#groupStructureHelper.hasProperties, (hasProperties) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts index d209f9a9f3..bd1bdd5704 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/views/edit/document-workspace-view-edit.element.ts @@ -39,7 +39,7 @@ export class UmbDocumentWorkspaceViewEditElement extends UmbLitElement implement this._tabsStructureHelper.setIsRoot(true); this._tabsStructureHelper.setContainerChildType('Tab'); this.observe( - this._tabsStructureHelper.containers, + this._tabsStructureHelper.mergedContainers, (tabs) => { this._tabs = tabs; this._createRoutes(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit-tab.element.ts index e9fe3a2f09..961d0f9c38 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit-tab.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit-tab.element.ts @@ -51,7 +51,7 @@ export class UmbMediaWorkspaceViewEditTabElement extends UmbLitElement { this.consumeContext(UMB_MEDIA_WORKSPACE_CONTEXT, (workspaceContext) => { this.#groupStructureHelper.setStructureManager(workspaceContext.structure); }); - this.observe(this.#groupStructureHelper.containers, (groups) => { + this.observe(this.#groupStructureHelper.mergedContainers, (groups) => { this._groups = groups; }); this.observe(this.#groupStructureHelper.hasProperties, (hasProperties) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit.element.ts index 8f3f7f75ca..a7560f78fe 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/views/edit/media-workspace-view-edit.element.ts @@ -38,7 +38,7 @@ export class UmbMediaWorkspaceViewEditElement extends UmbLitElement implements U this._tabsStructureHelper.setIsRoot(true); this._tabsStructureHelper.setContainerChildType('Tab'); - this.observe(this._tabsStructureHelper.containers, (tabs) => { + this.observe(this._tabsStructureHelper.mergedContainers, (tabs) => { this._tabs = tabs; this._createRoutes(); }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content-tab.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content-tab.element.ts index b2ab54a30d..a4807fafaf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content-tab.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content-tab.element.ts @@ -51,7 +51,7 @@ export class UmbMemberWorkspaceViewContentTabElement extends UmbLitElement { this.consumeContext(UMB_MEMBER_WORKSPACE_CONTEXT, (workspaceContext) => { this.#groupStructureHelper.setStructureManager(workspaceContext.structure); }); - this.observe(this.#groupStructureHelper.containers, (groups) => { + this.observe(this.#groupStructureHelper.mergedContainers, (groups) => { this._groups = groups; }); this.observe(this.#groupStructureHelper.hasProperties, (hasProperties) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content.element.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content.element.ts index be6129d3f9..d52a2769fb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member/workspace/views/content/member-workspace-view-content.element.ts @@ -38,7 +38,7 @@ export class UmbMemberWorkspaceViewEditElement extends UmbLitElement implements this._tabsStructureHelper.setIsRoot(true); this._tabsStructureHelper.setContainerChildType('Tab'); - this.observe(this._tabsStructureHelper.containers, (tabs) => { + this.observe(this._tabsStructureHelper.mergedContainers, (tabs) => { this._tabs = tabs; this._createRoutes(); });