@umbraco-cms/backoffice 14.0.0--preview006-89e89a2e → 14.0.0--preview006-7bdcb4ac

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

@@ -9,13 +9,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _UmbBlockWorkspaceContext_instances, _UmbBlockWorkspaceContext_blockManager, _UmbBlockWorkspaceContext_retrieveBlockManager, _UmbBlockWorkspaceContext_modalContext, _UmbBlockWorkspaceContext_retrieveModalContext, _UmbBlockWorkspaceContext_editorConfigPromise, _UmbBlockWorkspaceContext_entityType, _UmbBlockWorkspaceContext_isNew, _UmbBlockWorkspaceContext_liveEditingMode, _UmbBlockWorkspaceContext_layout, _UmbBlockWorkspaceContext_label, _UmbBlockWorkspaceContext_establishLiveSync, _UmbBlockWorkspaceContext_modalRejected;
+var _UmbBlockWorkspaceContext_instances, _UmbBlockWorkspaceContext_blockManager, _UmbBlockWorkspaceContext_retrieveBlockManager, _UmbBlockWorkspaceContext_blockEntries, _UmbBlockWorkspaceContext_retrieveBlockEntries, _UmbBlockWorkspaceContext_modalContext, _UmbBlockWorkspaceContext_retrieveModalContext, _UmbBlockWorkspaceContext_editorConfigPromise, _UmbBlockWorkspaceContext_entityType, _UmbBlockWorkspaceContext_isNew, _UmbBlockWorkspaceContext_liveEditingMode, _UmbBlockWorkspaceContext_initialLayout, _UmbBlockWorkspaceContext_initialContent, _UmbBlockWorkspaceContext_initialSettings, _UmbBlockWorkspaceContext_layout, _UmbBlockWorkspaceContext_label, _UmbBlockWorkspaceContext_establishLiveSync, _UmbBlockWorkspaceContext_modalRejected;
 import { UmbBlockElementManager } from './block-element-manager.js';
 import { UmbEditableWorkspaceContextBase } from '../../../core/workspace/index.js';
 import { UmbBooleanState, UmbObjectState, UmbStringState } from '../../../../libs/observable-api/index.js';
-import { UmbId } from '../../../core/id/index.js';
-import { UMB_BLOCK_MANAGER_CONTEXT } from '../../index.js';
-import { buildUdi } from '../../../../shared/utils/index.js';
+import { UMB_BLOCK_ENTRIES_CONTEXT, UMB_BLOCK_MANAGER_CONTEXT, } from '../../index.js';
 import { UMB_MODAL_CONTEXT } from '../../../core/modal/index.js';
 export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
     constructor(host, workspaceArgs) {
@@ -25,6 +23,8 @@ export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
         this.IS_BLOCK_WORKSPACE_CONTEXT = true;
         _UmbBlockWorkspaceContext_blockManager.set(this, void 0);
         _UmbBlockWorkspaceContext_retrieveBlockManager.set(this, void 0);
+        _UmbBlockWorkspaceContext_blockEntries.set(this, void 0);
+        _UmbBlockWorkspaceContext_retrieveBlockEntries.set(this, void 0);
         _UmbBlockWorkspaceContext_modalContext.set(this, void 0);
         _UmbBlockWorkspaceContext_retrieveModalContext.set(this, void 0);
         _UmbBlockWorkspaceContext_editorConfigPromise.set(this, void 0);
@@ -32,6 +32,9 @@ export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
         _UmbBlockWorkspaceContext_isNew.set(this, new UmbBooleanState(undefined));
         this.isNew = __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_isNew, "f").asObservable();
         _UmbBlockWorkspaceContext_liveEditingMode.set(this, void 0);
+        _UmbBlockWorkspaceContext_initialLayout.set(this, void 0);
+        _UmbBlockWorkspaceContext_initialContent.set(this, void 0);
+        _UmbBlockWorkspaceContext_initialSettings.set(this, void 0);
         _UmbBlockWorkspaceContext_layout.set(this, new UmbObjectState(undefined));
         this.layout = __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_layout, "f").asObservable();
         //readonly unique = this.#layout.asObservablePart((x) => x?.contentUdi);
