From 45b87c278dc66d0cd55ea2fd625f4a543589ce52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <nsl@umbraco.dk>
Date: Fri, 5 Sep 2025 08:26:55 +0200
Subject: [PATCH] Content Type Designer: fix style and localization (#20073)

* fix style and localization

* Update src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* fix class name as well

* add data-marks

* Updated package version to include test fixes for tab name

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Andreas Zerbst <andr317c@live.dk>
---
 .../content-type-design-editor.element.ts     | 42 +++++++++++++------
 .../package-lock.json                         |  8 ++--
 .../Umbraco.Tests.AcceptanceTest/package.json |  2 +-
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts
index 9f632ab6fc..beb09ec99d 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/content/content-type/workspace/views/design/content-type-design-editor.element.ts
@@ -475,7 +475,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 		// TODO: Localize this:
 		if (this._sortModeActive) return;
 		return html`
-			<uui-button id="add-tab" @click="${this.#addTab}" label="Add tab">
+			<uui-button id="add-tab" data-mark="add-tab-button" @click="${this.#addTab}" label="Add tab">
 				<uui-icon name="icon-add"></uui-icon>
 				Add tab
 			</uui-button>
@@ -492,6 +492,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 				${this._compositionRepositoryAlias
 					? html`
 							<uui-button
+								data-mark="edit-compositions"
 								look="outline"
 								label=${this.localize.term('contentTypeEditor_compositions')}
 								compact
@@ -501,7 +502,12 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 							</uui-button>
 						`
 					: ''}
-				<uui-button look="outline" label=${sortButtonText} compact @click=${this.#toggleSortMode}>
+				<uui-button
+					data-mark="toggle-sort-mode"
+					look="outline"
+					label=${sortButtonText}
+					compact
+					@click=${this.#toggleSortMode}>
 					<uui-icon name="icon-height"></uui-icon>
 					${sortButtonText}
 				</uui-button>
@@ -571,26 +577,28 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 		const tabName = hasTabName ? tab.name : 'Unnamed';
 		const tabId = tab.ownerId ?? tab.ids[0];
 		if (this._sortModeActive) {
-			return html`<div class="tab">
+			return html`<div class="tab-inner">
 				${ownedTab
-					? html`<uui-icon name="icon-grip" class="drag-${tabId}"> </uui-icon>${tabName}
+					? html`<uui-icon name="icon-grip" class="drag-${tabId}"> </uui-icon>${this.localize.string(tabName)}
 							<uui-input
+								data-mark="tab:sort-input"
 								label="sort order"
 								type="number"
 								value=${ifDefined(tab.sortOrder)}
 								style="width:50px"
 								@change=${(e: UUIInputEvent) => this.#changeOrderNumber(tab, e)}></uui-input>`
-					: html`<uui-icon name="icon-merge"></uui-icon>${tab.name!}`}
+					: html`<uui-icon name="icon-merge"></uui-icon>${this.localize.string(tabName)}`}
 			</div>`;
 		}
 
 		if (tabActive && ownedTab) {
-			return html`<div class="tab">
+			return html`<div class="tab-inner">
 				<uui-input
+					data-mark="tab:name-input"
 					id="input"
 					look="placeholder"
 					placeholder="Unnamed"
-					label=${tab.name!}
+					label=${this.localize.term('settings_tabname')}
 					value="${tab.name!}"
 					auto-width
 					minlength="1"
@@ -604,12 +612,13 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 
 		if (ownedTab) {
 			return html`<div class="not-active">
-				<span class=${hasTabName ? '' : 'invaild'}>${hasTabName ? tab.name : 'Unnamed'}</span> ${this.renderDeleteFor(
-					tab,
-				)}
+				<span class=${hasTabName ? '' : 'invalid'}>${hasTabName ? this.localize.string(tabName) : 'Unnamed'}</span>
+				${this.renderDeleteFor(tab)}
 			</div>`;
 		} else {
-			return html`<div class="not-active"><uui-icon name="icon-merge"></uui-icon>${tab.name!}</div>`;
+			return html`<div class="not-active">
+				<uui-icon name="icon-merge"></uui-icon>${this.localize.string(tabName)}
+			</div>`;
 		}
 	}
 
@@ -621,6 +630,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 
 	renderDeleteFor(tab: UmbPropertyTypeContainerMergedModel) {
 		return html`<uui-button
+			data-mark="tab:delete"
 			label=${this.localize.term('actions_remove')}
 			class="trash"
 			slot="append"
@@ -708,6 +718,14 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 				background-color: var(--uui-color-surface);
 			}
 
+			.tab-inner {
+				display: inline-flex;
+				align-items: center;
+				justify-content: center;
+				gap: var(--uui-size-space-2);
+				margin-right: calc(var(--uui-size-space-3) * -1);
+			}
+
 			.not-active uui-button {
 				pointer-events: auto;
 			}
@@ -721,7 +739,7 @@ export class UmbContentTypeDesignEditorElement extends UmbLitElement implements
 				gap: var(--uui-size-space-3);
 			}
 
-			.invaild {
+			.invalid {
 				color: var(--uui-color-danger, var(--uui-color-invalid));
 			}
 
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
index bb1da8d0fc..08dac24f0f 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package-lock.json
@@ -8,7 +8,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@umbraco/json-models-builders": "^2.0.37",
-        "@umbraco/playwright-testhelpers": "^16.0.41",
+        "@umbraco/playwright-testhelpers": "^16.0.42",
         "camelize": "^1.0.0",
         "dotenv": "^16.3.1",
         "node-fetch": "^2.6.7"
@@ -67,9 +67,9 @@
       }
     },
     "node_modules/@umbraco/playwright-testhelpers": {
-      "version": "16.0.41",
-      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.41.tgz",
-      "integrity": "sha512-FmpL3ucj+3lZKxuL1JWyFJeU5DBL6nRsREejhQd/gUMtoJJpXhPUJ/jorqnWEwPYcvGWSBS/Inly0q+Akuf9Ow==",
+      "version": "16.0.42",
+      "resolved": "https://registry.npmjs.org/@umbraco/playwright-testhelpers/-/playwright-testhelpers-16.0.42.tgz",
+      "integrity": "sha512-ePKl8gtELoIMEV57E3N4VumfKNkuOTFo/LYH7ePhseCcm5oUh1Cc/RVqvlXYsdfBTiMfZ7x7Nu4lOSv15D2Z3Q==",
       "license": "MIT",
       "dependencies": {
         "@umbraco/json-models-builders": "2.0.38",
diff --git a/tests/Umbraco.Tests.AcceptanceTest/package.json b/tests/Umbraco.Tests.AcceptanceTest/package.json
index 43b8727f80..32076a6012 100644
--- a/tests/Umbraco.Tests.AcceptanceTest/package.json
+++ b/tests/Umbraco.Tests.AcceptanceTest/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@umbraco/json-models-builders": "^2.0.37",
-    "@umbraco/playwright-testhelpers": "^16.0.41",
+    "@umbraco/playwright-testhelpers": "^16.0.42",
     "camelize": "^1.0.0",
     "dotenv": "^16.3.1",
     "node-fetch": "^2.6.7"