From c912bbb2d024dfe5f9a15a60fc58280c682a77dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= <niels.lyngso@gmail.com>
Date: Wed, 13 Mar 2024 16:31:57 +0100
Subject: [PATCH] rename to property type settings modal

---
 .../core/content-type/modals/index.ts         |  2 +-
 .../core/content-type/modals/manifests.ts     |  6 +--
 .../property-type-settings-modal.context.ts}  |  2 +-
 .../property-type-settings-modal.element.ts}  | 37 ++++++++++---------
 .../property-type-settings-modal.token.ts}    | 12 +++---
 ...t-type-design-editor-properties.element.ts |  4 +-
 ...ent-type-design-editor-property.element.ts |  4 +-
 7 files changed, 35 insertions(+), 32 deletions(-)
 rename src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/{property-settings/property-settings-modal.context.ts => property-type-settings/property-type-settings-modal.context.ts} (89%)
 rename src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/{property-settings/property-settings-modal.element.ts => property-type-settings/property-type-settings-modal.element.ts} (93%)
 rename src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/{property-settings/property-settings-modal.token.ts => property-type-settings/property-type-settings-modal.token.ts} (53%)

diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/index.ts
index e6a2919e14..15bf3de62f 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/index.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/index.ts
@@ -1,2 +1,2 @@
 export * from './composition-picker/composition-picker-modal.token.js';