@@ -49,7 +52,20 @@ export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
                     // Remove the block?
                     const contentUdi = __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_layout, "f").value?.contentUdi;
                     if (contentUdi) {
-                        __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f")?.deleteBlock(contentUdi);
+                        __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f")?.delete(contentUdi);
+                    }
+                }
+                else {
+                    // TODO: Revert the layout, content & settings data to the original state.
+                    if (__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialLayout, "f")) {
+                        console.log('reverted layout');
+                        __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f")?.setOneLayout(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialLayout, "f"));
+                    }
+                    if (__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialContent, "f")) {
+                        __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f")?.setOneContent(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialContent, "f"));
+                    }
+                    if (__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialSettings, "f")) {
+                        __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f")?.setOneContent(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialSettings, "f"));
                     }
                 }
             }
@@ -67,18 +83,25 @@ export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
                     const value = editorConfigs.getValueByAlias('useLiveEditing');
                     __classPrivateFieldSet(this, _UmbBlockWorkspaceContext_liveEditingMode, value, "f");
                 }
-            }).asPromise(), "f");
-            // TODO: Observe or just get the LiveEditing setting?
+            }, 'observeEditorConfig').asPromise(), "f");
+        }).asPromise(), "f");
+        __classPrivateFieldSet(this, _UmbBlockWorkspaceContext_retrieveBlockEntries, this.consumeContext(UMB_BLOCK_ENTRIES_CONTEXT, (context) => {
+            __classPrivateFieldSet(this, _UmbBlockWorkspaceContext_blockEntries, context, "f");
         }).asPromise(), "f");
     }
     async load(unique) {
         await __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_retrieveBlockManager, "f");
+        await __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_retrieveBlockEntries, "f");
         await __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_editorConfigPromise, "f");
-        if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f")) {
+        if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f") || !__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f")) {
             throw new Error('Block manager not found');
             return;
         }
-        this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").layoutOf(unique), (layoutData) => {
+        this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f").layoutOf(unique), (layoutData) => {
+            __classPrivateFieldSet(this, _UmbBlockWorkspaceContext_initialLayout, __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialLayout, "f") ?? layoutData, "f");
+            this.removeControllerByAlias('observeLayoutInitially');
+        }, 'observeLayoutInitially');
+        this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f").layoutOf(unique), (layoutData) => {
             __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_layout, "f").setValue(layoutData);
             // Content:
             const contentUdi = layoutData?.contentUdi;
@@ -86,6 +109,12 @@ export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
                 this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").contentOf(contentUdi), (contentData) => {
                     this.content.setData(contentData);
                 }, 'observeContent');
+                if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialContent, "f")) {
+                    this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").contentOf(contentUdi), (contentData) => {
+                        __classPrivateFieldSet(this, _UmbBlockWorkspaceContext_initialContent, __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialContent, "f") ?? contentData, "f");
+                        this.removeControllerByAlias('observeContentInitially');
+                    }, 'observeContentInitially');
+                }
             }
             // Settings:
             const settingsUdi = layoutData?.settingsUdi;
@@ -93,6 +122,12 @@ export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
                 this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").settingsOf(settingsUdi), (settingsData) => {
                     this.settings.setData(settingsData);
                 }, 'observeSettings');
+                if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialSettings, "f")) {
+                    this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").contentOf(settingsUdi), (settingsData) => {
+                        __classPrivateFieldSet(this, _UmbBlockWorkspaceContext_initialSettings, __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_initialSettings, "f") ?? settingsData, "f");
+                        this.removeControllerByAlias('observeSettingsInitially');
+                    }, 'observeSettingsInitially');
+                }
             }
         }, 'observeLayout');
         if (__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_liveEditingMode, "f")) {
@@ -100,36 +135,32 @@ export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
         }
     }
     async create(contentElementTypeId) {
-        await __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_retrieveBlockManager, "f");
+        await __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_retrieveBlockEntries, "f");
         await __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_retrieveModalContext, "f");
