Merge branch 'main' into v14/feature/version-check

Author: iOvergaard

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();
 	}
 }

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();
 	}
 }

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(
@@ -75,11 +75,8 @@ export class UmbContentPropertyDatasetContext<
 		this.observe(
 			this.#workspace.readOnlyState.states,
 			(states) => {
-				const isReadOnly = states.some(
-					(state) => state.unique.startsWith('UMB_CULTURE_') && state.variantId.equal(this.#variantId),
-				);
-
-				this.#currentVariantCultureIsReadOnly.setValue(isReadOnly);
+				const isReadOnly = states.some((state) => state.variantId.equal(this.#variantId));
+				this.#readOnly.setValue(isReadOnly);
 			},
 			'umbObserveReadOnlyStates',
 		);

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();
 	}
 }

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<string | undefined>;
 
-	getCurrentVariantCultureIsReadOnly(): boolean;
-	readonly currentVariantCultureIsReadOnly: Observable<boolean>;
+	getReadOnly(): boolean;
+	readonly readOnly: Observable<boolean>;
 
 	// Should it be possible to get the properties as a list of property aliases?
 	//readonly properties: Observable<Array<string>>;

src/packages/core/property/property/property.context.ts

@@ -128,7 +128,7 @@ export class UmbPropertyContext<ValueType = any> extends UmbContextBase<UmbPrope
 			'observeValue',
 		);
 
-		this.observe(this.#datasetContext.currentVariantCultureIsReadOnly, (value) => {
+		this.observe(this.#datasetContext.readOnly, (value) => {
 			this.#isReadOnly.setValue(value);
 		});
 	}

src/packages/core/workspace/components/workspace-split-view/workspace-split-view-variant-selector.element.ts

@@ -186,13 +186,7 @@ export class UmbWorkspaceSplitViewVariantSelectorElement extends UmbLitElement {
 
 	#setReadOnlyCultures() {
 		this._readOnlyCultures = this._variantOptions
-			.filter((variant) => {
-				const isReadOnly = this._readOnlyStates.some((state) => {
-					return state.unique.startsWith('UMB_CULTURE_') && state.variantId.compare(variant);
-				});
-
-				return isReadOnly;
-			})
+			.filter((variant) => this._readOnlyStates.some((state) => state.variantId.compare(variant)))
 			.map((variant) => variant.culture)
 			.filter((item) => item !== null) as string[];
 	}

src/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.ts

@@ -15,8 +15,8 @@ export class UmbInvariantWorkspacePropertyDatasetContext<
 	extends UmbContextBase<UmbPropertyDatasetContext>
 	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();
 	}
 }

src/packages/language/permissions/language-access.workspace-context.ts

@@ -56,7 +56,7 @@ export class UmbLanguageAccessWorkspaceContext extends UmbContextBase<UmbLanguag
 		const variantIds = disallowedLanguages?.map((variant) => new UmbVariantId(variant.culture, variant.segment)) || [];
 
 		// create a list of states for the disallowed languages
-		const identifier = 'UMB_CULTURE_';
+		const identifier = 'UMB_LANGUAGE_PERMISSION_';
 		const readOnlyStates = variantIds.map((variantId) => {
 			return {
 				unique: identifier + variantId.culture,