@umbraco-cms/backoffice 15.0.0-rc4 → 15.0.0

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

@@ -412,7 +412,6 @@ export class UmbBlockEntryContext extends UmbContextBase {
         const variantId = this.#variantId.getValue();
         if (!variantId || !this.#contentKey)
             return;
-        // TODO: Handle variantId changes
         this.observe(this._manager?.hasExposeOf(this.#contentKey, variantId), (hasExpose) => {
             this.#hasExpose.setValue(hasExpose);
         }, 'observeExpose');
@@ -445,8 +444,9 @@ export class UmbBlockEntryContext extends UmbContextBase {
         this._entries.delete(contentKey);
     }
     expose() {
-        if (!this.#contentKey)
+        const variantId = this.#variantId.getValue();
+        if (!variantId || !this.#contentKey)
             return;
-        this._manager?.setOneExpose(this.#contentKey);
+        this._manager?.setOneExpose(this.#contentKey, variantId);
     }
 }

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

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

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

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

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

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

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

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