@umbraco-cms/backoffice 14.0.0--preview004-478ab905 → 14.0.0--preview004-eaff2f45

package/dist-cms/packages/core/workspace/index.d.ts

@@ -1,4 +1,4 @@
-export * from './variant-context/index.js';
+export * from './workspace-property-dataset/index.js';
 export * from './workspace-action-menu/index.js';
 export * from './workspace-action/index.js';
 export type { WorkspaceAliasConditionConfig } from './workspace-alias.condition.js';
@@ -8,7 +8,5 @@ export * from './workspace-editor/index.js';
 export * from './workspace-footer/index.js';
 export * from './workspace-is-new-redirect-controller/index.js';
 export * from './workspace-modal/index.js';
-export * from './workspace-property-layout/workspace-property-layout.element.js';
-export * from './workspace-property/index.js';
 export * from './workspace-split-view-manager.class.js';
 export * from './workspace-split-view/index.js';

package/dist-cms/packages/core/workspace/index.js

@@ -1,4 +1,4 @@
-export * from './variant-context/index.js';
+export * from './workspace-property-dataset/index.js';
 export * from './workspace-action-menu/index.js';
 export * from './workspace-action/index.js';
 export * from './workspace-context/index.js';
@@ -6,7 +6,5 @@ export * from './workspace-editor/index.js';
 export * from './workspace-footer/index.js';
 export * from './workspace-is-new-redirect-controller/index.js';
 export * from './workspace-modal/index.js';
-export * from './workspace-property-layout/workspace-property-layout.element.js';
-export * from './workspace-property/index.js';
 export * from './workspace-split-view-manager.class.js';
 export * from './workspace-split-view/index.js';

package/dist-cms/packages/core/workspace/workspace-context/workspace-invariantable-context.interface.d.ts

@@ -1,13 +1,14 @@
 import { UmbVariantId } from '../../variant/variant-id.class.js';
-import { UmbVariantContext } from '../variant-context/variant-context.interface.js';
+import { UmbPropertyDatasetContext } from '../../property/property-dataset/property-dataset-context.interface.js';
 import type { UmbSaveableWorkspaceContextInterface } from './saveable-workspace-context.interface.js';
 import { UmbControllerHost } from '../../../../libs/controller-api/index.js';
 import type { Observable } from '../../../../external/rxjs/index.js';
 export interface UmbInvariantableWorkspaceContextInterface<T = unknown> extends UmbSaveableWorkspaceContextInterface<T> {
+    name: Observable<string | undefined>;
     getName(): string | undefined;
     setName(name: string): void;
     propertyValueByAlias<ReturnType = unknown>(alias: string): Promise<Observable<ReturnType | undefined>>;
     getPropertyValue<ReturnType = unknown>(alias: string): ReturnType;
     setPropertyValue(alias: string, value: unknown): Promise<void>;
-    createVariantContext(host: UmbControllerHost, variantId?: UmbVariantId): UmbVariantContext;
+    createPropertyDatasetContext(host: UmbControllerHost, variantId?: UmbVariantId): UmbPropertyDatasetContext;
 }

package/dist-cms/packages/core/workspace/workspace-context/workspace-variantable-context.interface.d.ts

@@ -1,5 +1,5 @@
 import type { UmbWorkspaceSplitViewManager } from '../workspace-split-view-manager.class.js';
-import { UmbVariantContext } from '../variant-context/variant-context.interface.js';
+import { UmbPropertyDatasetContext } from '../../property/property-dataset/property-dataset-context.interface.js';
 import type { UmbSaveableWorkspaceContextInterface } from './saveable-workspace-context.interface.js';
 import type { Observable } from '../../../../external/rxjs/index.js';
 import type { UmbVariantId } from '../../variant/index.js';
@@ -16,5 +16,5 @@ export interface UmbVariantableWorkspaceContextInterface<EntityType = unknown> e
     propertyValueByAlias<ReturnValue = unknown>(alias: string, variantId?: UmbVariantId): Promise<Observable<ReturnValue | undefined>>;
     getPropertyValue<ReturnValue = unknown>(alias: string, variantId?: UmbVariantId): ReturnValue | undefined;
     setPropertyValue(alias: string, value: unknown, variantId?: UmbVariantId): Promise<void>;
