@umbraco-cms/backoffice 14.0.0-rc5 → 14.0.0

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

@@ -1,19 +1,18 @@
 import type { UmbBlockDataType, UmbBlockLayoutBaseModel } from '../types.js';
-import { UMB_BLOCK_WORKSPACE_MODAL } from '../workspace/block-workspace.modal-token.js';
+import type { UmbBlockWorkspaceData } from '../workspace/block-workspace.modal-token.js';
 import type { UmbBlockDataObjectModel, UmbBlockManagerContext } from './block-manager.context.js';
+import { type Observable, UmbArrayState, UmbBasicState, UmbStringState } from '../../../../libs/observable-api/index.js';
+import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import type { UmbBlockTypeBaseModel } from '../../block-type/index.js';
 import type { UmbContextToken } from '../../../../libs/context-api/index.js';
-import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
-import { type Observable, UmbArrayState, UmbBasicState } from '../../../../libs/observable-api/index.js';
-import { type UmbModalRouteBuilder, UmbModalRouteRegistrationController } from '../../../core/router/index.js';
+import type { UmbModalRouteBuilder } from '../../../core/router/index.js';
 export declare abstract class UmbBlockEntriesContext<BlockManagerContextTokenType extends UmbContextToken<BlockManagerContextType, BlockManagerContextType>, BlockManagerContextType extends UmbBlockManagerContext<BlockType, BlockLayoutType>, BlockType extends UmbBlockTypeBaseModel, BlockLayoutType extends UmbBlockLayoutBaseModel> extends UmbContextBase<UmbBlockEntriesContext<BlockManagerContextTokenType, BlockManagerContextType, BlockType, BlockLayoutType>> {
-    #private;
     _manager?: BlockManagerContextType;
     _retrieveManager: Promise<BlockManagerContextType>;
-    _workspaceModal: UmbModalRouteRegistrationController;
     protected _catalogueRouteBuilderState: UmbBasicState<UmbModalRouteBuilder | undefined>;
     readonly catalogueRouteBuilder: Observable<UmbModalRouteBuilder | undefined>;
+    protected _workspacePath: UmbStringState<undefined>;
     workspacePath: Observable<string | undefined>;
     abstract readonly canCreate: Observable<boolean>;
     protected _layoutEntries: UmbArrayState<BlockLayoutType>;
@@ -28,7 +27,7 @@ export declare abstract class UmbBlockEntriesContext<BlockManagerContextTokenTyp
     setOneLayout(layoutData: BlockLayoutType): UmbArrayState<BlockLayoutType>;
     abstract getPathForCreateBlock(index: number): string | undefined;
     abstract getPathForClipboard(index: number): string | undefined;
-    abstract create(contentElementTypeKey: string, layoutEntry?: Omit<BlockLayoutType, 'contentUdi'>, modalData?: typeof UMB_BLOCK_WORKSPACE_MODAL.DATA): Promise<UmbBlockDataObjectModel<BlockLayoutType> | undefined>;
-    abstract insert(layoutEntry: BlockLayoutType, content: UmbBlockDataType, settings: UmbBlockDataType | undefined, modalData: typeof UMB_BLOCK_WORKSPACE_MODAL.DATA): Promise<boolean>;
+    abstract create(contentElementTypeKey: string, layoutEntry?: Omit<BlockLayoutType, 'contentUdi'>, modalData?: UmbBlockWorkspaceData): Promise<UmbBlockDataObjectModel<BlockLayoutType> | undefined>;
+    abstract insert(layoutEntry: BlockLayoutType, content: UmbBlockDataType, settings: UmbBlockDataType | undefined, modalData: UmbBlockWorkspaceData): Promise<boolean>;
     delete(contentUdi: string): Promise<void>;
 }

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

@@ -1,16 +1,13 @@
-import { UMB_BLOCK_WORKSPACE_MODAL } from '../workspace/block-workspace.modal-token.js';
 import { UMB_BLOCK_ENTRIES_CONTEXT } from './block-entries.context-token.js';
