@umbraco-cms/backoffice 14.0.0-b0704cee → 14.0.0-c26a40c4

package/dist-cms/packages/core/section/{section-views/section-views.element.js → section-main-views/section-main-views.element.js}

@@ -4,24 +4,26 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { UMB_SECTION_CONTEXT_TOKEN } from '../section.context.js';
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { css, html, nothing, customElement, property, state } from '../../../../external/lit/index.js';
-import { map, of } from '../../../../external/rxjs/index.js';
 import { umbExtensionsRegistry, } from '../../extension-registry/index.js';
-import { createExtensionElement } from '../../../../libs/extension-api/index.js';
+import { UmbExtensionsManifestController, createExtensionElement } from '../../../../libs/extension-api/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { pathFolderName } from '../../../../shared/utils/index.js';
-// TODO: this might need a new name, since it's both view and dashboard now
-export let UmbSectionViewsElement = class UmbSectionViewsElement extends UmbLitElement {
+// TODO: this might need a new name, since it's both views and dashboards
+export let UmbSectionMainViewElement = class UmbSectionMainViewElement extends UmbLitElement {
     constructor() {
         super();
         this._views = [];
         this._dashboards = [];
         this._routes = [];
-        this.consumeContext(UMB_SECTION_CONTEXT_TOKEN, (sectionContext) => {
-            this._sectionContext = sectionContext;
-            this._observeSectionAlias();
+        new UmbExtensionsManifestController(this, umbExtensionsRegistry, 'dashboard', null, (dashboards) => {
+            this._dashboards = dashboards.map((dashboard) => dashboard.manifest);
+            this.#createRoutes();
+        });
+        new UmbExtensionsManifestController(this, umbExtensionsRegistry, 'sectionView', null, (views) => {
+            this._views = views.map((view) => view.manifest);
+            this.#createRoutes();
         });
     }
     #constructDashboardPath(manifest) {
@@ -54,36 +56,6 @@ export let UmbSectionViewsElement = class UmbSectionViewsElement extends UmbLitE
         const routes = [...dashboardRoutes, ...viewRoutes];
         this._routes = routes?.length > 0 ? [...routes, { path: '', redirectTo: routes?.[0]?.path }] : [];
     }
-    _observeSectionAlias() {
-        if (!this._sectionContext)
-            return;
-        this.observe(this._sectionContext.alias, (sectionAlias) => {
-            this._observeViews(sectionAlias);
-            this._observeDashboards(sectionAlias);
-        }, 'viewsObserver');
-    }
-    _observeViews(sectionAlias) {
-        this._viewsObserver?.destroy();
-        if (sectionAlias) {
-            this._viewsObserver = this.observe(umbExtensionsRegistry
-                ?.extensionsOfType('sectionView')
-                .pipe(map((views) => views.filter((view) => view.conditions.sections.includes(sectionAlias)))) ?? of([]), (views) => {
-                this._views = views;
-                this.#createRoutes();
-            });
-        }
-    }
-    _observeDashboards(sectionAlias) {
-        this._dashboardObserver?.destroy();
-        if (sectionAlias) {
-            this._dashboardObserver = this.observe(umbExtensionsRegistry
-                ?.extensionsOfType('dashboard')
-                .pipe(map((views) => views.filter((view) => view.conditions.sections.includes(sectionAlias)))) ?? of([]), (views) => {
-                this._dashboards = views;
-                this.#createRoutes();
-            });
-        }
-    }
     render() {
         return this._routes.length > 0
             ? html `
@@ -163,23 +135,23 @@ export let UmbSectionViewsElement = class UmbSectionViewsElement extends UmbLitE
 };
 __decorate([
     property({ type: String, attribute: 'section-alias' })
-], UmbSectionViewsElement.prototype, "sectionAlias", void 0);
+], UmbSectionMainViewElement.prototype, "sectionAlias", void 0);
 __decorate([
     state()
-], UmbSectionViewsElement.prototype, "_views", void 0);
+], UmbSectionMainViewElement.prototype, "_views", void 0);
 __decorate([
     state()
-], UmbSectionViewsElement.prototype, "_dashboards", void 0);
+], UmbSectionMainViewElement.prototype, "_dashboards", void 0);
 __decorate([
     state()
-], UmbSectionViewsElement.prototype, "_routerPath", void 0);
+], UmbSectionMainViewElement.prototype, "_routerPath", void 0);
 __decorate([
     state()
-], UmbSectionViewsElement.prototype, "_activePath", void 0);
+], UmbSectionMainViewElement.prototype, "_activePath", void 0);
 __decorate([
     state()
-], UmbSectionViewsElement.prototype, "_routes", void 0);
-UmbSectionViewsElement = __decorate([
-    customElement('umb-section-views')
-], UmbSectionViewsElement);
-export default UmbSectionViewsElement;
+], UmbSectionMainViewElement.prototype, "_routes", void 0);
+UmbSectionMainViewElement = __decorate([
+    customElement('umb-section-main-views')
+], UmbSectionMainViewElement);
+export default UmbSectionMainViewElement;

package/dist-cms/packages/core/section/section-sidebar-context-menu/section-sidebar-context-menu.element.js

@@ -15,10 +15,23 @@ export let UmbSectionSidebarContextMenuElement = class UmbSectionSidebarContextM
         this._isOpen = false;
         this.consumeContext(UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, (instance) => {
             this.#sectionSidebarContext = instance;
-            this.observe(this.#sectionSidebarContext.contextMenuIsOpen, (value) => (this._isOpen = value));
-            this.observe(this.#sectionSidebarContext.unique, (value) => (this._unique = value));
-            this.observe(this.#sectionSidebarContext.entityType, (value) => (this._entityType = value));
-            this.observe(this.#sectionSidebarContext.headline, (value) => (this._headline = value));
+            if (this.#sectionSidebarContext) {
+                // make prettier not break the lines on the next 4 lines:
+                // prettier-ignore
+                this.observe(this.#sectionSidebarContext.contextMenuIsOpen, (value) => (this._isOpen = value), '_observeContextMenuIsOpen');
+                // prettier-ignore
+                this.observe(this.#sectionSidebarContext.unique, (value) => (this._unique = value), '_observeUnique');
+                // prettier-ignore
+                this.observe(this.#sectionSidebarContext.entityType, (value) => (this._entityType = value), '_observeEntityType');
+                // prettier-ignore
+                this.observe(this.#sectionSidebarContext.headline, (value) => (this._headline = value), '_observeHeadline');
+            }
+            else {
+                this.removeControllerByAlias('_observeContextMenuIsOpen');
+                this.removeControllerByAlias('_observeUnique');
+                this.removeControllerByAlias('_observeEntityType');
+                this.removeControllerByAlias('_observeHeadline');
+            }
         });
     }
     #closeContextMenu() {
@@ -44,7 +57,7 @@ export let UmbSectionSidebarContextMenuElement = class UmbSectionSidebarContextM
     }
     // TODO: allow different views depending on left or right click
     #renderModal() {
-        return this._isOpen && this._unique !== undefined
+        return this._isOpen && this._unique !== undefined && this._entityType
             ? html `<div id="action-modal">
 					<h3>${this._headline}</h3>
 					<umb-entity-action-list

package/dist-cms/packages/core/section/section-sidebar-menu/section-sidebar-menu.element.js

@@ -11,7 +11,7 @@ import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 // TODO: Move to separate file:
 const manifest = {
     type: 'kind',
-    alias: 'Umb.Kind.Menu',
+    alias: 'Umb.Kind.SectionSidebarAppMenu',
     matchKind: 'menu',
     matchType: 'sectionSidebarApp',
     manifest: {
@@ -25,11 +25,10 @@ export let UmbSectionSidebarMenuElement = class UmbSectionSidebarMenuElement ext
         return html `<h3>${this.manifest?.meta?.label}</h3>`;
     }
     render() {
-        // TODO: link to dashboards when clicking on the menu item header
         return html `${this.renderHeader()}
 			<umb-extension-slot
 				type="menu"
-				.filter=${(menu) => menu.alias === this.manifest?.meta?.menu}
+				.filter="${(menu) => menu.alias === this.manifest?.meta?.menu}"
 				default-element="umb-menu"></umb-extension-slot>`;
     }
     static { this.styles = [
@@ -42,7 +41,7 @@ export let UmbSectionSidebarMenuElement = class UmbSectionSidebarMenuElement ext
     ]; }
 };
 __decorate([
-    property()
+    property({ type: Object, attribute: false })
 ], UmbSectionSidebarMenuElement.prototype, "manifest", void 0);
 UmbSectionSidebarMenuElement = __decorate([
     customElement('umb-section-sidebar-menu')

package/dist-cms/packages/core/section/section-sidebar-menu-with-entity-actions/section-sidebar-menu-with-entity-actions.element.js

@@ -10,7 +10,7 @@ import { umbExtensionsRegistry, } from '../../extension-registry/index.js';
 import '../../menu/menu.element.js';
 const manifestWithEntityActions = {
     type: 'kind',
-    alias: 'Umb.Kind.Menu',
+    alias: 'Umb.Kind.SectionSidebarAppMenuWithEntityActions',
     matchKind: 'menuWithEntityActions',
     matchType: 'sectionSidebarApp',
     manifest: {
@@ -26,7 +26,7 @@ export let UmbSectionSidebarMenuWithEntityActionsElement = class UmbSectionSideb
 			<umb-entity-actions-bundle
 				slot="actions"
 				.unique=${null}
-				entity-type=${this.manifest?.meta.entityType}
+				.entityType=${this.manifest?.meta.entityType}
 				.label=${this.manifest?.meta.label}>
 			</umb-entity-actions-bundle>
 		</div> `;

package/dist-cms/packages/core/tree/entity-tree-item/entity-tree-item.element.d.ts

@@ -7,7 +7,7 @@ export declare class UmbEntityTreeItemElement extends UmbLitElement implements U
     private _item?;
     get item(): EntityTreeItemResponseModel | undefined;
     set item(value: EntityTreeItemResponseModel | undefined);
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 declare global {

package/dist-cms/packages/{templating/components → core/tree}/file-system-tree-item/file-system-tree-item.context.d.ts

@@ -1,7 +1,15 @@
-import { UmbTreeItemContextBase } from '../../../core/tree/index.js';
+import { UmbTreeItemContextBase } from '../tree-item-base/tree-item-base.context.js';
 import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
 import { FileSystemTreeItemPresentationModel } from '../../../../external/backend-api/index.js';
+/**
+ * Tree item context for file system tree items. Uses the path as the unique identifier.
+ *
+ * @export
+ * @class UmbFileSystemTreeItemContext
+ * @extends {UmbTreeItemContextBase<FileSystemTreeItemPresentationModel>}
+ */
 export declare class UmbFileSystemTreeItemContext extends UmbTreeItemContextBase<FileSystemTreeItemPresentationModel> {
     constructor(host: UmbControllerHostElement);
+    checkIfIsFolder(): void;
     constructPath(pathname: string, entityType: string, path: string): string;
 }

package/dist-cms/packages/core/tree/file-system-tree-item/file-system-tree-item.context.js

@@ -0,0 +1,28 @@
+import { UmbTreeItemContextBase } from '../tree-item-base/tree-item-base.context.js';
+/**
+ * Tree item context for file system tree items. Uses the path as the unique identifier.
+ *
+ * @export
+ * @class UmbFileSystemTreeItemContext
+ * @extends {UmbTreeItemContextBase<FileSystemTreeItemPresentationModel>}
+ */
+export class UmbFileSystemTreeItemContext extends UmbTreeItemContextBase {
+    constructor(host) {
+        super(host, (x) => x.path);
+    }
+    //TODO: this is not a nice solution! There should be a better way to distinguish in the tree between folders and files. Additionally we need to be able to register an action only on empty folder.
+    checkIfIsFolder() {
+        const treeItem = this.getTreeItem();
+        if (treeItem?.isFolder) {
+            if (treeItem.hasChildren) {
+                this.type = `${this.getTreeItem()?.type}-folder`;
+            }
+            else {
+                this.type = `${this.getTreeItem()?.type}-folder-empty`;
+            }
+        }
+    }
+    constructPath(pathname, entityType, path) {
+        return `section/${pathname}/workspace/${entityType}/edit/${encodeURIComponent(path).replace('.', '-')}`;
+    }
+}

package/dist-cms/packages/{templating/components → core/tree}/file-system-tree-item/file-system-tree-item.element.d.ts

@@ -1,13 +1,21 @@
 import { nothing } from '../../../../external/lit/index.js';
-import { UmbTreeItemElement } from '../../../core/tree/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { FileSystemTreeItemPresentationModel } from '../../../../external/backend-api/index.js';
-export declare class UmbFileSystemTreeItemElement extends UmbLitElement implements UmbTreeItemElement {
+import { UmbTreeItemExtensionElement } from '../../extension-registry/index.js';
+/**
+ * Tree item element for file system tree items. Uses the path as the unique identifier.
+ *
+ * @export
+ * @class UmbFileSystemTreeItemElement
+ * @extends {UmbLitElement}
+ * @implements {UmbTreeItemExtensionElement}
+ */
+export declare class UmbFileSystemTreeItemElement extends UmbLitElement implements UmbTreeItemExtensionElement {
     #private;
     private _item?;
     get item(): FileSystemTreeItemPresentationModel | undefined;
     set item(value: FileSystemTreeItemPresentationModel | undefined);
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }
 declare global {

package/dist-cms/packages/{templating/components → core/tree}/file-system-tree-item/file-system-tree-item.element.js

@@ -8,7 +8,7 @@ import { UmbFileSystemTreeItemContext } from './file-system-tree-item.context.js
 import { css, html, nothing, customElement, property } from '../../../../external/lit/index.js';
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-import { umbExtensionsRegistry } from '../../../core/extension-registry/index.js';
+import { umbExtensionsRegistry, } from '../../extension-registry/index.js';
 // TODO: Move to separate file:
 const manifest = {
     type: 'kind',
@@ -21,6 +21,14 @@ const manifest = {
     },
 };
 umbExtensionsRegistry.register(manifest);
+/**
+ * Tree item element for file system tree items. Uses the path as the unique identifier.
+ *
+ * @export
+ * @class UmbFileSystemTreeItemElement
+ * @extends {UmbLitElement}
+ * @implements {UmbTreeItemExtensionElement}
+ */
 export let UmbFileSystemTreeItemElement = class UmbFileSystemTreeItemElement extends UmbLitElement {
     get item() {
         return this._item;
@@ -28,6 +36,7 @@ export let UmbFileSystemTreeItemElement = class UmbFileSystemTreeItemElement ext
     set item(value) {
         this._item = value;
         this.#context.setTreeItem(value);
+        this.#context.checkIfIsFolder();
     }
     #context = new UmbFileSystemTreeItemContext(this);
     render() {

package/dist-cms/packages/core/tree/file-system-tree-item/index.d.ts

@@ -0,0 +1,2 @@
+export * from './file-system-tree-item.context.js';
+export * from './file-system-tree-item.element.js';

package/dist-cms/packages/core/tree/file-system-tree-item/index.js

@@ -0,0 +1,2 @@
+export * from './file-system-tree-item.context.js';
+export * from './file-system-tree-item.element.js';

package/dist-cms/packages/core/tree/index.d.ts

@@ -1,4 +1,5 @@
 export * from './entity-tree-item/index.js';
+export * from './file-system-tree-item/index.js';
 export * from './tree-item/index.js';
 export * from './tree-item-base/index.js';
 export * from './tree-menu-item/index.js';

package/dist-cms/packages/core/tree/index.js

@@ -1,4 +1,5 @@
 export * from './entity-tree-item/index.js';
+export * from './file-system-tree-item/index.js';
 export * from './tree-item/index.js';
 export * from './tree-item-base/index.js';
 export * from './tree-menu-item/index.js';

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

@@ -1,9 +1,7 @@
 import type { Observable } from '../../../../external/rxjs/index.js';
-import type { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
-import type { ProblemDetailsModel, TreeItemPresentationModel } from '../../../../external/backend-api/index.js';
+import type { ProblemDetails, TreeItemPresentationModel } from '../../../../external/backend-api/index.js';
 import { UmbPagedData } from '../../../../shared/repository/index.js';
 export interface UmbTreeItemContext<TreeItemType extends TreeItemPresentationModel> {
-    host: UmbControllerHostElement;
     unique?: string | null;
     type?: string;
     treeItem: Observable<TreeItemType | undefined>;
@@ -18,7 +16,7 @@ export interface UmbTreeItemContext<TreeItemType extends TreeItemPresentationMod
     setTreeItem(treeItem: TreeItemType | undefined): void;
     requestChildren(): Promise<{
         data?: UmbPagedData<TreeItemType> | undefined;
-        error?: ProblemDetailsModel | undefined;
+        error?: ProblemDetails | undefined;
         asObservable?: () => Observable<TreeItemType[]>;
     }>;
     toggleContextMenu(): void;

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

@@ -3,7 +3,7 @@ import { TreeItemPresentationModel } from '../../../../external/backend-api/inde
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 export declare class UmbTreeItemElement extends UmbLitElement {
     item?: TreeItemPresentationModel;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
     static styles: import("@lit/reactive-element/css-tag").CSSResult[];
 }
 declare global {

package/dist-cms/packages/core/tree/tree-item/tree-item.element.js

@@ -13,7 +13,7 @@ export let UmbTreeItemElement = class UmbTreeItemElement extends UmbLitElement {
             return nothing;
         return html `<umb-extension-slot
 			type="treeItem"
-			.filter=${(manifests) => manifests.conditions.entityTypes.includes(this.item.type)}
+			.filter=${(manifests) => manifests.meta.entityTypes.includes(this.item.type)}
 			.props=${{
             item: this.item,
         }}></umb-extension-slot>`;

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

@@ -1,12 +1,11 @@
 import { UmbTreeItemContext } from '../tree-item/tree-item.context.interface.js';
 import { UmbTreeContextBase } from '../tree.context.js';
-import { UmbControllerHostElement } from '../../../../libs/controller-api/index.js';
+import { UmbBaseController, UmbControllerHost } from '../../../../libs/controller-api/index.js';
 import { UmbContextToken } from '../../../../libs/context-api/index.js';
 import type { TreeItemPresentationModel } from '../../../../external/backend-api/index.js';
 export type UmbTreeItemUniqueFunction<TreeItemType extends TreeItemPresentationModel> = (x: TreeItemType) => string | null | undefined;
-export declare class UmbTreeItemContextBase<TreeItemType extends TreeItemPresentationModel> implements UmbTreeItemContext<TreeItemType> {
+export declare class UmbTreeItemContextBase<TreeItemType extends TreeItemPresentationModel> extends UmbBaseController implements UmbTreeItemContext<TreeItemType> {
     #private;
-    host: UmbControllerHostElement;
     unique?: string | null;
     type?: string;
     treeItem: import("rxjs/internal/Observable.js").Observable<TreeItemType | undefined>;
@@ -19,11 +18,11 @@ export declare class UmbTreeItemContextBase<TreeItemType extends TreeItemPresent
     hasActions: import("rxjs/internal/Observable.js").Observable<boolean>;
     path: import("rxjs/internal/Observable.js").Observable<string>;
     treeContext?: UmbTreeContextBase<TreeItemType>;
-    constructor(host: UmbControllerHostElement, getUniqueFunction: UmbTreeItemUniqueFunction<TreeItemType>);
+    constructor(host: UmbControllerHost, getUniqueFunction: UmbTreeItemUniqueFunction<TreeItemType>);
     setTreeItem(treeItem: TreeItemType | undefined): void;
     requestChildren(): Promise<{
         data?: import("../../../../shared/repository/tree-repository.interface.js").UmbPagedData<TreeItemType> | undefined;
-        error?: import("../../../../external/backend-api/index.js").ProblemDetailsModel | undefined;
+        error?: import("../../../../external/backend-api/index.js").ProblemDetails | undefined;
         asObservable?: (() => import("rxjs/internal/Observable.js").Observable<TreeItemType[]>) | undefined;
     }>;
     toggleContextMenu(): void;

package/dist-cms/packages/core/tree/tree-item-base/tree-item-base.context.js

@@ -1,9 +1,10 @@
 import { map } from '../../../../external/rxjs/index.js';
 import { UMB_SECTION_CONTEXT_TOKEN, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN } from '../../section/index.js';
 import { umbExtensionsRegistry } from '../../extension-registry/index.js';
-import { UmbBooleanState, UmbDeepState, UmbStringState, UmbObserverController, } from '../../../../libs/observable-api/index.js';
-import { UmbContextConsumerController, UmbContextProviderController, UmbContextToken, } from '../../../../libs/context-api/index.js';
-export class UmbTreeItemContextBase {
+import { UmbBooleanState, UmbDeepState, UmbStringState } from '../../../../libs/observable-api/index.js';
+import { UmbBaseController } from '../../../../libs/controller-api/index.js';
+import { UmbContextToken } from '../../../../libs/context-api/index.js';
+export class UmbTreeItemContextBase extends UmbBaseController {
     #treeItem;
     #hasChildren;
     #isLoading;
@@ -16,8 +17,8 @@ export class UmbTreeItemContextBase {
     #sectionContext;
     #sectionSidebarContext;
     #getUniqueFunction;
-    #actionObserver;
     constructor(host, getUniqueFunction) {
+        super(host);
         this.#treeItem = new UmbDeepState(undefined);
         this.treeItem = this.#treeItem.asObservable();
         this.#hasChildren = new UmbBooleanState(false);
@@ -36,10 +37,9 @@ export class UmbTreeItemContextBase {
         this.hasActions = this.#hasActions.asObservable();
         this.#path = new UmbStringState('');
         this.path = this.#path.asObservable();
-        this.host = host;
         this.#getUniqueFunction = getUniqueFunction;
         this.#consumeContexts();
-        new UmbContextProviderController(host, UMB_TREE_ITEM_CONTEXT_TOKEN, this);
+        this.provideContext(UMB_TREE_ITEM_CONTEXT_TOKEN, this);
     }
     setTreeItem(treeItem) {
         if (!treeItem) {
@@ -55,8 +55,12 @@ export class UmbTreeItemContextBase {
             throw new Error('Could not create tree item context, tree item type is missing');
         this.type = treeItem.type;
         this.#hasChildren.next(treeItem.hasChildren || false);
-        this.#observeActions();
         this.#treeItem.next(treeItem);
+        // Update observers:
+        this.#observeActions();
+        this.#observeIsSelectable();
+        this.#observeIsSelected();
+        this.#observeSectionPath();
     }
     async requestChildren() {
         if (this.unique === undefined)
@@ -84,14 +88,14 @@ export class UmbTreeItemContextBase {
         this.treeContext?.deselect(this.unique);
     }
     #consumeContexts() {
-        new UmbContextConsumerController(this.host, UMB_SECTION_CONTEXT_TOKEN, (instance) => {
+        this.consumeContext(UMB_SECTION_CONTEXT_TOKEN, (instance) => {
             this.#sectionContext = instance;
             this.#observeSectionPath();
         });
-        new UmbContextConsumerController(this.host, UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, (instance) => {
+        this.consumeContext(UMB_SECTION_SIDEBAR_CONTEXT_TOKEN, (instance) => {
             this.#sectionSidebarContext = instance;
         });
-        new UmbContextConsumerController(this.host, 'umbTreeContext', (treeContext) => {
+        this.consumeContext('umbTreeContext', (treeContext) => {
             this.treeContext = treeContext;
             this.#observeIsSelectable();
             this.#observeIsSelected();
@@ -103,46 +107,38 @@ export class UmbTreeItemContextBase {
     #observeIsSelectable() {
         if (!this.treeContext)
             return;
-        new UmbObserverController(this.host, this.treeContext.selectable, (value) => {
+        this.observe(this.treeContext.selectable, (value) => {
             this.#isSelectableContext.next(value);
             // If the tree is selectable, check if this item is selectable
             if (value === true) {
                 const isSelectable = this.treeContext?.selectableFilter?.(this.getTreeItem()) ?? true;
                 this.#isSelectable.next(isSelectable);
             }
-        });
+        }, 'observeIsSelectable');
     }
     #observeIsSelected() {
-        if (!this.treeContext)
-            throw new Error('Could not request children, tree context is missing');
-        if (this.unique === undefined)
-            throw new Error('Could not request children, unique key is missing');
-        new UmbObserverController(this.host, this.treeContext.selection.pipe(map((selection) => selection.includes(this.unique))), (isSelected) => {
+        if (!this.treeContext || !this.unique)
+            return;
+        this.observe(this.treeContext.selection.pipe(map((selection) => selection.includes(this.unique))), (isSelected) => {
             this.#isSelected.next(isSelected);
-        });
+        }, 'observeIsSelected');
     }
     #observeSectionPath() {
         if (!this.#sectionContext)
             return;
-        new UmbObserverController(this.host, this.#sectionContext.pathname, (pathname) => {
-            if (!pathname)
+        this.observe(this.#sectionContext.pathname, (pathname) => {
+            if (!pathname || !this.type || this.unique === undefined)
                 return;
-            if (!this.type)
-                throw new Error('Cant construct path, entity type is missing');
-            if (this.unique === undefined)
-                throw new Error('Cant construct path, unique is missing');
             const path = this.constructPath(pathname, this.type, this.unique);
             this.#path.next(path);
-        });
+        }, 'observeSectionPath');
     }
     #observeActions() {
-        if (this.#actionObserver)
-            this.#actionObserver.destroy();
-        this.#actionObserver = new UmbObserverController(this.host, umbExtensionsRegistry
+        this.observe(umbExtensionsRegistry
             .extensionsOfType('entityAction')
-            .pipe(map((actions) => actions.filter((action) => action.conditions.entityTypes.includes(this.type)))), (actions) => {
+            .pipe(map((actions) => actions.filter((action) => action.meta.entityTypes.includes(this.type)))), (actions) => {
             this.#hasActions.next(actions.length > 0);
-        });
+        }, 'observeActions');
     }
     // TODO: use router context
     constructPath(pathname, entityType, unique) {

package/dist-cms/packages/core/tree/tree-item-base/tree-item-base.element.d.ts

@@ -1,6 +1,7 @@
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 export declare class UmbTreeItemBaseElement extends UmbLitElement {
     #private;
+    private _iconAlias?;
     private _item?;
     private _childItems?;
     private _href?;

package/dist-cms/packages/core/tree/tree-item-base/tree-item-base.element.js

@@ -93,8 +93,8 @@ export let UmbTreeItemBaseElement = class UmbTreeItemBaseElement extends UmbLitE
 				@slotchange=${(e) => {
             this._iconSlotHasChildren = this.#hasNodes(e);
         }}></slot>
-			${this._item?.icon && !this._iconSlotHasChildren
-            ? html ` <uui-icon slot="icon" name="${this._item.icon}"></uui-icon> `
+			${this._iconAlias && !this._iconSlotHasChildren
+            ? html ` <uui-icon slot="icon" name="${this._iconAlias}"></uui-icon> `
             : nothing}
 		`;
     }
@@ -105,7 +105,7 @@ export let UmbTreeItemBaseElement = class UmbTreeItemBaseElement extends UmbLitE
         return this.#treeItemContext && this._item
             ? html `<umb-entity-actions-bundle
 					slot="actions"
-					entity-type=${this.#treeItemContext.type}
+					.entityType=${this.#treeItemContext.type}
 					.unique=${this.#treeItemContext.unique}
 					.label=${this._item.name}>
 			  </umb-entity-actions-bundle>`
@@ -122,6 +122,9 @@ export let UmbTreeItemBaseElement = class UmbTreeItemBaseElement extends UmbLitE
     }
     static { this.styles = [UUITextStyles, css ``]; }
 };
+__decorate([
+    state()
+], UmbTreeItemBaseElement.prototype, "_iconAlias", void 0);
 __decorate([
     state()
 ], UmbTreeItemBaseElement.prototype, "_item", void 0);

package/dist-cms/packages/core/tree/tree-menu-item/tree-menu-item.element.d.ts

@@ -3,7 +3,7 @@ import { UmbLitElement } from '../../../../shared/lit-element/index.js';
 import { ManifestMenuItemTreeKind, UmbMenuItemExtensionElement } from '../../extension-registry/index.js';
 export declare class UmbMenuItemTreeElement extends UmbLitElement implements UmbMenuItemExtensionElement {
     manifest?: ManifestMenuItemTreeKind;
-    render(): typeof nothing | import("lit-html").TemplateResult<1>;
+    render(): import("lit-html").TemplateResult<1> | typeof nothing;
 }
 export default UmbMenuItemTreeElement;
 declare global {

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

@@ -1,7 +1,7 @@
 import { Observable } from '../../../external/rxjs/index.js';
 import { UmbPagedData, UmbTreeRepository } from '../../../shared/repository/index.js';
 import { UmbBaseController, UmbControllerHostElement } from '../../../libs/controller-api/index.js';
-import { ProblemDetailsModel, TreeItemPresentationModel } from '../../../external/backend-api/index.js';
+import { ProblemDetails, TreeItemPresentationModel } from '../../../external/backend-api/index.js';
 export interface UmbTreeContext<TreeItemType extends TreeItemPresentationModel> extends UmbBaseController {
     readonly selectable: Observable<boolean>;
     readonly selection: Observable<Array<string | null>>;
@@ -15,7 +15,7 @@ export interface UmbTreeContext<TreeItemType extends TreeItemPresentationModel>
     deselect(unique: string | null): void;
     requestChildrenOf: (parentUnique: string | null) => Promise<{
         data?: UmbPagedData<TreeItemType>;
-        error?: ProblemDetailsModel;
+        error?: ProblemDetails;
         asObservable?: () => Observable<TreeItemType[]>;
     }>;
 }
@@ -39,16 +39,16 @@ export declare class UmbTreeContextBase<TreeItemType extends TreeItemPresentatio
     deselect(unique: string | null): void;
     requestTreeRoot(): Promise<{
         data?: import("./index.js").UmbTreeRootEntityModel | undefined;
-        error?: ProblemDetailsModel | undefined;
+        error?: ProblemDetails | undefined;
     }>;
     requestRootItems(): Promise<{
         data?: UmbPagedData<TreeItemType> | undefined;
-        error?: ProblemDetailsModel | undefined;
+        error?: ProblemDetails | undefined;
         asObservable?: (() => Observable<TreeItemType[]>) | undefined;
     }>;
     requestChildrenOf(parentUnique: string | null): Promise<{
         data?: UmbPagedData<TreeItemType> | undefined;
-        error?: ProblemDetailsModel | undefined;
+        error?: ProblemDetails | undefined;
         asObservable?: (() => Observable<TreeItemType[]>) | undefined;
     }>;
     rootItems(): Promise<Observable<TreeItemType[]>>;

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

@@ -1,10 +1,12 @@
-export * from './workspace-action/index.js';
 export * from './workspace-action-menu/index.js';
+export * from './workspace-action/index.js';
+export * from './workspace-context/index.js';
 export * from './workspace-editor/index.js';
 export * from './workspace-footer/index.js';
+export * from './workspace-is-new-redirect-controller/index.js';
 export * from './workspace-modal/index.js';
-export * from './workspace-context/index.js';
-export * from './workspace-variant/index.js';
-export * from './workspace-split-view-manager.class.js';
-export * from './workspace-property/index.js';
 export * from './workspace-property-layout/workspace-property-layout.element.js';
+export * from './workspace-property/index.js';
+export * from './workspace-split-view-manager.class.js';
+export * from './workspace-variant/index.js';
+export * from './workspace-alias.condition.js';