-        if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f")) {
-            throw new Error('Block Manager not found');
+        if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f")) {
+            throw new Error('Block Entries not found');
             return;
         }
         if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_modalContext, "f")) {
             throw new Error('Modal Context not found');
             return;
         }
-        //
-        // TODO: Condense this into some kind of create method?
-        const key = UmbId.new();
-        const contentUdi = buildUdi('block', key);
-        const layoutData = {
-            contentUdi: contentUdi,
-        };
-        const contentData = {
-            udi: contentUdi,
-            contentTypeKey: contentElementTypeId,
-        };
-        this.content.setData(contentData);
-        // TODO: If we have Settings dedicated to this block type, we initiate them here:
+        // TODO: Missing some way to append more layout data... this could be part of modal data, (or context api?)
         this.setIsNew(true);
-        __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_layout, "f").setValue(layoutData);
+        const blockCreated = await __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f").create(contentElementTypeId, {}, __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_modalContext, "f").data);
+        if (!blockCreated) {
+            throw new Error('Block Entries could not create block');
+        }
+        __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_layout, "f").setValue(blockCreated.layout);
+        this.content.setData(blockCreated.content);
+        if (blockCreated.settings) {
+            this.settings.setData(blockCreated.settings);
+        }
         if (__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_liveEditingMode, "f")) {
-            const blockCreated = __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").createBlock(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_modalContext, "f").data, layoutData, contentElementTypeId);
-            if (!blockCreated) {
-                throw new Error('Block Manager could not create block');
-                return;
+            // Insert already, cause we are in live editing mode:
+            const blockInserted = await __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f").insert(blockCreated.layout, blockCreated.content, blockCreated.settings, __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_modalContext, "f").data);
+            if (!blockInserted) {
+                throw new Error('Block Entries could not insert block');
             }
             __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_instances, "m", _UmbBlockWorkspaceContext_establishLiveSync).call(this);
         }
@@ -169,24 +200,26 @@ export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
     async save() {
         const layoutData = __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_layout, "f").value;
         const contentData = this.content.getData();
-        if (!layoutData || !__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f") || !contentData || !__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_modalContext, "f"))
+        if (!layoutData || !__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f") || !__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f") || !contentData || !__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_modalContext, "f"))
             return;
+        const settingsData = this.settings.getData();
         if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_liveEditingMode, "f")) {
             if (this.getIsNew() === true) {
-                const blockCreated = __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").createBlock(__classPrivateFieldGet(this, _UmbBlockWorkspaceContext_modalContext, "f").data, layoutData, contentData.contentTypeKey);
-                if (!blockCreated) {
-                    throw new Error('Block Manager could not create block');
-                    return;
+                // Insert (This means the layout entry will be inserted at the desired location):
+                const blockInserted = await __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f").insert(layoutData, contentData, settingsData, __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_modalContext, "f").data);
+                if (!blockInserted) {
+                    throw new Error('Block Entries could not insert block');
                 }
             }
-            // TODO: Save the block, but only in non-live-editing mode.
-            __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").setOneLayout(layoutData);
-            if (contentData) {
-                __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").setOneContent(contentData);
-            }
-            const settingsData = this.settings.getData();
-            if (settingsData) {
-                __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").setOneSettings(settingsData);
+            else {
+                // Update data:
+                __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f").setOneLayout(layoutData);
+                if (contentData) {
+                    __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").setOneContent(contentData);
+                }
+                if (settingsData) {
+                    __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f").setOneSettings(settingsData);
+                }
             }
         }
         this.saveComplete(layoutData);
@@ -195,10 +228,10 @@ export class UmbBlockWorkspaceContext extends UmbEditableWorkspaceContextBase {
         __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_layout, "f").destroy();
     }
 }
