@umbraco-cms/backoffice 15.0.0-rc3 → 15.0.0

package/dist-cms/custom-elements.json

@@ -10430,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",
@@ -10484,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",
@@ -10502,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",
@@ -12245,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`\""
         }
       ]
     },

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/packages/block/block/context/block-entry.context.js

@@ -412,8 +412,7 @@ export class UmbBlockEntryContext extends UmbContextBase {
         const variantId = this.#variantId.getValue();
         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');
     }
@@ -445,8 +444,9 @@ export class UmbBlockEntryContext extends UmbContextBase {
         this._entries.delete(contentKey);
     }
     expose() {
-        if (!this.#contentKey)
+        const variantId = this.#variantId.getValue();
+        if (!variantId || !this.#contentKey)
             return;
-        this._manager?.setOneExpose(this.#contentKey);
+        this._manager?.setOneExpose(this.#contentKey, variantId);
     }
 }

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

@@ -19,6 +19,7 @@ export declare abstract class UmbBlockManagerContext<BlockType extends UmbBlockT
     setPropertyAlias(propertyAlias: string | undefined): void;
     variantId: import("rxjs/internal/Observable").Observable<UmbVariantId | undefined>;
     setVariantId(variantId: UmbVariantId | undefined): void;
+    getVariantId(): UmbVariantId | undefined;
     readonly blockTypes: import("rxjs/internal/Observable").Observable<BlockType[]>;
     protected _editorConfiguration: UmbClassState<UmbPropertyEditorConfigCollection | undefined>;
     readonly editorConfiguration: import("rxjs/internal/Observable").Observable<UmbPropertyEditorConfigCollection | undefined>;
@@ -52,13 +53,13 @@ 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;
     setOneContent(contentData: UmbBlockDataModel): void;
     setOneSettings(settingsData: UmbBlockDataModel): void;
-    setOneExpose(contentKey: string): void;
+    setOneExpose(contentKey: string, variantId: UmbVariantId): void;
     removeOneContent(contentKey: string): void;
     removeOneSettings(settingsKey: string): void;
     removeExposesOf(contentKey: string): void;

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

@@ -18,6 +18,9 @@ export class UmbBlockManagerContext extends UmbContextBase {
     setVariantId(variantId) {
         this.#variantId.setValue(variantId);
     }
+    getVariantId() {
+        return this.#variantId.getValue();
+    }
     #structures;
     #blockTypes;
     #contents;
@@ -148,8 +151,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)));
@@ -171,8 +173,7 @@ export class UmbBlockManagerContext extends UmbContextBase {
     setOneSettings(settingsData) {
         this.#settings.appendOne(settingsData);
     }
-    setOneExpose(contentKey) {
-        const variantId = this.#variantId.getValue();
+    setOneExpose(contentKey, variantId) {
         if (!variantId)
             return;
         this.#exposes.appendOne({ contentKey, ...variantId.toObject() });

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'));
                 },
             },
@@ -344,11 +344,14 @@ export class UmbBlockWorkspaceContext extends UmbSubmittableWorkspaceContextBase
     expose() {
         const contentKey = this.#layout.value?.contentKey;
         if (!contentKey)
-            throw new Error('Cannot expose block that does not exist.');
+            throw new Error('Failed to expose block, missing content key.');
         this.#expose(contentKey);
     }
     #expose(unique) {
-        this.#blockManager?.setOneExpose(unique);
+        const variantId = this.#variantId.getValue();
+        if (!variantId)
+            throw new Error('Failed to expose block, missing variant id.');
+        this.#blockManager?.setOneExpose(unique, variantId);
     }
     #modalRejected;
     destroy() {

package/dist-cms/packages/block/block-list/context/block-list-entries.context.js

@@ -94,11 +94,7 @@ export class UmbBlockListEntriesContext extends UmbBlockEntriesContext {
     // insert Block?
     async insert(layoutEntry, content, settings, originData) {
         await this._retrieveManager;
-        const success = this._manager?.insert(layoutEntry, content, settings, originData) ?? false;
-        if (success) {
-            this._manager?.setOneExpose(layoutEntry.contentKey);
-        }
-        return success;
+        return this._manager?.insert(layoutEntry, content, settings, originData) ?? false;
     }
     // create Block?
     async delete(contentKey) {

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

@@ -25,7 +25,7 @@ export class UmbBlockTypeWorkspaceContext extends UmbSubmittableWorkspaceContext
                     component.workspaceAlias = manifest.alias;
                     const elementTypeKey = info.match.params.elementTypeKey;
                     const groupKey = info.match.params.groupKey === 'null' ? null : info.match.params.groupKey;
-                    this.create(elementTypeKey, groupKey);
+                    await this.create(elementTypeKey, groupKey);
                     new UmbWorkspaceIsNewRedirectController(this, this, this.getHostElement().shadowRoot.querySelector('umb-router-slot'));
                 },
             },

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

@@ -11,8 +11,9 @@ import { UmbTextStyles } from '../../style/index.js';
 import { html, customElement } from '../../../../external/lit/index.js';
 import { UmbBasicState } from '../../../../libs/observable-api/index.js';
 import { UUIModalCloseEvent, } from '../../../../external/uui/index.js';
+import { UMB_ROUTE_CONTEXT } from '../../router/index.js';
 import { createExtensionElement } from '../../../../libs/extension-api/index.js';
-import { UMB_CONTENT_REQUEST_EVENT_TYPE, UmbContextProvider } from '../../../../libs/context-api/index.js';
+import { UMB_CONTEXT_REQUEST_EVENT_TYPE, UmbContextBoundary, UmbContextProvider, } from '../../../../libs/context-api/index.js';
 let UmbModalElement = class UmbModalElement extends UmbLitElement {
     #modalContext;
     get modalContext() {
@@ -30,7 +31,7 @@ let UmbModalElement = class UmbModalElement extends UmbLitElement {
     }
     #innerElement = new UmbBasicState(undefined);
     #modalExtensionObserver;
-    #modalRouterElement = document.createElement('umb-router-slot');
+    #modalRouterElement;
     #onClose = () => {
         this.element?.removeEventListener(UUIModalCloseEvent, this.#onClose);
         this.#modalContext?.reject({ type: 'close' });
@@ -44,7 +45,7 @@ let UmbModalElement = class UmbModalElement extends UmbLitElement {
         this.element.addEventListener(UUIModalCloseEvent, this.#onClose);
         // The following code is the context api proxy.
         // It re-dispatches the context api request event to the origin target of this modal, in other words the element that initiated the modal. [NL]
-        this.element.addEventListener(UMB_CONTENT_REQUEST_EVENT_TYPE, ((event) => {
+        this.element.addEventListener(UMB_CONTEXT_REQUEST_EVENT_TYPE, ((event) => {
             if (!this.#modalContext)
                 return;
             // Note for this hack (The if-sentence):  [NL]
@@ -66,6 +67,7 @@ let UmbModalElement = class UmbModalElement extends UmbLitElement {
          *
          */
         if (this.#modalContext.router) {
+            this.#modalRouterElement = document.createElement('umb-router-slot');
             this.#modalRouterElement.routes = [
                 {
                     path: '',
@@ -74,6 +76,13 @@ let UmbModalElement = class UmbModalElement extends UmbLitElement {
             ];
             this.#modalRouterElement.parent = this.#modalContext.router;
         }
+        else {
+            this.#modalRouterElement = document.createElement('div');
+            // Notice inline styling here is used cause the element is not appended into this elements shadowDom but outside and there by gets into the element via a slot.
+            this.#modalRouterElement.style.position = 'relative';
+            this.#modalRouterElement.style.height = '100%';
+            new UmbContextBoundary(this.#modalRouterElement, UMB_ROUTE_CONTEXT).hostConnected();
+        }
         this.element.appendChild(this.#modalRouterElement);
         this.#observeModal(this.#modalContext.alias.toString());
         const provider = new UmbContextProvider(this.element, UMB_MODAL_CONTEXT, this.#modalContext);

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

@@ -37,7 +37,7 @@ export class UmbPropertyTypeWorkspaceContext extends UmbSubmittableWorkspaceCont
                 setup: async (component, info) => {
                     component.workspaceAlias = manifest.alias;
                     const containerUnique = info.match.params.containerUnique === 'null' ? null : info.match.params.containerUnique;
-                    this.create(containerUnique);
+                    await this.create(containerUnique);
                     new UmbWorkspaceIsNewRedirectController(this, this, this.getHostElement().shadowRoot.querySelector('umb-router-slot'));
                 },
             },

package/dist-cms/packages/core/router/modal-registration/modal-route-registration.controller.js

@@ -179,9 +179,9 @@ export class UmbModalRouteRegistrationController extends UmbControllerBase {
         return !!this.#modalContext;
     }
     open(params, prepend) {
-        if (this.active)
+        if (this.active || !this.#routeBuilder)
             return;
-        window.history.pushState({}, '', this.#routeBuilder?.(params) + (prepend ? `${prepend}` : ''));
+        window.history.pushState({}, '', this.#routeBuilder(params) + (prepend ? `${prepend}` : ''));
     }
     /**
      * Returns the modal context if the modal is currently active. Otherwise its undefined.
@@ -195,6 +195,8 @@ export class UmbModalRouteRegistrationController extends UmbControllerBase {
         return this;
     }
     _internal_setRouteBuilder(urlBuilder) {
+        if (!this.#routeContext)
+            return;
         this.#routeBuilder = urlBuilder;
         this.#urlBuilderCallback?.(urlBuilder);
     }

package/dist-cms/packages/core/validation/context/validation-messages.manager.d.ts

@@ -19,6 +19,7 @@ export declare class UmbValidationMessagesManager {
     addMessage(type: UmbValidationMessageType, path: string, body: string, key?: string): void;
     addMessages(type: UmbValidationMessageType, path: string, bodies: Array<string>): void;
     removeMessageByKey(key: string): void;
+    removeMessageByKeys(keys: Array<string>): void;
     removeMessagesByTypeAndPath(type: UmbValidationMessageType, path: string): void;
     removeMessagesByType(type: UmbValidationMessageType): void;
     addTranslator(translator: UmbValidationMessageTranslator): void;

package/dist-cms/packages/core/validation/context/validation-messages.manager.js

@@ -8,7 +8,7 @@ export class UmbValidationMessagesManager {
     }
     #messages;
     debug(logName) {
-        this.#messages.asObservable().subscribe((x) => console.log(logName, x, this.#translators));
+        this.#messages.asObservable().subscribe((x) => console.log(logName, x));
     }
     getHasAnyMessages() {
         return this.#messages.getValue().length !== 0;
@@ -58,6 +58,9 @@ export class UmbValidationMessagesManager {
     removeMessageByKey(key) {
         this.#messages.removeOne(key);
     }
+    removeMessageByKeys(keys) {
+        this.#messages.filter((x) => keys.indexOf(x.key) === -1);
+    }
     removeMessagesByTypeAndPath(type, path) {
         //path = path.toLowerCase();
         this.#messages.filter((x) => !(x.type === type && x.path === path));

package/dist-cms/packages/core/validation/controllers/bind-server-validation-to-form-control.controller.js

@@ -24,11 +24,8 @@ export class UmbBindServerValidationToFormControl extends UmbControllerBase {
             if (!defaultMemoization(this.#value, value)) {
                 this.#value = value;
                 // Only remove server validations from validation context [NL]
-                this.#messages.forEach((message) => {
-                    if (message.type === 'server') {
-                        this.#context?.messages.removeMessageByKey(message.key);
-                    }
-                });
+                const toRemove = this.#messages.filter((x) => x.type === 'server').map((msg) => msg.key);
+                this.#context?.messages.removeMessageByKeys(toRemove);
             }
         }
     }

package/dist-cms/packages/core/validation/controllers/validation.controller.js

@@ -117,9 +117,7 @@ export class UmbValidationController extends UmbControllerBase {
                 if (this.#parentMessages) {
                     // Remove the local messages that does not exist in the parent anymore:
                     const toRemove = this.#parentMessages.filter((msg) => !msgs.find((m) => m.key === msg.key));
-                    toRemove.forEach((msg) => {
-                        this.messages.removeMessageByKey(msg.key);
-                    });
+                    this.#parent.messages.removeMessageByKeys(toRemove.map((msg) => msg.key));
                 }
                 this.#parentMessages = msgs;
                 msgs.forEach((msg) => {
@@ -135,9 +133,7 @@ export class UmbValidationController extends UmbControllerBase {
                 if (this.#localMessages) {
                     // Remove the parent messages that does not exist locally anymore:
                     const toRemove = this.#localMessages.filter((msg) => !msgs.find((m) => m.key === msg.key));
-                    toRemove.forEach((msg) => {
-                        this.#parent.messages.removeMessageByKey(msg.key);
-                    });
+                    this.#parent.messages.removeMessageByKeys(toRemove.map((msg) => msg.key));
                 }
                 this.#localMessages = msgs;
                 msgs.forEach((msg) => {

package/dist-cms/packages/core/validation/mixins/form-control.mixin.js

@@ -60,7 +60,7 @@ export function UmbFormControlMixin(superClass, defaultValue) {
         set pristine(value) {
             if (this._pristine !== value) {
                 this._pristine = value;
-                this.#dispatchValidationState();
+                this._runValidators();
             }
         }
         get pristine() {

package/dist-cms/packages/core/workspace/entity-detail/entity-detail-workspace-base.js

@@ -116,10 +116,10 @@ export class UmbEntityDetailWorkspaceContextBase extends UmbSubmittableWorkspace
             throw new Error('Unique is not set');
         }
         if (this.getIsNew()) {
-            this.#create(currentData);
+            await this.#create(currentData);
         }
         else {
-            this.#update(currentData);
+            await this.#update(currentData);
         }
     }
     async delete(unique) {

package/dist-cms/packages/data-type/workspace/data-type-workspace.context.js

@@ -60,10 +60,10 @@ export class UmbDataTypeWorkspaceContext extends UmbEntityDetailWorkspaceContext
             {
                 path: 'create/parent/:entityType/:parentUnique',
                 component: UmbDataTypeWorkspaceEditorElement,
-                setup: (_component, info) => {
+                setup: async (_component, info) => {
                     const parentEntityType = info.match.params.entityType;
                     const parentUnique = info.match.params.parentUnique === 'null' ? null : info.match.params.parentUnique;
-                    this.createScaffold({ parent: { entityType: parentEntityType, unique: parentUnique } });
+                    await this.createScaffold({ parent: { entityType: parentEntityType, unique: parentUnique } });
                     new UmbWorkspaceIsNewRedirectController(this, this, this.getHostElement().shadowRoot.querySelector('umb-router-slot'));
                 },
             },

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

@@ -19,7 +19,7 @@ export class UmbDictionaryWorkspaceContext extends UmbEntityDetailWorkspaceConte
                 setup: async (_component, info) => {
                     const parentEntityType = info.match.params.entityType;
                     const parentUnique = info.match.params.parentUnique === 'null' ? null : info.match.params.parentUnique;
-                    this.createScaffold({ parent: { entityType: parentEntityType, unique: parentUnique } });
+                    await this.createScaffold({ parent: { entityType: parentEntityType, unique: parentUnique } });
                     new UmbWorkspaceIsNewRedirectController(this, this, this.getHostElement().shadowRoot.querySelector('umb-router-slot'));
                 },
             },

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

@@ -126,7 +126,7 @@ export class UmbDocumentBlueprintWorkspaceContext extends UmbSubmittableWorkspac
                     const parentEntityType = info.match.params.parentEntityType;
                     const parentUnique = info.match.params.parentUnique === 'null' ? null : info.match.params.parentUnique;
                     const documentTypeUnique = info.match.params.documentTypeUnique;
-                    this.create({ entityType: parentEntityType, unique: parentUnique }, documentTypeUnique);
+                    await this.create({ entityType: parentEntityType, unique: parentUnique }, documentTypeUnique);
                     new UmbWorkspaceIsNewRedirectController(this, this, this.getHostElement().shadowRoot.querySelector('umb-router-slot'));
                 },
             },

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

@@ -52,7 +52,7 @@ export class UmbDocumentTypeWorkspaceContext extends UmbSubmittableWorkspaceCont
             {
                 path: UMB_CREATE_DOCUMENT_TYPE_WORKSPACE_PATH_PATTERN.toString(),
                 component: UmbDocumentTypeWorkspaceEditorElement,
-                setup: (_component, info) => {
+                setup: async (_component, info) => {
                     const params = info.match.params;
                     const parentEntityType = params.parentEntityType;
                     const parentUnique = params.parentUnique === 'null' ? null : params.parentUnique;
@@ -60,7 +60,7 @@ export class UmbDocumentTypeWorkspaceContext extends UmbSubmittableWorkspaceCont
                     if (parentUnique === undefined) {
                         throw new Error('ParentUnique url parameter is required to create a document type');
                     }
-                    this.create({ entityType: parentEntityType, unique: parentUnique }, presetAlias);
+                    await this.create({ entityType: parentEntityType, unique: parentUnique }, presetAlias);
                     new UmbWorkspaceIsNewRedirectController(this, this, this.getHostElement().shadowRoot.querySelector('umb-router-slot'));
                 },
             },