-export * from './property-settings/property-settings-modal.token.js';
+export * from './property-type-settings/property-type-settings-modal.token.js';
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/manifests.ts
index c5ceaaa20d..ce5f178b56 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/manifests.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/manifests.ts
@@ -9,9 +9,9 @@ const modals: Array<ManifestModal> = [
 	},
 	{
 		type: 'modal',
-		alias: 'Umb.Modal.PropertySettings',
-		name: 'Property Settings Modal',
-		js: () => import('.//property-settings/property-settings-modal.element.js'),
+		alias: 'Umb.Modal.PropertyTypeSettings',
+		name: 'Property Type Settings Modal',
+		js: () => import('./property-type-settings/property-type-settings-modal.element.js'),
 	},
 ];
 
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-settings/property-settings-modal.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.context.ts
similarity index 89%
rename from src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-settings/property-settings-modal.context.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.context.ts
index 82d2f7bc4f..e22f3f0aa2 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-settings/property-settings-modal.context.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.context.ts
@@ -6,7 +6,7 @@ import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
 export const UMB_PROPERTY_TYPE_WORKSPACE_ALIAS = 'Umb.Workspace.PropertyType';
 
 /**
- * This is a very simplified workspace context, just to serve one for the imitated property type workspace. (As its not a real workspace)
+ * This is a very simplified workspace context, just to serve one for the imitated property type workspace. (As its not a real workspace, but this does as well provide the ability for extension-conditions to match with this workspace, as entity type and alias is available.)  [NL]
  */
 export class UmbPropertyTypeWorkspaceContext
 	extends UmbContextBase<UmbPropertyTypeWorkspaceContext>
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-settings/property-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts
similarity index 93%
rename from src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-settings/property-settings-modal.element.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts
index f9ab69f77e..c28a24bcd3 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-settings/property-settings-modal.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.element.ts
@@ -1,8 +1,11 @@
 import {
 	UMB_PROPERTY_TYPE_WORKSPACE_ALIAS,
 	UmbPropertyTypeWorkspaceContext,
-} from './property-settings-modal.context.js';
-import type { UmbPropertySettingsModalData, UmbPropertySettingsModalValue } from './property-settings-modal.token.js';
+} from './property-type-settings-modal.context.js';
+import type {
+	UmbPropertyTypeSettingsModalData,
+	UmbPropertyTypeSettingsModalValue,
+} from './property-type-settings-modal.token.js';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { UUIBooleanInputEvent, UUIInputEvent, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
@@ -10,14 +13,14 @@ import { css, html, nothing, customElement, state } from '@umbraco-cms/backoffic
 import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal';
 import { generateAlias } from '@umbraco-cms/backoffice/utils';
 import { UMB_CONTENT_TYPE_WORKSPACE_CONTEXT } from '@umbraco-cms/backoffice/content-type';
-// TODO: Could base take a token to get its types?.
-@customElement('umb-property-settings-modal')
-export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
-	UmbPropertySettingsModalData,
-	UmbPropertySettingsModalValue
+// TODO: Could base take a token to get its types? [NL]
+@customElement('umb-property-type-settings-modal')
+export class UmbPropertyTypeSettingsModalElement extends UmbModalBaseElement<
+	UmbPropertyTypeSettingsModalData,
+	UmbPropertyTypeSettingsModalValue
 > {
-	//TODO: Should these options come from the server?
-	// TODO: Or should they come from a extension point?
+	//TODO: Should these options come from the server? [NL]
+	// TODO: Or should they come from a extension point? [NL]
 	@state() private _customValidationOptions: Array<Option> = [
 		{
 			name: 'No validation',
@@ -44,7 +47,7 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
 
 	@state() private _aliasLocked = true;
 
-	protected _originalPropertyData!: UmbPropertySettingsModalValue;
+	protected _originalPropertyData!: UmbPropertyTypeSettingsModalValue;
 
 	/** Indicates if the currently edited property is a new property or an existing */
 	#isNew = false;
@@ -92,7 +95,7 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
 	protected firstUpdated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void {
 		super.firstUpdated(_changedProperties);
 
-		// TODO: Make a general way to put focus on a input in a modal. (also make sure it only happens if its the top-most-modal.)
+		// TODO: Make a general way to put focus on a input in a modal. (also make sure it only happens if its the top-most-modal.) [NL]
 		requestAnimationFrame(() => {
 			(this.shadowRoot!.querySelector('#name-input') as HTMLElement).focus();
 		});
@@ -116,7 +119,7 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
 		this.updateValue({ name: event.target.value.toString() });
 		if (this._aliasLocked) {
 			const expectedOldAlias = generateAlias(oldName ?? '');
-			// Only update the alias if the alias matches a generated alias of the old name (otherwise the alias is considered one written by the user.)
+			// Only update the alias if the alias matches a generated alias of the old name (otherwise the alias is considered one written by the user.) [NL]
 			if (expectedOldAlias === oldAlias) {
 				this.updateValue({ alias: generateAlias(this.value.name ?? '') });
 			}
@@ -215,9 +218,9 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
 		});
 	}
 
-	// TODO: This would conceptually be a Property Type Workspace, should be changed at one point in the future.
-	// For now this is hacky made available by giving the element an fixed alias.
-	// This would allow for workspace views and workspace actions.
+	// TODO: This would conceptually be a Property Type Workspace, should be changed at one point in the future. [NL]
+	// For now this is hacky made available by giving the element an fixed alias. [NL]
+	// This would allow for workspace views and workspace actions. [NL]
 	render() {
 		return html`
 			<uui-form>
@@ -510,10 +513,10 @@ export class UmbPropertySettingsModalElement extends UmbModalBaseElement<
 	];
 }
 
-export default UmbPropertySettingsModalElement;
+export default UmbPropertyTypeSettingsModalElement;
 
 declare global {
 	interface HTMLElementTagNameMap {
-		'umb-property-settings-modal': UmbPropertySettingsModalElement;
+		'umb-property-type-settings-modal': UmbPropertyTypeSettingsModalElement;
 	}
 }
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-settings/property-settings-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.token.ts
similarity index 53%
rename from src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-settings/property-settings-modal.token.ts
rename to src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.token.ts
index 722c92d0eb..63fe6fe95c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-settings/property-settings-modal.token.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/property-type-settings/property-type-settings-modal.token.ts
@@ -1,15 +1,15 @@
 import { UmbModalToken } from '../../../modal/token/modal-token.js';
 import type { UmbPropertyTypeModel, UmbPropertyTypeScaffoldModel } from '@umbraco-cms/backoffice/content-type';
 
-export type UmbPropertySettingsModalData = {
+export type UmbPropertyTypeSettingsModalData = {
 	contentTypeId: string;
 };
-export type UmbPropertySettingsModalValue = UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel;
+export type UmbPropertyTypeSettingsModalValue = UmbPropertyTypeModel | UmbPropertyTypeScaffoldModel;
 
-export const UMB_PROPERTY_SETTINGS_MODAL = new UmbModalToken<
-	UmbPropertySettingsModalData,
-	UmbPropertySettingsModalValue
->('Umb.Modal.PropertySettings', {
+export const UMB_PROPERTY_TYPE_SETTINGS_MODAL = new UmbModalToken<
+	UmbPropertyTypeSettingsModalData,
+	UmbPropertyTypeSettingsModalValue
+>('Umb.Modal.PropertyTypeSettings', {
 	modal: {
 		type: 'sidebar',
 		size: 'small',
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-properties.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-properties.element.ts
index a29c67f78e..492246400c 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-properties.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-properties.element.ts
@@ -12,7 +12,7 @@ import type {
 } from '@umbraco-cms/backoffice/content-type';
 import {
 	UmbContentTypePropertyStructureHelper,
-	UMB_PROPERTY_SETTINGS_MODAL,
+	UMB_PROPERTY_TYPE_SETTINGS_MODAL,
 } from '@umbraco-cms/backoffice/content-type';
 import { type UmbSorterConfig, UmbSorterController } from '@umbraco-cms/backoffice/sorter';
 import {
@@ -189,7 +189,7 @@ export class UmbContentTypeDesignEditorPropertiesElement extends UmbLitElement {
 		});
 
 		// Note: Route for adding a new property
-		this.#addPropertyModal = new UmbModalRouteRegistrationController(this, UMB_PROPERTY_SETTINGS_MODAL)
+		this.#addPropertyModal = new UmbModalRouteRegistrationController(this, UMB_PROPERTY_TYPE_SETTINGS_MODAL)
 			.addUniquePaths(['container-id'])
 			.addAdditionalPath('add-property/:sortOrder')
 			.onSetup(async (params) => {
diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-property.element.ts
index 1e9072bd1b..a4072c4ee8 100644
--- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-property.element.ts
+++ b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/workspace/views/design/content-type-design-editor-property.element.ts
@@ -7,7 +7,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { generateAlias } from '@umbraco-cms/backoffice/utils';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import {
-	UMB_PROPERTY_SETTINGS_MODAL,
+	UMB_PROPERTY_TYPE_SETTINGS_MODAL,
 	type UmbContentTypeModel,
 	type UmbContentTypePropertyStructureHelper,
 	type UmbPropertyTypeModel,
@@ -90,7 +90,7 @@ export class UmbContentTypeDesignEditorPropertyElement extends UmbLitElement {
 
 	constructor() {
 		super();
-		this.#settingsModal = new UmbModalRouteRegistrationController(this, UMB_PROPERTY_SETTINGS_MODAL)
+		this.#settingsModal = new UmbModalRouteRegistrationController(this, UMB_PROPERTY_TYPE_SETTINGS_MODAL)
 			.addUniquePaths(['propertyId'])
 			.onSetup(() => {
 				const id = this.ownerContentTypeId;