-_UmbBlockWorkspaceContext_blockManager = new WeakMap(), _UmbBlockWorkspaceContext_retrieveBlockManager = new WeakMap(), _UmbBlockWorkspaceContext_modalContext = new WeakMap(), _UmbBlockWorkspaceContext_retrieveModalContext = new WeakMap(), _UmbBlockWorkspaceContext_editorConfigPromise = new WeakMap(), _UmbBlockWorkspaceContext_entityType = new WeakMap(), _UmbBlockWorkspaceContext_isNew = new WeakMap(), _UmbBlockWorkspaceContext_liveEditingMode = new WeakMap(), _UmbBlockWorkspaceContext_layout = new WeakMap(), _UmbBlockWorkspaceContext_label = new WeakMap(), _UmbBlockWorkspaceContext_modalRejected = new WeakMap(), _UmbBlockWorkspaceContext_instances = new WeakSet(), _UmbBlockWorkspaceContext_establishLiveSync = function _UmbBlockWorkspaceContext_establishLiveSync() {
+_UmbBlockWorkspaceContext_blockManager = new WeakMap(), _UmbBlockWorkspaceContext_retrieveBlockManager = new WeakMap(), _UmbBlockWorkspaceContext_blockEntries = new WeakMap(), _UmbBlockWorkspaceContext_retrieveBlockEntries = new WeakMap(), _UmbBlockWorkspaceContext_modalContext = new WeakMap(), _UmbBlockWorkspaceContext_retrieveModalContext = new WeakMap(), _UmbBlockWorkspaceContext_editorConfigPromise = new WeakMap(), _UmbBlockWorkspaceContext_entityType = new WeakMap(), _UmbBlockWorkspaceContext_isNew = new WeakMap(), _UmbBlockWorkspaceContext_liveEditingMode = new WeakMap(), _UmbBlockWorkspaceContext_initialLayout = new WeakMap(), _UmbBlockWorkspaceContext_initialContent = new WeakMap(), _UmbBlockWorkspaceContext_initialSettings = new WeakMap(), _UmbBlockWorkspaceContext_layout = new WeakMap(), _UmbBlockWorkspaceContext_label = new WeakMap(), _UmbBlockWorkspaceContext_modalRejected = new WeakMap(), _UmbBlockWorkspaceContext_instances = new WeakSet(), _UmbBlockWorkspaceContext_establishLiveSync = function _UmbBlockWorkspaceContext_establishLiveSync() {
     this.observe(this.layout, (layoutData) => {
         if (layoutData) {
-            __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockManager, "f")?.setOneLayout(layoutData);
+            __classPrivateFieldGet(this, _UmbBlockWorkspaceContext_blockEntries, "f")?.setOneLayout(layoutData);
         }
     });
     this.observe(this.content.data, (contentData) => {

package/dist-cms/packages/block/block/workspace/views/edit/{block-workspace-view-edit-no-router.element.d.ts → block-workspace-view-edit-content-no-router.element.d.ts}

@@ -2,23 +2,26 @@ import './block-workspace-view-edit-tab.element.js';
 import { UmbLitElement } from '../../../../../core/lit-element/index.js';
 import type { PropertyTypeContainerModelBaseModel } from '../../../../../../external/backend-api/index.js';
 import type { UmbWorkspaceViewElement } from '../../../../../core/extension-registry/index.js';
-export declare class UmbBlockWorkspaceViewEditNoRouterElement extends UmbLitElement implements UmbWorkspaceViewElement {
+/**
+ * @element umb-block-workspace-view-edit-content-no-router
+ * @description
+ * A specific view for editing content in a block workspace placed inline within a block view/element.
+ */
+export declare class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitElement implements UmbWorkspaceViewElement {
     #private;
     private _hasRootGroups;
     _tabs?: Array<PropertyTypeContainerModelBaseModel>;
     private _activeTabId?;
     private _activeTabName?;
-    private _workspaceContext?;
-    private _tabsStructureHelper;
     constructor();
     private _observeRootGroups;
     private _checkDefaultTabName;
     render(): import("lit-html").TemplateResult<1> | undefined;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
-export default UmbBlockWorkspaceViewEditNoRouterElement;
+export default UmbBlockWorkspaceViewEditContentNoRouterElement;
 declare global {
     interface HTMLElementTagNameMap {
-        'umb-block-workspace-view-edit-no-router': UmbBlockWorkspaceViewEditNoRouterElement;
+        'umb-block-workspace-view-edit-content-no-router': UmbBlockWorkspaceViewEditContentNoRouterElement;
     }
 }

package/dist-cms/packages/block/block/workspace/views/edit/block-workspace-view-edit-content-no-router.element.js

@@ -0,0 +1,148 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var _UmbBlockWorkspaceViewEditContentNoRouterElement_instances, _UmbBlockWorkspaceViewEditContentNoRouterElement_blockWorkspace, _UmbBlockWorkspaceViewEditContentNoRouterElement_tabsStructureHelper, _UmbBlockWorkspaceViewEditContentNoRouterElement_setTabName;
+import { UMB_BLOCK_WORKSPACE_CONTEXT } from '../../block-workspace.context-token.js';
+import './block-workspace-view-edit-tab.element.js';
+import { css, html, customElement, state, repeat } from '../../../../../../external/lit/index.js';
+import { UmbTextStyles } from '../../../../../../shared/style/index.js';
+import { UmbContentTypeContainerStructureHelper } from '../../../../../core/content-type/index.js';
+import { UmbLitElement } from '../../../../../core/lit-element/index.js';
+/**
+ * @element umb-block-workspace-view-edit-content-no-router
+ * @description
+ * A specific view for editing content in a block workspace placed inline within a block view/element.
+ */
+let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceViewEditContentNoRouterElement extends UmbLitElement {
+    constructor() {
+        super();
+        _UmbBlockWorkspaceViewEditContentNoRouterElement_instances.add(this);
+        //private _hasRootProperties = false;
+        this._hasRootGroups = false;
+        _UmbBlockWorkspaceViewEditContentNoRouterElement_blockWorkspace.set(this, void 0);
+        _UmbBlockWorkspaceViewEditContentNoRouterElement_tabsStructureHelper.set(this, new UmbContentTypeContainerStructureHelper(this));
+        __classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_tabsStructureHelper, "f").setIsRoot(true);
+        __classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_tabsStructureHelper, "f").setContainerChildType('Tab');
+        this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_tabsStructureHelper, "f").containers, (tabs) => {
+            this._tabs = tabs;
+            this._checkDefaultTabName();
+        });
+        // _hasRootProperties can be gotten via _tabsStructureHelper.hasProperties. But we do not support root properties currently.
+        this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (workspaceContext) => {
+            __classPrivateFieldSet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_blockWorkspace, workspaceContext, "f");
+            __classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_tabsStructureHelper, "f").setStructureManager(workspaceContext.content.structure);
+            workspaceContext.content.createPropertyDatasetContext(this);
+            this._observeRootGroups();
+        });
+    }
+    _observeRootGroups() {
+        if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_blockWorkspace, "f"))
+            return;
+        this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_blockWorkspace, "f").content.structure.hasRootContainers('Group'), (hasRootGroups) => {
+            this._hasRootGroups = hasRootGroups;
+            this._checkDefaultTabName();
+        }, 'observeGroups');
+    }
+    _checkDefaultTabName() {
+        if (!this._tabs || !__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_blockWorkspace, "f"))
+            return;
+        // Find the default tab to grab:
+        if (this._activeTabId === undefined) {
+            if (this._hasRootGroups) {
+                this._activeTabName = null;
+                this._activeTabId = null;
+            }
+            else if (this._tabs.length > 0) {
+                this._activeTabName = this._tabs[0].name;
+                this._activeTabId = this._tabs[0].id;
+            }
+        }
+    }
+    render() {
+        if (!this._tabs)
+            return;
+        return html `
+			${this._tabs.length > 1 || (this._tabs.length === 1 && this._hasRootGroups)
+            ? html ` <uui-tab-group slot="header">
+						${this._hasRootGroups && this._tabs.length > 0
+                ? html `
+									<uui-tab
+										label="Content"
+										.active=${null === this._activeTabId}
+										@click=${() => __classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_instances, "m", _UmbBlockWorkspaceViewEditContentNoRouterElement_setTabName).call(this, null, null)}
+										>Content</uui-tab
+									>
+							  `
+                : ''}
+						${repeat(this._tabs, (tab) => tab.name, (tab) => {
+                return html `<uui-tab
+									label=${tab.name ?? 'Unnamed'}
+									.active=${tab.id === this._activeTabId}
+									@click=${() => __classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_instances, "m", _UmbBlockWorkspaceViewEditContentNoRouterElement_setTabName).call(this, tab.name, tab.id)}
+									>${tab.name}</uui-tab
+								>`;
+            })}
+				  </uui-tab-group>`
+            : ''}
+			${this._activeTabId !== undefined
+            ? html `<umb-block-workspace-view-edit-tab
+						.managerName=${'content'}
+						.hideSingleGroup=${true}
+						.ownerTabId=${this._activeTabId && __classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditContentNoRouterElement_tabsStructureHelper, "f").isOwnerContainer(this._activeTabId)
+                ? this._activeTabId
+                : null}
+						.noTabName=${this._hasRootGroups && this._activeTabName === null}
+						.tabName=${this._activeTabName ?? undefined}>
+				  </umb-block-workspace-view-edit-tab>`
+            : ''}
+		`;
+    }
+};
+_UmbBlockWorkspaceViewEditContentNoRouterElement_blockWorkspace = new WeakMap();
+_UmbBlockWorkspaceViewEditContentNoRouterElement_tabsStructureHelper = new WeakMap();
+_UmbBlockWorkspaceViewEditContentNoRouterElement_instances = new WeakSet();
+_UmbBlockWorkspaceViewEditContentNoRouterElement_setTabName = function _UmbBlockWorkspaceViewEditContentNoRouterElement_setTabName(tabName, tabId) {
+    this._activeTabName = tabName;
+    this._activeTabId = tabId;
+};
+UmbBlockWorkspaceViewEditContentNoRouterElement.styles = [
+    UmbTextStyles,
+    css `
+			:host {
+				display: block;
+				height: 100%;
+				--uui-tab-background: var(--uui-color-surface);
+			}
+		`,
+];
+__decorate([
+    state()
+], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_hasRootGroups", void 0);
+__decorate([
+    state()
+], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_tabs", void 0);
+__decorate([
+    state()
+], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_activeTabId", void 0);
+__decorate([
+    state()
+], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_activeTabName", void 0);
+UmbBlockWorkspaceViewEditContentNoRouterElement = __decorate([
+    customElement('umb-block-workspace-view-edit-content-no-router')
+], UmbBlockWorkspaceViewEditContentNoRouterElement);
+export { UmbBlockWorkspaceViewEditContentNoRouterElement };
+export default UmbBlockWorkspaceViewEditContentNoRouterElement;

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

@@ -136,7 +136,10 @@ _UmbBlockWorkspaceViewEditElement_instances = new WeakSet();
 _UmbBlockWorkspaceViewEditElement_setStructureManager = function _UmbBlockWorkspaceViewEditElement_setStructureManager() {
     if (!__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_blockWorkspace, "f") || !__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_managerName, "f"))
         return;
-    __classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_tabsStructureHelper, "f").setStructureManager(__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_blockWorkspace, "f")[__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_managerName, "f")].structure);
+    const dataManager = __classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_blockWorkspace, "f")[__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_managerName, "f")];
+    __classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_tabsStructureHelper, "f").setStructureManager(dataManager.structure);
+    // Create Data Set:
+    dataManager.createPropertyDatasetContext(this);
     this.observe(__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_blockWorkspace, "f")[__classPrivateFieldGet(this, _UmbBlockWorkspaceViewEditElement_managerName, "f")].structure.hasRootContainers('Group'), (hasRootGroups) => {
         this._hasRootGroups = hasRootGroups;
         this._createRoutes();

package/dist-cms/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.d.ts

@@ -0,0 +1,18 @@
+import { type UmbBlockGridLayoutAreaItemModel } from '../../../index.js';
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import '../block-grid-entries/index.js';
+/**
+ * @element umb-block-grid-area-container
+ */
+export declare class UmbBlockGridAreaContainerElement extends UmbLitElement {
+    _areas?: Array<UmbBlockGridLayoutAreaItemModel>;
+    constructor();
+    render(): unknown;
+    static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
+}
+export default UmbBlockGridAreaContainerElement;
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-block-grid-area-container': UmbBlockGridAreaContainerElement;
+    }
+}

