@umbraco-cms/backoffice 15.0.0-rc2 → 15.0.0-rc4

package/dist-cms/custom-elements.json

@@ -1669,6 +1669,10 @@
         }
       ]
     },
+    {
+      "name": "umb-collection-create-action-button",
+      "path": "./../src/packages/core/collection/action/create/collection-create-action.element.ts"
+    },
     {
       "name": "umb-collection",
       "path": "./../src/packages/core/collection/collection.element.ts",
@@ -3707,6 +3711,10 @@
         }
       ]
     },
+    {
+      "name": "umb-entity-create-option-action-list-modal",
+      "path": "./../src/packages/core/entity-action/common/create/modal/entity-create-option-action-list-modal.element.ts"
+    },
     {
       "name": "umb-entity-action",
       "path": "./../src/packages/core/entity-action/default/entity-action.element.ts",
@@ -10422,26 +10430,9 @@
         }
       ]
     },
-    {
-      "name": "umb-property-editor-ui-content-picker-source-type",
-      "path": "./../src/packages/property-editors/content-picker/config/source-type/property-editor-ui-content-picker-source-type.element.ts",
-      "attributes": [
-        {
-          "name": "value",
-          "type": "string"
-        }
-      ],
-      "properties": [
-        {
-          "name": "value",
-          "attribute": "value",
-          "type": "string"
-        }
-      ]
-    },
     {
       "name": "umb-input-content-picker-source",
-      "path": "./../src/packages/property-editors/content-picker/config/source/input-content-picker-source.element.ts",
+      "path": "./../src/packages/property-editors/content-picker/config/source-content/input-content-picker-source.element.ts",
       "attributes": [
         {
           "name": "type",
@@ -10476,7 +10467,7 @@
     },
     {
       "name": "umb-property-editor-ui-content-picker-source",
-      "path": "./../src/packages/property-editors/content-picker/config/source/property-editor-ui-content-picker-source.element.ts",
+      "path": "./../src/packages/property-editors/content-picker/config/source-content/property-editor-ui-content-picker-source.element.ts",
       "attributes": [
         {
           "name": "value",
@@ -10494,6 +10485,23 @@
         }
       ]
     },
+    {
+      "name": "umb-property-editor-ui-content-picker-source-type",
+      "path": "./../src/packages/property-editors/content-picker/config/source-type/property-editor-ui-content-picker-source-type.element.ts",
+      "attributes": [
+        {
+          "name": "value",
+          "type": "string"
+        }
+      ],
+      "properties": [
+        {
+          "name": "value",
+          "attribute": "value",
+          "type": "string"
+        }
+      ]
+    },
     {
       "name": "umb-input-content-picker-document-root",
       "path": "./../src/packages/property-editors/content-picker/dynamic-root/components/input-content-picker-document-root.element.ts",
@@ -12237,7 +12245,7 @@
         },
         {
           "name": "styles",
-          "default": "\"css`\\n\\t\\t:host([readonly]) {\\n\\t\\t\\tpointer-events: none;\\n\\t\\t\\tbackground-color: var(--uui-color-surface-alt);\\n\\t\\t}\\n\\n\\t\\t:host {\\n\\t\\t\\tborder-radius: var(--uui-border-radius);\\n\\t\\t\\tborder: 1px solid var(--uui-color-border);\\n\\t\\t\\tborder-bottom-left-radius: 0;\\n\\t\\t\\tborder-bottom-right-radius: 0;\\n\\t\\t\\tbackground-color: var(--uui-color-surface);\\n\\t\\t\\tcolor: var(--color-text);\\n\\t\\t\\tdisplay: grid;\\n\\t\\t\\tgrid-template-columns: repeat(auto-fill, 10px);\\n\\t\\t\\tgrid-auto-flow: row;\\n\\t\\t\\tposition: sticky;\\n\\t\\t\\ttop: -25px;\\n\\t\\t\\tleft: 0px;\\n\\t\\t\\tright: 0px;\\n\\t\\t\\tpadding: var(--uui-size-space-3);\\n\\t\\t\\tz-index: 9999999;\\n\\t\\t}\\n\\n\\t\\t.item {\\n\\t\\t\\tgrid-column: span 3;\\n\\t\\t}\\n\\n\\t\\t.separator {\\n\\t\\t\\tbackground-color: var(--uui-color-border);\\n\\t\\t\\twidth: 1px;\\n\\t\\t\\tplace-self: center;\\n\\t\\t\\theight: 22px;\\n\\t\\t}\\n\\t\\t.separator:last-child,\\n\\t\\t.separator:has(+ [data-new-row]) {\\n\\t\\t\\tdisplay: none;\\n\\t\\t}\\n\\t`\""
+          "default": "\"css`\\n\\t\\t:host([readonly]) {\\n\\t\\t\\tpointer-events: none;\\n\\t\\t\\tbackground-color: var(--uui-color-surface-alt);\\n\\t\\t}\\n\\n\\t\\t:host {\\n\\t\\t\\tborder-radius: var(--uui-border-radius);\\n\\t\\t\\tborder: 1px solid var(--uui-color-border);\\n\\t\\t\\tborder-bottom-left-radius: 0;\\n\\t\\t\\tborder-bottom-right-radius: 0;\\n\\t\\t\\tbackground-color: var(--uui-color-surface);\\n\\t\\t\\tcolor: var(--color-text);\\n\\n\\t\\t\\tdisplay: flex;\\n\\t\\t\\tflex-direction: column;\\n\\n\\t\\t\\tposition: sticky;\\n\\t\\t\\ttop: -25px;\\n\\t\\t\\tleft: 0px;\\n\\t\\t\\tright: 0px;\\n\\t\\t\\tpadding: var(--uui-size-3);\\n\\t\\t\\tz-index: 9999999;\\n\\t\\t}\\n\\n\\t\\t.row {\\n\\t\\t\\tdisplay: flex;\\n\\t\\t\\tflex-direction: row;\\n\\n\\t\\t\\t.group {\\n\\t\\t\\t\\tdisplay: inline-flex;\\n\\t\\t\\t\\talign-items: stretch;\\n\\n\\t\\t\\t\\t&:not(:last-child)::after {\\n\\t\\t\\t\\t\\tcontent: '';\\n\\t\\t\\t\\t\\tbackground-color: var(--uui-color-border);\\n\\t\\t\\t\\t\\twidth: 1px;\\n\\t\\t\\t\\t\\tplace-self: center;\\n\\t\\t\\t\\t\\theight: 22px;\\n\\t\\t\\t\\t\\tmargin: 0 var(--uui-size-3);\\n\\t\\t\\t\\t}\\n\\t\\t\\t}\\n\\t\\t}\\n\\t`\""
         }
       ]
     },
