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

package/dist-cms/libs/extension-api/types/condition.types.d.ts

@@ -2,17 +2,17 @@ import type { ManifestBase } from './manifest-base.interface.js';
 export interface UmbConditionConfigBase<AliasType extends string = string> {
     alias: AliasType;
 }
-export type ConditionTypeMap<ConditionTypes extends UmbConditionConfigBase> = {
-    [Condition in ConditionTypes as Condition['alias']]: Condition;
+export type ConditionTypeMap<ConditionConfigs extends UmbConditionConfigBase> = {
+    [Condition in ConditionConfigs as Condition['alias']]: Condition;
 } & {
     [key: string]: UmbConditionConfigBase;
 };
-export type SpecificConditionTypeOrUmbConditionConfigBase<ConditionTypes extends UmbConditionConfigBase, T extends keyof ConditionTypeMap<ConditionTypes> | string> = T extends keyof ConditionTypeMap<ConditionTypes> ? ConditionTypeMap<ConditionTypes>[T] : UmbConditionConfigBase;
-export interface ManifestWithDynamicConditions<ConditionTypes extends UmbConditionConfigBase = UmbConditionConfigBase> extends ManifestBase {
+export type SpecificConditionTypeOrUmbConditionConfigBase<ConditionConfigs extends UmbConditionConfigBase, T extends keyof ConditionTypeMap<ConditionConfigs> | string> = T extends keyof ConditionTypeMap<ConditionConfigs> ? ConditionTypeMap<ConditionConfigs>[T] : UmbConditionConfigBase;
+export interface ManifestWithDynamicConditions<ConditionConfigs extends UmbConditionConfigBase = UmbConditionConfigBase> extends ManifestBase {
     /**
      * Set the conditions for when the extension should be loaded
      */
-    conditions?: Array<ConditionTypes>;
+    conditions?: Array<ConditionConfigs>;
     /**
      * Define one or more extension aliases that this extension should overwrite.
      */

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

@@ -5,7 +5,7 @@ export interface BlockEntryIsExposedConditionConfig extends UmbConditionConfigBa
     match?: boolean;
 }
 declare global {
-    interface UmbExtensionConditionMap {
+    interface UmbExtensionConditionConfigMap {
         umbBlock: BlockEntryShowContentEditConditionConfig | BlockWorkspaceHasSettingsConditionConfig | BlockEntryIsExposedConditionConfig;
     }
 }

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

@@ -38,6 +38,7 @@ export declare abstract class UmbBlockEntryContext<BlockManagerContextTokenType
     readonly workspacePath: Observable<string | undefined>;
     readonly workspaceEditContentPath: Observable<string>;
     readonly workspaceEditSettingsPath: Observable<string>;
+    _contentStructureHasProperties: Observable<boolean | undefined>;
     propertyVariantId(structure: UmbContentTypeStructureManager, propertyAlias: string): Promise<Observable<UmbVariantId | undefined>>;
     setContentPropertyValue(propertyAlias: string, value: unknown): void;
     setSettingsPropertyValue(propertyAlias: string, value: unknown): void;

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

@@ -31,6 +31,7 @@ export class UmbBlockEntryContext extends UmbContextBase {
     #contentStructure;
     #contentStructurePromiseResolve;
     #contentStructurePromise;
+    #contentStructureHasProperties;
     #settingsStructure;
     #settingsStructurePromiseResolve;
     #settingsStructurePromise;
@@ -149,6 +150,8 @@ export class UmbBlockEntryContext extends UmbContextBase {
                 this.#contentStructurePromiseResolve = undefined;
             };
         });
+        this.#contentStructureHasProperties = new UmbBooleanState(undefined);
+        this._contentStructureHasProperties = this.#contentStructureHasProperties.asObservable();
         this.#settingsStructurePromise = new Promise((resolve) => {
             this.#settingsStructurePromiseResolve = () => {
                 resolve(undefined);
@@ -363,6 +366,9 @@ export class UmbBlockEntryContext extends UmbContextBase {
             this.#contentElementType.setValue(contentType);
             this._gotContentType(contentType);
         }, 'observeContentElementType');
+        this.observe(this.#contentStructure?.contentTypeHasProperties, (has) => {
+            this.#contentStructureHasProperties.setValue(has);
+        }, 'observeContentTypeHasProperties');
     }
     #getSettingsStructure(contentTypeKey) {
         if (!this._manager || !contentTypeKey)
