@umbraco-cms/backoffice 18.2.1 → 18.3.0-rc

package/dist-cms/packages/core/validation/utils/first-json-path-bracket.function.js

@@ -0,0 +1,20 @@
+/**
+ * Extracts the contents of the first pair of square brackets in a JSON-Path string — the query of the
+ * outermost/first array-item scope, ignoring anything nested deeper in the path.
+ * @param {string} path - The JSON-Path string.
+ * @returns {string | undefined} The bracket contents, or undefined if the path has no brackets.
+ * @example
+ * ```ts
+ * umbGetFirstJsonPathBracket("$.values[?(@.alias == 'x')].value.contentData[?(@.key == 'y')]");
+ * // => "?(@.alias == 'x')"
+ * ```
+ */
+export function umbGetFirstJsonPathBracket(path) {
+    const start = path.indexOf('[');
+    if (start === -1)
+        return undefined;
+    const end = path.indexOf(']', start + 1);
+    if (end === -1)
+        return undefined;
+    return path.substring(start + 1, end);
+}

package/dist-cms/packages/core/validation/utils/index.d.ts

@@ -1,6 +1,8 @@
 export * from './data-path-property-value-query.function.js';
 export * from './data-path-variant-query.function.js';
+export * from './extract-first-json-query-containing.function.js';
 export * from './extract-json-query-properties.function.js';
+export * from './first-json-path-bracket.function.js';
 export * from './json-path.function.js';
 export * from './scope-mapper-json-paths.function.js';
 export * from './query-mapper-json-paths.function.js';

package/dist-cms/packages/core/validation/utils/index.js

@@ -1,6 +1,8 @@
 export * from './data-path-property-value-query.function.js';
 export * from './data-path-variant-query.function.js';
+export * from './extract-first-json-query-containing.function.js';
 export * from './extract-json-query-properties.function.js';
+export * from './first-json-path-bracket.function.js';
 export * from './json-path.function.js';
 export * from './scope-mapper-json-paths.function.js';
 export * from './query-mapper-json-paths.function.js';

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

@@ -50,7 +50,9 @@ let UmbWorkspaceActionMenuElement = class UmbWorkspaceActionMenuElement extends
 				@click=${this._onPopoverClickCapture}>
 				<umb-popover-layout id="workspace-action-popover-layout">
 					<uui-scroll-container>
-						${repeat(this.items, (ext) => ext.alias, (ext) => ext.component)}
+						${repeat(this.items, (ext) => ext.alias, (ext, i) => html `${i > 0 && ext.manifest?.separatorBefore
+            ? html `<umb-separator></umb-separator>`
+            : nothing}${ext.component}`)}
 					</uui-scroll-container>
 				</umb-popover-layout>
 			</uui-popover-container>

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

@@ -8,7 +8,7 @@ export declare class UmbWorkspaceVariantMenuBreadcrumbElement extends UmbLitElem
     private _appCurrentCulture?;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
-    static styles: import("lit").CSSResult[];
+    static readonly styles: import("lit").CSSResult[];
 }
 export default UmbWorkspaceVariantMenuBreadcrumbElement;
 declare global {

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

@@ -5,6 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UMB_VARIANT_WORKSPACE_CONTEXT } from '../../../contexts/index.js';
+import { UMB_ENTITY_NAMED_DETAIL_WORKSPACE_CONTEXT } from '../../../entity-detail/index.js';
 import { css, customElement, html, ifDefined, state } from '../../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../lit-element/index.js';
 import { UmbTextStyles } from '../../../../style/index.js';
@@ -14,9 +15,12 @@ import { UMB_MENU_VARIANT_STRUCTURE_WORKSPACE_CONTEXT } from '../../../../menu/i
 const observeDefaultLanguageSymbol = Symbol();
 const observeCurrentLanguageSymbol = Symbol();
 const observeWorkspaceActiveVariantSymbol = Symbol();
