diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts index e8fdc7c13e..a320f9914a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block-grid/components/block-grid-block-inline/block-grid-inline-property-dataset.context.ts @@ -11,8 +11,8 @@ import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; export class UmbBlockGridInlinePropertyDatasetContext extends UmbControllerBase implements UmbPropertyDatasetContext { #entryContext: UmbBlockGridEntryContext; - #currentVariantCultureIsReadOnly = new UmbBooleanState(false); - public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable(); + #readOnly = new UmbBooleanState(false); + public readOnly = this.#readOnly.asObservable(); // default data: @@ -67,7 +67,7 @@ export class UmbBlockGridInlinePropertyDatasetContext extends UmbControllerBase * @returns {*} {boolean} * @memberof UmbBlockGridInlinePropertyDatasetContext */ - getCurrentVariantCultureIsReadOnly(): boolean { - return this.#currentVariantCultureIsReadOnly.getValue(); + getReadOnly(): boolean { + return this.#readOnly.getValue(); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts index 4db36b5497..c6e72bcf0c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/block/block/workspace/block-element-property-dataset.context.ts @@ -12,8 +12,8 @@ import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api'; export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase implements UmbPropertyDatasetContext { #elementManager: UmbBlockElementManager; - #currentVariantCultureIsReadOnly = new UmbBooleanState(false); - public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable(); + #readOnly = new UmbBooleanState(false); + public readOnly = this.#readOnly.asObservable(); // default data: @@ -41,7 +41,7 @@ export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase imp this.observe( workspace.readOnlyState.isOn, (value) => { - this.#currentVariantCultureIsReadOnly.setValue(value); + this.#readOnly.setValue(value); }, 'umbObserveReadOnlyStates', ); @@ -80,7 +80,7 @@ export class UmbBlockElementPropertyDatasetContext extends UmbControllerBase imp * @returns {*} {boolean} * @memberof UmbBlockGridInlinePropertyDatasetContext */ - getCurrentVariantCultureIsReadOnly(): boolean { - return this.#currentVariantCultureIsReadOnly.getValue(); + getReadOnly(): boolean { + return this.#readOnly.getValue(); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/content-property-dataset.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/content-property-dataset.context.ts index b5b997153c..bbd9cb460d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/content-property-dataset.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/content-property-dataset.context.ts @@ -30,8 +30,8 @@ export class UmbContentPropertyDatasetContext< culture = this.#currentVariant.asObservablePart((x) => x?.culture); segment = this.#currentVariant.asObservablePart((x) => x?.segment); - #currentVariantCultureIsReadOnly = new UmbBooleanState(false); - public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable(); + #readOnly = new UmbBooleanState(false); + public readOnly = this.#readOnly.asObservable(); getEntityType(): string { return this.#workspace.getEntityType(); @@ -49,8 +49,8 @@ export class UmbContentPropertyDatasetContext< return this.#workspace.getVariant(this.#variantId); } - getCurrentVariantCultureIsReadOnly() { - return this.#currentVariantCultureIsReadOnly.getValue(); + getReadOnly() { + return this.#readOnly.getValue(); } constructor( @@ -76,7 +76,7 @@ export class UmbContentPropertyDatasetContext< this.#workspace.readOnlyState.states, (states) => { const isReadOnly = states.some((state) => state.variantId.equal(this.#variantId)); - this.#currentVariantCultureIsReadOnly.setValue(isReadOnly); + this.#readOnly.setValue(isReadOnly); }, 'umbObserveReadOnlyStates', ); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset-base-context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset-base-context.ts index b3309398d8..b48d71fd3d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset-base-context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset-base-context.ts @@ -24,8 +24,8 @@ export class UmbPropertyDatasetContextBase private _entityType!: string; private _unique!: string; - #currentVariantCultureIsReadOnly = new UmbBooleanState(false); - public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable(); + #readOnly = new UmbBooleanState(false); + public readOnly = this.#readOnly.asObservable(); getEntityType() { return this._entityType; @@ -85,7 +85,7 @@ export class UmbPropertyDatasetContextBase * @return {*} {boolean} * @memberof UmbBlockGridInlinePropertyDatasetContext */ - getCurrentVariantCultureIsReadOnly(): boolean { - return this.#currentVariantCultureIsReadOnly.getValue(); + getReadOnly(): boolean { + return this.#readOnly.getValue(); } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset-context.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset-context.interface.ts index eea0074e45..c33b0896ed 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset-context.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property-dataset/property-dataset-context.interface.ts @@ -25,8 +25,8 @@ export interface UmbPropertyDatasetContext extends UmbContext { getName(): string | undefined; readonly name: Observable; - getCurrentVariantCultureIsReadOnly(): boolean; - readonly currentVariantCultureIsReadOnly: Observable; + getReadOnly(): boolean; + readonly readOnly: Observable; // Should it be possible to get the properties as a list of property aliases? //readonly properties: Observable>; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts index 7ab44fcb52..7454dad43e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property/property/property.context.ts @@ -128,7 +128,7 @@ export class UmbPropertyContext extends UmbContextBase { + this.observe(this.#datasetContext.readOnly, (value) => { this.#isReadOnly.setValue(value); }); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts index 224bab9cef..8039e78632 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts @@ -15,8 +15,8 @@ export class UmbInvariantWorkspacePropertyDatasetContext< extends UmbContextBase implements UmbPropertyDatasetContext, UmbNameablePropertyDatasetContext { - #currentVariantCultureIsReadOnly = new UmbBooleanState(false); - public currentVariantCultureIsReadOnly = this.#currentVariantCultureIsReadOnly.asObservable(); + #readOnly = new UmbBooleanState(false); + public readOnly = this.#readOnly.asObservable(); #workspace: WorkspaceType; @@ -66,7 +66,7 @@ export class UmbInvariantWorkspacePropertyDatasetContext< return this.#workspace.setPropertyValue(propertyAlias, value); } - getCurrentVariantCultureIsReadOnly() { - return this.#currentVariantCultureIsReadOnly.getValue(); + getReadOnly() { + return this.#readOnly.getValue(); } }