move unique + entityType observable to the base class

madsrasmussen · madsrasmussen · commit 53d0d6cfa574 · 2024-09-26T15:15:13.000+02:00
diff --git a/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts b/src/packages/core/workspace/entity-detail/entity-detail-workspace-base.ts
@@ -3,7 +3,7 @@ import { UmbEntityWorkspaceDataManager } from '../entity/entity-workspace-data-m
 import { UMB_WORKSPACE_PATH_PATTERN } from '../paths.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
-import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
+import type { UmbEntityModel, UmbEntityUnique } from '@umbraco-cms/backoffice/entity';
 import { UMB_DISCARD_CHANGES_MODAL, UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal';
 import { UmbObjectState } from '@umbraco-cms/backoffice/observable-api';
 import {
@@ -37,15 +37,18 @@ export abstract class UmbEntityDetailWorkspaceContextBase<
 	 * @memberof UmbEntityWorkspaceContextBase
 	 */
 	protected readonly _data = new UmbEntityWorkspaceDataManager<DetailModelType>(this);
+
 	public readonly data = this._data.current;
+	public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
+	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
 
 	protected _getDataPromise?: Promise<any>;
 
 	protected _detailRepository?: DetailRepositoryType;
 
 	#entityType: string;
 
-	#parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined);
+	#parent = new UmbObjectState<{ entityType: string; unique: UmbEntityUnique } | undefined>(undefined);
 	readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined));
 	readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined));
 
