@umbraco-cms/backoffice 18.0.0-beta2 → 18.0.0-rc2

package/dist-cms/packages/core/themes/manifests.js

@@ -1,12 +1,12 @@
-export const UMB_THEME_LIGHT_ALIAS = 'umb-light-theme';
-export const UMB_THEME_DARK_ALIAS = 'umb-dark-theme';
-export const UMB_THEME_HIGH_CONTRAST_ALIAS = 'umb-high-contrast-theme';
+import UmbThemeContext from './theme.context.js';
+import { UMB_THEME_LIGHT_ALIAS, UMB_THEME_DARK_ALIAS, UMB_THEME_HIGH_CONTRAST_ALIAS } from './constants.js';
+export { UMB_THEME_LIGHT_ALIAS, UMB_THEME_DARK_ALIAS, UMB_THEME_HIGH_CONTRAST_ALIAS };
 export const themes = [
     {
         type: 'globalContext',
         alias: 'Umb.GlobalContext.Theme',
         name: 'Theme Context',
-        api: () => import('./theme.context.js'),
+        api: UmbThemeContext,
     },
     {
         type: 'theme',

package/dist-cms/packages/core/themes/theme.context.js

@@ -1,4 +1,4 @@
-import { UMB_THEME_LIGHT_ALIAS } from './manifests.js';
+import { UMB_THEME_LIGHT_ALIAS } from './constants.js';
 import { loadManifestPlainCss } from '../../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../extension-registry/index.js';
 import { UmbContextBase } from '../../../libs/class-api/index.js';

package/dist-cms/packages/core/tree/default/manifests.js

@@ -1,3 +1,5 @@
+import { UmbDefaultTreeContext } from './default-tree.context.js';
+import UmbDefaultTreeElement from './default-tree.element.js';
 export const manifests = [
     {
         type: 'kind',
@@ -6,8 +8,8 @@ export const manifests = [
         matchType: 'tree',
         manifest: {
             type: 'tree',
-            api: () => import('./default-tree.context.js'),
-            element: () => import('./default-tree.element.js'),
+            api: UmbDefaultTreeContext,
+            element: UmbDefaultTreeElement,
         },
     },
 ];

package/dist-cms/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.js

@@ -1,4 +1,5 @@
 import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../../entity-action/index.js';
+import { UmbDuplicateToEntityAction } from './duplicate-to.action.js';
 export const manifest = {
     type: 'kind',
     alias: 'Umb.Kind.EntityAction.DuplicateTo',
@@ -8,7 +9,7 @@ export const manifest = {
         ...UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST.manifest,
         type: 'entityAction',
         kind: 'duplicateTo',
-        api: () => import('./duplicate-to.action.js'),
+        api: UmbDuplicateToEntityAction,
         weight: 600,
         forEntityTypes: [],
         meta: {

package/dist-cms/packages/core/tree/entity-actions/duplicate-to/modal/manifests.js

@@ -1,9 +1,10 @@
 import { UMB_DUPLICATE_TO_MODAL_ALIAS } from './constants.js';
+import { UmbDuplicateToModalElement } from './duplicate-to-modal.element.js';
 export const manifests = [
     {
         type: 'modal',
         alias: UMB_DUPLICATE_TO_MODAL_ALIAS,
         name: 'Duplicate To Modal',
-        element: () => import('./duplicate-to-modal.element.js'),
+        element: UmbDuplicateToModalElement,
     },
 ];

package/dist-cms/packages/core/tree/entity-actions/move/move-repository.interface.d.ts

@@ -1,4 +1,4 @@
-import type { UmbRepositoryErrorResponse } from '../../../repository/types.js';
+import type { UmbRepositoryErrorResponse } from '../../../repository/index.js';
 import type { UmbMoveToRequestArgs } from './types.js';
 import type { UmbApi } from '../../../../../libs/extension-api/index.js';
 export interface UmbMoveRepository extends UmbApi {

package/dist-cms/packages/core/tree/entity-actions/move/move-to.action.kind.js

@@ -1,4 +1,5 @@
 import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../../entity-action/index.js';
+import UmbMoveToEntityAction from './move-to.action.js';
 export const manifest = {
     type: 'kind',
     alias: 'Umb.Kind.EntityAction.MoveTo',
@@ -8,7 +9,7 @@ export const manifest = {
         ...UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST.manifest,
         type: 'entityAction',
         kind: 'moveTo',
-        api: () => import('./move-to.action.js'),
+        api: UmbMoveToEntityAction,
         weight: 700,
         forEntityTypes: [],
         meta: {

package/dist-cms/packages/core/tree/entity-actions/reload-tree-item-children/reload-tree-item-children.action.kind.js

@@ -1,4 +1,5 @@
 import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../../entity-action/index.js';
+import { UmbReloadTreeItemChildrenEntityAction } from './reload-tree-item-children.action.js';
 export const manifest = {
     type: 'kind',
     alias: 'Umb.Kind.EntityAction.Tree.ReloadChildrenOf',
@@ -8,7 +9,7 @@ export const manifest = {
         ...UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST.manifest,
         type: 'entityAction',
         kind: 'reloadTreeItemChildren',
-        api: () => import('./reload-tree-item-children.action.js'),
+        api: UmbReloadTreeItemChildrenEntityAction,
         weight: 0,
         forEntityTypes: [],
         meta: {

package/dist-cms/packages/core/tree/entity-actions/sort-children-of/modal/manifests.js

@@ -1,9 +1,10 @@
 import { UMB_SORT_CHILDREN_OF_MODAL_ALIAS } from './constants.js';
+import { UmbSortChildrenOfModalElement } from './sort-children-of-modal.element.js';
 export const manifests = [
     {
         type: 'modal',
         alias: UMB_SORT_CHILDREN_OF_MODAL_ALIAS,
         name: 'Sort Children Of Modal',
-        element: () => import('./sort-children-of-modal.element.js'),
+        element: UmbSortChildrenOfModalElement,
     },
 ];

package/dist-cms/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.js

@@ -1,4 +1,5 @@
 import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../../entity-action/index.js';
+import UmbSortChildrenOfEntityAction from './sort-children-of.action.js';
 export const UMB_ENTITY_ACTION_SORT_CHILDREN_OF_KIND_MANIFEST = {
     type: 'kind',
     alias: 'Umb.Kind.EntityAction.SortChildrenOf',
@@ -8,7 +9,7 @@ export const UMB_ENTITY_ACTION_SORT_CHILDREN_OF_KIND_MANIFEST = {
         ...UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST.manifest,
         type: 'entityAction',
         kind: 'sortChildrenOf',
-        api: () => import('./sort-children-of.action.js'),
+        api: UmbSortChildrenOfEntityAction,
         weight: 100,
         forEntityTypes: [],
         meta: {

package/dist-cms/packages/core/tree/folder/entity-create-option-action/manifests.js

@@ -1,3 +1,4 @@
+import { UmbFolderCreateOptionAction } from './folder-entity-create-option-action.js';
 export const manifests = [
     {
         type: 'kind',
@@ -7,7 +8,7 @@ export const manifests = [
         manifest: {
             type: 'entityCreateOptionAction',
             kind: 'folder',
-            api: () => import('./folder-entity-create-option-action.js'),
+            api: UmbFolderCreateOptionAction,
             weight: 1,
             forEntityTypes: [],
             meta: {

package/dist-cms/packages/core/tree/folder/modal/manifests.js

@@ -1,14 +1,16 @@
+import UmbFolderModalElement from './folder-update-modal.element.js';
+import UmbFolderCreateModalElement from './folder-create-modal.element.js';
 export const manifests = [
     {
         type: 'modal',
         alias: 'Umb.Modal.Folder.Update',
         name: 'Update Folder Modal',
-        element: () => import('./folder-update-modal.element.js'),
+        element: UmbFolderModalElement,
     },
     {
         type: 'modal',
         alias: 'Umb.Modal.Folder.Create',
         name: 'Create Folder Modal',
-        element: () => import('./folder-create-modal.element.js'),
+        element: UmbFolderCreateModalElement,
     },
 ];

package/dist-cms/packages/core/tree/tree-item/tree-item-context.interface.d.ts

@@ -1,5 +1,5 @@
 import type { UmbTreeItemModel } from '../types.js';
-import type { UmbPaginationManager } from '../../utils/pagination-manager/pagination.manager.js';
+import type { UmbPaginationManager } from '../../utils/index.js';
 import type { Observable } from '../../../../external/rxjs/index.js';
 import type { UmbApi } from '../../../../libs/extension-api/index.js';
 import type { UmbContextMinimal } from '../../../../libs/context-api/index.js';

package/dist-cms/packages/core/tree/tree-item/tree-item-default/manifests.js

@@ -1,3 +1,5 @@
+import UmbDefaultTreeItemContext from './tree-item-default.context.js';
+import UmbDefaultTreeItemElement from './tree-item-default.element.js';
 export const UMB_TREE_ITEM_DEFAULT_KIND_MANIFEST = {
     type: 'kind',
     alias: 'Umb.Kind.TreeItem.Default',
@@ -5,8 +7,8 @@ export const UMB_TREE_ITEM_DEFAULT_KIND_MANIFEST = {
     matchType: 'treeItem',
     manifest: {
         type: 'treeItem',
-        api: () => import('./tree-item-default.context.js'),
-        element: () => import('./tree-item-default.element.js'),
+        api: UmbDefaultTreeItemContext,
+        element: UmbDefaultTreeItemElement,
     },
 };
 export const manifests = [UMB_TREE_ITEM_DEFAULT_KIND_MANIFEST];

package/dist-cms/packages/core/tree/tree-menu-item/manifests.js

@@ -1,3 +1,4 @@
+import UmbMenuItemTreeDefaultElement from './tree-menu-item.element.js';
 export const manifests = [
     {
         type: 'kind',
@@ -6,7 +7,7 @@ export const manifests = [
         matchType: 'menuItem',
         manifest: {
             type: 'menuItem',
-            element: () => import('./tree-menu-item.element.js'),
+            element: UmbMenuItemTreeDefaultElement,
         },
     },
 ];

package/dist-cms/packages/core/tree/tree-picker-modal/manifests.js

@@ -1,8 +1,9 @@
+import UmbTreePickerModalElement from './tree-picker-modal.element.js';
 export const manifests = [
     {
         type: 'modal',
         alias: 'Umb.Modal.TreePicker',
         name: 'Tree Picker Modal',
-        element: () => import('./tree-picker-modal.element.js'),
+        element: UmbTreePickerModalElement,
     },
 ];

package/dist-cms/packages/core/validation/controllers/validation.controller.d.ts

@@ -1,7 +1,7 @@
 import type { UmbValidator } from '../interfaces/validator.interface.js';
 import type { UmbValidationMessageTranslator } from '../translators/index.js';
 import { UmbValidationMessagesManager } from '../context/validation-messages.manager.js';
-import type { UmbVariantId } from '../../variant/variant-id.class.js';
+import type { UmbVariantId } from '../../variant/index.js';
 import { type UmbClassInterface, UmbControllerBase } from '../../../../libs/class-api/index.js';
 import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
 /**

package/dist-cms/packages/core/value-summary/default/manifests.js

@@ -1,3 +1,5 @@
+import { UmbDefaultValueSummaryElement } from './default-value-summary.element.js';
+import { UmbValueSummaryDefaultApi } from './default-value-summary.api.js';
 export const manifests = [
     {
         type: 'kind',
@@ -7,8 +9,8 @@ export const manifests = [
         manifest: {
             type: 'valueSummary',
             kind: 'default',
-            element: () => import('./default-value-summary.js'),
-            api: () => import('./default-value-summary.js'),
+            element: UmbDefaultValueSummaryElement,
+            api: UmbValueSummaryDefaultApi,
         },
     },
 ];

package/dist-cms/packages/core/value-summary/value-types/boolean/manifests.js

@@ -1,5 +1,6 @@
 import { UMB_BOOLEAN_VALUE_SUMMARY_ALIAS } from './constants.js';
 import { UMB_BOOLEAN_VALUE_TYPE } from '../../../value-type/index.js';
+import { UmbBooleanValueSummaryElement } from './boolean-value-summary.element.js';
 export const manifests = [
     {
         type: 'valueSummary',
@@ -7,6 +8,6 @@ export const manifests = [
         alias: UMB_BOOLEAN_VALUE_SUMMARY_ALIAS,
         name: 'Boolean Value Summary',
         forValueType: UMB_BOOLEAN_VALUE_TYPE,
-        element: () => import('./boolean-value-summary.element.js'),
+        element: UmbBooleanValueSummaryElement,
     },
 ];

package/dist-cms/packages/core/value-summary/value-types/date-time/manifests.js

@@ -1,5 +1,6 @@
 import { UMB_DATE_TIME_VALUE_SUMMARY_ALIAS } from './constants.js';
 import { UMB_DATE_TIME_VALUE_TYPE } from '../../../value-type/index.js';
+import { UmbDateTimeValueSummaryElement } from './date-time-value-summary.element.js';
 export const manifests = [
     {
         type: 'valueSummary',
@@ -7,6 +8,6 @@ export const manifests = [
         alias: UMB_DATE_TIME_VALUE_SUMMARY_ALIAS,
         name: 'Date Time Value Summary',
         forValueType: UMB_DATE_TIME_VALUE_TYPE,
-        element: () => import('./date-time-value-summary.element.js'),
+        element: UmbDateTimeValueSummaryElement,
     },
 ];

package/dist-cms/packages/core/view/context/view.controller.d.ts

@@ -1,4 +1,4 @@
-import { UmbShortcutController } from '../../shortcut/context/shortcut.controller.js';
+import { UmbShortcutController } from '../../shortcut/index.js';
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';
 import { UmbHintController } from '../../hint/index.js';
 import type { UmbClassInterface } from '../../../../libs/class-api/index.js';

package/dist-cms/packages/core/view/context/view.controller.js

@@ -1,5 +1,5 @@
 var _a;
-import { UmbShortcutController } from '../../shortcut/context/shortcut.controller.js';
+import { UmbShortcutController } from '../../shortcut/index.js';
 import { UMB_VIEW_CONTEXT } from './view.context-token.js';
 import { UmbClassState, UmbStringState, mergeObservables } from '../../../../libs/observable-api/index.js';
 import { UmbControllerBase } from '../../../../libs/class-api/index.js';

package/dist-cms/packages/core/workspace/components/workspace-action/common/save/save.action.js

@@ -3,6 +3,9 @@ import { UmbWorkspaceActionBase } from '../../workspace-action-base.controller.j
 export class UmbSaveWorkspaceAction extends UmbWorkspaceActionBase {
     constructor(host, args) {
         super(host, args);
+        // Opt in to isExecuting feedback so the workspace-action element waits
+        // for the save modal (when present) before showing the spinner.
+        this.setExecuting(false);
         this._retrieveWorkspaceContext = this.consumeContext(args.workspaceContextToken ?? UMB_SAVEABLE_WORKSPACE_CONTEXT, (context) => {
             this._workspaceContext = context;
             this.#observeUnique();
@@ -27,7 +30,14 @@ export class UmbSaveWorkspaceAction extends UmbWorkspaceActionBase {
         // Override in subclass
     }
     async execute() {
-        await this._retrieveWorkspaceContext;
-        await this._workspaceContext?.requestSave();
+        try {
+            await this._retrieveWorkspaceContext;
+            await this._workspaceContext?.requestSave({
+                onActionStarting: () => this.setExecuting(true),
+            });
+        }
+        finally {
+            this.setExecuting(false);
+        }
     }
 }

package/dist-cms/packages/core/workspace/components/workspace-action/default/manifests.js

@@ -1,3 +1,4 @@
+import UmbWorkspaceActionElement from './workspace-action.element.js';
 export const manifest = {
     type: 'kind',
     alias: 'Umb.Kind.WorkspaceAction.Default',
@@ -7,7 +8,7 @@ export const manifest = {
         type: 'workspaceAction',
         kind: 'default',
         weight: 1000,
-        element: () => import('./workspace-action.element.js'),
+        element: UmbWorkspaceActionElement,
         meta: {
             label: '(Missing label in manifest)',
         },

package/dist-cms/packages/core/workspace/components/workspace-action/default/workspace-action.element.js

@@ -16,6 +16,11 @@ let UmbWorkspaceActionElement = class UmbWorkspaceActionElement extends UmbLitEl
         this._isDisabled = false;
         this._items = [];
         this.#buttonStateResetTimeoutId = null;
+        // When the api exposes an `isExecuting` observable we wait for it to flip
+        // true before showing the waiting state, so the spinner only appears once
+        // real work begins (after any preceding modal/dialog). When absent we fall
+        // back to setting waiting eagerly on click for backwards compatibility.
+        this.#executionStarted = false;
     }
     #manifest;
     #api;
@@ -47,6 +52,11 @@ let UmbWorkspaceActionElement = class UmbWorkspaceActionElement extends UmbLitEl
         return this.#api;
     }
     #buttonStateResetTimeoutId;
+    // When the api exposes an `isExecuting` observable we wait for it to flip
+    // true before showing the waiting state, so the spinner only appears once
+    // real work begins (after any preceding modal/dialog). When absent we fall
+    // back to setting waiting eagerly on click for backwards compatibility.
+    #executionStarted;
     /**
      * Create a list of original and overwritten aliases of workspace actions for the action.
      */
@@ -73,28 +83,57 @@ let UmbWorkspaceActionElement = class UmbWorkspaceActionElement extends UmbLitEl
         if (this._href) {
             event.stopPropagation();
         }
-        // If its a link or has additional options, then we do not want to display state on the button. [NL]
-        if (!this._href) {
-            if (!this._additionalOptions) {
+        else {
+            // _actionApi is typed as the narrower UmbAction; widen to UmbWorkspaceAction
+            // here so we can probe the optional isExecuting observable.
+            const api = (this._actionApi ?? this.#api);
+            await this.#runApiAction(api);
+        }
+        this.dispatchEvent(new UmbActionExecutedEvent());
+    }
+    async #runApiAction(api) {
+        this.#executionStarted = false;
+        // Observe isExecuting on the api we're about to invoke - which may be
+        // _actionApi (set dynamically by subclasses like save-and-preview) or #api.
+        // The shared alias replaces any previous observation so re-clicks track
+        // the right api each time.
+        this.observe(api?.isExecuting, (isExecuting) => {
+            if (isExecuting) {
                 this._buttonState = 'waiting';
+                this.#executionStarted = true;
             }
-            try {
-                const api = this._actionApi ?? this.#api;
-                if (!api)
-                    throw new Error('No api defined');
-                await api.execute();
+        }, 'isExecutingObserver');
+        // If the api doesn't opt in to isExecuting feedback, fall back to
+        // showing the waiting state immediately (legacy behaviour).
+        if (!api?.isExecuting) {
+            this._buttonState = 'waiting';
+            this.#executionStarted = true;
+        }
+        try {
+            if (!api)
+                throw new Error('No api defined');
+            await api.execute();
+            // Only show success if real work actually started. A modal-aware
+            // action that the user cancelled will resolve without ever signalling
+            // execution - in that case we leave the button idle.
+            if (this.#executionStarted) {
                 this._buttonState = 'success';
                 this.#initButtonStateReset();
             }
-            catch (reason) {
-                if (reason) {
-                    console.warn(reason);
-                }
+        }
+        catch (reason) {
+            if (reason) {
+                console.warn(reason);
+            }
+            // Only communicate failures once real work has started. Pre-flight
+            // rejections (e.g. user cancelling a variant-picker modal) leave the
+            // button idle - matching the silent-cancel path of actions that simply
+            // return without rejecting.
+            if (this.#executionStarted) {
                 this._buttonState = 'failed';
                 this.#initButtonStateReset();
             }
         }
-        this.dispatchEvent(new UmbActionExecutedEvent());
     }
     #observeIsDisabled() {
         this.observe(this.#api?.isDisabled, (isDisabled) => {
@@ -102,8 +141,6 @@ let UmbWorkspaceActionElement = class UmbWorkspaceActionElement extends UmbLitEl
         }, 'isDisabledObserver');
     }
     #initButtonStateReset() {
-        /* When the button has additional options, we do not show the waiting state.
-    Therefore, we need to ensure the button state is reset, so we are able to show the success state again. */
         this.#clearButtonStateResetTimeout();
         this.#buttonStateResetTimeoutId = window.setTimeout(() => {
             this._buttonState = undefined;

package/dist-cms/packages/core/workspace/components/workspace-action/workspace-action-base.controller.d.ts

@@ -2,6 +2,7 @@ import type { UmbWorkspaceActionArgs } from './types.js';
 import type { UmbWorkspaceAction } from './workspace-action.interface.js';
 import { UmbBooleanState } from '../../../../../libs/observable-api/index.js';
 import { UmbActionBase } from '../../../action/index.js';
+import type { Observable } from '../../../../../external/rxjs/index.js';
 /**
  * Base class for an workspace action.
  * @abstract
@@ -12,7 +13,9 @@ import { UmbActionBase } from '../../../action/index.js';
  */
 export declare abstract class UmbWorkspaceActionBase<ArgsMetaType = never> extends UmbActionBase<UmbWorkspaceActionArgs<ArgsMetaType>> implements UmbWorkspaceAction<ArgsMetaType> {
     protected _isDisabled: UmbBooleanState<false>;
-    isDisabled: import("rxjs").Observable<boolean>;
+    isDisabled: Observable<boolean>;
+    protected _isExecuting?: UmbBooleanState<boolean>;
+    isExecuting?: Observable<boolean>;
     /**
      * By specifying the href, the action will act as a link.
      * The `execute` method will not be called.
@@ -36,4 +39,21 @@ export declare abstract class UmbWorkspaceActionBase<ArgsMetaType = never> exten
      * @memberof UmbWorkspaceActionBase
      */
     enable(): void;
+    /**
+     * Signals whether `execute()` is currently performing real work. Subclasses
+     * that opt in to modal-aware execution feedback should:
+     *
+     * 1. Call `this.setExecuting(false)` in their constructor so `isExecuting`
+     *    is exposed before the workspace-action element observes it.
+     * 2. Call `this.setExecuting(true)` once any preceding modal has been
+     *    confirmed and real work is about to begin.
+     * 3. Wrap the work in `try/finally` and call `this.setExecuting(false)` on
+     *    completion so the observable honours its contract.
+     *
+     * Subclasses that never call this method keep `isExecuting` undefined,
+     * which signals consumers to fall back to legacy eager-feedback behaviour.
+     * @param {boolean} value - `true` while real work is in flight; `false` otherwise.
+     * @memberof UmbWorkspaceActionBase
+     */
+    protected setExecuting(value: boolean): void;
 }

package/dist-cms/packages/core/workspace/components/workspace-action/workspace-action-base.controller.js

@@ -45,4 +45,27 @@ export class UmbWorkspaceActionBase extends UmbActionBase {
     enable() {
         this._isDisabled.setValue(false);
     }
+    /**
+     * Signals whether `execute()` is currently performing real work. Subclasses
+     * that opt in to modal-aware execution feedback should:
+     *
+     * 1. Call `this.setExecuting(false)` in their constructor so `isExecuting`
+     *    is exposed before the workspace-action element observes it.
+     * 2. Call `this.setExecuting(true)` once any preceding modal has been
+     *    confirmed and real work is about to begin.
+     * 3. Wrap the work in `try/finally` and call `this.setExecuting(false)` on
+     *    completion so the observable honours its contract.
+     *
+     * Subclasses that never call this method keep `isExecuting` undefined,
+     * which signals consumers to fall back to legacy eager-feedback behaviour.
+     * @param {boolean} value - `true` while real work is in flight; `false` otherwise.
+     * @memberof UmbWorkspaceActionBase
+     */
+    setExecuting(value) {
+        if (!this._isExecuting) {
+            this._isExecuting = new UmbBooleanState(false);
+            this.isExecuting = this._isExecuting.asObservable();
+        }
+        this._isExecuting.setValue(value);
+    }
 }

package/dist-cms/packages/core/workspace/components/workspace-action/workspace-action.interface.d.ts

@@ -3,6 +3,18 @@ import type { Observable } from '../../../../../external/rxjs/index.js';
 import type { UmbAction } from '../../../action/index.js';
 export interface UmbWorkspaceAction<ArgsMetaType = never> extends UmbAction<UmbWorkspaceActionArgs<ArgsMetaType>> {
     isDisabled: Observable<boolean>;
+    /**
+     * Emits `true` while `execute()` is performing real work (e.g. after a
+     * preceding modal/dialog has been confirmed) and `false` otherwise.
+     *
+     * Consumers (such as the workspace action element) use this to show
+     * in-flight UI - e.g. a button spinner - only while work is actually
+     * happening, not while a user is interacting with a modal.
+     *
+     * Optional; when not exposed, consumers fall back to assuming work
+     * begins immediately on `execute()`.
+     */
+    isExecuting?: Observable<boolean>;
     /**
      * The href location, the action will act as a link.
      * @returns {Promise<string | undefined>}

package/dist-cms/packages/core/workspace/components/workspace-action-menu-item/default/default.action.kind.js

@@ -1,3 +1,4 @@
+import UmbWorkspaceActionMenuItemElement from './workspace-action-menu-item.element.js';
 export const manifest = {
     type: 'kind',
     alias: 'Umb.Kind.WorkspaceActionMenuItem.Default',
@@ -7,7 +8,7 @@ export const manifest = {
         type: 'workspaceActionMenuItem',
         kind: 'default',
         weight: 1000,
-        element: () => import('./workspace-action-menu-item.element.js'),
+        element: UmbWorkspaceActionMenuItemElement,
         meta: {
             icon: '',
             label: '(Missing label in manifest)',

package/dist-cms/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.element.js

@@ -67,6 +67,8 @@ let UmbWorkspaceBreadcrumbElement = class UmbWorkspaceBreadcrumbElement extends
         UmbTextStyles,
         css `
 			:host {
+				overflow: hidden;
+				min-width: 0;
 				margin-left: var(--uui-size-layout-1);
 			}
 		`,

package/dist-cms/packages/core/workspace/components/workspace-breadcrumb/workspace-menu-breadcrumb/workspace-menu-breadcrumb.kind.js

@@ -1,3 +1,4 @@
+import UmbWorkspaceBreadcrumbElement from './workspace-menu-breadcrumb.element.js';
 export const manifest = {
     type: 'kind',
     alias: 'Umb.Kind.WorkspaceFooterApp.MenuBreadcrumb',
@@ -6,7 +7,7 @@ export const manifest = {
     manifest: {
         type: 'workspaceFooterApp',
         kind: 'menuBreadcrumb',
-        element: () => import('./workspace-menu-breadcrumb.element.js'),
+        element: UmbWorkspaceBreadcrumbElement,
         weight: 1000,
     },
 };

package/dist-cms/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.element.js

@@ -118,10 +118,8 @@ let UmbWorkspaceVariantMenuBreadcrumbElement = class UmbWorkspaceVariantMenuBrea
         UmbTextStyles,
         css `
 			:host {
-				/* TODO: This is a temp solution to handle an issue where long nested breadcrumbs would hide workspace actions */
 				overflow: hidden;
-				display: flex;
-				flex-direction: row-reverse;
+				min-width: 0;
 				margin-left: var(--uui-size-layout-1);
 			}
 		`,

package/dist-cms/packages/core/workspace/components/workspace-breadcrumb/workspace-variant-menu-breadcrumb/workspace-variant-menu-breadcrumb.kind.js

@@ -1,3 +1,4 @@
+import UmbWorkspaceVariantMenuBreadcrumbElement from './workspace-variant-menu-breadcrumb.element.js';
 export const manifest = {
     type: 'kind',
     alias: 'Umb.Kind.WorkspaceFooterApp.VariantMenuBreadcrumb',
@@ -6,7 +7,7 @@ export const manifest = {
     manifest: {
         type: 'workspaceFooterApp',
         kind: 'variantMenuBreadcrumb',
-        element: () => import('./workspace-variant-menu-breadcrumb.element.js'),
+        element: UmbWorkspaceVariantMenuBreadcrumbElement,
         weight: 1000,
     },
 };

package/dist-cms/packages/core/workspace/conditions/workspace-is-loaded/manifests.js

@@ -1,7 +1,8 @@
 import { UMB_CONTENT_WORKSPACE_IS_LOADED_CONDITION_ALIAS } from './constants.js';
+import { UmbContentWorkspaceIsLoadedCondition } from './workspace-is-loaded.condition.js';
 export const manifest = {
     type: 'condition',
     name: 'Content Workspace Is Loaded Condition',
     alias: UMB_CONTENT_WORKSPACE_IS_LOADED_CONDITION_ALIAS,
-    api: () => import('./workspace-is-loaded.condition.js'),
+    api: UmbContentWorkspaceIsLoadedCondition,
 };

package/dist-cms/packages/core/workspace/contexts/tokens/index.d.ts

@@ -1,4 +1,5 @@
 export * from './entity-workspace.context-token.js';
+export * from './notify-workspace-action-starting.function.js';
 export * from './publishable-workspace.context-token.js';
 export * from './routable-workspace.context-token.js';
 export * from './submittable-tree-entity-workspace.context-token.js';
@@ -14,3 +15,4 @@ export type * from './submittable-tree-entity-workspace-context.interface.js';
 export type * from './submittable-workspace-context.interface.js';
 export type * from './saveable-workspace-context.interface.js';
 export type * from './variant-dataset-workspace-context.interface.js';
+export type * from './workspace-action-execution-options.interface.js';

package/dist-cms/packages/core/workspace/contexts/tokens/index.js

@@ -1,4 +1,5 @@
 export * from './entity-workspace.context-token.js';
+export * from './notify-workspace-action-starting.function.js';
 export * from './publishable-workspace.context-token.js';
 export * from './routable-workspace.context-token.js';
 export * from './submittable-tree-entity-workspace.context-token.js';