From 30133ca7662bf3ddc56ffd911c6b99a9fea21db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 13 Mar 2024 16:22:50 +0100 Subject: [PATCH] block corrections --- .../edit/block-workspace-view-edit-tab.element.ts | 11 +++-------- .../views/edit/block-workspace-view-edit.element.ts | 5 ++--- 2 files changed, 5 insertions(+), 11 deletions(-) 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 15737c0b84..2518c814d4 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 @@ -45,14 +45,11 @@ export class UmbBlockWorkspaceViewEditTabElement extends UmbLitElement { this.#groupStructureHelper.setIsRoot(value); } - private _ownerTabId?: string | null; @property({ type: String }) - public get ownerTabId(): string | null | undefined { - return this._ownerTabId; + public get containerId(): string | null | undefined { + return this.#groupStructureHelper.getParentId(); } - public set ownerTabId(value: string | null | undefined) { - if (value === this._ownerTabId) return; - this._ownerTabId = value; + public set containerId(value: string | null | undefined) { this.#groupStructureHelper.setParentId(value); } @@ -72,8 +69,6 @@ export class UmbBlockWorkspaceViewEditTabElement extends UmbLitElement { constructor() { super(); - this.#groupStructureHelper.setParentType('Tab'); - this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (workspaceContext) => { this.#blockWorkspace = workspaceContext; this.#setStructureManager(); 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 35d18e315c..c671edc40d 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 @@ -98,8 +98,7 @@ export class UmbBlockWorkspaceViewEditElement extends UmbLitElement implements U (component as UmbBlockWorkspaceViewEditTabElement).tabName = tabName; // TODO: Consider if we can link these more simple, and not parse this on. // Instead have the structure manager looking at wether one of the OwnerALikecontainers is in the owner document. - (component as UmbBlockWorkspaceViewEditTabElement).ownerTabId = - this.#tabsStructureHelper.isOwnerChildContainer(tab.id!) ? tab.id : undefined; + (component as UmbBlockWorkspaceViewEditTabElement).containerId = tab.id; }, }); }); @@ -112,7 +111,7 @@ export class UmbBlockWorkspaceViewEditElement extends UmbLitElement implements U setup: (component) => { (component as UmbBlockWorkspaceViewEditTabElement).managerName = this.#managerName; (component as UmbBlockWorkspaceViewEditTabElement).noTabName = true; - (component as UmbBlockWorkspaceViewEditTabElement).ownerTabId = null; + (component as UmbBlockWorkspaceViewEditTabElement).containerId = null; }, }); }