@@ -407,7 +413,7 @@ export class UmbBlockEntryContext extends UmbContextBase {
         if (!variantId || !this.#contentKey)
             return;
         // TODO: Handle variantId changes
-        this.observe(this._manager?.hasExposeOf(this.#contentKey, variantId), (hasExpose) => {
+        this.observe(this._manager?.hasExposeOf(this.#contentKey), (hasExpose) => {
             this.#hasExpose.setValue(hasExpose);
         }, 'observeExpose');
     }
@@ -439,9 +445,8 @@ export class UmbBlockEntryContext extends UmbContextBase {
         this._entries.delete(contentKey);
     }
     expose() {
-        const variantId = this.#variantId.getValue();
-        if (!this.#contentKey || !variantId)
+        if (!this.#contentKey)
             return;
-        this._manager?.setOneExpose(this.#contentKey, variantId);
+        this._manager?.setOneExpose(this.#contentKey);
     }
 }

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

@@ -2,7 +2,7 @@ import type { UmbBlockWorkspaceOriginData } from '../workspace/index.js';
 import type { UmbBlockLayoutBaseModel, UmbBlockDataModel, UmbBlockExposeModel } from '../types.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
-import { UmbArrayState, UmbBooleanState, UmbClassState } from '../../../../libs/observable-api/index.js';
+import { UmbArrayState, UmbBooleanState, UmbClassState, type MappingFunction } from '../../../../libs/observable-api/index.js';
 import { UmbContentTypeStructureManager, type UmbContentTypeModel } from '../../../core/content-type/index.js';
 import type { UmbPropertyEditorConfigCollection } from '../../../core/property-editor/index.js';
 import type { UmbVariantId } from '../../../core/variant/index.js';
@@ -31,6 +31,7 @@ export declare abstract class UmbBlockManagerContext<BlockType extends UmbBlockT
     readonly exposes: import("rxjs/internal/Observable").Observable<UmbBlockExposeModel[]>;
     setEditorConfiguration(configs: UmbPropertyEditorConfigCollection): void;
     getEditorConfiguration(): UmbPropertyEditorConfigCollection | undefined;
+    editorConfigurationPart(method: MappingFunction<UmbPropertyEditorConfigCollection | undefined, unknown>): import("rxjs/internal/Observable").Observable<unknown>;
     setBlockTypes(blockTypes: Array<BlockType>): void;
     getBlockTypes(): BlockType[];
     setLayouts(layouts: Array<BlockLayoutType>): void;
@@ -50,18 +51,18 @@ export declare abstract class UmbBlockManagerContext<BlockType extends UmbBlockT
     layoutOf(contentKey: string): import("rxjs/internal/Observable").Observable<BlockLayoutType | undefined>;
     contentOf(key: string): import("rxjs/internal/Observable").Observable<UmbBlockDataModel | undefined>;
     settingsOf(key: string): import("rxjs/internal/Observable").Observable<UmbBlockDataModel | undefined>;
-    exposeOf(contentKey: string, variantId: UmbVariantId): import("rxjs/internal/Observable").Observable<UmbBlockExposeModel[]>;
-    hasExposeOf(contentKey: string, variantId: UmbVariantId): import("rxjs/internal/Observable").Observable<boolean>;
+    currentExposeOf(contentKey: string): import("rxjs/internal/Observable").Observable<UmbBlockExposeModel | undefined> | undefined;
+    hasExposeOf(contentKey: string): import("rxjs/internal/Observable").Observable<boolean> | undefined;
     getBlockTypeOf(contentTypeKey: string): BlockType | undefined;
     getContentOf(contentKey: string): UmbBlockDataModel | undefined;
-    setOneLayout(layoutData: BlockLayoutType): void;
+    setOneLayout(layoutData: BlockLayoutType, _originData?: BlockOriginDataType): void;
     setOneContent(contentData: UmbBlockDataModel): void;
     setOneSettings(settingsData: UmbBlockDataModel): void;
-    setOneExpose(contentKey: string, variantId: UmbVariantId): void;
+    setOneExpose(contentKey: string): void;
     removeOneContent(contentKey: string): void;
     removeOneSettings(settingsKey: string): void;
     removeExposesOf(contentKey: string): void;
-    removeOneExpose(contentKey: string, variantId: UmbVariantId): void;
+    removeCurrentExpose(contentKey: string): void;
     setOneContentProperty(key: string, propertyAlias: string, value: unknown): void;
     setOneSettingsProperty(key: string, propertyAlias: string, value: unknown): void;
     contentProperty(key: string, propertyAlias: string): void;
@@ -87,6 +88,6 @@ export declare abstract class UmbBlockManagerContext<BlockType extends UmbBlockT
         settings: UmbBlockDataModel | undefined;
     };
     abstract insert(layoutEntry: BlockLayoutType, content: UmbBlockDataModel, settings: UmbBlockDataModel | undefined, originData: BlockOriginDataType): boolean;
-    protected insertBlockData(layoutEntry: BlockLayoutType, content: UmbBlockDataModel, settings?: UmbBlockDataModel): void;
+    protected insertBlockData(layoutEntry: BlockLayoutType, content: UmbBlockDataModel, settings: UmbBlockDataModel | undefined, _originData: BlockOriginDataType): void;
     protected removeBlockKey(contentKey: string): void;
 }

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

@@ -1,6 +1,6 @@
 import { UMB_BLOCK_MANAGER_CONTEXT } from './block-manager.context-token.js';
 import { UmbContextBase } from '../../../../libs/class-api/index.js';
-import { UmbArrayState, UmbBooleanState, UmbClassState, UmbStringState } from '../../../../libs/observable-api/index.js';
+import { UmbArrayState, UmbBooleanState, UmbClassState, UmbStringState, mergeObservables, } from '../../../../libs/observable-api/index.js';
 import { UmbDocumentTypeDetailRepository } from '../../../documents/document-types/index.js';
 import { UmbContentTypeStructureManager } from '../../../core/content-type/index.js';
 import { UmbId } from '../../../core/id/index.js';
@@ -26,12 +26,15 @@ export class UmbBlockManagerContext extends UmbContextBase {
     setEditorConfiguration(configs) {
         this._editorConfiguration.setValue(configs);
         if (this._liveEditingMode.getValue() === undefined) {
-            this._liveEditingMode.setValue(configs.getValueByAlias('liveEditingMode'));
+            this._liveEditingMode.setValue(configs.getValueByAlias('useLiveEditing'));
         }
     }
     getEditorConfiguration() {
         return this._editorConfiguration.getValue();
     }
+    editorConfigurationPart(method) {
+        return this._editorConfiguration.asObservablePart(method);
+    }
     setBlockTypes(blockTypes) {
         this.#blockTypes.setValue(blockTypes);
     }
@@ -139,10 +142,16 @@ export class UmbBlockManagerContext extends UmbContextBase {
     settingsOf(key) {
         return this.#settings.asObservablePart((source) => source.find((x) => x.key === key));
     }
-    exposeOf(contentKey, variantId) {
-        return this.#exposes.asObservablePart((source) => source.filter((x) => x.contentKey === contentKey && variantId.compare(x)));
+    currentExposeOf(contentKey) {
+        const variantId = this.#variantId.getValue();
+        if (!variantId)
+            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, variantId) {
+    hasExposeOf(contentKey) {
+        const variantId = this.#variantId.getValue();
+        if (!variantId)
+            return;
         return this.#exposes.asObservablePart((source) => source.some((x) => x.contentKey === contentKey && variantId.compare(x)));
     }
     getBlockTypeOf(contentTypeKey) {
@@ -151,7 +160,9 @@ export class UmbBlockManagerContext extends UmbContextBase {
     getContentOf(contentKey) {
         return this.#contents.value.find((x) => x.key === contentKey);
     }
-    setOneLayout(layoutData) {
+    // originData param is used by some implementations. [NL] should be here, do not remove it.
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    setOneLayout(layoutData, _originData) {
         this._layouts.appendOne(layoutData);
     }
     setOneContent(contentData) {
@@ -160,7 +171,10 @@ export class UmbBlockManagerContext extends UmbContextBase {
     setOneSettings(settingsData) {
         this.#settings.appendOne(settingsData);
     }
-    setOneExpose(contentKey, variantId) {
+    setOneExpose(contentKey) {
+        const variantId = this.#variantId.getValue();
+        if (!variantId)
+            return;
         this.#exposes.appendOne({ contentKey, ...variantId.toObject() });
     }
     removeOneContent(contentKey) {
@@ -172,7 +186,10 @@ export class UmbBlockManagerContext extends UmbContextBase {
     removeExposesOf(contentKey) {
         this.#exposes.filter((x) => x.contentKey !== contentKey);
     }
-    removeOneExpose(contentKey, variantId) {
+    removeCurrentExpose(contentKey) {
+        const variantId = this.#variantId.getValue();
+        if (!variantId)
+            return;
         this.#exposes.filter((x) => !(x.contentKey === contentKey && variantId.compare(x)));
     }
     setOneContentProperty(key, propertyAlias, value) {
@@ -231,7 +248,9 @@ export class UmbBlockManagerContext extends UmbContextBase {
             settings,
         };
     }
-    insertBlockData(layoutEntry, content, settings) {
+    insertBlockData(layoutEntry, content, settings, 
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    _originData) {
         // Create content entry:
         if (layoutEntry.contentKey) {
             this.#contents.appendOne(content);

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

@@ -51,6 +51,7 @@ export declare class UmbBlockWorkspaceContext<LayoutDataType extends UmbBlockLay
      */
     setPropertyValue(alias: string, value: unknown): Promise<void>;
     submit(): Promise<void>;
+    expose(): void;
     destroy(): void;
 }
 export { UmbBlockWorkspaceContext as api };

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

@@ -57,7 +57,7 @@ export class UmbBlockWorkspaceContext extends UmbSubmittableWorkspaceContextBase
                 else {
                     // Revert the layout, content & settings data to the original state: [NL]
                     if (this.#initialLayout) {
-                        this.#blockManager?.setOneLayout(this.#initialLayout);
+                        this.#blockManager?.setOneLayout(this.#initialLayout, this.#modalContext?.data.originData);
                     }
                     if (this.#initialContent) {
                         this.#blockManager?.setOneContent(this.#initialContent);
@@ -99,13 +99,13 @@ export class UmbBlockWorkspaceContext extends UmbSubmittableWorkspaceContextBase
                 }
                 this.#variantId.setValue(variantId);
             }, 'observeBlockType');
-            this.observe(observeMultiple([this.variantId, this.contentKey]), ([variantId, contentKey]) => {
-                if (!variantId || !contentKey)
+            this.observe(this.contentKey, (contentKey) => {
+                if (!contentKey)
                     return;
-                this.observe(manager.hasExposeOf(contentKey, variantId), (exposed) => {
+                this.observe(manager.hasExposeOf(contentKey), (exposed) => {
                     this.#exposed.setValue(exposed);
                 }, 'observeHasExpose');
-            }, 'observeVariantIdContentKey');
+            }, 'observeContentKey');
         }).asPromise();
         this.#retrieveBlockEntries = this.consumeContext(UMB_BLOCK_ENTRIES_CONTEXT, (context) => {
             this.#blockEntries = context;
@@ -260,7 +260,7 @@ export class UmbBlockWorkspaceContext extends UmbSubmittableWorkspaceContextBase
     establishLiveSync() {
         this.observe(this.layout, (layoutData) => {
             if (layoutData) {
-                this.#blockManager?.setOneLayout(layoutData);
+                this.#blockManager?.setOneLayout(layoutData, this.#modalContext?.data.originData);
             }
         }, 'observeThisLayout');
         this.observe(this.content.data, (contentData) => {
@@ -329,7 +329,7 @@ export class UmbBlockWorkspaceContext extends UmbSubmittableWorkspaceContextBase
             }
             else {
                 // Update data:
-                this.#blockManager.setOneLayout(layoutData);
+                this.#blockManager.setOneLayout(layoutData, this.#modalContext.data.originData);
                 if (contentData) {
                     this.#blockManager.setOneContent(contentData);
                 }
@@ -341,13 +341,14 @@ export class UmbBlockWorkspaceContext extends UmbSubmittableWorkspaceContextBase
         this.#expose(layoutData.contentKey);
         this.setIsNew(false);
     }
+    expose() {
+        const contentKey = this.#layout.value?.contentKey;
+        if (!contentKey)
+            throw new Error('Cannot expose block that does not exist.');
+        this.#expose(contentKey);
+    }
     #expose(unique) {
-        const variantId = this.#variantId.getValue();
-        if (!variantId) {
-            throw new Error('Block could not bre exposed cause we where missing a variant ID.');
-        }
-        // expose
-        this.#blockManager?.setOneExpose(unique, variantId);
+        this.#blockManager?.setOneExpose(unique);
     }
     #modalRejected;
     destroy() {

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

@@ -12,7 +12,9 @@ export declare class UmbBlockWorkspaceViewEditContentNoRouterElement extends Umb
     private _hasRootGroups;
     _tabs?: Array<UmbPropertyTypeContainerModel>;
     private _activeTabId?;
-    private _activeTabName?;
+    private _ownerContentTypeName?;
+    private _variantName?;
+    private _exposed?;
     constructor();
     render(): import("lit-html").TemplateResult<1> | undefined;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

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

@@ -6,10 +6,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 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 { css, html, customElement, state, repeat, nothing } from '../../../../../../external/lit/index.js';
 import { UmbTextStyles } from '../../../../../core/style/index.js';
 import { UmbContentTypeContainerStructureHelper } from '../../../../../core/content-type/index.js';
 import { UmbLitElement } from '../../../../../core/lit-element/index.js';
+import { UmbLanguageItemRepository } from '../../../../../language/index.js';
 /**
  * @element umb-block-workspace-view-edit-content-no-router
  * @description
@@ -23,6 +24,9 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
         //private _hasRootProperties = false;
         this._hasRootGroups = false;
         this.#tabsStructureHelper = new UmbContentTypeContainerStructureHelper(this);
+        this.#expose = () => {
+            this.#blockWorkspace?.expose();
+        };
         this.#tabsStructureHelper.setIsRoot(true);
         this.#tabsStructureHelper.setContainerChildType('Tab');
         this.observe(this.#tabsStructureHelper.mergedContainers, (tabs) => {
@@ -30,11 +34,29 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
             this.#checkDefaultTabName();
         });
         // _hasRootProperties can be gotten via _tabsStructureHelper.hasProperties. But we do not support root properties currently.
-        this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (workspaceContext) => {
-            this.#blockWorkspace = workspaceContext;
-            this.#tabsStructureHelper.setStructureManager(workspaceContext.content.structure);
-            workspaceContext.content.setup(this);
+        this.consumeContext(UMB_BLOCK_WORKSPACE_CONTEXT, (context) => {
+            this.#blockWorkspace = context;
+            this.#tabsStructureHelper.setStructureManager(context.content.structure);
+            context.content.setup(this);
             this.#observeRootGroups();
+            this.observe(context.content.structure.ownerContentTypeName, (name) => {
+                this._ownerContentTypeName = name;
+            }, 'observeContentTypeName');
+            this.observe(context.variantId, async (variantId) => {
+                if (variantId) {
+                    // TODO: Support segment name?
+                    const culture = variantId.culture;
+                    if (culture) {
+                        const languageRepository = new UmbLanguageItemRepository(this);
+                        const { data } = await languageRepository.requestItems([culture]);
+                        const name = data?.[0].name;
+                        this._variantName = name ? this.localize.string(name) : undefined;
+                    }
+                }
+            }, 'observeVariant');
+            this.observe(context.exposed, (exposed) => {
+                this._exposed = exposed;
+            }, 'observeExposed');
         });
     }
     async #observeRootGroups() {
@@ -51,20 +73,29 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
         // Find the default tab to grab:
         if (this._activeTabId === undefined) {
             if (this._hasRootGroups) {
-                this._activeTabName = null;
+                //this._activeTabName = null;
                 this._activeTabId = null;
             }
             else if (this._tabs.length > 0) {
-                this._activeTabName = this._tabs[0].name;
+                //this._activeTabName = this._tabs[0].name;
                 this._activeTabId = this._tabs[0].id;
             }
         }
     }
     #setTabName(tabName, tabId) {
-        this._activeTabName = tabName;
+        //this._activeTabName = tabName;
         this._activeTabId = tabId;
     }
+    #expose;
     render() {
+        if (this._exposed === false) {
+            return html `<uui-button style="position:absolute; inset:0;" @click=${this.#expose}
+				><uui-icon name="icon-add"></uui-icon>
+				<umb-localize
+					key="blockEditor_createThisFor"
+					.args=${[this._ownerContentTypeName, this._variantName]}></umb-localize
+			></uui-button>`;
+        }
         if (!this._tabs)
             return;
         return html `
@@ -79,7 +110,7 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
 										>Content</uui-tab
 									>
 								`
-                : ''}
+                : nothing}
 						${repeat(this._tabs, (tab) => tab.name, (tab) => {
                 return html `<uui-tab
 									label=${tab.name ?? 'Unnamed'}
@@ -89,20 +120,21 @@ let UmbBlockWorkspaceViewEditContentNoRouterElement = class UmbBlockWorkspaceVie
 								>`;
             })}
 					</uui-tab-group>`
-            : ''}
+            : nothing}
 			${this._activeTabId !== undefined
             ? html `<umb-block-workspace-view-edit-tab
 						.managerName=${'content'}
 						.hideSingleGroup=${true}
 						.containerId=${this._activeTabId}>
 					</umb-block-workspace-view-edit-tab>`
-            : ''}
+            : nothing}
 		`;
     }
     static { this.styles = [
         UmbTextStyles,
         css `
 			:host {
+				position: relative;
 				display: block;
 				height: 100%;
 				--uui-tab-background: var(--uui-color-surface);
@@ -123,7 +155,13 @@ __decorate([
 ], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_activeTabId", void 0);
 __decorate([
     state()
-], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_activeTabName", void 0);
+], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_ownerContentTypeName", void 0);
+__decorate([
+    state()
+], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_variantName", void 0);
+__decorate([
+    state()
+], UmbBlockWorkspaceViewEditContentNoRouterElement.prototype, "_exposed", void 0);
 UmbBlockWorkspaceViewEditContentNoRouterElement = __decorate([
     customElement('umb-block-workspace-view-edit-content-no-router')
 ], UmbBlockWorkspaceViewEditContentNoRouterElement);

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

@@ -10,7 +10,7 @@ export interface UmbBlockEditorCustomViewConfiguration {
 }
 export interface UmbBlockEditorCustomViewProperties<LayoutType extends UmbBlockLayoutBaseModel = UmbBlockLayoutBaseModel, BlockType extends UmbBlockTypeBaseModel = UmbBlockTypeBaseModel> {
     manifest?: ManifestBlockEditorCustomView;
-    config?: Partial<UmbBlockEditorCustomViewConfiguration>;
+    config?: UmbBlockEditorCustomViewConfiguration;
     blockType?: BlockType;
     contentKey?: string;
     label?: string;

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

@@ -14,7 +14,9 @@ import '../ref-grid-block/index.js';
  */
 let UmbBlockGridBlockElement = class UmbBlockGridBlockElement extends UmbLitElement {
     render() {
-        return html `<umb-ref-grid-block standalone href=${this.config?.editContentPath ?? ''}>
+        return html `<umb-ref-grid-block
+			standalone
+			href=${(this.config?.showContentEdit ? this.config?.editContentPath : undefined) ?? ''}>
 			<umb-icon slot="icon" .name=${this.icon}></umb-icon>
 			<umb-ufm-render slot="name" inline .markdown=${this.label} .value=${this.content}></umb-ufm-render>
 			<umb-block-grid-areas-container slot="areas"></umb-block-grid-areas-container>

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

@@ -24,7 +24,9 @@ let UmbBlockGridBlockInlineElement = class UmbBlockGridBlockInlineElement extend
         });
     }
     render() {
-        return html `<umb-ref-grid-block standalone href=${this.config?.editContentPath ?? ''}>
+        return html `<umb-ref-grid-block
+			standalone
+			href=${(this.config?.showContentEdit ? this.config?.editContentPath : undefined) ?? ''}>
 			<umb-icon slot="icon" .name=${this.icon}></umb-icon>
 			<umb-ufm-render slot="name" inline .markdown=${this.label} .value=${this.content}></umb-ufm-render>
 			<umb-property-type-based-property

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

@@ -12,7 +12,8 @@ export declare class UmbBlockGridEntriesElement extends UmbBlockGridEntriesEleme
     get layoutColumns(): number | undefined;
     private _areaKey?;
     private _canCreate?;
-    private _singleBlockTypeName?;
+    private _createLabel?;
+    private _configCreateLabel?;
     private _styleElement?;
     private _layoutEntries;
     constructor();

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

@@ -151,11 +151,12 @@ let UmbBlockGridEntriesElement = class UmbBlockGridEntriesElement extends UmbFor
             this._canCreate = length > 0;
             if (length === 1) {
                 this.observe(this.#context.firstAllowedBlockTypeName(), (firstAllowedName) => {
-                    this._singleBlockTypeName = firstAllowedName;
+                    this._createLabel = this.localize.term('blockEditor_addThis', [firstAllowedName]);
                 }, 'observeSingleBlockTypeName');
             }
             else {
                 this.removeUmbControllerByAlias('observeSingleBlockTypeName');
+                this._createLabel = this.localize.term('blockEditor_addBlock');
             }
         }, null);
         this.observe(this.#context.rangeLimits, (rangeLimits) => {
@@ -172,6 +173,12 @@ let UmbBlockGridEntriesElement = class UmbBlockGridEntriesElement extends UmbFor
                 this._styleElement.rel = 'stylesheet';
                 this._styleElement.href = stylesheet;
             }, 'observeStylesheet');
+            if (this.areaKey) {
+                this.observe(this.#context.areaTypeCreateLabel, (label) => (this._configCreateLabel = label), 'observeConfigCreateLabel');
+            }
+            else {
+                this.observe(manager.editorConfigurationPart((x) => x?.find((y) => y.alias === 'createLabel')?.value), (label) => (this._configCreateLabel = label), 'observeConfigCreateLabel');
+            }
         });
         new UmbFormControlValidator(this, this /*, this.#dataPath*/);
     }
@@ -234,9 +241,7 @@ let UmbBlockGridEntriesElement = class UmbBlockGridEntriesElement extends UmbFor
             return html `<uui-button-group id="createButton">
 				<uui-button
 					look="placeholder"
-					label=${this._singleBlockTypeName
-                ? this.localize.term('blockEditor_addThis', [this._singleBlockTypeName])
-                : this.localize.term('blockEditor_addBlock')}
+					label=${this._configCreateLabel ?? this._createLabel ?? ''}
 					href=${this.#context.getPathForCreateBlock(-1) ?? ''}></uui-button>
 				${this._areaKey === null
                 ? html ` <uui-button
@@ -332,7 +337,10 @@ __decorate([
 ], UmbBlockGridEntriesElement.prototype, "_canCreate", void 0);
 __decorate([
     state()
-], UmbBlockGridEntriesElement.prototype, "_singleBlockTypeName", void 0);
+], UmbBlockGridEntriesElement.prototype, "_createLabel", void 0);
+__decorate([
+    state()
+], UmbBlockGridEntriesElement.prototype, "_configCreateLabel", void 0);
 __decorate([
     state()
 ], UmbBlockGridEntriesElement.prototype, "_styleElement", void 0);

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

@@ -223,6 +223,7 @@ let UmbBlockGridEntryElement = class UmbBlockGridEntryElement extends UmbLitElem
 			.label=${this._label}
 			.icon=${this._icon}
 			.unpublished=${!this._exposed}
+			.config=${this._blockViewProps.config}
 			.content=${this._blockViewProps.content}
 			.settings=${this._blockViewProps.settings}></umb-block-grid-block-inline>`;
     }
@@ -232,6 +233,7 @@ let UmbBlockGridEntryElement = class UmbBlockGridEntryElement extends UmbLitElem
 			.label=${this._label}
 			.icon=${this._icon}
 			.unpublished=${!this._exposed}
+			.config=${this._blockViewProps.config}
 			.content=${this._blockViewProps.content}
 			.settings=${this._blockViewProps.settings}></umb-block-grid-block>`;
     }

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

@@ -1,7 +1,7 @@
 import type { UmbBlockDataModel } from '../../block/index.js';
 import { UmbBlockEntriesContext } from '../../block/index.js';
 import { type UmbBlockGridWorkspaceOriginData } from '../index.js';
-import type { UmbBlockGridLayoutModel, UmbBlockGridTypeModel } from '../types.js';
+import type { UmbBlockGridLayoutModel, UmbBlockGridTypeAreaType, UmbBlockGridTypeModel } from '../types.js';
 import { UMB_BLOCK_GRID_MANAGER_CONTEXT } from './block-grid-manager.context-token.js';
 import type { UmbBlockGridScalableContainerContext } from './block-grid-scale-manager/block-grid-scale-manager.controller.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
@@ -17,6 +17,8 @@ interface UmbBlockGridAreaTypeInvalidRuleType {
 export declare class UmbBlockGridEntriesContext extends UmbBlockEntriesContext<typeof UMB_BLOCK_GRID_MANAGER_CONTEXT, typeof UMB_BLOCK_GRID_MANAGER_CONTEXT.TYPE, UmbBlockGridTypeModel, UmbBlockGridLayoutModel, UmbBlockGridWorkspaceOriginData> implements UmbBlockGridScalableContainerContext {
     #private;
     readonly layoutColumns: import("rxjs/internal/Observable").Observable<number | undefined>;
+    areaType: import("rxjs/internal/Observable").Observable<UmbBlockGridTypeAreaType | undefined>;
+    areaTypeCreateLabel: import("rxjs/internal/Observable").Observable<string | undefined>;
     readonly rangeLimits: import("rxjs/internal/Observable").Observable<UmbNumberRangeValueType | undefined>;
     readonly allowedBlockTypes: import("rxjs/internal/Observable").Observable<UmbBlockGridTypeModel[]>;
     readonly amountOfAllowedBlockTypes: import("rxjs/internal/Observable").Observable<number>;
@@ -53,7 +55,7 @@ export declare class UmbBlockGridEntriesContext extends UmbBlockEntriesContext<t
     checkBlockTypeLimitsValidity(): boolean;
     /**
      * Check if given contentKey is allowed in the current area.
-     * @param contentKey {string} - The contentKey of the content to check.
+     * @param {string} contentKey - The contentKey of the content to check.
      * @returns {boolean} - True if the content is allowed in the current area, otherwise false.
      */
     allowDrop(contentKey: string): boolean;