@@ -12929,10 +12937,6 @@
         }
       ]
     },
-    {
-      "name": "umb-create-user-collection-action-button",
-      "path": "./../src/packages/user/user/collection/action/create-user-collection-action.element.ts"
-    },
     {
       "name": "umb-user-collection-header",
       "path": "./../src/packages/user/user/collection/user-collection-header.element.ts",
@@ -13172,12 +13176,8 @@
       ]
     },
     {
-      "name": "umb-user-create-options-modal",
-      "path": "./../src/packages/user/user/entity-actions/create/modal/user-create-options-modal.element.ts"
-    },
-    {
-      "name": "umb-invite-user-modal",
-      "path": "./../src/packages/user/user/invite/modal/invite/user-invite-modal.element.ts",
+      "name": "umb-create-user-modal",
+      "path": "./../src/packages/user/user/entity-actions/create/modal/create-user-modal.element.ts",
       "properties": [
         {
           "name": "styles",
@@ -13187,12 +13187,8 @@
       ]
     },
     {
-      "name": "umb-resend-invite-to-user-modal",
-      "path": "./../src/packages/user/user/invite/modal/resend-invite/resend-invite-to-user-modal.element.ts"
-    },
-    {
-      "name": "umb-create-user-modal",
-      "path": "./../src/packages/user/user/modals/create/create-user-modal.element.ts",
+      "name": "umb-create-user-success-modal",
+      "path": "./../src/packages/user/user/entity-actions/create/modal/create-user-success-modal.element.ts",
       "properties": [
         {
           "name": "styles",
@@ -13202,8 +13198,8 @@
       ]
     },
     {
-      "name": "umb-create-user-success-modal",
-      "path": "./../src/packages/user/user/modals/create/create-user-success-modal.element.ts",
+      "name": "umb-invite-user-modal",
+      "path": "./../src/packages/user/user/invite/modal/invite/user-invite-modal.element.ts",
       "properties": [
         {
           "name": "styles",
@@ -13212,6 +13208,10 @@
         }
       ]
     },
+    {
+      "name": "umb-resend-invite-to-user-modal",
+      "path": "./../src/packages/user/user/invite/modal/resend-invite/resend-invite-to-user-modal.element.ts"
+    },
     {
       "name": "umb-user-mfa-modal",
       "path": "./../src/packages/user/user/modals/user-mfa/user-mfa-modal.element.ts",

package/dist-cms/json-schema/all-packages.d.ts

@@ -33,6 +33,7 @@ import '../packages/documents/document-types/index.js';
 import '../packages/documents/documents/index.js';
 import '../packages/core/entity-action/index.js';
 import '../packages/core/entity-bulk-action/index.js';
+import '../packages/core/entity-create-option-action/index.js';
 import '../packages/core/entity/index.js';
 import '../packages/core/event/index.js';
 import '../packages/core/extension-registry/index.js';

package/dist-cms/json-schema/all-packages.js

@@ -33,6 +33,7 @@ import '../packages/documents/document-types/index.js';
 import '../packages/documents/documents/index.js';
 import '../packages/core/entity-action/index.js';
 import '../packages/core/entity-bulk-action/index.js';
+import '../packages/core/entity-create-option-action/index.js';
 import '../packages/core/entity/index.js';
 import '../packages/core/event/index.js';
 import '../packages/core/extension-registry/index.js';

package/dist-cms/libs/context-api/consume/context-request.event.d.ts

@@ -1,3 +1,8 @@
+export declare const UMB_CONTEXT_REQUEST_EVENT_TYPE = "umb:context-request";
+/**
+ * @deprecated use UMB_CONTEXT_REQUEST_EVENT_TYPE
+ * This will be removed in Umbraco 17
+ */
 export declare const UMB_CONTENT_REQUEST_EVENT_TYPE = "umb:context-request";
 export declare const UMB_DEBUG_CONTEXT_EVENT_TYPE = "umb:debug-contexts";
 export type UmbContextCallback<T> = (instance: T) => void;

package/dist-cms/libs/context-api/consume/context-request.event.js

@@ -1,4 +1,9 @@
-export const UMB_CONTENT_REQUEST_EVENT_TYPE = 'umb:context-request';
+export const UMB_CONTEXT_REQUEST_EVENT_TYPE = 'umb:context-request';
+/**
+ * @deprecated use UMB_CONTEXT_REQUEST_EVENT_TYPE
+ * This will be removed in Umbraco 17
+ */
+export const UMB_CONTENT_REQUEST_EVENT_TYPE = UMB_CONTEXT_REQUEST_EVENT_TYPE;
 export const UMB_DEBUG_CONTEXT_EVENT_TYPE = 'umb:debug-contexts';
 /**
  * @class UmbContextRequestEventImplementation
@@ -7,7 +12,7 @@ export const UMB_DEBUG_CONTEXT_EVENT_TYPE = 'umb:debug-contexts';
  */
 export class UmbContextRequestEventImplementation extends Event {
     constructor(contextAlias, apiAlias, callback, stopAtContextMatch = true) {
-        super(UMB_CONTENT_REQUEST_EVENT_TYPE, { bubbles: true, composed: true, cancelable: true });
+        super(UMB_CONTEXT_REQUEST_EVENT_TYPE, { bubbles: true, composed: true, cancelable: true });
         this.contextAlias = contextAlias;
         this.apiAlias = apiAlias;
         this.callback = callback;

package/dist-cms/libs/context-api/provide/context-boundary.controller.d.ts

@@ -0,0 +1,9 @@
+import type { UmbContextToken } from '../token/index.js';
+import { UmbContextBoundary } from './context-boundary.js';
+import type { UmbControllerHost, UmbController } from '../../controller-api/index.js';
+export declare class UmbContextBoundaryController extends UmbContextBoundary implements UmbController {
+    #private;
+    get controllerAlias(): string;
+    constructor(host: UmbControllerHost, contextAlias: string | UmbContextToken<any>);
+    destroy(): void;
+}

package/dist-cms/libs/context-api/provide/context-boundary.controller.js

@@ -0,0 +1,32 @@
+import { UmbContextBoundary } from './context-boundary.js';
+export class UmbContextBoundaryController extends UmbContextBoundary {
+    #host;
+    #controllerAlias;
+    get controllerAlias() {
+        return this.#controllerAlias;
+    }
+    constructor(host, contextAlias) {
+        super(host.getHostElement(), contextAlias);
+        this.#host = host;
+        // Makes the controllerAlias unique for this instance, this enables multiple Contexts to be provided under the same name. (This only makes sense cause of Context Token Discriminators)
+        // This does mean that if someone provides a context with the same name, but with a different instance, it will not override the previous instance. But its good since it enables extensions to provide contexts at the same scope of other contexts.
+        this.#controllerAlias = 'umbContextBoundary_' + contextAlias.toString();
+        // If this API is already provided with this alias? Then we do not want to register this controller:
+        const existingControllers = host.getUmbControllers((x) => x.controllerAlias === this.controllerAlias);
+        if (existingControllers.length > 0) {
+            // This just an additional awareness feature to make devs Aware, the alternative would be adding it anyway, but that would destroy existing controller of this alias.
+            // Back out, this instance is already provided, by another controller.
+            throw new Error(`Context API: The context boundary of '${this.controllerAlias}' is already provided by another Context Provider Controller.`);
+        }
+        else {
+            host.addUmbController(this);
+        }
+    }
+    destroy() {
+        if (this.#host) {
+            this.#host.removeUmbController(this);
+            this.#host = undefined;
+        }
+        super.destroy();
+    }
+}

package/dist-cms/libs/context-api/provide/context-boundary.d.ts

@@ -0,0 +1,24 @@
+import type { UmbContextToken } from '../token/index.js';
+/**
+ * @class UmbContextBoundary
+ */
+export declare class UmbContextBoundary {
+    #private;
+    /**
+     * Creates an instance of UmbContextBoundary.
+     * @param {EventTarget} eventTarget - the host element for this context provider
+     * @param {string | UmbContextToken} contextIdentifier - a string or token to identify the context
+     * @param {*} instance - the instance to provide
+     * @memberof UmbContextBoundary
+     */
+    constructor(eventTarget: EventTarget, contextIdentifier: string | UmbContextToken<any>);
+    /**
+     * @memberof UmbContextBoundary
+     */
+    hostConnected(): void;
+    /**
+     * @memberof UmbContextBoundary
+     */
+    hostDisconnected(): void;
+    destroy(): void;
+}

package/dist-cms/libs/context-api/provide/context-boundary.js

@@ -0,0 +1,49 @@
+import { UMB_CONTEXT_REQUEST_EVENT_TYPE } from '../consume/context-request.event.js';
+import { UmbContextProvideEventImplementation } from './context-provide.event.js';
+/**
+ * @class UmbContextBoundary
+ */
+export class UmbContextBoundary {
+    #eventTarget;
+    #contextAlias;
+    /**
+     * Creates an instance of UmbContextBoundary.
+     * @param {EventTarget} eventTarget - the host element for this context provider
+     * @param {string | UmbContextToken} contextIdentifier - a string or token to identify the context
+     * @param {*} instance - the instance to provide
+     * @memberof UmbContextBoundary
+     */
+    constructor(eventTarget, contextIdentifier) {
+        this.#eventTarget = eventTarget;
+        const idSplit = contextIdentifier.toString().split('#');
+        this.#contextAlias = idSplit[0];
+        this.#eventTarget.addEventListener(UMB_CONTEXT_REQUEST_EVENT_TYPE, this.#handleContextRequest);
+    }
+    /**
+     * @private
+     * @param {UmbContextRequestEvent} event - the event to handle
+     * @memberof UmbContextBoundary
+     */
+    #handleContextRequest = ((event) => {
+        if (event.contextAlias !== this.#contextAlias)
+            return;
+        if (event.stopAtContextMatch) {
+            // Since the alias matches, we will stop it from bubbling further up. But we still allow it to ask the other Contexts of the element. Hence not calling `event.stopImmediatePropagation();`
+            event.stopPropagation();
+        }
+    });
+    /**
+     * @memberof UmbContextBoundary
+     */
+    hostConnected() {
+        //this.hostElement.addEventListener(UMB_CONTENT_REQUEST_EVENT_TYPE, this.#handleContextRequest);
+        this.#eventTarget.dispatchEvent(new UmbContextProvideEventImplementation(this.#contextAlias));
+    }
+    /**
+     * @memberof UmbContextBoundary
+     */
+    hostDisconnected() { }
+    destroy() {
+        this.#eventTarget = undefined;
+    }
+}

package/dist-cms/libs/context-api/provide/context-provider.js

@@ -1,4 +1,4 @@
-import { UMB_CONTENT_REQUEST_EVENT_TYPE, UMB_DEBUG_CONTEXT_EVENT_TYPE } from '../consume/context-request.event.js';
+import { UMB_CONTEXT_REQUEST_EVENT_TYPE, UMB_DEBUG_CONTEXT_EVENT_TYPE } from '../consume/context-request.event.js';
 import { UmbContextProvideEventImplementation } from './context-provide.event.js';
 /**
  * @class UmbContextProvider
@@ -29,11 +29,11 @@ export class UmbContextProvider {
         this.#contextAlias = idSplit[0];
         this.#apiAlias = idSplit[1] ?? 'default';
         this.#instance = instance;
-        this.#eventTarget.addEventListener(UMB_CONTENT_REQUEST_EVENT_TYPE, this.#handleContextRequest);
+        this.#eventTarget.addEventListener(UMB_CONTEXT_REQUEST_EVENT_TYPE, this.#handleContextRequest);
     }
     /**
      * @private
-     * @param {UmbContextRequestEvent} event
+     * @param {UmbContextRequestEvent} event - the event to handle
      * @memberof UmbContextProvider
      */
     #handleContextRequest = ((event) => {

package/dist-cms/libs/context-api/provide/index.d.ts

@@ -1,3 +1,5 @@
+export * from './context-boundary.js';
+export * from './context-boundary.controller.js';
+export * from './context-provide.event.js';
 export * from './context-provider.controller.js';
 export * from './context-provider.js';
-export * from './context-provide.event.js';

package/dist-cms/libs/context-api/provide/index.js

@@ -1,3 +1,5 @@
+export * from './context-boundary.js';
+export * from './context-boundary.controller.js';
+export * from './context-provide.event.js';
 export * from './context-provider.controller.js';
 export * from './context-provider.js';
-export * from './context-provide.event.js';

package/dist-cms/libs/extension-api/initializers/extension-initializer-base.d.ts

@@ -9,7 +9,7 @@ import type { UmbElement } from '../../element-api/index.js';
 export declare abstract class UmbExtensionInitializerBase<Key extends string, T extends ManifestBase = SpecificManifestTypeOrManifestBase<UmbExtensionManifest, Key>> extends UmbControllerBase {
     #private;
     protected host: UmbElement;
-    protected extensionRegistry: UmbExtensionRegistry<T, ManifestBase | T>;
+    protected extensionRegistry: UmbExtensionRegistry<T, import("../types/condition.types.js").UmbConditionConfigBase<string>, ManifestBase | T>;
     loaded: import("rxjs/internal/Observable").Observable<void>;
     constructor(host: UmbElement, extensionRegistry: UmbExtensionRegistry<T>, manifestType: Key);
     /**

package/dist-cms/libs/extension-api/registry/extension.registry.d.ts

@@ -1,7 +1,7 @@
 import type { ManifestBase, ManifestKind, UmbConditionConfigBase } from '../types/index.js';
 import type { SpecificManifestTypeOrManifestBase } from '../types/map.types.js';
 import type { Observable } from '../../../external/rxjs/index.js';
-export declare class UmbExtensionRegistry<IncomingManifestTypes extends ManifestBase, ManifestTypes extends ManifestBase = IncomingManifestTypes | ManifestBase> {
+export declare class UmbExtensionRegistry<IncomingManifestTypes extends ManifestBase, IncomingConditionConfigTypes extends UmbConditionConfigBase = UmbConditionConfigBase, ManifestTypes extends ManifestBase = IncomingManifestTypes | ManifestBase> {
     #private;
     readonly MANIFEST_TYPES: ManifestTypes;
     private _extensions;
@@ -73,11 +73,11 @@ export declare class UmbExtensionRegistry<IncomingManifestTypes extends Manifest
      * @param {string} alias - The alias of the extension to append the condition to.
      * @param  {UmbConditionConfigBase} newCondition - The condition to append to the extension.
      */
-    appendCondition(alias: string, newCondition: UmbConditionConfigBase): void;
+    appendCondition(alias: string, newCondition: IncomingConditionConfigTypes): void;
     /**
      * Appends an array of conditions to an existing extension
      * @param {string} alias  - The alias of the extension to append the condition to
      * @param {Array<UmbConditionConfigBase>} newConditions  - An array of conditions to be appended to an extension manifest.
      */
-    appendConditions(alias: string, newConditions: Array<UmbConditionConfigBase>): void;
+    appendConditions(alias: string, newConditions: Array<IncomingConditionConfigTypes>): void;
 }

package/dist-cms/packages/block/block/context/block-entry.context.js

@@ -413,7 +413,7 @@ export class UmbBlockEntryContext extends UmbContextBase {
         if (!variantId || !this.#contentKey)
             return;
         // TODO: Handle variantId changes
-        this.observe(this._manager?.hasExposeOf(this.#contentKey), (hasExpose) => {
+        this.observe(this._manager?.hasExposeOf(this.#contentKey, variantId), (hasExpose) => {
             this.#hasExpose.setValue(hasExpose);
         }, 'observeExpose');
     }

package/dist-cms/packages/block/block/context/block-manager.context.d.ts

@@ -52,7 +52,7 @@ export declare abstract class UmbBlockManagerContext<BlockType extends UmbBlockT
     contentOf(key: string): import("rxjs/internal/Observable").Observable<UmbBlockDataModel | undefined>;
     settingsOf(key: string): import("rxjs/internal/Observable").Observable<UmbBlockDataModel | undefined>;
     currentExposeOf(contentKey: string): import("rxjs/internal/Observable").Observable<UmbBlockExposeModel | undefined> | undefined;
-    hasExposeOf(contentKey: string): import("rxjs/internal/Observable").Observable<boolean> | undefined;
+    hasExposeOf(contentKey: string, variantId: UmbVariantId): import("rxjs/internal/Observable").Observable<boolean> | undefined;
     getBlockTypeOf(contentTypeKey: string): BlockType | undefined;
     getContentOf(contentKey: string): UmbBlockDataModel | undefined;
     setOneLayout(layoutData: BlockLayoutType, _originData?: BlockOriginDataType): void;

package/dist-cms/packages/block/block/context/block-manager.context.js

@@ -148,8 +148,7 @@ export class UmbBlockManagerContext extends UmbContextBase {
             return;
         return mergeObservables([this.#exposes.asObservablePart((source) => source.filter((x) => x.contentKey === contentKey)), this.variantId], ([exposes, variantId]) => (variantId ? exposes.find((x) => variantId.compare(x)) : undefined));
     }
-    hasExposeOf(contentKey) {
-        const variantId = this.#variantId.getValue();
+    hasExposeOf(contentKey, variantId) {
         if (!variantId)
             return;
         return this.#exposes.asObservablePart((source) => source.some((x) => x.contentKey === contentKey && variantId.compare(x)));

package/dist-cms/packages/block/block/index.d.ts

@@ -1,6 +1,6 @@
 export * from './context/index.js';
 export * from './modals/index.js';
-export type * from './types.js';
+export * from './property-value-resolver/index.js';
 export * from './validation/index.js';
 export * from './workspace/index.js';
-export * from './property-value-resolver/index.js';
+export type * from './types.js';

package/dist-cms/packages/block/block/index.js

@@ -1,5 +1,5 @@
 export * from './context/index.js';
 export * from './modals/index.js';
+export * from './property-value-resolver/index.js';
 export * from './validation/index.js';
 export * from './workspace/index.js';
-export * from './property-value-resolver/index.js';

package/dist-cms/packages/block/block/types.d.ts

@@ -1,4 +1,6 @@
 import type { UmbContentValueModel } from '../../core/content/index.js';
+export type * from './conditions/types.js';
+export type * from './clipboard/types.js';
 export interface UmbBlockLayoutBaseModel {
     contentKey: string;
     settingsKey?: string | null;

package/dist-cms/packages/block/block/validation/block-element-values-validation-path-translator.controller.d.ts

@@ -0,0 +1,6 @@
+import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
+import { UmbAbstractArrayValidationPathTranslator } from '../../../core/validation/index.js';
+export declare class UmbBlockElementValuesDataValidationPathTranslator extends UmbAbstractArrayValidationPathTranslator {
+    constructor(host: UmbControllerHost);
+    getDataFromIndex(index: number): any;
+}

package/dist-cms/packages/block/block/validation/block-element-values-validation-path-translator.controller.js

@@ -0,0 +1,12 @@
+import { UmbAbstractArrayValidationPathTranslator, UmbDataPathPropertyValueQuery, } from '../../../core/validation/index.js';
+export class UmbBlockElementValuesDataValidationPathTranslator extends UmbAbstractArrayValidationPathTranslator {
+    constructor(host) {
+        super(host, '$.values[', UmbDataPathPropertyValueQuery);
+    }
+    getDataFromIndex(index) {
+        if (!this._context)
+            return;
+        const data = this._context.getTranslationData();
+        return data.values[index];
+    }
+}

package/dist-cms/packages/block/block/validation/data-path-element-data-query.function.d.ts

@@ -1,7 +1,7 @@
 import type { UmbBlockDataModel } from '../types.js';
 /**
  * Validation Data Path Query generator for Block Element Data.
- * write a JSON-Path filter similar to `?(@.key = 'my-key://1234')`
+ * write a JSON-Path filter similar to `?(@.key == 'my-key://1234')`
  * @param key {string} - The key of the block Element data.
  * @param data {{key: string}} - A data object with the key property.
  * @returns

package/dist-cms/packages/block/block/validation/data-path-element-data-query.function.js

@@ -1,13 +1,13 @@
 /**
  * Validation Data Path Query generator for Block Element Data.
- * write a JSON-Path filter similar to `?(@.key = 'my-key://1234')`
+ * write a JSON-Path filter similar to `?(@.key == 'my-key://1234')`
  * @param key {string} - The key of the block Element data.
  * @param data {{key: string}} - A data object with the key property.
  * @returns
  */
 export function UmbDataPathBlockElementDataQuery(data) {
     // write a array of strings for each property, where alias must be present and culture and segment are optional
-    //const filters: Array<string> = [`@.key = '${key}'`];
+    //const filters: Array<string> = [`@.key == '${key}'`];
     //return `?(${filters.join(' && ')})`;
-    return `?(@.key = '${data.key}')`;
+    return `?(@.key == '${data.key}')`;
 }

package/dist-cms/packages/block/block/validation/index.d.ts

@@ -1,2 +1,3 @@
-export * from './block-data-validation-path-translator.controller.js';
+export * from './block-element-values-validation-path-translator.controller.js';
+export * from './block-element-data-validation-path-translator.controller.js';
 export * from './data-path-element-data-query.function.js';

package/dist-cms/packages/block/block/validation/index.js

@@ -1,2 +1,3 @@
-export * from './block-data-validation-path-translator.controller.js';
+export * from './block-element-values-validation-path-translator.controller.js';
+export * from './block-element-data-validation-path-translator.controller.js';
 export * from './data-path-element-data-query.function.js';

package/dist-cms/packages/block/block/workspace/block-element-manager.js

@@ -1,3 +1,4 @@
+import { UmbBlockElementValuesDataValidationPathTranslator } from '../validation/block-element-values-validation-path-translator.controller.js';
 import { UmbBlockElementPropertyDatasetContext } from './block-element-property-dataset.context.js';
 import { UmbContentTypeStructureManager } from '../../../core/content-type/index.js';
 import { UmbClassState, UmbObjectState, appendToFrozenArray, mergeObservables, } from '../../../../libs/observable-api/index.js';
@@ -33,7 +34,7 @@ export class UmbBlockElementManager extends UmbControllerBase {
         this.observe(this.contentTypeId, (id) => this.structure.loadType(id));
         this.observe(this.unique, (key) => {
             if (key) {
-                this.validation.setDataPath('$.' + dataPathPropertyName + `[?(@.key = '${key}')]`);
+                this.validation.setDataPath('$.' + dataPathPropertyName + `[?(@.key == '${key}')]`);
             }
         });
     }
@@ -157,6 +158,8 @@ export class UmbBlockElementManager extends UmbControllerBase {
         this.createPropertyDatasetContext(host);
         // Provide Validation Context for this view:
         this.validation.provideAt(host);
+        // TODO: Implement ctrl alias.
+        new UmbBlockElementValuesDataValidationPathTranslator(host);
     }
     destroy() {
         this.#data.destroy();

package/dist-cms/packages/block/block/workspace/block-workspace-editor.element.d.ts

@@ -4,7 +4,7 @@ export declare class UmbBlockWorkspaceEditorElement extends UmbLitElement {
     workspaceAlias?: string;
     constructor();
     _headline: string;
-    render(): import("lit-html").TemplateResult<1> | typeof nothing;
+    render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 export default UmbBlockWorkspaceEditorElement;

package/dist-cms/packages/block/block/workspace/block-workspace.context.js

@@ -99,13 +99,13 @@ export class UmbBlockWorkspaceContext extends UmbSubmittableWorkspaceContextBase
                 }
                 this.#variantId.setValue(variantId);
             }, 'observeBlockType');
-            this.observe(this.contentKey, (contentKey) => {
-                if (!contentKey)
+            this.observe(observeMultiple([this.contentKey, this.variantId]), ([contentKey, variantId]) => {
+                if (!contentKey || !variantId)
                     return;
-                this.observe(manager.hasExposeOf(contentKey), (exposed) => {
+                this.observe(manager.hasExposeOf(contentKey, variantId), (exposed) => {
                     this.#exposed.setValue(exposed);
                 }, 'observeHasExpose');
-            }, 'observeContentKey');
+            }, 'observeContentKeyAndVariantId');
         }).asPromise();
         this.#retrieveBlockEntries = this.consumeContext(UMB_BLOCK_ENTRIES_CONTEXT, (context) => {
             this.#blockEntries = context;
@@ -141,7 +141,7 @@ export class UmbBlockWorkspaceContext extends UmbSubmittableWorkspaceContextBase
                 setup: async (component, info) => {
                     component.workspaceAlias = manifest.alias;
                     const elementTypeKey = info.match.params.elementTypeKey;
-                    this.create(elementTypeKey);
+                    await this.create(elementTypeKey);
                     new UmbWorkspaceIsNewRedirectController(this, this, this.getHostElement().shadowRoot.querySelector('umb-router-slot'));
                 },
             },

package/dist-cms/packages/block/block/workspace/views/edit/block-workspace-view-edit-properties.element.js

@@ -9,6 +9,7 @@ import { css, html, customElement, property, state, repeat } from '../../../../.
 import { UmbTextStyles } from '../../../../../core/style/index.js';
 import { UmbContentTypePropertyStructureHelper } from '../../../../../core/content-type/index.js';
 import { UmbLitElement, umbDestroyOnDisconnect } from '../../../../../core/lit-element/index.js';
+import { UmbDataPathPropertyValueQuery } from '../../../../../core/validation/index.js';
 let UmbBlockWorkspaceViewEditPropertiesElement = class UmbBlockWorkspaceViewEditPropertiesElement extends UmbLitElement {
     #managerName;
     #blockWorkspace;
@@ -26,6 +27,7 @@ let UmbBlockWorkspaceViewEditPropertiesElement = class UmbBlockWorkspaceViewEdit
     set containerId(value) {
         this.#propertyStructureHelper.setContainerId(value);
     }
+    #variantId;
     constructor() {
         super();
         this.#propertyStructureHelper = new UmbContentTypePropertyStructureHelper(this);
@@ -33,6 +35,10 @@ let UmbBlockWorkspaceViewEditPropertiesElement = class UmbBlockWorkspaceViewEdit
         this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (workspaceContext) => {
             this.#blockWorkspace = workspaceContext;
             this._ownerEntityType = this.#blockWorkspace.getEntityType();
+            this.observe(workspaceContext.variantId, (variantId) => {
+                this.#variantId = variantId;
+                this.#generatePropertyDataPath();
+            }, 'observeVariantId');
             this.#setStructureManager();
         });
     }
@@ -45,10 +51,20 @@ let UmbBlockWorkspaceViewEditPropertiesElement = class UmbBlockWorkspaceViewEdit
             this.#generatePropertyDataPath();
         }, 'observePropertyStructure');
     }
+    /*
     #generatePropertyDataPath() {
-        if (!this._propertyStructure)
-            return;
+        if (!this._propertyStructure) return;
         this._dataPaths = this._propertyStructure.map((property) => `$.${property.alias}`);
+    }
+        */
+    #generatePropertyDataPath() {
+        if (!this.#variantId || !this._propertyStructure)
+            return;
+        this._dataPaths = this._propertyStructure.map((property) => `$.values[${UmbDataPathPropertyValueQuery({
+            alias: property.alias,
+            culture: property.variesByCulture ? this.#variantId.culture : null,
+            segment: property.variesBySegment ? this.#variantId.segment : null,
+        })}].value`);
     }
     render() {
         return repeat(this._propertyStructure, (property) => property.alias, (property, index) => html `<umb-property-type-based-property