-import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import { UmbArrayState, UmbBasicState, UmbStringState } from '../../../../libs/observable-api/index.js';
-import { UmbModalRouteRegistrationController } from '../../../core/router/index.js';
+import { UmbContextBase } from '../../../../libs/class-api/index.js';
 export class UmbBlockEntriesContext extends UmbContextBase {
-    #workspacePath;
     constructor(host, blockManagerContextToken) {
         super(host, UMB_BLOCK_ENTRIES_CONTEXT.toString());
         this._catalogueRouteBuilderState = new UmbBasicState(undefined);
         this.catalogueRouteBuilder = this._catalogueRouteBuilderState.asObservable();
-        this.#workspacePath = new UmbStringState(undefined);
-        this.workspacePath = this.#workspacePath.asObservable();
+        this._workspacePath = new UmbStringState(undefined);
+        this.workspacePath = this._workspacePath.asObservable();
         this._layoutEntries = new UmbArrayState([], (x) => x.contentUdi);
         this.layoutEntries = this._layoutEntries.asObservable();
         this.layoutEntriesLength = this._layoutEntries.asObservablePart((x) => x.length);
@@ -18,24 +15,7 @@ export class UmbBlockEntriesContext extends UmbContextBase {
         this._retrieveManager = this.consumeContext(blockManagerContextToken, (blockGridManager) => {
             this._manager = blockGridManager;
             this._gotBlockManager();
-            this.observe(this._manager.propertyAlias, (alias) => {
-                this._workspaceModal.setUniquePathValue('propertyAlias', alias);
-            }, 'observePropertyAlias');
-            this.observe(this._manager.variantId, (variantId) => {
-                // TODO: This might not be the property variant ID, but the content variant ID. Check up on what makes most sense?
-                this._workspaceModal.setUniquePathValue('variantId', variantId?.toString());
-            }, 'observePropertyVariantId');
         }).asPromise();
-        this._workspaceModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_WORKSPACE_MODAL)
-            .addUniquePaths(['propertyAlias', 'variantId'])
-            .addAdditionalPath('block')
-            .onSetup(() => {
-            return { data: { entityType: 'block', preset: {} }, modal: { size: 'medium' } };
-        })
-            .observeRouteBuilder((routeBuilder) => {
-            const newPath = routeBuilder({});
-            this.#workspacePath.setValue(newPath);
-        });
     }
     async getManager() {
         await this._retrieveManager;

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

@@ -246,7 +246,7 @@ export class UmbBlockWorkspaceContext extends UmbSubmittableWorkspaceContextBase
             }
             else {
                 // Update data:
-                this.#blockManager.setOneLayout(layoutData, this.#modalContext?.data);
+                this.#blockManager.setOneLayout(layoutData, this.#modalContext.data);
                 if (contentData) {
                     this.#blockManager.setOneContent(contentData);
                 }

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

@@ -1,5 +1,5 @@
 import { UMB_BLOCK_CATALOGUE_MODAL, UmbBlockEntriesContext } from '../../block/index.js';
-import { UMB_BLOCK_GRID_ENTRY_CONTEXT } from '../index.js';
+import { UMB_BLOCK_GRID_ENTRY_CONTEXT, UMB_BLOCK_GRID_WORKSPACE_MODAL, } from '../index.js';
 import { UMB_BLOCK_GRID_MANAGER_CONTEXT } from './block-grid-manager.context-token.js';
 import { UmbArrayState, UmbNumberState, UmbObjectState, UmbStringState } from '../../../../libs/observable-api/index.js';
 import { UmbModalRouteRegistrationController } from '../../../core/router/index.js';
@@ -7,6 +7,7 @@ import { pathFolderName } from '../../../core/utils/index.js';
 export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
     //
     #catalogueModal;
+    #workspaceModal;
     #parentEntry;
     #layoutColumns;
     #areaType;
@@ -34,12 +35,12 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
     setParentUnique(contentUdi) {
         this.#parentUnique = contentUdi;
         // Notice pathFolderName can be removed when we have switched to use a proper GUID/ID/KEY. [NL]
-        this._workspaceModal.setUniquePathValue('parentUnique', pathFolderName(contentUdi ?? 'null'));
+        this.#workspaceModal.setUniquePathValue('parentUnique', pathFolderName(contentUdi ?? 'null'));
         this.#catalogueModal.setUniquePathValue('parentUnique', pathFolderName(contentUdi ?? 'null'));
     }
     setAreaKey(areaKey) {
         this.#areaKey = areaKey;
-        this._workspaceModal.setUniquePathValue('areaKey', areaKey ?? 'null');
+        this.#workspaceModal.setUniquePathValue('areaKey', areaKey ?? 'null');
         this.#catalogueModal.setUniquePathValue('areaKey', areaKey ?? 'null');
         this.#gotAreaKey();
     }
@@ -62,7 +63,6 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
         this.allowedBlockTypes = this.#allowedBlockTypes.asObservable();
         this.amountOfAllowedBlockTypes = this.#allowedBlockTypes.asObservablePart((x) => x.length);
         this.canCreate = this.#allowedBlockTypes.asObservablePart((x) => x.length > 0);
-        this._workspaceModal.addUniquePaths(['parentUnique', 'areaKey']);
         this.consumeContext(UMB_BLOCK_GRID_ENTRY_CONTEXT, (blockGridEntry) => {
             this.#parentEntry = blockGridEntry;
             this.#gotBlockParentEntry(); // is not used at this point. [NL]
@@ -86,6 +86,23 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
             // TODO: Does it make any sense that this is a state? Check usage and confirm. [NL]
             this._catalogueRouteBuilderState.setValue(routeBuilder);
         });
+        this.#workspaceModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_GRID_WORKSPACE_MODAL)
+            .addUniquePaths(['propertyAlias', 'variantId', 'parentUnique', 'areaKey'])
+            .addAdditionalPath('block')
+            .onSetup(() => {
+            return {
+                data: {
+                    entityType: 'block',
+                    preset: {},
+                    originData: { areaKey: this.#areaKey, parentUnique: this.#parentUnique },
+                },
+                modal: { size: 'medium' },
+            };
+        })
+            .observeRouteBuilder((routeBuilder) => {
+            const newPath = routeBuilder({});
+            this._workspacePath.setValue(newPath);
+        });
     }
     _gotBlockManager() {
         if (!this._manager)
@@ -94,11 +111,12 @@ export class UmbBlockGridEntriesContext extends UmbBlockEntriesContext {
         this.#getRangeLimits();
         this.observe(this._manager.propertyAlias, (alias) => {
             this.#catalogueModal.setUniquePathValue('propertyAlias', alias ?? 'null');
+            this.#workspaceModal.setUniquePathValue('propertyAlias', alias ?? 'null');
         }, 'observePropertyAlias');
         this.observe(this._manager.variantId, (variantId) => {
-            if (variantId) {
-                this.#catalogueModal.setUniquePathValue('variantId', variantId.toString());
-            }
+            // TODO: This might not be the property variant ID, but the content variant ID. Check up on what makes most sense?
+            this.#catalogueModal.setUniquePathValue('variantId', variantId?.toString());
+            this.#workspaceModal.setUniquePathValue('variantId', variantId?.toString());
         }, 'observePropertyAlias');
     }
     #gotAreaKey() {

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

@@ -1,6 +1,6 @@
 import type { UmbBlockDataType } from '../../block/index.js';
 import { UmbBlockEntriesContext } from '../../block/index.js';
-import type { UmbBlockListWorkspaceData } from '../index.js';
+import { type UmbBlockListWorkspaceData } from '../index.js';
 import type { UmbBlockListLayoutModel, UmbBlockListTypeModel } from '../types.js';
 import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from './block-list-manager.context-token.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';

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

@@ -1,10 +1,12 @@
 import { UMB_BLOCK_CATALOGUE_MODAL, UmbBlockEntriesContext } from '../../block/index.js';
+import { UMB_BLOCK_LIST_WORKSPACE_MODAL } from '../index.js';
 import { UMB_BLOCK_LIST_MANAGER_CONTEXT } from './block-list-manager.context-token.js';
 import { UmbBooleanState } from '../../../../libs/observable-api/index.js';
 import { UmbModalRouteRegistrationController } from '../../../core/router/index.js';
 export class UmbBlockListEntriesContext extends UmbBlockEntriesContext {
     //
     #catalogueModal;
+    #workspaceModal;
     constructor(host) {
         super(host, UMB_BLOCK_LIST_MANAGER_CONTEXT);
         // We will just say its always allowed for list for now: [NL]
@@ -27,6 +29,16 @@ export class UmbBlockListEntriesContext extends UmbBlockEntriesContext {
             .observeRouteBuilder((routeBuilder) => {
             this._catalogueRouteBuilderState.setValue(routeBuilder);
         });
+        this.#workspaceModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_LIST_WORKSPACE_MODAL)
+            .addUniquePaths(['propertyAlias', 'variantId'])
+            .addAdditionalPath('block')
+            .onSetup(() => {
+            return { data: { entityType: 'block', preset: {} }, modal: { size: 'medium' } };
+        })
+            .observeRouteBuilder((routeBuilder) => {
+            const newPath = routeBuilder({});
+            this._workspacePath.setValue(newPath);
+        });
     }
     _gotBlockManager() {
         if (!this._manager)
@@ -39,11 +51,12 @@ export class UmbBlockListEntriesContext extends UmbBlockEntriesContext {
         }, 'observeThisLayouts');
         this.observe(this._manager.propertyAlias, (alias) => {
             this.#catalogueModal.setUniquePathValue('propertyAlias', alias ?? 'null');
+            this.#workspaceModal.setUniquePathValue('propertyAlias', alias ?? 'null');
         }, 'observePropertyAlias');
         this.observe(this._manager.variantId, (variantId) => {
-            if (variantId) {
-                this.#catalogueModal.setUniquePathValue('variantId', variantId.toString());
-            }
+            // TODO: This might not be the property variant ID, but the content variant ID. Check up on what makes most sense?
+            this.#catalogueModal.setUniquePathValue('variantId', variantId?.toString());
+            this.#workspaceModal.setUniquePathValue('variantId', variantId?.toString());
         }, 'observePropertyAlias');
     }
     getPathForCreateBlock(index) {

package/dist-cms/packages/block/block-rte/context/block-rte-entries.context.d.ts

@@ -1,7 +1,7 @@
 import type { UmbBlockDataType } from '../../block/index.js';
 import { UmbBlockEntriesContext } from '../../block/index.js';
-import type { UmbBlockRteWorkspaceData } from '../index.js';
 import type { UmbBlockRteLayoutModel, UmbBlockRteTypeModel } from '../types.js';
+import { type UmbBlockRteWorkspaceData } from '../workspace/block-rte-workspace.modal-token.js';
 import { UMB_BLOCK_RTE_MANAGER_CONTEXT } from './block-rte-manager.context-token.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
 export declare class UmbBlockRteEntriesContext extends UmbBlockEntriesContext<typeof UMB_BLOCK_RTE_MANAGER_CONTEXT, typeof UMB_BLOCK_RTE_MANAGER_CONTEXT.TYPE, UmbBlockRteTypeModel, UmbBlockRteLayoutModel> {

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

@@ -1,10 +1,12 @@
 import { UMB_BLOCK_CATALOGUE_MODAL, UmbBlockEntriesContext } from '../../block/index.js';
+import { UMB_BLOCK_RTE_WORKSPACE_MODAL, } from '../workspace/block-rte-workspace.modal-token.js';
 import { UMB_BLOCK_RTE_MANAGER_CONTEXT } from './block-rte-manager.context-token.js';
 import { UmbBooleanState } from '../../../../libs/observable-api/index.js';
 import { UmbModalRouteRegistrationController } from '../../../core/router/index.js';
 export class UmbBlockRteEntriesContext extends UmbBlockEntriesContext {
     //
     #catalogueModal;
+    #workspaceModal;
     constructor(host) {
         super(host, UMB_BLOCK_RTE_MANAGER_CONTEXT);
         // We will just say its always allowed for RTE for now: [NL]
@@ -25,6 +27,16 @@ export class UmbBlockRteEntriesContext extends UmbBlockEntriesContext {
             .observeRouteBuilder((routeBuilder) => {
             this._catalogueRouteBuilderState.setValue(routeBuilder);
         });
+        this.#workspaceModal = new UmbModalRouteRegistrationController(this, UMB_BLOCK_RTE_WORKSPACE_MODAL)
+            .addUniquePaths(['propertyAlias', 'variantId'])
+            .addAdditionalPath('block')
+            .onSetup(() => {
+            return { data: { entityType: 'block', preset: {} }, modal: { size: 'medium' } };
+        })
+            .observeRouteBuilder((routeBuilder) => {
+            const newPath = routeBuilder({});
+            this._workspacePath.setValue(newPath);
+        });
     }
     _gotBlockManager() {
         if (!this._manager)
@@ -37,11 +49,12 @@ export class UmbBlockRteEntriesContext extends UmbBlockEntriesContext {
         }, 'observeThisLayouts');
         this.observe(this._manager.propertyAlias, (alias) => {
             this.#catalogueModal.setUniquePathValue('propertyAlias', alias ?? 'null');
+            this.#workspaceModal.setUniquePathValue('propertyAlias', alias ?? 'null');
         }, 'observePropertyAlias');
         this.observe(this._manager.variantId, (variantId) => {
-            if (variantId) {
-                this.#catalogueModal.setUniquePathValue('variantId', variantId.toString());
-            }
+            // TODO: This might not be the property variant ID, but the content variant ID. Check up on what makes most sense?
+            this.#catalogueModal.setUniquePathValue('variantId', variantId?.toString());
+            this.#workspaceModal.setUniquePathValue('variantId', variantId?.toString());
         }, 'observePropertyAlias');
     }
     getPathForCreateBlock() {

package/dist-cms/packages/block/block-rte/workspace/block-rte-workspace.modal-token.d.ts

@@ -1,7 +1,6 @@
-import type { UmbBlockLayoutBaseModel, UmbBlockViewPropsType, UmbBlockWorkspaceData } from '../../block/index.js';
-import type { UmbWorkspaceModalData } from '../../../core/modal/index.js';
+import type { UmbBlockWorkspaceData } from '../../block/index.js';
+import type { UmbWorkspaceModalData, UmbWorkspaceModalValue } from '../../../core/modal/index.js';
 import { UmbModalToken } from '../../../core/modal/index.js';
 export interface UmbBlockRteWorkspaceData extends UmbBlockWorkspaceData<object> {
 }
-export type UmbBlockRteWorkspaceValue = Array<UmbBlockViewPropsType<UmbBlockLayoutBaseModel>>;
-export declare const UMB_BLOCK_RTE_WORKSPACE_MODAL: UmbModalToken<Omit<UmbWorkspaceModalData<unknown>, "entityType">, UmbBlockRteWorkspaceValue>;
+export declare const UMB_BLOCK_RTE_WORKSPACE_MODAL: UmbModalToken<Omit<UmbWorkspaceModalData<unknown>, "entityType">, UmbWorkspaceModalValue>;