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

package/dist-cms/packages/block/block-list/context/{block-list.context.js → block-list-entry.context.js}

@@ -3,26 +3,27 @@ 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 _UmbBlockListContext_inlineEditingMode;
-import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from '../manager/block-list-manager.context.js';
-import { UmbBlockContext } from '../../index.js';
+var _UmbBlockListEntryContext_inlineEditingMode;
+import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from './block-list-manager.context.js';
+import { UMB_BLOCK_LIST_ENTRIES_CONTEXT } from './block-list-entries.context-token.js';
+import { UmbBlockEntryContext } from '../../index.js';
 import { UmbBooleanState } from '../../../../libs/observable-api/index.js';
-export class UmbBlockListContext extends UmbBlockContext {
+export class UmbBlockListEntryContext extends UmbBlockEntryContext {
     constructor(host) {
-        super(host, UMB_BLOCK_LIST_MANAGER_CONTEXT);
-        _UmbBlockListContext_inlineEditingMode.set(this, new UmbBooleanState(undefined));
-        this.inlineEditingMode = __classPrivateFieldGet(this, _UmbBlockListContext_inlineEditingMode, "f").asObservable();
+        super(host, UMB_BLOCK_LIST_MANAGER_CONTEXT, UMB_BLOCK_LIST_ENTRIES_CONTEXT);
+        _UmbBlockListEntryContext_inlineEditingMode.set(this, new UmbBooleanState(undefined));
+        this.inlineEditingMode = __classPrivateFieldGet(this, _UmbBlockListEntryContext_inlineEditingMode, "f").asObservable();
     }
     _gotManager() {
-        super._gotManager();
         if (this._manager) {
             this.observe(this._manager.inlineEditingMode, (inlineEditingMode) => {
-                __classPrivateFieldGet(this, _UmbBlockListContext_inlineEditingMode, "f").setValue(inlineEditingMode);
+                __classPrivateFieldGet(this, _UmbBlockListEntryContext_inlineEditingMode, "f").setValue(inlineEditingMode);
             }, 'observeInlineEditingMode');
         }
         else {
             this.removeControllerByAlias('observeInlineEditingMode');
         }
     }
+    _gotEntries() { }
 }
-_UmbBlockListContext_inlineEditingMode = new WeakMap();
+_UmbBlockListEntryContext_inlineEditingMode = new WeakMap();

package/dist-cms/packages/block/block-list/{manager → context}/block-list-manager.context.d.ts

@@ -1,14 +1,23 @@
 import type { UmbBlockListLayoutModel, UmbBlockListTypeModel } from '../types.js';
-import { UmbBlockManagerContext } from '../../block/manager/block-manager.context.js';
+import { UmbBlockManagerContext } from '../../block/context/block-manager.context.js';
 import type { UmbBlockListWorkspaceData } from '../index.js';
+import type { UmbBlockDataType } from '../../block/types.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
 /**
- * A implementation of the Block Manager specifically for the Block List.
+ * A implementation of the Block Manager specifically for the Block List Editor.
  */
 export declare class UmbBlockListManagerContext<BlockLayoutType extends UmbBlockListLayoutModel = UmbBlockListLayoutModel> extends UmbBlockManagerContext<UmbBlockListTypeModel, BlockLayoutType> {
     #private;
-    inlineEditingMode: import("rxjs").Observable<boolean | undefined>;
+    readonly inlineEditingMode: import("rxjs").Observable<boolean | undefined>;
     setInlineEditingMode(inlineEditingMode: boolean | undefined): void;
-    _createBlock(modalData: UmbBlockListWorkspaceData, layoutEntry: BlockLayoutType, contentElementTypeKey: string): boolean;
+    create(contentElementTypeKey: string, partialLayoutEntry?: Omit<BlockLayoutType, 'contentUdi'>, modalData?: UmbBlockListWorkspaceData): {
+        layout: BlockLayoutType;
+        content: {
+            udi: string;
+            contentTypeKey: string;
+        };
+        settings: UmbBlockDataType | undefined;
+    };
+    insert(layoutEntry: BlockLayoutType, content: UmbBlockDataType, settings: UmbBlockDataType | undefined, modalData: UmbBlockListWorkspaceData): boolean;
 }
 export declare const UMB_BLOCK_LIST_MANAGER_CONTEXT: UmbContextToken<UmbBlockListManagerContext<UmbBlockListLayoutModel>, UmbBlockListManagerContext<UmbBlockListLayoutModel>>;

package/dist-cms/packages/block/block-list/{manager → context}/block-list-manager.context.js

@@ -4,11 +4,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _UmbBlockListManagerContext_inlineEditingMode;
-import { UmbBlockManagerContext } from '../../block/manager/block-manager.context.js';
+import { UmbBlockManagerContext } from '../../block/context/block-manager.context.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
 import { UmbBooleanState } from '../../../../libs/observable-api/index.js';
 /**
- * A implementation of the Block Manager specifically for the Block List.
+ * A implementation of the Block Manager specifically for the Block List Editor.
  */
 export class UmbBlockListManagerContext extends UmbBlockManagerContext {
     constructor() {
@@ -20,11 +20,15 @@ export class UmbBlockListManagerContext extends UmbBlockManagerContext {
     setInlineEditingMode(inlineEditingMode) {
         __classPrivateFieldGet(this, _UmbBlockListManagerContext_inlineEditingMode, "f").setValue(inlineEditingMode ?? false);
     }
-    _createBlock(modalData, layoutEntry, contentElementTypeKey) {
-        // Here is room to append some extra layout properties if needed for this type.
+    create(contentElementTypeKey, partialLayoutEntry, modalData) {
+        return super.createBlockData(contentElementTypeKey, partialLayoutEntry);
+    }
+    insert(layoutEntry, content, settings, modalData) {
         this._layouts.appendOneAt(layoutEntry, modalData.originData.index ?? -1);
+        this.insertBlockData(layoutEntry, content, settings, modalData);
         return true;
     }
 }
 _UmbBlockListManagerContext_inlineEditingMode = new WeakMap();
+// TODO: Make discriminator method for this:
 export const UMB_BLOCK_LIST_MANAGER_CONTEXT = new UmbContextToken('UmbBlockManagerContext');

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

@@ -0,0 +1 @@
+export * from './block-list-entry.context-token.js';

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

@@ -0,0 +1 @@
+export * from './block-list-entry.context-token.js';

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

@@ -1,2 +1,3 @@
+export * from './context/index.js';
+export * from './types.js';
 export * from './workspace/index.js';
-export * from './context/block-list.context-token.js';

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

@@ -1,2 +1,3 @@
+export * from './context/index.js';
+export * from './types.js';
 export * from './workspace/index.js';
-export * from './context/block-list.context-token.js';

package/dist-cms/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.d.ts

@@ -1,12 +1,8 @@
-import '../../components/block-list-block/index.js';
+import '../../components/block-list-entry/index.js';
+import type { UmbBlockListValueModel } from '../../types.js';
 import type { UmbPropertyEditorUiElement } from '../../../../core/extension-registry/index.js';
 import { UmbLitElement } from '../../../../core/lit-element/index.js';
 import type { UmbPropertyEditorConfigCollection } from '../../../../core/property-editor/index.js';
-import type { UmbBlockLayoutBaseModel, UmbBlockValueType } from '../../../index.js';
-export interface UmbBlockListLayoutModel extends UmbBlockLayoutBaseModel {
-}
-export interface UmbBlockListValueModel extends UmbBlockValueType<UmbBlockListLayoutModel> {
-}
 /**
  * @element umb-property-editor-ui-block-list
  */
@@ -22,7 +18,6 @@ export declare class UmbPropertyEditorUIBlockListElement extends UmbLitElement i
     private _blocks?;
     private _layouts;
     private _catalogueRouteBuilder?;
-    private _directRoute?;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

package/dist-cms/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.js

@@ -15,9 +15,10 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     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 _UmbPropertyEditorUIBlockListElement_sorter, _UmbPropertyEditorUIBlockListElement_catalogueModal, _UmbPropertyEditorUIBlockListElement_context;
-import { UmbBlockListManagerContext } from '../../manager/block-list-manager.context.js';
-import '../../components/block-list-block/index.js';
+var _UmbPropertyEditorUIBlockListElement_sorter, _UmbPropertyEditorUIBlockListElement_catalogueModal, _UmbPropertyEditorUIBlockListElement_managerContext, _UmbPropertyEditorUIBlockListElement_entriesContext;
+import { UmbBlockListManagerContext } from '../../context/block-list-manager.context.js';
+import '../../components/block-list-entry/index.js';
+import { UmbBlockListEntriesContext } from '../../context/block-list-entries.context.js';
 import { UMB_BLOCK_LIST_PROPERTY_EDITOR_ALIAS } from './manifests.js';
 import { html, customElement, property, state, repeat, css } from '../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../shared/style/index.js';
@@ -29,13 +30,13 @@ import { UmbSorterController } from '../../../../core/sorter/index.js';
 import { UMB_PROPERTY_CONTEXT } from '../../../../core/property/index.js';
 const SORTER_CONFIG = {
     getUniqueOfElement: (element) => {
-        return element.getAttribute('data-udi');
+        return element.contentUdi;
     },
     getUniqueOfModel: (modelEntry) => {
         return modelEntry.contentUdi;
     },
-    identifier: 'block-list-editor',
-    itemSelector: 'umb-property-editor-ui-block-list-block',
+    //identifier: 'block-list-editor',
+    itemSelector: 'umb-block-list-entry',
     //containerSelector: 'EMPTY ON PURPOSE, SO IT BECOMES THE HOST ELEMENT',
 };
 /**
@@ -51,9 +52,9 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
         buildUpValue.contentData ?? (buildUpValue.contentData = []);
         buildUpValue.settingsData ?? (buildUpValue.settingsData = []);
         this._value = buildUpValue;
-        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").setLayouts(this._value.layout[UMB_BLOCK_LIST_PROPERTY_EDITOR_ALIAS] ?? []);
-        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").setContents(buildUpValue.contentData);
-        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").setSettings(buildUpValue.settingsData);
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").setLayouts(this._value.layout[UMB_BLOCK_LIST_PROPERTY_EDITOR_ALIAS] ?? []);
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").setContents(buildUpValue.contentData);
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").setSettings(buildUpValue.settingsData);
     }
     set config(config) {
         if (!config)
@@ -62,7 +63,7 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
         this._limitMin = validationLimit?.min;
         this._limitMax = validationLimit?.max;
         const blocks = config.getValueByAlias('blocks') ?? [];
-        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").setBlockTypes(blocks);
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").setBlockTypes(blocks);
         const customCreateButtonLabel = config.getValueByAlias('createLabel');
         if (customCreateButtonLabel) {
             this._createButtonLabel = customCreateButtonLabel;
@@ -71,12 +72,11 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
             this._createButtonLabel = `${this.localize.term('general_add')} ${blocks[0].label}`;
         }
         const useInlineEditingAsDefault = config.getValueByAlias('useInlineEditingAsDefault');
-        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").setInlineEditingMode(useInlineEditingAsDefault);
-        //config.useSingleBlockMode
-        //config.useLiveEditing
-        //config.useInlineEditingAsDefault
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").setInlineEditingMode(useInlineEditingAsDefault);
+        // TODO:
+        //config.useSingleBlockMode, not done jey
         this.style.maxWidth = config.getValueByAlias('maxPropertyWidth') ?? '';
-        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").setEditorConfiguration(config);
+        __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").setEditorConfiguration(config);
     }
     constructor() {
         super();
@@ -84,7 +84,7 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
         _UmbPropertyEditorUIBlockListElement_sorter.set(this, new UmbSorterController(this, {
             ...SORTER_CONFIG,
             onChange: ({ model }) => {
-                __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").setLayouts(model);
+                __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_entriesContext, "f").setLayouts(model);
             },
         }));
         _UmbPropertyEditorUIBlockListElement_catalogueModal.set(this, void 0);
@@ -95,35 +95,42 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
         };
         this._createButtonLabel = this.localize.term('content_createEmpty');
         this._layouts = [];
-        _UmbPropertyEditorUIBlockListElement_context.set(this, new UmbBlockListManagerContext(this));
+        _UmbPropertyEditorUIBlockListElement_managerContext.set(this, new UmbBlockListManagerContext(this));
+        _UmbPropertyEditorUIBlockListElement_entriesContext.set(this, new UmbBlockListEntriesContext(this));
         this.consumeContext(UMB_PROPERTY_CONTEXT, (propertyContext) => {
             this.observe(propertyContext?.alias, (alias) => {
                 __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_catalogueModal, "f").setUniquePathValue('propertyAlias', alias);
             }, 'observePropertyAlias');
         });
         // TODO: Prevent initial notification from these observes:
-        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").layouts, (layouts) => {
+        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").layouts, (layouts) => {
             this._value = { ...this._value, layout: { [UMB_BLOCK_LIST_PROPERTY_EDITOR_ALIAS]: layouts } };
             // Notify that the value has changed.
             //console.log('layout changed', this._value);
             // TODO: idea: consider inserting an await here, so other changes could appear first? Maybe some mechanism to only fire change event onces?
+            //this.#entriesContext.setLayoutEntries(layouts);
+            this.dispatchEvent(new UmbChangeEvent());
+        });
+        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_entriesContext, "f").layoutEntries, (layouts) => {
             this._layouts = layouts;
+            // Update sorter.
             __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_sorter, "f").setModel(layouts);
-            this.dispatchEvent(new UmbChangeEvent());
+            // Update manager:
+            __classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").setLayouts(layouts);
         });
-        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").contents, (contents) => {
+        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").contents, (contents) => {
             this._value = { ...this._value, contentData: contents };
             // Notify that the value has changed.
             //console.log('content changed', this._value);
             this.dispatchEvent(new UmbChangeEvent());
         });
-        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").settings, (settings) => {
+        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").settings, (settings) => {
             this._value = { ...this._value, settingsData: settings };
             // Notify that the value has changed.
             //console.log('settings changed', this._value);
             this.dispatchEvent(new UmbChangeEvent());
         });
-        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_context, "f").blockTypes, (blockTypes) => {
+        this.observe(__classPrivateFieldGet(this, _UmbPropertyEditorUIBlockListElement_managerContext, "f").blockTypes, (blockTypes) => {
             this._blocks = blockTypes;
         });
         __classPrivateFieldSet(this, _UmbPropertyEditorUIBlockListElement_catalogueModal, new UmbModalRouteRegistrationController(this, UMB_BLOCK_CATALOGUE_MODAL)
@@ -144,21 +151,25 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
         }), "f");
     }
     render() {
+        let createPath;
         if (this._blocks?.length === 1) {
             const elementKey = this._blocks[0].contentElementTypeKey;
-            this._directRoute =
+            createPath =
                 this._catalogueRouteBuilder?.({ view: 'create', index: -1 }) + 'modal/umb-modal-workspace/create/' + elementKey;
         }
+        else {
+            createPath = this._catalogueRouteBuilder?.({ view: 'create', index: -1 });
+        }
         return html ` ${repeat(this._layouts, (x) => x.contentUdi, (layoutEntry, index) => html `<uui-button-inline-create
 							href=${this._catalogueRouteBuilder?.({ view: 'create', index: index }) ?? ''}></uui-button-inline-create>
-						<umb-property-editor-ui-block-list-block data-udi=${layoutEntry.contentUdi} .layout=${layoutEntry}>
-						</umb-property-editor-ui-block-list-block> `)}
+						<umb-block-list-entry .contentUdi=${layoutEntry.contentUdi} .layout=${layoutEntry}>
+						</umb-block-list-entry> `)}
 			<uui-button-group>
 				<uui-button
 					id="add-button"
 					look="placeholder"
 					label=${this._createButtonLabel}
-					href=${this._directRoute ?? this._catalogueRouteBuilder?.({ view: 'create', index: -1 }) ?? ''}></uui-button>
+					href=${createPath ?? ''}></uui-button>
 				<uui-button
 					label=${this.localize.term('content_createFromClipboard')}
 					look="placeholder"
@@ -170,7 +181,8 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
 };
 _UmbPropertyEditorUIBlockListElement_sorter = new WeakMap();
 _UmbPropertyEditorUIBlockListElement_catalogueModal = new WeakMap();
-_UmbPropertyEditorUIBlockListElement_context = new WeakMap();
+_UmbPropertyEditorUIBlockListElement_managerContext = new WeakMap();
+_UmbPropertyEditorUIBlockListElement_entriesContext = new WeakMap();
 UmbPropertyEditorUIBlockListElement.styles = [
     UmbTextStyles,
     css `
@@ -215,9 +227,6 @@ __decorate([
 __decorate([
     state()
 ], UmbPropertyEditorUIBlockListElement.prototype, "_catalogueRouteBuilder", void 0);
-__decorate([
-    state()
-], UmbPropertyEditorUIBlockListElement.prototype, "_directRoute", void 0);
 UmbPropertyEditorUIBlockListElement = __decorate([
     customElement('umb-property-editor-ui-block-list')
 ], UmbPropertyEditorUIBlockListElement);

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

@@ -1,7 +1,9 @@
 import type { UmbBlockTypeBaseModel } from '../block-type/index.js';
-import type { UmbBlockLayoutBaseModel } from '../index.js';
+import type { UmbBlockLayoutBaseModel, UmbBlockValueType } from '../index.js';
 export declare const UMB_BLOCK_LIST_TYPE = "block-list-type";
 export interface UmbBlockListTypeModel extends UmbBlockTypeBaseModel {
 }
 export interface UmbBlockListLayoutModel extends UmbBlockLayoutBaseModel {
 }
+export interface UmbBlockListValueModel extends UmbBlockValueType<UmbBlockListLayoutModel> {
+}

package/dist-cms/packages/block/block-type/components/block-type-card/block-type-card.element.js

@@ -63,7 +63,7 @@ _UmbBlockTypeCardElement_onRequestDelete = function _UmbBlockTypeCardElement_onR
             data: {
                 color: 'danger',
                 headline: `Remove ${this._name}?`,
-                content: 'Are you sure you want to remove this item',
+                content: 'Are you sure you want to remove this block type?',
                 confirmLabel: 'Remove',
             },
         });

package/dist-cms/packages/core/modal/modal-route-registration.controller.d.ts

@@ -3,7 +3,7 @@ import type { UmbModalToken } from './token/index.js';
 import type { UmbController, UmbControllerHost } from '../../../libs/controller-api/index.js';
 export declare class UmbModalRouteRegistrationController<D extends object = object, R = any> extends UmbModalRouteRegistration<D, R> implements UmbController {
     #private;
-    get controllerAlias(): undefined;
+    get controllerAlias(): string;
     protected getControllerHostElement(): Element;
     /**
      * Creates an instance of UmbModalRouteRegistrationController.

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

@@ -15,7 +15,7 @@ import { UMB_ROUTE_CONTEXT } from '../../../shared/router/index.js';
 import { UmbContextConsumerController } from '../../../libs/context-api/index.js';
 export class UmbModalRouteRegistrationController extends UmbModalRouteRegistration {
     get controllerAlias() {
-        return undefined;
+        return this.alias.toString();
     }
     getControllerHostElement() {
         return __classPrivateFieldGet(this, _UmbModalRouteRegistrationController_host, "f").getHostElement();