Merge branch 'main' into v14/feature/use-uui-1.10-rc0

Author: nielslyngsoe

src/packages/core/content/property-dataset-context/content-property-dataset.context.ts

@@ -75,10 +75,7 @@ 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),
-				);
-
+				const isReadOnly = states.some((state) => state.variantId.equal(this.#variantId));
 				this.#currentVariantCultureIsReadOnly.setValue(isReadOnly);
 			},
 			'umbObserveReadOnlyStates',

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/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,