From bb511cf074b25751e0b415469df4cfa57554a03f Mon Sep 17 00:00:00 2001
From: Lone Iversen <108085781+loivsen@users.noreply.github.com>
Date: Wed, 9 Aug 2023 11:15:05 +0200
Subject: [PATCH] reorder typo, del confirm msg

---
 .../src/mocks/data/document-type.data.ts      |  4 +--
 .../content-type-structure-manager.class.ts   |  2 +-
 ...cument-type-workspace-view-edit.element.ts | 31 +++++++------------
 3 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type.data.ts b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type.data.ts
index 18123945b9..f510fa8468 100644
--- a/src/Umbraco.Web.UI.Client/src/mocks/data/document-type.data.ts
+++ b/src/Umbraco.Web.UI.Client/src/mocks/data/document-type.data.ts
@@ -756,11 +756,11 @@ export const data: Array<DocumentTypeResponseModel> = [
 		],
 		compositions: [
 			{
-				id: '5035d7d9-0a63-415c-9e75-ee2cf931db92',
+				id: '8f68ba66-6fb2-4778-83b8-6ab4ca3a7c5d',
 				compositionType: ContentTypeCompositionTypeModel.INHERITANCE,
 			},
 			{
-				id: '8f68ba66-6fb2-4778-83b8-6ab4ca3a7c5d',
+				id: '5035d7d9-0a63-415c-9e75-ee2cf931db92',
 				compositionType: ContentTypeCompositionTypeModel.COMPOSITION,
 			},
 		],
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts
index 30a3b0de61..815f59cd12 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/content-type-structure-manager.class.ts
@@ -199,7 +199,7 @@ export class UmbContentTypePropertyStructureManager<R extends UmbDetailRepositor
 		containerType: PropertyContainerTypes = 'Tab',
 		parentId: string | null = null
 	) {
-		const ownerRootContainers = this.getOwnerContainers(containerType);
+		const ownerRootContainers = this.getOwnerContainers(containerType); //getRootContainers() can't differentiates between compositions and locals
 
 		let changedName = newName;
 		if (ownerRootContainers) {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts
index d9bba5c9d6..889195f467 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit.element.ts
@@ -117,7 +117,7 @@ export class UmbDocumentTypeWorkspaceViewEditElement
 	}
 
 	#requestRemoveTab(tab: PropertyTypeContainerModelBaseModel | undefined) {
-		const LocalMessage: UmbConfirmModalData = {
+		const Message: UmbConfirmModalData = {
 			headline: 'Delete tab',
 			content: html`Are you sure you want to delete the tab (${tab?.name || tab?.id})?
 				<div style="color:var(--uui-color-danger-emphasis)">
@@ -127,18 +127,9 @@ export class UmbDocumentTypeWorkspaceViewEditElement
 			color: 'danger',
 		};
 
-		const ComposedMessage: UmbConfirmModalData = {
-			headline: 'Remove composed tab',
-			content: html`This tab is a composed tab. Are you sure you want to remove the composed tab
-			(${tab?.name || tab?.id})?`,
-			confirmLabel: 'Remove',
-			color: 'danger',
-		};
-
 		// TODO: If this tab is composed of other tabs, then notify that it will only delete the local tab.
-		const modalHandler = this._tabsStructureHelper?.isOwnerContainer(tab?.id)
-			? this._modalManagerContext?.open(UMB_CONFIRM_MODAL, LocalMessage)
-			: this._modalManagerContext?.open(UMB_CONFIRM_MODAL, ComposedMessage);
+
+		const modalHandler = this._modalManagerContext?.open(UMB_CONFIRM_MODAL, Message);
 
 		modalHandler?.onSubmit().then(() => {
 			this.#remove(tab?.id);
@@ -243,12 +234,12 @@ export class UmbDocumentTypeWorkspaceViewEditElement
 												</uui-button>
 											</uui-input>
 									  `
-									: html` <span class="no-edit">
-												${!this._tabsStructureHelper.isOwnerContainer(tab.id!)
-													? html`<uui-icon name="umb:merge"></uui-icon>`
-													: ''}
-												${tab.name}
-											</span>
+									: !this._tabsStructureHelper.isOwnerContainer(tab.id!)
+									? html` <span class="no-edit">
+											<uui-icon name="umb:merge"></uui-icon>
+											${tab.name}
+									  </span>`
+									: html` <span class="no-edit">${tab.name}</span>
 											<uui-button class="trash" label="Remove tab" @click=${() => this.#requestRemoveTab(tab)} compact>
 												<uui-icon name="umb:trash"></uui-icon>
 											</uui-button>`}
@@ -269,9 +260,9 @@ export class UmbDocumentTypeWorkspaceViewEditElement
 				<uui-icon name="umb:merge"></uui-icon>
 				Compositions
 			</uui-button>
-			<uui-button label="Recorder" compact>
+			<uui-button label="Reorder" compact>
 				<uui-icon name="umb:navigation"></uui-icon>
-				Recorder
+				Reorder
 			</uui-button>
 		</div>`;
 	}