package/dist-cms/packages/block/block-grid/components/block-grid-areas-container/block-grid-areas-container.element.js

@@ -0,0 +1,46 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { UMB_BLOCK_GRID_ENTRY_CONTEXT } from '../../../index.js';
+import { css, customElement, html, repeat, state } from '../../../../../external/lit/index.js';
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import '../block-grid-entries/index.js';
+/**
+ * @element umb-block-grid-area-container
+ */
+let UmbBlockGridAreaContainerElement = class UmbBlockGridAreaContainerElement extends UmbLitElement {
+    constructor() {
+        super();
+        //
+        this._areas = [];
+        this.consumeContext(UMB_BLOCK_GRID_ENTRY_CONTEXT, (context) => {
+            this.observe(context.areas, (areas) => {
+                this._areas = areas;
+            }, 'observeAreas');
+        });
+    }
+    render() {
+        return this._areas
+            ? repeat(this._areas, (area) => area.key, (area) => html ` <umb-block-grid-entries .areaKey=${area.key}> </umb-block-grid-entries>`)
+            : '';
+    }
+};
+UmbBlockGridAreaContainerElement.styles = [
+    css `
+			:host {
+				display: block;
+				width: 100%;
+			}
+		`,
+];
+__decorate([
+    state()
+], UmbBlockGridAreaContainerElement.prototype, "_areas", void 0);
+UmbBlockGridAreaContainerElement = __decorate([
+    customElement('umb-block-grid-area-container')
+], UmbBlockGridAreaContainerElement);
+export { UmbBlockGridAreaContainerElement };
+export default UmbBlockGridAreaContainerElement;