-    createVariantContext(host: UmbControllerHost, variantId?: UmbVariantId): UmbVariantContext;
+    createPropertyDatasetContext(host: UmbControllerHost, variantId?: UmbVariantId): UmbPropertyDatasetContext;
 }

package/dist-cms/packages/core/workspace/workspace-modal/workspace-modal.element.d.ts

@@ -7,7 +7,7 @@ export declare class UmbWorkspaceModalElement extends UmbLitElement {
      * TODO: Consider if this binding and events integration is the right for communicating back the modal handler. Or if we should go with some Context API. like a Modal Context API.
      *
      */
-    render(): import("lit-html").TemplateResult<1>;
+    render(): "" | import("lit-html").TemplateResult<1>;
     static styles: CSSResultGroup;
 }
 export default UmbWorkspaceModalElement;

package/dist-cms/packages/core/workspace/workspace-modal/workspace-modal.element.js

@@ -13,7 +13,7 @@ let UmbWorkspaceModalElement = class UmbWorkspaceModalElement extends UmbLitElem
      *
      */
     render() {
-        return html `<umb-workspace .entityType=${this.data?.entityType}></umb-workspace>`;
+        return this.data ? html `<umb-workspace .entityType=${this.data.entityType}></umb-workspace>` : '';
     }
     static { this.styles = [
         UmbTextStyles,
@@ -26,7 +26,7 @@ let UmbWorkspaceModalElement = class UmbWorkspaceModalElement extends UmbLitElem
     ]; }
 };
 __decorate([
-    property()
+    property({ attribute: false })
 ], UmbWorkspaceModalElement.prototype, "data", void 0);
 UmbWorkspaceModalElement = __decorate([
     customElement('umb-workspace-modal')

package/dist-cms/packages/core/workspace/workspace-property-dataset/index.d.ts

@@ -0,0 +1 @@
+export * from './invariant-workspace-property-dataset-context.js';

package/dist-cms/packages/core/workspace/workspace-property-dataset/index.js

@@ -0,0 +1 @@
+export * from './invariant-workspace-property-dataset-context.js';

package/dist-cms/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.d.ts

@@ -0,0 +1,26 @@
+import { UmbPropertyDatasetContext, UmbNameablePropertyDatasetContext } from '../../property/index.js';
+import { type UmbControllerHost } from '../../../../libs/controller-api/index.js';
+import { UmbBaseController } from '../../../../libs/class-api/index.js';
+import { UmbVariantId } from '../../variant/index.js';
+import { UmbInvariantableWorkspaceContextInterface } from '../index.js';
+/**
+ * A property dataset context that hooks directly into the workspace context.
+ */
+export declare class UmbInvariantWorkspacePropertyDatasetContext<WorkspaceType extends UmbInvariantableWorkspaceContextInterface = UmbInvariantableWorkspaceContextInterface> extends UmbBaseController implements UmbPropertyDatasetContext, UmbNameablePropertyDatasetContext {
+    #private;
+    name: import("rxjs").Observable<string | undefined>;
+    getVariantId(): UmbVariantId;
+    getEntityType(): string;
+    getUnique(): string | undefined;
+    getName(): string | undefined;
+    setName(name: string): void;
+    constructor(host: UmbControllerHost, workspace: WorkspaceType);
+    /**
+     * TODO: Write proper JSDocs here.
+     */
+    propertyValueByAlias<ReturnType = unknown>(propertyAlias: string): Promise<import("rxjs").Observable<ReturnType | undefined>>;
+    /**
+     * TODO: Write proper JSDocs here.
+     */
+    setPropertyValue(propertyAlias: string, value: unknown): Promise<void>;
+}

package/dist-cms/packages/core/workspace/workspace-property-dataset/invariant-workspace-property-dataset-context.js

@@ -0,0 +1,44 @@
+import { UMB_PROPERTY_DATASET_CONTEXT, } from '../../property/index.js';
+import { UmbBaseController } from '../../../../libs/class-api/index.js';
+import { UmbVariantId } from '../../variant/index.js';
+/**
+ * A property dataset context that hooks directly into the workspace context.
+ */
+export class UmbInvariantWorkspacePropertyDatasetContext extends UmbBaseController {
+    #workspace;
+    // default data:
+    getVariantId() {
+        return UmbVariantId.CreateInvariant();
+    }
+    getEntityType() {
+        return this.#workspace.getEntityType();
+    }
+    getUnique() {
+        return this.#workspace.getEntityId();
+    }
+    getName() {
+        return this.#workspace.getName();
+    }
+    setName(name) {
+        this.#workspace.setName(name);
+    }
+    constructor(host, workspace) {
+        // The controller alias, is a very generic name cause we want only one of these for this controller host.
+        super(host, 'variantContext');
+        this.#workspace = workspace;
+        this.name = this.#workspace.name;
+        this.provideContext(UMB_PROPERTY_DATASET_CONTEXT, this);
+    }
+    /**
+     * TODO: Write proper JSDocs here.
+     */
+    async propertyValueByAlias(propertyAlias) {
+        return await this.#workspace.propertyValueByAlias(propertyAlias);
+    }
+    /**
+     * TODO: Write proper JSDocs here.
+     */
+    async setPropertyValue(propertyAlias, value) {
+        return this.#workspace.setPropertyValue(propertyAlias, value);
+    }
+}

package/dist-cms/packages/core/workspace/workspace-split-view/workspace-split-view.context.js

@@ -38,7 +38,7 @@ export class UmbWorkspaceSplitViewContext extends UmbBaseController {
             // TODO: Ask workspace context to create the specific variant context.
             this.#variantContext?.destroy();
             const variantId = UmbVariantId.Create(activeVariantInfo);
-            this.#variantContext = this.#workspaceContext?.createVariantContext(this, variantId);
+            this.#variantContext = this.#workspaceContext?.createPropertyDatasetContext(this, variantId);
         }, '_observeActiveVariant');
     }
     switchVariant(variant) {

package/dist-cms/packages/dictionary/dictionary/workspace/views/editor/workspace-view-dictionary-editor.element.js

@@ -34,14 +34,14 @@ let UmbWorkspaceViewDictionaryEditorElement = class UmbWorkspaceViewDictionaryEd
         if (!language.isoCode)
             return;
         const translation = this._dictionary?.translations?.find((x) => x.isoCode === language.isoCode);
-        return html ` <umb-workspace-property-layout label=${language.name ?? language.isoCode}>
+        return html ` <umb-property-layout label=${language.name ?? language.isoCode}>
 			<uui-textarea
 				slot="editor"
 				name=${language.isoCode}
 				label="translation"
 				@change=${this.#onTextareaChange}
 				value=${ifDefined(translation?.translation)}></uui-textarea>
-		</umb-workspace-property-layout>`;
+		</umb-property-layout>`;
     }
     #onTextareaChange(e) {
         if (e instanceof UUITextareaEvent) {

package/dist-cms/packages/documents/document-types/workspace/views/design/document-type-workspace-view-edit-property.element.js

@@ -165,7 +165,7 @@ let UmbDocumentTypeWorkspacePropertyElement = class UmbDocumentTypeWorkspaceProp
 						.value=${this.property.name}
 						@input=${this.#onNameChange}></uui-input>
 					${this.renderPropertyAlias()}
-					<slot name="property-action-menu"></slot>
+					<slot name="action-menu"></slot>
 					<p>
 						<uui-textarea
 							label="description"

package/dist-cms/packages/documents/document-types/workspace/views/settings/document-type-workspace-view-settings.element.js

@@ -28,7 +28,7 @@ let UmbDocumentTypeWorkspaceViewSettingsElement = class UmbDocumentTypeWorkspace
     render() {
         return html `
 			<uui-box headline="Data variations">
-				<umb-workspace-property-layout alias="VaryByCulture" label="Allow vary by culture">
+				<umb-property-layout alias="VaryByCulture" label="Allow vary by culture">
 					<div slot="description">Allow editors to create content of different languages.</div>
 					<div slot="editor">
 						<uui-toggle
@@ -38,8 +38,8 @@ let UmbDocumentTypeWorkspaceViewSettingsElement = class UmbDocumentTypeWorkspace
         }}
 							label="Vary by culture"></uui-toggle>
 					</div>
-				</umb-workspace-property-layout>
-				<umb-workspace-property-layout alias="VaryBySegments" label="Allow segmentation">
+				</umb-property-layout>
+				<umb-property-layout alias="VaryBySegments" label="Allow segmentation">
 					<div slot="description">Allow editors to segment their content.</div>
 					<div slot="editor">
 						<uui-toggle
@@ -49,8 +49,8 @@ let UmbDocumentTypeWorkspaceViewSettingsElement = class UmbDocumentTypeWorkspace
         }}
 							label="Vary by segments"></uui-toggle>
 					</div>
-				</umb-workspace-property-layout>
-				<umb-workspace-property-layout alias="ElementType" label="Is an Element Type">
+				</umb-property-layout>
+				<umb-property-layout alias="ElementType" label="Is an Element Type">
 					<div slot="description">
 						An Element Type is used for content instances in Property Editors, like the Block Editors.
 					</div>
@@ -62,10 +62,10 @@ let UmbDocumentTypeWorkspaceViewSettingsElement = class UmbDocumentTypeWorkspace
         }}
 							label="Element type"></uui-toggle>
 					</div>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 			</uui-box>
 			<uui-box headline="History cleanup">
-				<umb-workspace-property-layout alias="HistoryCleanup" label="History cleanup">
+				<umb-property-layout alias="HistoryCleanup" label="History cleanup">
 					<div slot="description">
 						Allow overriding the global history cleanup settings. (TODO: this ui is not working.. )
 					</div>
@@ -77,7 +77,7 @@ let UmbDocumentTypeWorkspaceViewSettingsElement = class UmbDocumentTypeWorkspace
 						<uui-label for="latest-version-per-day-days">Keep latest version per day for X days</uui-label>
 						<umb-property-editor-ui-number id="latest-version-per-day-days"></umb-property-editor-ui-number>
 					</div>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 			</uui-box>
 		`;
     }

package/dist-cms/packages/documents/document-types/workspace/views/structure/document-type-workspace-view-structure.element.js

@@ -33,7 +33,7 @@ let UmbDocumentTypeWorkspaceViewStructureElement = class UmbDocumentTypeWorkspac
     render() {
         return html `
 			<uui-box headline="Structure">
-				<umb-workspace-property-layout alias="Root" label="Allow as Root">
+				<umb-property-layout alias="Root" label="Allow as Root">
 					<div slot="description">${this.localize.term('contentTypeEditor_allowAsRootDescription')}</div>
 					<div slot="editor">
 						<uui-toggle
@@ -43,8 +43,8 @@ let UmbDocumentTypeWorkspaceViewStructureElement = class UmbDocumentTypeWorkspac
             this.#workspaceContext?.setAllowedAsRoot(e.target.checked);
         }}></uui-toggle>
 					</div>
-				</umb-workspace-property-layout>
-				<umb-workspace-property-layout alias="ChildNodeType" label="Allowed child node types">
+				</umb-property-layout>
+				<umb-property-layout alias="ChildNodeType" label="Allowed child node types">
 					<div slot="description">
 						Allow content of the specified types to be created underneath content of this type.
 					</div>
@@ -61,13 +61,13 @@ let UmbDocumentTypeWorkspaceViewStructureElement = class UmbDocumentTypeWorkspac
         }}">
 						</umb-document-type-input>
 					</div>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 			</uui-box>
 			<uui-box headline="Presentation">
-				<umb-workspace-property-layout alias="Root" label="Collection view">
+				<umb-property-layout alias="Root" label="Collection view">
 					<div slot="description">Provides an overview of child content and hides it in the tree.</div>
 					<div slot="editor"><uui-toggle label="Display children in a Collection view"></uui-toggle></div>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 			</uui-box>
 		`;
     }

package/dist-cms/packages/documents/document-types/workspace/views/templates/document-type-workspace-view-templates.element.js

@@ -41,7 +41,7 @@ let UmbDocumentTypeWorkspaceViewTemplatesElement = class UmbDocumentTypeWorkspac
     }
     render() {
         return html `<uui-box headline="Templates">
-			<umb-workspace-property-layout alias="Templates" label="Allowed Templates">
+			<umb-property-layout alias="Templates" label="Allowed Templates">
 				<div slot="description">Choose which templates editors are allowed to use on content of this type</div>
 				<div id="templates" slot="editor">
 					<umb-input-template
@@ -49,7 +49,7 @@ let UmbDocumentTypeWorkspaceViewTemplatesElement = class UmbDocumentTypeWorkspac
 						.selectedIds=${this._allowedTemplateIds}
 						@change=${this.#templateInputChange}></umb-input-template>
 				</div>
-			</umb-workspace-property-layout>
+			</umb-property-layout>
 		</uui-box>`;
     }
     static { this.styles = [
@@ -70,10 +70,10 @@ let UmbDocumentTypeWorkspaceViewTemplatesElement = class UmbDocumentTypeWorkspac
 				align-items: stretch;
 			}
 
-			umb-workspace-property-layout {
+			umb-property-layout {
 				border-top: 1px solid var(--uui-color-border);
 			}
-			umb-workspace-property-layout:first-child {
+			umb-property-layout:first-child {
 				padding-top: 0;
 				border: none;
 			}

package/dist-cms/packages/documents/documents/{variant-context/document-variant-context.d.ts → property-dataset-context/document-property-dataset-context.d.ts}

@@ -1,17 +1,17 @@
+import { UmbNameablePropertyDatasetContext, UmbPropertyDatasetContext } from '../../../core/property/index.js';
 import type { UmbDocumentWorkspaceContext } from '../workspace/index.js';
 import { DocumentVariantResponseModel } from '../../../../external/backend-api/index.js';
 import { type UmbControllerHost } from '../../../../libs/controller-api/index.js';
-import { UmbBaseController } from '../../../../libs/class-api/index.js';
+import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import { UmbVariantId } from '../../../core/variant/index.js';
-import { UmbVariantContext } from '../../../core/workspace/index.js';
-export declare class UmbDocumentVariantContext extends UmbBaseController implements UmbVariantContext {
+export declare class UmbDocumentPropertyDataContext extends UmbContextBase<UmbPropertyDatasetContext> implements UmbPropertyDatasetContext, UmbNameablePropertyDatasetContext {
     #private;
     getVariantId(): UmbVariantId;
     currentVariant: import("rxjs/internal/Observable.js").Observable<DocumentVariantResponseModel | undefined>;
     name: import("rxjs/internal/Observable.js").Observable<string | undefined>;
     culture: import("rxjs/internal/Observable.js").Observable<string | null | undefined>;
     segment: import("rxjs/internal/Observable.js").Observable<string | null | undefined>;
-    getType(): string;
+    getEntityType(): string;
     getUnique(): string | undefined;
     getName(): string | undefined;
     setName(name: string): void;

package/dist-cms/packages/documents/documents/{variant-context/document-variant-context.js → property-dataset-context/document-property-dataset-context.js}

@@ -1,10 +1,10 @@
-import { UmbBaseController } from '../../../../libs/class-api/index.js';
+import { UMB_PROPERTY_DATASET_CONTEXT, } from '../../../core/property/index.js';
+import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import { map } from '../../../../external/rxjs/index.js';
 import { UmbObjectState } from '../../../../libs/observable-api/index.js';
 import { UmbVariantId } from '../../../core/variant/index.js';
-import { UMB_VARIANT_CONTEXT } from '../../../core/workspace/index.js';
-// TODO: This code can be split into a UmbContentTypeVariantContext, leaving just the publishing state and methods to this class.
-export class UmbDocumentVariantContext extends UmbBaseController {
+// TODO: This code can be split into a UmbContentTypePropertyDatasetContext, leaving just the publishing state and methods to this class.
+export class UmbDocumentPropertyDataContext extends UmbContextBase {
     #workspace;
     #variantId;
     getVariantId() {
@@ -15,7 +15,7 @@ export class UmbDocumentVariantContext extends UmbBaseController {
     // TO make such happen I think we need to maintain all properties and their value of this object.
     // This will actually make it simpler if multiple are watching the same property.
     // But it will also mean that we wil watch all properties and their structure, for variantID, all the time for all of the properties.
-    getType() {
+    getEntityType() {
         return this.#workspace.getEntityType();
     }
     getUnique() {
@@ -32,7 +32,7 @@ export class UmbDocumentVariantContext extends UmbBaseController {
     }
     constructor(host, workspace, variantId) {
         // The controller alias, is a very generic name cause we want only one of these for this controller host.
-        super(host, 'variantContext');
+        super(host, UMB_PROPERTY_DATASET_CONTEXT);
         this.#currentVariant = new UmbObjectState(undefined);
         this.currentVariant = this.#currentVariant.asObservable();
         this.name = this.#currentVariant.asObservablePart((x) => x?.name);
@@ -45,8 +45,6 @@ export class UmbDocumentVariantContext extends UmbBaseController {
                 return;
             this.#currentVariant.next(variantInfo);
         }, '_observeActiveVariant');
-        // TODO: Refactor: use the document dataset context token.
-        this.provideContext(UMB_VARIANT_CONTEXT, this);
     }
     #createPropertyVariantId(property) {
         return UmbVariantId.Create({

package/dist-cms/packages/documents/documents/property-dataset-context/document-property-dataset-context.token.d.ts

@@ -0,0 +1,5 @@
+import { UmbPropertyDatasetContext } from '../../../core/property/index.js';
+import type { UmbDocumentPropertyDataContext } from './document-property-dataset-context.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export declare const IsDocumentVariantContext: (context: UmbPropertyDatasetContext) => context is UmbDocumentPropertyDataContext;
+export declare const UMB_DOCUMENT_VARIANT_CONTEXT: UmbContextToken<UmbPropertyDatasetContext, UmbDocumentPropertyDataContext>;

package/dist-cms/packages/documents/documents/{variant-context/document-variant-context.token.js → property-dataset-context/document-property-dataset-context.token.js}

@@ -1,4 +1,4 @@
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
-export const IsDocumentVariantContext = (context) => context.getType() === UMB_DOCUMENT_ENTITY_TYPE;
+export const IsDocumentVariantContext = (context) => context.getEntityType() === UMB_DOCUMENT_ENTITY_TYPE;
 export const UMB_DOCUMENT_VARIANT_CONTEXT = new UmbContextToken('UmbVariantContext', undefined, IsDocumentVariantContext);

package/dist-cms/packages/documents/documents/workspace/document-workspace.context.d.ts

@@ -1,6 +1,6 @@
 import { UmbDocumentRepository } from '../repository/document.repository.js';
 import { UmbDocumentTypeDetailRepository } from '../../document-types/repository/detail/document-type-detail.repository.js';
-import { UmbDocumentVariantContext } from '../variant-context/document-variant-context.js';
+import { UmbDocumentPropertyDataContext } from '../property-dataset-context/document-property-dataset-context.js';
 import { UmbVariantId } from '../../../core/variant/index.js';
 import { UmbContentTypePropertyStructureManager } from '../../../core/content-type/index.js';
 import { UmbSaveableWorkspaceContextInterface, UmbEditableWorkspaceContextBase, UmbWorkspaceSplitViewManager, UmbVariantableWorkspaceContextInterface, UmbPublishableWorkspaceContextInterface } from '../../../core/workspace/index.js';
@@ -44,7 +44,7 @@ export declare class UmbDocumentWorkspaceContext extends UmbEditableWorkspaceCon
     saveAndPublish(): Promise<void>;
     publish(): Promise<void>;
     unpublish(): Promise<void>;
-    createVariantContext(host: UmbControllerHost, variantId: UmbVariantId): UmbDocumentVariantContext;
+    createPropertyDatasetContext(host: UmbControllerHost, variantId: UmbVariantId): UmbDocumentPropertyDataContext;
     destroy(): void;
 }
 export default UmbDocumentWorkspaceContext;

package/dist-cms/packages/documents/documents/workspace/document-workspace.context.js

@@ -1,6 +1,6 @@
 import { UmbDocumentRepository } from '../repository/document.repository.js';
 import { UmbDocumentTypeDetailRepository } from '../../document-types/repository/detail/document-type-detail.repository.js';
-import { UmbDocumentVariantContext } from '../variant-context/document-variant-context.js';
+import { UmbDocumentPropertyDataContext } from '../property-dataset-context/document-property-dataset-context.js';
 import { UMB_DOCUMENT_ENTITY_TYPE } from '../entity.js';
 import { UmbVariantId } from '../../../core/variant/index.js';
 import { UmbContentTypePropertyStructureManager } from '../../../core/content-type/index.js';
@@ -202,8 +202,8 @@ export class UmbDocumentWorkspaceContext extends UmbEditableWorkspaceContextBase
 
     }
     */
-    createVariantContext(host, variantId) {
-        return new UmbDocumentVariantContext(host, this, variantId);
+    createPropertyDatasetContext(host, variantId) {
+        return new UmbDocumentPropertyDataContext(host, this, variantId);
     }
     destroy() {
         this.#currentData.destroy();

package/dist-cms/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.js

@@ -165,7 +165,7 @@ let UmbMediaTypeWorkspacePropertyElement = class UmbMediaTypeWorkspacePropertyEl
 						.value=${this.property.name}
 						@input=${this.#onNameChange}></uui-input>
 					${this.renderPropertyAlias()}
-					<slot name="property-action-menu"></slot>
+					<slot name="action-menu"></slot>
 					<p>
 						<uui-textarea
 							label="description"

package/dist-cms/packages/media/media-types/workspace/views/structure/media-type-workspace-view-structure.element.js

@@ -33,7 +33,7 @@ let UmbMediaTypeWorkspaceViewStructureElement = class UmbMediaTypeWorkspaceViewS
     render() {
         return html `
 			<uui-box headline="Structure">
-				<umb-workspace-property-layout alias="Root" label="Allow as Root">
+				<umb-property-layout alias="Root" label="Allow as Root">
 					<div slot="description">${this.localize.term('contentTypeEditor_allowAsRootDescription')}</div>
 					<div slot="editor">
 						<uui-toggle
@@ -43,8 +43,8 @@ let UmbMediaTypeWorkspaceViewStructureElement = class UmbMediaTypeWorkspaceViewS
             this.#workspaceContext?.updateProperty('allowedAsRoot', e.target.checked);
         }}></uui-toggle>
 					</div>
-				</umb-workspace-property-layout>
-				<umb-workspace-property-layout alias="ChildNodeType" label="Allowed child node types">
+				</umb-property-layout>
+				<umb-property-layout alias="ChildNodeType" label="Allowed child node types">
 					<div slot="description">
 						Allow content of the specified types to be created underneath content of this type.
 					</div>
@@ -61,13 +61,13 @@ let UmbMediaTypeWorkspaceViewStructureElement = class UmbMediaTypeWorkspaceViewS
         }}">
 						</umb-media-type-input>
 					</div>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 			</uui-box>
 			<uui-box headline="Presentation">
-				<umb-workspace-property-layout alias="Root" label="Collection view">
+				<umb-property-layout alias="Root" label="Collection view">
 					<div slot="description">Provides an overview of child content and hides it in the tree.</div>
 					<div slot="editor"><uui-toggle label="Display children in a Collection view"></uui-toggle></div>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 			</uui-box>
 		`;
     }

package/dist-cms/packages/packages/package-builder/workspace/workspace-package-builder.element.js

@@ -107,49 +107,35 @@ let UmbWorkspacePackageBuilderElement = class UmbWorkspacePackageBuilderElement
 		</div>`;
     }
     #renderEditors() {
-        return html `<umb-workspace-property-layout label="Content" description="">
+        return html `<umb-property-layout label="Content" description="">
 				${this.#renderContentSection()}
-			</umb-workspace-property-layout>
+			</umb-property-layout>
 
-			<umb-workspace-property-layout label="Media" description=""
-				>${this.#renderMediaSection()}
-			</umb-workspace-property-layout>
+			<umb-property-layout label="Media" description="">${this.#renderMediaSection()} </umb-property-layout>
 
-			<umb-workspace-property-layout label="Document Types" description="">
+			<umb-property-layout label="Document Types" description="">
 				${this.#renderDocumentTypeSection()}
-			</umb-workspace-property-layout>
+			</umb-property-layout>
 
-			<umb-workspace-property-layout label="Media Types" description="">
-				${this.#renderMediaTypeSection()}
-			</umb-workspace-property-layout>
+			<umb-property-layout label="Media Types" description=""> ${this.#renderMediaTypeSection()} </umb-property-layout>
 
-			<umb-workspace-property-layout label="Languages" description="">
-				${this.#renderLanguageSection()}
-			</umb-workspace-property-layout>
+			<umb-property-layout label="Languages" description=""> ${this.#renderLanguageSection()} </umb-property-layout>
 
-			<umb-workspace-property-layout label="Dictionary" description="">
-				${this.#renderDictionarySection()}
-			</umb-workspace-property-layout>
+			<umb-property-layout label="Dictionary" description=""> ${this.#renderDictionarySection()} </umb-property-layout>
 
-			<umb-workspace-property-layout label="Data Types" description="">
-				${this.#renderDataTypeSection()}
-			</umb-workspace-property-layout>
+			<umb-property-layout label="Data Types" description=""> ${this.#renderDataTypeSection()} </umb-property-layout>
 
-			<umb-workspace-property-layout label="Templates" description="">
-				${this.#renderTemplateSection()}
-			</umb-workspace-property-layout>
+			<umb-property-layout label="Templates" description=""> ${this.#renderTemplateSection()} </umb-property-layout>
 
-			<umb-workspace-property-layout label="Stylesheets" description="">
+			<umb-property-layout label="Stylesheets" description="">
 				${this.#renderStylesheetsSection()}
-			</umb-workspace-property-layout>
+			</umb-property-layout>
 
-			<umb-workspace-property-layout label="Scripts" description="">
-				${this.#renderScriptsSection()}
-			</umb-workspace-property-layout>
+			<umb-property-layout label="Scripts" description=""> ${this.#renderScriptsSection()} </umb-property-layout>
 
-			<umb-workspace-property-layout label="Partial Views" description="">
+			<umb-property-layout label="Partial Views" description="">
 				${this.#renderPartialViewSection()}
-			</umb-workspace-property-layout>`;
+			</umb-property-layout>`;
     }
     #renderContentSection() {
         return html `

package/dist-cms/packages/settings/languages/modals/language-picker/language-picker-modal.element.js

@@ -14,7 +14,7 @@ let UmbLanguagePickerModalElement = class UmbLanguagePickerModalElement extends
         super(...arguments);
         this._languages = [];
         this.#languageRepository = new UmbLanguageRepository(this);
-        this.#selectionManager = new UmbSelectionManager();
+        this.#selectionManager = new UmbSelectionManager(this);
     }
     #languageRepository;
     #selectionManager;

package/dist-cms/packages/settings/languages/workspace/language/views/details/language-details-workspace-view.element.js

@@ -88,7 +88,7 @@ let UmbLanguageDetailsWorkspaceViewElement = class UmbLanguageDetailsWorkspaceVi
     render() {
         return html `
 			<uui-box>
-				<umb-workspace-property-layout label="Language">
+				<umb-property-layout label="Language">
 					<div slot="editor">
 						<!-- TODO: disable already created cultures in the select -->
 						<umb-input-culture-select
@@ -99,13 +99,13 @@ let UmbLanguageDetailsWorkspaceViewElement = class UmbLanguageDetailsWorkspaceVi
 						<!-- TEMP VALIDATION ERROR -->
 						${this._validationErrors?.isoCode.map((isoCodeError) => html `<div class="validation-message">${isoCodeError}</div>`)}
 					</div>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 
-				<umb-workspace-property-layout label="ISO Code">
+				<umb-property-layout label="ISO Code">
 					<div slot="editor">${this._language?.isoCode}</div>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 
-				<umb-workspace-property-layout label="Settings">
+				<umb-property-layout label="Settings">
 					<div slot="editor">
 						<uui-toggle
 							label="Default language"
@@ -135,9 +135,9 @@ let UmbLanguageDetailsWorkspaceViewElement = class UmbLanguageDetailsWorkspaceVi
 							</div>
 						</uui-toggle>
 					</div>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 
-				<umb-workspace-property-layout
+				<umb-property-layout
 					label="Fallback language"
 					description="To allow multi-lingual content to fall back to another language if not present in the requested language, select it here.">
 					<umb-input-language-picker
@@ -146,7 +146,7 @@ let UmbLanguageDetailsWorkspaceViewElement = class UmbLanguageDetailsWorkspaceVi
 						max="1"
 						@change=${this.#handleFallbackChange}
 						.filter=${(language) => language.isoCode !== this._language?.isoCode}></umb-input-language-picker>
-				</umb-workspace-property-layout>
+				</umb-property-layout>
 			</uui-box>
 		`;
     }