diff --git a/src/packages/data-type/tree/folder/workspace/data-type-folder-workspace.context.ts b/src/packages/data-type/tree/folder/workspace/data-type-folder-workspace.context.ts
@@ -15,8 +15,6 @@ export class UmbDataTypeFolderWorkspaceContext
 	extends UmbEntityDetailWorkspaceContextBase<UmbFolderModel, UmbDataTypeFolderRepository>
 	implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext
 {
-	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
-	public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
 	public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
 
 	constructor(host: UmbControllerHost) {
diff --git a/src/packages/data-type/workspace/data-type-workspace.context.ts b/src/packages/data-type/workspace/data-type-workspace.context.ts
@@ -46,9 +46,6 @@ export class UmbDataTypeWorkspaceContext
 	implements UmbInvariantDatasetWorkspaceContext, UmbRoutableWorkspaceContext
 {
 	readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
-	readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
-	readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
-
 	readonly propertyEditorUiAlias = this._data.createObservablePartOfCurrent((data) => data?.editorUiAlias);
 	readonly propertyEditorSchemaAlias = this._data.createObservablePartOfCurrent((data) => data?.editorAlias);
 
diff --git a/src/packages/dictionary/workspace/dictionary-workspace.context.ts b/src/packages/dictionary/workspace/dictionary-workspace.context.ts
@@ -15,9 +15,6 @@ export class UmbDictionaryWorkspaceContext
 	extends UmbEntityDetailWorkspaceContextBase<UmbDictionaryDetailModel, UmbDictionaryDetailRepository>
 	implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext
 {
-	readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
-	readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
-
 	readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
 	readonly dictionary = this._data.createObservablePartOfCurrent((data) => data);
 
diff --git a/src/packages/documents/document-types/tree/folder/workspace/document-type-folder-workspace.context.ts b/src/packages/documents/document-types/tree/folder/workspace/document-type-folder-workspace.context.ts
@@ -18,8 +18,6 @@ export class UmbDocumentTypeFolderWorkspaceContext
 	extends UmbEntityDetailWorkspaceContextBase<UmbFolderModel, UmbDocumentTypeFolderRepository>
 	implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext
 {
-	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
-	public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
 	public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
 
 	constructor(host: UmbControllerHost) {
diff --git a/src/packages/language/workspace/language/language-workspace.context.ts b/src/packages/language/workspace/language/language-workspace.context.ts
@@ -17,7 +17,6 @@ export class UmbLanguageWorkspaceContext
 {
 	public readonly repository: UmbLanguageDetailRepository = new UmbLanguageDetailRepository(this);
 
-	readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
 	readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
 
 	constructor(host: UmbControllerHost) {
diff --git a/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts b/src/packages/members/member-group/workspace/member-group/member-group-workspace-editor.element.ts
@@ -27,7 +27,7 @@ export class UmbMemberGroupWorkspaceEditorElement extends UmbLitElement {
 			this.#workspaceContext = workspaceContext;
 			if (!this.#workspaceContext) return;
 			this.observe(this.#workspaceContext.name, (name) => (this._name = name ?? ''));
-			this.observe(this.#workspaceContext.unique, (unique) => (this._unique = unique));
+			this.observe(this.#workspaceContext.unique, (unique) => (this._unique = unique ?? undefined));
 		});
 	}
 
diff --git a/src/packages/members/member-group/workspace/member-group/member-group-workspace.context.ts b/src/packages/members/member-group/workspace/member-group/member-group-workspace.context.ts
@@ -16,7 +16,6 @@ export class UmbMemberGroupWorkspaceContext
 	extends UmbEntityDetailWorkspaceContextBase<UmbMemberGroupDetailModel>
 	implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext
 {
-	readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
 	readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
 
 	constructor(host: UmbControllerHost) {
diff --git a/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts b/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts
@@ -31,8 +31,6 @@ export class UmbPartialViewWorkspaceContext
 	>
 	implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext
 {
-	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
-	public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
 	public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
 	public readonly content = this._data.createObservablePartOfCurrent((data) => data?.content);
 
diff --git a/src/packages/templating/scripts/tree/folder/workspace/script-type-folder-workspace.context.ts b/src/packages/templating/scripts/tree/folder/workspace/script-type-folder-workspace.context.ts
@@ -15,8 +15,6 @@ export class UmbScriptFolderWorkspaceContext
 	extends UmbEntityDetailWorkspaceContextBase<UmbFolderModel, UmbScriptFolderRepository>
 	implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext
 {
-	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
-	public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
 	public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
 
 	constructor(host: UmbControllerHost) {
diff --git a/src/packages/templating/scripts/workspace/script-workspace.context.ts b/src/packages/templating/scripts/workspace/script-workspace.context.ts
@@ -16,8 +16,6 @@ export class UmbScriptWorkspaceContext
 	extends UmbEntityDetailWorkspaceContextBase<UmbScriptDetailModel, UmbScriptDetailRepository>
 	implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext
 {
-	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
-	public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
 	public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
 	public readonly content = this._data.createObservablePartOfCurrent((data) => data?.content);
 
diff --git a/src/packages/templating/templates/workspace/template-workspace.context.ts b/src/packages/templating/templates/workspace/template-workspace.context.ts
@@ -25,8 +25,6 @@ export class UmbTemplateWorkspaceContext
 	public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);
 	public readonly alias = this._data.createObservablePartOfCurrent((data) => data?.alias);
 	public readonly content = this._data.createObservablePartOfCurrent((data) => data?.content);
-	public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
-	public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);
 	public readonly masterTemplateUnique = this._data.createObservablePartOfCurrent(
 		(data) => data?.masterTemplate?.unique,
 	);
diff --git a/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts b/src/packages/user/user-group/workspace/user-group/user-group-workspace-editor.element.ts
@@ -73,7 +73,7 @@ export class UmbUserGroupWorkspaceEditorElement extends UmbLitElement {
 	#observeUserGroup() {
 		if (!this.#workspaceContext) return;
 		this.observe(this.#workspaceContext.isNew, (value) => (this._isNew = value), '_observeIsNew');
-		this.observe(this.#workspaceContext.unique, (value) => (this._unique = value), '_observeUnique');
+		this.observe(this.#workspaceContext.unique, (value) => (this._unique = value ?? undefined), '_observeUnique');
 		this.observe(this.#workspaceContext.name, (value) => (this._name = value), '_observeName');
 		this.observe(this.#workspaceContext.alias, (value) => (this._alias = value), '_observeAlias');
 		this.observe(
diff --git a/src/packages/user/user-group/workspace/user-group/user-group-workspace.context.ts b/src/packages/user/user-group/workspace/user-group/user-group-workspace.context.ts
@@ -15,7 +15,6 @@ export class UmbUserGroupWorkspaceContext
 	extends UmbEntityDetailWorkspaceContextBase<UmbUserGroupDetailModel, UmbUserGroupDetailRepository>
 	implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext
 {
-	readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
 	readonly name = this._data.createObservablePartOfCurrent((data) => data?.name || '');
 	readonly alias = this._data.createObservablePartOfCurrent((data) => data?.alias || '');
 	readonly aliasCanBeChanged = this._data.createObservablePartOfCurrent((data) => data?.aliasCanBeChanged);
diff --git a/src/packages/user/user/conditions/user-allow-action-base.condition.ts b/src/packages/user/user/conditions/user-allow-action-base.condition.ts
@@ -51,7 +51,7 @@ export abstract class UmbUserActionConditionBase
 			this.observe(
 				observeMultiple([context.unique, context.state, context.kind]),
 				([unique, state, kind]) => {
-					this.userUnique = unique;
+					this.userUnique = unique ?? undefined;
 					this.userState = state;
 					this.userKind = kind;
 					this._onUserDataChange();
diff --git a/src/packages/user/user/workspace/user/components/user-workspace-client-credentials/user-workspace-client-credentials.element.ts b/src/packages/user/user/workspace/user/components/user-workspace-client-credentials/user-workspace-client-credentials.element.ts
@@ -37,7 +37,11 @@ export class UmbUserWorkspaceClientCredentialsElement extends UmbLitElement {
 
 			this.observe(
 				this.#userWorkspaceContext.unique,
-				async (unique) => this.#onUserUniqueChange(unique),
+				async (unique) => {
+					if (unique) {
+						this.#onUserUniqueChange(unique);
+					}
+				},
 				'umbUserUniqueObserver',
 			);
 		});
diff --git a/src/packages/user/user/workspace/user/user-workspace.context.ts b/src/packages/user/user/workspace/user/user-workspace.context.ts
@@ -22,7 +22,6 @@ export class UmbUserWorkspaceContext
 	public readonly configRepository = new UmbUserConfigRepository(this);
 
 	readonly state = this._data.createObservablePartOfCurrent((x) => x?.state);
-	readonly unique = this._data.createObservablePartOfCurrent((x) => x?.unique);
 	readonly kind = this._data.createObservablePartOfCurrent((x) => x?.kind);
 	readonly userGroupUniques = this._data.createObservablePartOfCurrent((x) => x?.userGroupUniques || []);
 	readonly documentStartNodeUniques = this._data.createObservablePartOfCurrent(
diff --git a/src/packages/webhook/workspace/webhook/webhook-workspace.context.ts b/src/packages/webhook/workspace/webhook/webhook-workspace.context.ts
@@ -15,8 +15,6 @@ export class UmbWebhookWorkspaceContext
 	extends UmbEntityDetailWorkspaceContextBase<UmbWebhookDetailModel, UmbWebhookDetailRepository>
 	implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext
 {
-	readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);
-
 	constructor(host: UmbControllerHost) {
 		super(host, {
 			workspaceAlias: UMB_WEBHOOK_WORKSPACE_ALIAS,

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@ export class UmbDataTypeFolderWorkspaceContext`
`15`	`15`	`extends UmbEntityDetailWorkspaceContextBase<UmbFolderModel, UmbDataTypeFolderRepository>`
`16`	`16`	`implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext`
`17`	`17`	`{`
`18`		`- public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);`
`19`		`- public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);`
`20`	`18`	`public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);`
`21`	`19`
`22`	`20`	`constructor(host: UmbControllerHost) {`
Original file line number	Diff line number	Diff line change
`@@ -46,9 +46,6 @@ export class UmbDataTypeWorkspaceContext`
`46`	`46`	`implements UmbInvariantDatasetWorkspaceContext, UmbRoutableWorkspaceContext`
`47`	`47`	`{`
`48`	`48`	`readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);`
`49`		`- readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);`
`50`		`- readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);`
`51`		`-`
`52`	`49`	`readonly propertyEditorUiAlias = this._data.createObservablePartOfCurrent((data) => data?.editorUiAlias);`
`53`	`50`	`readonly propertyEditorSchemaAlias = this._data.createObservablePartOfCurrent((data) => data?.editorAlias);`
`54`	`51`
Original file line number	Diff line number	Diff line change
`@@ -15,9 +15,6 @@ export class UmbDictionaryWorkspaceContext`
`15`	`15`	`extends UmbEntityDetailWorkspaceContextBase<UmbDictionaryDetailModel, UmbDictionaryDetailRepository>`
`16`	`16`	`implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext`
`17`	`17`	`{`
`18`		`- readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);`
`19`		`- readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);`
`20`		`-`
`21`	`18`	`readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);`
`22`	`19`	`readonly dictionary = this._data.createObservablePartOfCurrent((data) => data);`
`23`	`20`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,6 @@ export class UmbDocumentTypeFolderWorkspaceContext`
`18`	`18`	`extends UmbEntityDetailWorkspaceContextBase<UmbFolderModel, UmbDocumentTypeFolderRepository>`
`19`	`19`	`implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext`
`20`	`20`	`{`
`21`		`- public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);`
`22`		`- public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);`
`23`	`21`	`public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);`
`24`	`22`
`25`	`23`	`constructor(host: UmbControllerHost) {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ export class UmbLanguageWorkspaceContext`
`17`	`17`	`{`
`18`	`18`	`public readonly repository: UmbLanguageDetailRepository = new UmbLanguageDetailRepository(this);`
`19`	`19`
`20`		`- readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);`
`21`	`20`	`readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);`
`22`	`21`
`23`	`22`	`constructor(host: UmbControllerHost) {`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ export class UmbMemberGroupWorkspaceEditorElement extends UmbLitElement {`
`27`	`27`	`this.#workspaceContext = workspaceContext;`
`28`	`28`	`if (!this.#workspaceContext) return;`
`29`	`29`	`this.observe(this.#workspaceContext.name, (name) => (this._name = name ?? ''));`
`30`		`- this.observe(this.#workspaceContext.unique, (unique) => (this._unique = unique));`
	`30`	`+ this.observe(this.#workspaceContext.unique, (unique) => (this._unique = unique ?? undefined));`
`31`	`31`	`});`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ export class UmbMemberGroupWorkspaceContext`
`16`	`16`	`extends UmbEntityDetailWorkspaceContextBase<UmbMemberGroupDetailModel>`
`17`	`17`	`implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext`
`18`	`18`	`{`
`19`		`- readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);`
`20`	`19`	`readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);`
`21`	`20`
`22`	`21`	`constructor(host: UmbControllerHost) {`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ export class UmbPartialViewWorkspaceContext`
`31`	`31`	`>`
`32`	`32`	`implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext`
`33`	`33`	`{`
`34`		`- public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);`
`35`		`- public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);`
`36`	`34`	`public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);`
`37`	`35`	`public readonly content = this._data.createObservablePartOfCurrent((data) => data?.content);`
`38`	`36`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,6 @@ export class UmbScriptFolderWorkspaceContext`
`15`	`15`	`extends UmbEntityDetailWorkspaceContextBase<UmbFolderModel, UmbScriptFolderRepository>`
`16`	`16`	`implements UmbSubmittableWorkspaceContext, UmbRoutableWorkspaceContext`
`17`	`17`	`{`
`18`		`- public readonly unique = this._data.createObservablePartOfCurrent((data) => data?.unique);`
`19`		`- public readonly entityType = this._data.createObservablePartOfCurrent((data) => data?.entityType);`
`20`	`18`	`public readonly name = this._data.createObservablePartOfCurrent((data) => data?.name);`
`21`	`19`
`22`	`20`	`constructor(host: UmbControllerHost) {`