diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts index e5d7544bcc..0808e07aff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/workspace/data-type-workspace.context.ts @@ -40,6 +40,7 @@ export class UmbDataTypeWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); #persistedData = new UmbObjectState(undefined); #currentData = new UmbObjectState(undefined); @@ -52,6 +53,7 @@ export class UmbDataTypeWorkspaceContext readonly name = this.#currentData.asObservablePart((data) => data?.name); readonly unique = this.#currentData.asObservablePart((data) => data?.unique); + readonly entityType = this.#currentData.asObservablePart((data) => data?.entityType); readonly propertyEditorUiAlias = this.#currentData.asObservablePart((data) => data?.editorUiAlias); readonly propertyEditorSchemaAlias = this.#currentData.asObservablePart((data) => data?.editorAlias); diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.context.ts index 63bdb762cb..7ca3b32fc8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/workspace/dictionary-workspace.context.ts @@ -23,11 +23,14 @@ export class UmbDictionaryWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); #data = new UmbObjectState(undefined); readonly data = this.#data.asObservable(); readonly unique = this.#data.asObservablePart((data) => data?.unique); + readonly entityType = this.#data.asObservablePart((data) => data?.entityType); + readonly name = this.#data.asObservablePart((data) => data?.name); readonly dictionary = this.#data.asObservablePart((data) => data); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace.context.ts index c63c4f4bd3..12155d4ffc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-blueprints/workspace/document-blueprint-workspace.context.ts @@ -45,6 +45,7 @@ export class UmbDocumentBlueprintWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); /** */ @@ -62,6 +63,8 @@ export class UmbDocumentBlueprintWorkspaceContext } readonly unique = this.#currentData.asObservablePart((data) => data?.unique); + readonly entityType = this.#currentData.asObservablePart((data) => data?.entityType); + readonly contentTypeUnique = this.#currentData.asObservablePart((data) => data?.documentType.unique); readonly variants = this.#currentData.asObservablePart((data) => data?.variants || []); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.context.ts index af9b15e7c5..5b8d881c09 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/workspace/document-type-workspace.context.ts @@ -42,12 +42,14 @@ export class UmbDocumentTypeWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); #persistedData = new UmbObjectState(undefined); // General for content types: //readonly data; readonly unique; + readonly entityType; readonly name; getName(): string | undefined { return this.structure.getOwnerContentType()?.name; @@ -81,6 +83,8 @@ export class UmbDocumentTypeWorkspaceContext //this.data = this.structure.ownerContentType; this.unique = this.structure.ownerContentTypeObservablePart((data) => data?.unique); + this.entityType = this.structure.ownerContentTypeObservablePart((data) => data?.entityType); + this.name = this.structure.ownerContentTypeObservablePart((data) => data?.name); this.alias = this.structure.ownerContentTypeObservablePart((data) => data?.alias); this.description = this.structure.ownerContentTypeObservablePart((data) => data?.description); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts index a496a3a08e..eaab4e1709 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/document-workspace.context.ts @@ -75,6 +75,7 @@ export class UmbDocumentWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); /** * The document is the current state/draft version of the document. @@ -100,6 +101,7 @@ export class UmbDocumentWorkspaceContext } readonly unique = this.#currentData.asObservablePart((data) => data?.unique); + readonly entityType = this.#currentData.asObservablePart((data) => data?.entityType); readonly isTrashed = this.#currentData.asObservablePart((data) => data?.isTrashed); readonly contentTypeUnique = this.#currentData.asObservablePart((data) => data?.documentType.unique); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context.ts index f11010df0d..ff0642ff09 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/media-type-workspace.context.ts @@ -33,12 +33,14 @@ export class UmbMediaTypeWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); #persistedData = new UmbObjectState(undefined); // General for content types: readonly data; readonly unique; + readonly entityType; readonly name; getName(): string | undefined { return this.structure.getOwnerContentType()?.name; @@ -63,6 +65,7 @@ export class UmbMediaTypeWorkspaceContext // General for content types: this.data = this.structure.ownerContentType; this.unique = this.structure.ownerContentTypeObservablePart((data) => data?.unique); + this.entityType = this.structure.ownerContentTypeObservablePart((data) => data?.entityType); this.name = this.structure.ownerContentTypeObservablePart((data) => data?.name); this.alias = this.structure.ownerContentTypeObservablePart((data) => data?.alias); this.description = this.structure.ownerContentTypeObservablePart((data) => data?.description); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts index 8ea7e656cf..4f90532c8f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/workspace/media-workspace.context.ts @@ -41,6 +41,7 @@ export class UmbMediaWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); /** * The media is the current state/draft version of the media. @@ -58,6 +59,7 @@ export class UmbMediaWorkspaceContext } readonly unique = this.#currentData.asObservablePart((data) => data?.unique); + readonly entityType = this.#currentData.asObservablePart((data) => data?.entityType); readonly contentTypeUnique = this.#currentData.asObservablePart((data) => data?.mediaType.unique); readonly contentTypeHasCollection = this.#currentData.asObservablePart((data) => !!data?.mediaType.collection); diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace.context.ts index e17f605597..054dd486d4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/workspace/member-type-workspace.context.ts @@ -30,6 +30,7 @@ export class UmbMemberTypeWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); #persistedData = new UmbObjectState(undefined); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts index 1b6f6935cb..6ee8bbca69 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/workspace/partial-view-workspace.context.ts @@ -26,10 +26,12 @@ export class UmbPartialViewWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); #data = new UmbObjectState(undefined); readonly data = this.#data.asObservable(); readonly unique = this.#data.asObservablePart((data) => data?.unique); + readonly entityType = this.#data.asObservablePart((data) => data?.entityType); readonly name = this.#data.asObservablePart((data) => data?.name); readonly content = this.#data.asObservablePart((data) => data?.content); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts index f69d707cab..d13fd8900b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/scripts/workspace/script-workspace.context.ts @@ -26,11 +26,13 @@ export class UmbScriptWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); #data = new UmbObjectState(undefined); readonly data = this.#data.asObservable(); readonly unique = this.#data.asObservablePart((data) => data?.unique); + readonly entityType = this.#data.asObservablePart((data) => data?.entityType); readonly name = this.#data.asObservablePart((data) => data?.name); readonly content = this.#data.asObservablePart((data) => data?.content); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.context.ts index 4a45c82c3a..01d9df95c2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/stylesheets/workspace/stylesheet-workspace.context.ts @@ -26,10 +26,12 @@ export class UmbStylesheetWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); #data = new UmbObjectState(undefined); readonly data = this.#data.asObservable(); readonly unique = this.#data.asObservablePart((data) => data?.unique); + readonly entityType = this.#data.asObservablePart((data) => data?.entityType); readonly name = this.#data.asObservablePart((data) => data?.name); readonly content = this.#data.asObservablePart((data) => data?.content); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts index 2c92dd0e10..40613982b0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/workspace/template-workspace.context.ts @@ -26,6 +26,7 @@ export class UmbTemplateWorkspaceContext #parent = new UmbObjectState<{ entityType: string; unique: string | null } | undefined>(undefined); readonly parentUnique = this.#parent.asObservablePart((parent) => (parent ? parent.unique : undefined)); + readonly parentEntityType = this.#parent.asObservablePart((parent) => (parent ? parent.entityType : undefined)); #data = new UmbObjectState(undefined); data = this.#data.asObservable(); @@ -35,6 +36,7 @@ export class UmbTemplateWorkspaceContext alias = this.#data.asObservablePart((data) => data?.alias); content = this.#data.asObservablePart((data) => data?.content); readonly unique = this.#data.asObservablePart((data) => data?.unique); + readonly entityType = this.#data.asObservablePart((data) => data?.entityType); masterTemplateUnique = this.#data.asObservablePart((data) => data?.masterTemplate?.unique); #isCodeEditorReady = new UmbBooleanState(false);