package/dist-cms/packages/block/block-grid/components/block-grid-areas-container/index.d.ts

@@ -0,0 +1 @@
+export * from './block-grid-areas-container.element.js';

package/dist-cms/packages/block/block-grid/components/block-grid-areas-container/index.js

@@ -0,0 +1 @@
+export * from './block-grid-areas-container.element.js';

package/dist-cms/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.d.ts

@@ -0,0 +1,21 @@
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import '../block-grid-entry/index.js';
+/**
+ * @element umb-block-grid-entries
+ */
+export declare class UmbBlockGridEntriesElement extends UmbLitElement {
+    #private;
+    set areaKey(value: string | null);
+    get areaKey(): string | null;
+    private _layoutEntries;
+    private _createButtonLabel;
+    constructor();
+    render(): import("lit-html").TemplateResult<1>;
+    static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
+}
+export default UmbBlockGridEntriesElement;
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-block-grid-entries': UmbBlockGridEntriesElement;
+    }
+}

package/dist-cms/packages/block/block-grid/components/block-grid-entries/block-grid-entries.element.js

@@ -0,0 +1,118 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _UmbBlockGridEntriesElement_sorter, _UmbBlockGridEntriesElement_context;
+import { UmbBlockGridEntriesContext } from '../../context/block-grid-entries.context.js';
+import { html, customElement, state, repeat, css, property } from '../../../../../external/lit/index.js';
+import { UmbTextStyles } from '../../../../../shared/style/index.js';
+import { UmbLitElement } from '../../../../core/lit-element/index.js';
+import '../block-grid-entry/index.js';
+import { UmbSorterController } from '../../../../core/sorter/index.js';
+const SORTER_CONFIG = {
+    getUniqueOfElement: (element) => {
+        return element.contentUdi;
+    },
+    getUniqueOfModel: (modelEntry) => {
+        return modelEntry.contentUdi;
+    },
+    identifier: 'block-grid-editor',
+    itemSelector: 'umb-block-grid-entry',
+    //containerSelector: 'EMPTY ON PURPOSE, SO IT BECOMES THE HOST ELEMENT',
+};
+/**
+ * @element umb-block-grid-entries
+ */
+let UmbBlockGridEntriesElement = class UmbBlockGridEntriesElement extends UmbLitElement {
+    set areaKey(value) {
+        __classPrivateFieldGet(this, _UmbBlockGridEntriesElement_context, "f").setAreaKey(value);
+    }
+    get areaKey() {
+        return null; // Not implemented.
+    }
+    constructor() {
+        super();
+        //
+        // TODO: Make sure Sorter callbacks handles columnSpan when retrieving a new entry.
+        //
+        _UmbBlockGridEntriesElement_sorter.set(this, new UmbSorterController(this, {
+            ...SORTER_CONFIG,
+            onChange: ({ model }) => {
+                __classPrivateFieldGet(this, _UmbBlockGridEntriesElement_context, "f").setLayouts(model);
+            },
+        }));
+        _UmbBlockGridEntriesElement_context.set(this, new UmbBlockGridEntriesContext(this));
+        this._layoutEntries = [];
+        this._createButtonLabel = this.localize.term('blockEditor_addBlock');
+        this.observe(__classPrivateFieldGet(this, _UmbBlockGridEntriesElement_context, "f").layoutEntries, (layoutEntries) => {
+            const oldValue = this._layoutEntries;
+            this._layoutEntries = layoutEntries;
+            __classPrivateFieldGet(this, _UmbBlockGridEntriesElement_sorter, "f").setModel(layoutEntries);
+            this.requestUpdate('layoutEntries', oldValue);
+        });
+    }
+    render() {
+        // TODO: Missing ability to jump directly to creating a Block, when there is only one Block Type.
+        return html `${repeat(this._layoutEntries, (x) => x.contentUdi, (layoutEntry, index) => html `<uui-button-inline-create
+							href=${__classPrivateFieldGet(this, _UmbBlockGridEntriesElement_context, "f").getPathForCreateBlock(index) ?? ''}></uui-button-inline-create>
+						<umb-block-grid-entry .contentUdi=${layoutEntry.contentUdi} .layout=${layoutEntry}>
+						</umb-block-grid-entry>`)}
+			<uui-button-group>
+				<uui-button
+					id="add-button"
+					look="placeholder"
+					label=${this._createButtonLabel}
+					href=${__classPrivateFieldGet(this, _UmbBlockGridEntriesElement_context, "f").getPathForCreateBlock(-1) ?? ''}></uui-button>
+				<uui-button
+					label=${this.localize.term('content_createFromClipboard')}
+					look="placeholder"
+					href=${__classPrivateFieldGet(this, _UmbBlockGridEntriesElement_context, "f").getPathForClipboard(-1) ?? ''}>
+					<uui-icon name="icon-paste-in"></uui-icon>
+				</uui-button>
+			</uui-button-group>`;
+        //
+    }
+};
+_UmbBlockGridEntriesElement_sorter = new WeakMap();
+_UmbBlockGridEntriesElement_context = new WeakMap();
+UmbBlockGridEntriesElement.styles = [
+    UmbTextStyles,
+    css `
+			:host {
+				display: grid;
+				gap: 1px;
+			}
+			> div {
+				display: flex;
+				flex-direction: column;
+				align-items: stretch;
+			}
+
+			uui-button-group {
+				padding-top: 1px;
+				display: grid;
+				grid-template-columns: 1fr auto;
+			}
+		`,
+];
+__decorate([
+    property({ attribute: false })
+], UmbBlockGridEntriesElement.prototype, "areaKey", null);
+__decorate([
+    state()
+], UmbBlockGridEntriesElement.prototype, "_layoutEntries", void 0);
+__decorate([
+    state()
+], UmbBlockGridEntriesElement.prototype, "_createButtonLabel", void 0);
+UmbBlockGridEntriesElement = __decorate([
+    customElement('umb-block-grid-entries')
+], UmbBlockGridEntriesElement);
+export { UmbBlockGridEntriesElement };
+export default UmbBlockGridEntriesElement;

package/dist-cms/packages/block/block-grid/components/block-grid-entries/index.d.ts

@@ -0,0 +1 @@
+export * from './block-grid-entries.element.js';

package/dist-cms/packages/block/block-grid/components/block-grid-entries/index.js

@@ -0,0 +1 @@
+export * from './block-grid-entries.element.js';