+// Shared by the variant and named-detail name observers below - registering a second controller under the same
+// alias destroys the first, so this only works because a context can never satisfy both of their discriminators.
 const observeWorkspaceNameSymbol = Symbol();
 let UmbWorkspaceVariantMenuBreadcrumbElement = class UmbWorkspaceVariantMenuBreadcrumbElement extends UmbLitElement {
-    #workspaceContext;
+    #variantWorkspaceContext;
+    #namedDetailWorkspaceContext;
     #appLanguageContext;
     #menuStructureContext;
     constructor() {
@@ -35,10 +39,19 @@ let UmbWorkspaceVariantMenuBreadcrumbElement = class UmbWorkspaceVariantMenuBrea
         this.consumeContext(UMB_VARIANT_WORKSPACE_CONTEXT, (instance) => {
             if (!instance)
                 return;
-            this.#workspaceContext = instance;
+            this.#variantWorkspaceContext = instance;
             this.#observeWorkspaceActiveVariant();
             this.#observeStructure();
         });
+        // Fallback name source for workspaces with no variance (e.g. folders), which have no variant context to
+        // supply the breadcrumb's last segment from.
+        this.consumeContext(UMB_ENTITY_NAMED_DETAIL_WORKSPACE_CONTEXT, (instance) => {
+            if (!instance)
+                return;
+            this.#namedDetailWorkspaceContext = instance;
+            this.observe(instance.name, (value) => (this._name = value || ''), observeWorkspaceNameSymbol);
+            this.#observeStructure();
+        });
         this.consumeContext(UMB_MENU_VARIANT_STRUCTURE_WORKSPACE_CONTEXT, (instance) => {
             if (!instance)
                 return;
@@ -47,18 +60,18 @@ let UmbWorkspaceVariantMenuBreadcrumbElement = class UmbWorkspaceVariantMenuBrea
         });
     }
     #observeStructure() {
-        if (!this.#menuStructureContext || !this.#workspaceContext)
+        if (!this.#menuStructureContext)
+            return;
+        if (!this.#variantWorkspaceContext && !this.#namedDetailWorkspaceContext)
             return;
         this.observe(this.#menuStructureContext.structure, (value) => {
-            if (!this.#workspaceContext)
-                return;
-            const unique = this.#workspaceContext.getUnique();
+            const unique = this.#variantWorkspaceContext?.getUnique() ?? this.#namedDetailWorkspaceContext?.getUnique();
             // exclude the current unique from the structure. We append this with an observer of the name
             this._structure = value.filter((structureItem) => structureItem.unique !== unique);
         });
     }
     #observeWorkspaceActiveVariant() {
-        this.observe(this.#workspaceContext?.splitView.firstActiveVariantInfo, (variantInfo) => {
+        this.observe(this.#variantWorkspaceContext?.splitView.firstActiveVariantInfo, (variantInfo) => {
             if (!variantInfo)
                 return;
             this._workspaceActiveVariantId = UmbVariantId.Create(variantInfo);
@@ -66,10 +79,14 @@ let UmbWorkspaceVariantMenuBreadcrumbElement = class UmbWorkspaceVariantMenuBrea
         }, observeWorkspaceActiveVariantSymbol);
     }
     #observeActiveVariantName() {
-        this.observe(this.#workspaceContext?.name(this._workspaceActiveVariantId), (value) => (this._name = value || ''), observeWorkspaceNameSymbol);
+        this.observe(this.#variantWorkspaceContext?.name(this._workspaceActiveVariantId), (value) => (this._name = value || ''), observeWorkspaceNameSymbol);
     }
     // TODO: we should move the fallback name logic to a helper class. It will be used in multiple places
     #getItemVariantName(structureItem) {
+        // Folders aren't variant content, so they have no variants to match against - use their flat name directly.
+        if (structureItem.isFolder && structureItem.name) {
+            return structureItem.name;
+        }
         // If the active workspace is a variant, we will try to find the matching variant name.
         if (!this._workspaceActiveVariantId?.isInvariant()) {
             const variant = structureItem.variants.find((variantId) => this._workspaceActiveVariantId?.compare(variantId));

package/dist-cms/packages/core/workspace/components/workspace-editor/index.d.ts

@@ -1,4 +1,5 @@
-export * from './workspace-editor.element.js';
 export * from './workspace-editor.context-token.js';
 export * from './workspace-editor.context.js';
+export * from './workspace-editor.element.js';
 export * from './workspace-view.context-token.js';
+export type * from './workspace-view.controller.js';

package/dist-cms/packages/core/workspace/components/workspace-editor/index.js

@@ -1,4 +1,4 @@
-export * from './workspace-editor.element.js';
 export * from './workspace-editor.context-token.js';
 export * from './workspace-editor.context.js';
+export * from './workspace-editor.element.js';
 export * from './workspace-view.context-token.js';

package/dist-cms/packages/core/workspace/components/workspace-editor/workspace-editor.context.d.ts

@@ -1,14 +1,14 @@
 import type { ManifestWorkspaceView } from '../../types.js';
-import { UmbWorkspaceViewContext } from './workspace-view.context.js';
+import { UmbWorkspaceViewController } from './workspace-view.controller.js';
 import { UmbContextBase } from '../../../../../libs/class-api/index.js';
 import type { UmbControllerHost } from '../../../../../libs/controller-api/index.js';
 import type { UmbDeepPartialObject } from '../../../utils/index.js';
 import type { UmbVariantId } from '../../../variant/index.js';
 export declare class UmbWorkspaceEditorContext extends UmbContextBase {
     #private;
-    readonly views: import("rxjs").Observable<UmbWorkspaceViewContext[]>;
+    readonly views: import("rxjs").Observable<UmbWorkspaceViewController[]>;
     constructor(host: UmbControllerHost);
     setVariantId(variantId: UmbVariantId | undefined): void;
     setOverrides(overrides?: Array<UmbDeepPartialObject<ManifestWorkspaceView>>): void;
-    getViewContext(alias: string): Promise<UmbWorkspaceViewContext | undefined>;
+    getViewContext(alias: string): Promise<UmbWorkspaceViewController | undefined>;
 }

package/dist-cms/packages/core/workspace/components/workspace-editor/workspace-editor.context.js

@@ -1,5 +1,5 @@
-import { UmbWorkspaceViewContext } from './workspace-view.context.js';
 import { UMB_WORKSPACE_EDITOR_CONTEXT } from './workspace-editor.context-token.js';
+import { UmbWorkspaceViewController } from './workspace-view.controller.js';
 import { UmbBasicState, mergeObservables } from '../../../../../libs/observable-api/index.js';
 import { UmbContextBase } from '../../../../../libs/class-api/index.js';
 import { UmbExtensionsManifestInitializer } from '../../../../../libs/extension-api/index.js';
@@ -39,7 +39,7 @@ export class UmbWorkspaceEditorContext extends UmbContextBase {
                 manifests
                     .filter((manifest) => !contextsToKeep.some((x) => x.manifest.alias === manifest.alias))
                     .forEach((manifest) => {
-                    const context = new UmbWorkspaceViewContext(this, manifest);
+                    const context = new UmbWorkspaceViewController(this, manifest);
                     context.setVariantId(this.#variantId);
                     context.setTitle(manifest.meta.label);
                     context.inherit();
@@ -84,7 +84,7 @@ export class UmbWorkspaceEditorContext extends UmbContextBase {
     setVariantId(variantId) {
         this.#variantId = variantId;
         this.#contexts.forEach((view) => {
-            view.hints.updateScaffold({ variantId });
+            view.setVariantId(variantId);
         });
     }
     setOverrides(overrides) {

package/dist-cms/packages/core/workspace/components/workspace-editor/workspace-editor.element.d.ts

@@ -1,7 +1,7 @@
 import type { ManifestWorkspaceView } from '../../types.js';
 import { type PropertyValues } from '../../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../lit-element/index.js';
-import type { UmbDeepPartialObject } from '../../../utils/index.js';
+import { type UmbDeepPartialObject } from '../../../utils/index.js';
 import type { UmbVariantId } from '../../../variant/index.js';
 /**
  * @element umb-workspace-editor
@@ -27,6 +27,7 @@ export declare class UmbWorkspaceEditorElement extends UmbLitElement {
     private _variantId?;
     set overrides(value: Array<UmbDeepPartialObject<ManifestWorkspaceView>> | undefined);
     get overrides(): Array<UmbDeepPartialObject<ManifestWorkspaceView>> | undefined;
+    private _hasSlottedContent?;
     private _workspaceViews;
     private _hintMap;
     private _routes?;

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

@@ -10,6 +10,7 @@ import { css, customElement, html, nothing, property, repeat, state, when, } fro
 import { createExtensionElement } from '../../../../../libs/extension-api/index.js';
 import { UmbLitElement } from '../../../lit-element/index.js';
 import { UmbTextStyles } from '../../../style/index.js';
+import { UmbDeprecation } from '../../../utils/index.js';
 /**
  * @element umb-workspace-editor
  * @description
@@ -115,7 +116,7 @@ let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends UmbLitEl
     }
     render() {
         // Notice if no routes then fallback to use a slot.
-        // TODO: Deprecate the slot feature, to rely purely on routes, cause currently bringing an additional route would mean the slotted content would never be shown. [NL]
+        // TODO: Remove the default slot in v.21, to rely purely on workspaceViews extensions, cause currently bringing an additional route would mean the slotted content would never be shown. [NL]
         return html `
 			<umb-body-layout main-no-padding .headline=${this.headline} ?loading=${this.loading}>
 				${when(!this.notFound, () => html `
@@ -125,7 +126,17 @@ let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends UmbLitEl
 						${this.#renderViews()}
 					`)}
 				${this.#renderRoutes()}
-				<slot></slot>
+				<slot
+					@slotchange=${(event) => {
+            this._hasSlottedContent = event.target.assignedElements({ flatten: true }).length > 0;
+            if (this._hasSlottedContent) {
+                new UmbDeprecation({
+                    deprecated: 'Using slotted content in umb-workspace-editor is deprecated, use routes instead.',
+                    solution: 'Add a workspace view for your content.',
+                    removeInVersion: '21.0.0',
+                }).warn();
+            }
+        }}></slot>
 				${when(!this.enforceNoFooter, () => html `
 						<umb-workspace-footer slot="footer" data-mark="workspace:footer">
 							<slot name="footer-info"></slot>
@@ -184,7 +195,8 @@ let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends UmbLitEl
 		`;
     }
     #renderRoutes() {
-        if (!this._routes || this._routes.length === 0 || !this._workspaceViews || this._workspaceViews.length === 0) {
+        // Only render the router-slot if there is no slotted content, or if workspace views are registered.
+        if (this._hasSlottedContent && this._workspaceViews.length === 0) {
             return nothing;
         }
         return html `
@@ -197,7 +209,9 @@ let UmbWorkspaceEditorElement = class UmbWorkspaceEditorElement extends UmbLitEl
         }}
 				@change=${(event) => {
             this._activePath = event.target.localActiveViewPath;
-        }}></umb-router-slot>
+        }}
+				>${!this._hasSlottedContent ? html `<umb-view-loader></umb-view-loader>` : nothing}</umb-router-slot
+			>
 		`;
     }
     static { this.styles = [
@@ -264,6 +278,9 @@ __decorate([
 __decorate([
     property({ attribute: false })
 ], UmbWorkspaceEditorElement.prototype, "overrides", null);
+__decorate([
+    state()
+], UmbWorkspaceEditorElement.prototype, "_hasSlottedContent", void 0);
 __decorate([
     state()
 ], UmbWorkspaceEditorElement.prototype, "_workspaceViews", void 0);

package/dist-cms/packages/core/workspace/components/workspace-editor/workspace-view.context.d.ts

@@ -1,8 +1,6 @@
 import type { ManifestWorkspaceView } from '../../types.js';
-import { UmbViewContext } from '../../../view/index.js';
+import { UmbWorkspaceViewController } from './workspace-view.controller.js';
 import type { UmbClassInterface } from '../../../../../libs/class-api/index.js';
-export declare class UmbWorkspaceViewContext extends UmbViewContext {
-    readonly IS_WORKSPACE_VIEW_CONTEXT: true;
-    manifest: ManifestWorkspaceView;
+export declare class UmbWorkspaceViewContext extends UmbWorkspaceViewController {
     constructor(host: UmbClassInterface, manifest: ManifestWorkspaceView);
 }

package/dist-cms/packages/core/workspace/components/workspace-editor/workspace-view.context.js

@@ -1,8 +1,7 @@
-import { UmbViewContext } from '../../../view/index.js';
-export class UmbWorkspaceViewContext extends UmbViewContext {
+import { UmbWorkspaceViewController } from './workspace-view.controller.js';
+export class UmbWorkspaceViewContext extends UmbWorkspaceViewController {
     constructor(host, manifest) {
-        super(host, manifest.alias);
-        this.IS_WORKSPACE_VIEW_CONTEXT = true;
-        this.manifest = manifest;
+        super(host, manifest);
+        this.provideAt(host);
     }
 }

package/dist-cms/packages/core/workspace/components/workspace-editor/workspace-view.controller.d.ts

@@ -0,0 +1,8 @@
+import type { ManifestWorkspaceView } from '../../types.js';
+import { UmbViewController } from '../../../view/index.js';
+import type { UmbClassInterface } from '../../../../../libs/class-api/index.js';
+export declare class UmbWorkspaceViewController extends UmbViewController {
+    readonly IS_WORKSPACE_VIEW_CONTEXT: true;
+    manifest: ManifestWorkspaceView;
+    constructor(host: UmbClassInterface, manifest: ManifestWorkspaceView);
+}

package/dist-cms/packages/core/workspace/components/workspace-editor/workspace-view.controller.js

@@ -0,0 +1,8 @@
+import { UmbViewController } from '../../../view/index.js';
+export class UmbWorkspaceViewController extends UmbViewController {
+    constructor(host, manifest) {
+        super(host, manifest.alias);
+        this.IS_WORKSPACE_VIEW_CONTEXT = true;
+        this.manifest = manifest;
+    }
+}

package/dist-cms/packages/core/workspace/components/workspace-split-view/workspace-split-view-variant-selector.element.js

@@ -132,9 +132,11 @@ let UmbWorkspaceSplitViewVariantSelectorElement = class UmbWorkspaceSplitViewVar
         }
     }
     #switchVariant(variant) {
+        this._popoverElement?.hidePopover();
         this.#splitViewContext?.switchVariant(UmbVariantId.Create(variant));
     }
     #openSplitView(variant) {
+        this._popoverElement?.hidePopover();
         this.#splitViewContext?.openSplitView(UmbVariantId.Create(variant));
     }
     #closeSplitView() {

package/dist-cms/packages/core/workspace/components/workspace-split-view/workspace-split-view.context.js

@@ -62,10 +62,10 @@ export class UmbWorkspaceSplitViewContext extends UmbContextBase {
             // TODO: move this logic to a method that creates an observable part in the workspace context, so that the split view context can just consume it. [NL]
             // TODO: eventually consider a getSplitViewVariantOptionByIndex(index) method in the workspace context, that returns an observable part of the variant option for the given index, to enable merging the two observations. [NL]
             this.observe(this.#workspaceContext && variantId
-                ? createObservablePart(this.#workspaceContext.variantOptions, (variants) => variants.find((v) => v.unique === variantId.toString()))
-                : undefined, (variantOption) => {
-                this.#notFound.setValue(variantOption === undefined);
-                if (!variantOption || !variantId || !this.#workspaceContext)
+                ? createObservablePart(this.#workspaceContext.variantOptions, (variants) => variants.some((v) => v.unique === variantId.toString()))
+                : undefined, (variantExists) => {
+                this.#notFound.setValue(variantExists === false);
+                if (!variantExists || !variantId || !this.#workspaceContext)
                     return;
                 // Finish setting up the split view context by providing the validation context and creating the dataset context for the active variant.
                 const validationContext = this.#workspaceContext?.getVariantValidationContext(variantId);

package/dist-cms/packages/core/workspace/controllers/delete-entity-workspace-redirect.controller.d.ts

@@ -0,0 +1,30 @@
+import { UmbControllerBase } from '../../../../libs/class-api/index.js';
+import type { UmbControllerHost } from '../../../../libs/controller-api/index.js';
+import type { UmbEntityUnique } from '../../entity/index.js';
+import type { Observable } from '../../../../external/rxjs/index.js';
+export declare const UmbDeleteEntityWorkspaceRedirectControllerAlias: unique symbol;
+/**
+ * The minimal shape this controller needs from a workspace context — intentionally not a public interface, since
+ * it exists only to keep this controller's own dependency narrow, not as a contract for others to implement
+ * against.
+ */
+type UmbDeleteEntityWorkspaceRedirectControllerWorkspaceContext = {
+    getUnique(): UmbEntityUnique | undefined;
+    getEntityType(): string;
+    readonly navigationParentItemPath: Observable<string | undefined>;
+    readonly modalContext?: unknown;
+};
+/**
+ * Redirects the workspace to its parent once the open entity has been permanently deleted, reading where to go
+ * from the workspace context's own `navigationParentItemPath` — the one place that logic lives.
+ */
+export declare class UmbDeleteEntityWorkspaceRedirectController extends UmbControllerBase {
+    #private;
+    /**
+     * @param {UmbControllerHost} host - The controller host for this controller to be appended to
+     * @param {UmbDeleteEntityWorkspaceRedirectControllerWorkspaceContext} workspaceContext - The workspace context whose entity, once deleted, should trigger the redirect.
+     */
+    constructor(host: UmbControllerHost, workspaceContext: UmbDeleteEntityWorkspaceRedirectControllerWorkspaceContext);
+    destroy(): void;
+}
+export {};

package/dist-cms/packages/core/workspace/controllers/delete-entity-workspace-redirect.controller.js

@@ -0,0 +1,48 @@
+import { UMB_ACTION_EVENT_CONTEXT } from '../../action/index.js';
+import { UmbControllerBase } from '../../../../libs/class-api/index.js';
+import { UmbEntityDeletedEvent } from '../../entity-action/index.js';
+export const UmbDeleteEntityWorkspaceRedirectControllerAlias = Symbol('UmbDeleteEntityWorkspaceRedirectControllerAlias');
+/**
+ * Redirects the workspace to its parent once the open entity has been permanently deleted, reading where to go
+ * from the workspace context's own `navigationParentItemPath` — the one place that logic lives.
+ */
+export class UmbDeleteEntityWorkspaceRedirectController extends UmbControllerBase {
+    #actionEventContext;
+    #workspaceContext;
+    #navigationParentItemPath;
+    /**
+     * @param {UmbControllerHost} host - The controller host for this controller to be appended to
+     * @param {UmbDeleteEntityWorkspaceRedirectControllerWorkspaceContext} workspaceContext - The workspace context whose entity, once deleted, should trigger the redirect.
+     */
+    constructor(host, workspaceContext) {
+        super(host, UmbDeleteEntityWorkspaceRedirectControllerAlias);
+        this.#workspaceContext = workspaceContext;
+        this.observe(workspaceContext.navigationParentItemPath, (path) => (this.#navigationParentItemPath = path), null);
+        this.consumeContext(UMB_ACTION_EVENT_CONTEXT, (context) => {
+            this.#actionEventContext = context;
+            this.#actionEventContext?.removeEventListener(UmbEntityDeletedEvent.TYPE, this.#onDeleted);
+            this.#actionEventContext?.addEventListener(UmbEntityDeletedEvent.TYPE, this.#onDeleted);
+        });
+    }
+    #onDeleted = ((event) => {
+        if (event.getUnique() !== this.#workspaceContext.getUnique())
+            return;
+        if (event.getEntityType() !== this.#workspaceContext.getEntityType())
+            return;
+        // In a modal, rewriting window.history would unwind the whole modal stack, not just this layer.
+        if (this.#workspaceContext.modalContext)
+            return;
+        const path = this.#navigationParentItemPath;
+        if (!path)
+            return;
+        // The deleted entity's own URL is gone for good (unlike trash, which keeps a readonly URL reachable) —
+        // replace it rather than push, so "back" doesn't land on a 404.
+        window.history.replaceState(null, '', path);
+    });
+    destroy() {
+        // Remove the listener before tearing down the context consumer — destroying the consumer can itself
+        // re-invoke its callback with `undefined`, which would otherwise clobber `#actionEventContext` first.
+        this.#actionEventContext?.removeEventListener(UmbEntityDeletedEvent.TYPE, this.#onDeleted);
+        super.destroy();
+    }
+}

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

@@ -1,4 +1,5 @@
 export * from './constants.js';
+export * from './delete-entity-workspace-redirect.controller.js';
 export * from './resolve-stale-variant-route.function.js';
 export * from './workspace-is-new-redirect.controller.js';
 export * from './workspace-route-manager.controller.js';

package/dist-cms/packages/core/workspace/controllers/index.js

@@ -1,4 +1,5 @@
 export * from './constants.js';
+export * from './delete-entity-workspace-redirect.controller.js';
 export * from './resolve-stale-variant-route.function.js';
 export * from './workspace-is-new-redirect.controller.js';
 export * from './workspace-route-manager.controller.js';

package/dist-cms/packages/core/workspace/entity-detail/entity-detail-workspace-base.d.ts

@@ -43,7 +43,22 @@ export declare abstract class UmbEntityDetailWorkspaceContextBase<DetailModelTyp
      * ```
      */
     protected validationContext: UmbValidationContext;
+    /**
+     * Where a "back to parent" navigation should go, computed from the entity's current parent (see
+     * `UMB_PARENT_ENTITY_CONTEXT`). Override `_getNavigationParentItemPath` to provide entity-specific redirect
+     * logic — the default implementation always resolves to `undefined` (no known target).
+     */
+    readonly navigationParentItemPath: import("rxjs").Observable<string | undefined>;
     constructor(host: UmbControllerHost, args: UmbEntityDetailWorkspaceContextArgs);
+    /**
+     * Resolves where a "back to parent" navigation should go, given the entity's current parent item (or
+     * `undefined` when there's no parent or it's not yet known). Override to provide entity-specific redirect
+     * logic — e.g. a root workspace or section fallback when there's no parent, or branching on the parent's
+     * entity type (e.g. a folder vs. a regular item). Defaults to `undefined` (no known target).
+     * @param {UmbEntityModel | undefined} _entity - The current parent entity, or undefined when there is none.
+     * @returns {string | undefined} An absolute path to navigate to, or undefined if there is none.
+     */
+    protected _getNavigationParentItemPath(_entity: UmbEntityModel | undefined): string | undefined;
     /**
      * Get the entity type
      * @returns { string } The entity type
@@ -130,6 +145,11 @@ export declare abstract class UmbEntityDetailWorkspaceContextBase<DetailModelTyp
      * @returns { boolean } true if there are unpersisted changes.
      */
     getHasUnpersistedChanges(): boolean;
+    /**
+     * Resets the data back to the last persisted state, discarding any local changes.
+     * @memberof UmbEntityDetailWorkspaceContextBase
+     */
+    resetData(): void;
     resetState(): void;
     protected readonly _workspaceEventUnique: string;
     destroy(): void;

package/dist-cms/packages/core/workspace/entity-detail/entity-detail-workspace-base.js

@@ -1,10 +1,11 @@
 import { UmbSubmittableWorkspaceContextBase } from '../submittable/index.js';
 import { umbWorkspaceWillNavigateAway } from '../utils/check-will-navigate-away.function.js';
 import { UmbEntityWorkspaceDataManager } from '../entity/entity-workspace-data-manager.js';
+import { UmbDeleteEntityWorkspaceRedirectController } from '../controllers/delete-entity-workspace-redirect.controller.js';
 import { UMB_ACTION_EVENT_CONTEXT } from '../../action/index.js';
-import { UmbEntityContext } from '../../entity/index.js';
+import { UMB_PARENT_ENTITY_CONTEXT, UmbEntityContext, } from '../../entity/index.js';
 import { UMB_DISCARD_CHANGES_MODAL, umbOpenModal } from '../../modal/index.js';
-import { UmbObjectState } from '../../../../libs/observable-api/index.js';
+import { UmbObjectState, UmbStringState } from '../../../../libs/observable-api/index.js';
 import { UmbEntityUpdatedEvent, UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '../../entity-action/index.js';
 import { UmbExtensionApiInitializer } from '../../../../libs/extension-api/index.js';
 import { umbExtensionsRegistry } from '../../extension-registry/index.js';
@@ -18,6 +19,7 @@ export class UmbEntityDetailWorkspaceContextBase extends UmbSubmittableWorkspace
     #entityContext;
     #eventContext;
     #createUnderParent;
+    #navigationParentItemPath;
     #initResolver;
     #initialized;
     #init;
@@ -61,6 +63,13 @@ export class UmbEntityDetailWorkspaceContextBase extends UmbSubmittableWorkspace
          * ```
          */
         this.validationContext = new UmbValidationContext(this);
+        this.#navigationParentItemPath = new UmbStringState(undefined);
+        /**
+         * Where a "back to parent" navigation should go, computed from the entity's current parent (see
+         * `UMB_PARENT_ENTITY_CONTEXT`). Override `_getNavigationParentItemPath` to provide entity-specific redirect
+         * logic — the default implementation always resolves to `undefined` (no known target).
+         */
+        this.navigationParentItemPath = this.#navigationParentItemPath.asObservable();
         this.#initialized = false;
         this.#init = new Promise((resolve) => {
             if (this.#initialized) {
@@ -127,6 +136,25 @@ export class UmbEntityDetailWorkspaceContextBase extends UmbSubmittableWorkspace
             this.#eventContext?.removeEventListener(UmbEntityUpdatedEvent.TYPE, this.#onEntityUpdatedEvent);
             this.#eventContext?.addEventListener(UmbEntityUpdatedEvent.TYPE, this.#onEntityUpdatedEvent);
         });
+        this.consumeContext(UMB_PARENT_ENTITY_CONTEXT, (instance) => {
+            this.observe(instance?.parent, (entity) => this.#navigationParentItemPath.setValue(this._getNavigationParentItemPath(entity)), 'umbObserveParentForNavigationPath');
+        });
+        new UmbDeleteEntityWorkspaceRedirectController(this, this);
+    }
+    // TODO: Ideally this would be resolved by a more global, outer navigation context instead of by each
+    // workspace individually. Right now, only the workspace itself knows how to match an entity to a path, so
+    // that responsibility sits here. Once there's a way to do that matching more generally, this method could
+    // source the information from that context instead.
+    /**
+     * Resolves where a "back to parent" navigation should go, given the entity's current parent item (or
+     * `undefined` when there's no parent or it's not yet known). Override to provide entity-specific redirect
+     * logic — e.g. a root workspace or section fallback when there's no parent, or branching on the parent's
+     * entity type (e.g. a folder vs. a regular item). Defaults to `undefined` (no known target).
+     * @param {UmbEntityModel | undefined} _entity - The current parent entity, or undefined when there is none.
+     * @returns {string | undefined} An absolute path to navigate to, or undefined if there is none.
+     */
+    _getNavigationParentItemPath(_entity) {
+        return undefined;
     }
     /**
      * Get the entity type
@@ -213,7 +241,10 @@ export class UmbEntityDetailWorkspaceContextBase extends UmbSubmittableWorkspace
             const processedData = await this._processIncomingData(data);
             this._data.setPersisted(processedData);
             this._data.setCurrent(processedData);
-            this.observe(asObservable?.(), (entity) => this.#onDetailStoreChange(entity), 'umbEntityDetailTypeStoreObserver');
+            this.observe(asObservable?.(), (entity) => {
+                if (!entity)
+                    this._data.clear();
+            }, 'umbEntityDetailTypeStoreObserver');
         }
         this.loading.removeState(LOADING_STATE_UNIQUE);
         return response;
@@ -384,6 +415,13 @@ export class UmbEntityDetailWorkspaceContextBase extends UmbSubmittableWorkspace
     getHasUnpersistedChanges() {
         return this._data.getHasUnpersistedChanges();
     }
+    /**
+     * Resets the data back to the last persisted state, discarding any local changes.
+     * @memberof UmbEntityDetailWorkspaceContextBase
+     */
+    resetData() {
+        this._data.resetCurrent();
+    }
     resetState() {
         super.resetState();
         this.loading.clear();
@@ -406,11 +444,6 @@ export class UmbEntityDetailWorkspaceContextBase extends UmbSubmittableWorkspace
             this.#checkIfInitialized();
         });
     }
-    #onDetailStoreChange(entity) {
-        if (!entity) {
-            this._data.clear();
-        }
-    }
     #onEntityUpdatedEvent;
     destroy() {
         window.removeEventListener('willchangestate', this.#onWillNavigate);

package/dist-cms/packages/core/workspace/entity-detail/global-components/entity-detail-workspace-editor.element.d.ts

@@ -1,12 +1,27 @@
 import { UmbLitElement } from '../../../lit-element/index.js';
 export declare class UmbEntityDetailWorkspaceEditorElement extends UmbLitElement {
     #private;
-    backPath?: string;
+    /**
+     * A fallback "back to parent" path, used only when the workspace context has no `navigationParentItemPath` of
+     * its own. Always shows its own back button when set, independent of `showBackToParentButton`, which only
+     * governs the button for `navigationParentItemPath`.
+     * @deprecated Implement `navigationParentItemPath` on the workspace context instead. Will be removed in Umbraco 20.
+     * @returns {string | undefined} The fallback back-to-parent path.
+     */
+    get backPath(): string | undefined;
+    set backPath(value: string | undefined);
+    /**
+     * Shows a "back to parent" button linking to the workspace context's own `navigationParentItemPath`. Left as an
+     * explicit opt-in since not every entity should surface this button (e.g. tree-based entities rely on the tree
+     * itself for navigation). Does not affect the deprecated `backPath`, which always shows its own button when set.
+     */
+    showBackToParentButton: boolean;
     private _entityType?;
     private _isLoading;
     private _isForbidden;
     private _exists;
     private _isNew?;
+    private _navigationParentItemPath?;
     constructor();
     protected render(): import("lit-html").TemplateResult<1>;
     destroy(): void;