@umbraco-cms/backoffice 14.0.0-e72b5840 → 14.0.0-ef334a6d

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/section-sidebar.context.d.ts

@@ -11,4 +11,4 @@ export declare class UmbSectionSidebarContext {
     openContextMenu(entityType: string, unique: string | null | undefined, headline: string | undefined): void;
     closeContextMenu(): void;
 }
-export declare const UMB_SECTION_SIDEBAR_CONTEXT_TOKEN: UmbContextToken<UmbSectionSidebarContext>;
+export declare const UMB_SECTION_SIDEBAR_CONTEXT_TOKEN: UmbContextToken<UmbSectionSidebarContext, UmbSectionSidebarContext>;

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/section/section.context.d.ts

@@ -8,4 +8,4 @@ export declare class UmbSectionContext {
     constructor(manifest: ManifestSection);
     setManifest(manifest?: ManifestSection): void;
 }
-export declare const UMB_SECTION_CONTEXT_TOKEN: UmbContextToken<UmbSectionContext>;
+export declare const UMB_SECTION_CONTEXT_TOKEN: UmbContextToken<UmbSectionContext, UmbSectionContext>;

package/dist-cms/packages/core/sorter/sorter.controller.js

@@ -421,8 +421,14 @@ export class UmbSorterController {
         };
         // TODO: Move auto scroll into its own class?
         this.#autoScrollRAF = null;
+        this.#autoScrollEl = document.scrollingElement || document.documentElement;
         this.autoScrollX = 0;
         this.autoScrollY = 0;
+        this._performAutoScroll = () => {
+            this.#autoScrollEl.scrollLeft += this.autoScrollX * autoScrollSpeed;
+            this.#autoScrollEl.scrollTop += this.autoScrollY * autoScrollSpeed;
+            this.#autoScrollRAF = requestAnimationFrame(this._performAutoScroll);
+        };
         this.#host = host;
         // Set defaults:
         config.ignorerSelector ??= 'a, img, iframe';
@@ -640,11 +646,6 @@ export class UmbSorterController {
             this.#autoScrollRAF = requestAnimationFrame(this._performAutoScroll);
         }
     }
-    _performAutoScroll() {
-        this.#autoScrollEl.scrollLeft += this.autoScrollX * autoScrollSpeed;
-        this.#autoScrollEl.scrollTop += this.autoScrollY * autoScrollSpeed;
-        this.#autoScrollRAF = requestAnimationFrame(this._performAutoScroll);
-    }
     stopAutoScroll() {
         cancelAnimationFrame(this.#autoScrollRAF);
         this.#autoScrollRAF = null;
@@ -680,6 +681,5 @@ export class UmbSorterController {
         this.#observer.disconnect();
         // For auto scroller:
         this.#scrollElement = null;
-        this.#autoScrollEl = undefined;
     }
 }

package/dist-cms/packages/core/sorter/stories/test-sorter-controller.element.d.ts

@@ -0,0 +1,13 @@
+import { UmbSorterController } from '../sorter.controller.js';
+import { UmbLitElement } from '../../../../shared/lit-element/index.js';
+type SortEntryType = {
+    id: string;
+    value: string;
+};
+export default class UmbTestSorterControllerElement extends UmbLitElement {
+    sorter: UmbSorterController<SortEntryType>;
+    constructor();
+    render(): import("lit-html").TemplateResult<1>;
+    static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
+}
+export {};

package/dist-cms/packages/core/sorter/stories/test-sorter-controller.element.js

@@ -0,0 +1,92 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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 { UmbSorterController } from '../sorter.controller.js';
+import { UmbLitElement } from '../../../../shared/lit-element/index.js';
+import { css, customElement, html } from '../../../../external/lit/index.js';
+const sorterConfig = {
+    compareElementToModel: (element, model) => {
+        return element.getAttribute('data-sort-entry-id') === model.id;
+    },
+    querySelectModelToElement: (container, modelEntry) => {
+        return container.querySelector('data-sort-entry-id[' + modelEntry.id + ']');
+    },
+    identifier: 'test-sorter',
+    itemSelector: 'li',
+    containerSelector: 'ul',
+};
+const model = [
+    {
+        id: '0',
+        value: 'Entry 0',
+    },
+    {
+        id: '1',
+        value: 'Entry 1',
+    },
+    {
+        id: '2',
+        value: 'Entry 2',
+    },
+];
+let UmbTestSorterControllerElement = class UmbTestSorterControllerElement extends UmbLitElement {
+    constructor() {
+        super();
+        this.sorter = new UmbSorterController(this, sorterConfig);
+        this.sorter.setModel(model);
+    }
+    render() {
+        return html `
+			<ul>
+				${model.map((entry) => html `<li id="${'sort' + entry.id}" data-sort-entry-id="${entry.id}">${entry.value}</li>`)}
+			</ul>
+		`;
+    }
+    static { this.styles = [
+        css `
+			:host {
+				display: block;
+			}
+
+			ul {
+				list-style: none;
+				padding: 0;
+				margin: 0;
+			}
+
+			li {
+				padding: 10px;
+				margin: 5px;
+				background: #eee;
+			}
+
+			li:hover {
+				background: #ddd !important;
+				cursor: move;
+			}
+
+			li:active {
+				background: #ccc;
+			}
+
+			#sort0 {
+				background: #f00;
+			}
+
+			#sort1 {
+				background: #0f0;
+			}
+
+			#sort2 {
+				background: #c9da10;
+			}
+		`,
+    ]; }
+};
+UmbTestSorterControllerElement = __decorate([
+    customElement('test-my-sorter-controller')
+], UmbTestSorterControllerElement);
+export default UmbTestSorterControllerElement;

package/dist-cms/packages/core/themes/theme.context.d.ts

@@ -6,5 +6,5 @@ export declare class UmbThemeContext extends UmbBaseController {
     constructor(host: UmbControllerHostElement);
     setThemeByAlias(themeAlias: string): void;
 }
-export declare const UMB_THEME_CONTEXT_TOKEN: UmbContextToken<UmbThemeContext>;
+export declare const UMB_THEME_CONTEXT_TOKEN: UmbContextToken<UmbThemeContext, UmbThemeContext>;
 export default UmbThemeContext;

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 { 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>;

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,7 +18,7 @@ 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;
@@ -32,4 +31,4 @@ export declare class UmbTreeItemContextBase<TreeItemType extends TreeItemPresent
     getTreeItem(): TreeItemType | undefined;
     constructPath(pathname: string, entityType: string, unique: string | null): string;
 }
-export declare const UMB_TREE_ITEM_CONTEXT_TOKEN: UmbContextToken<UmbTreeItemContext<any>>;
+export declare const UMB_TREE_ITEM_CONTEXT_TOKEN: UmbContextToken<UmbTreeItemContext<any>, UmbTreeItemContext<any>>;

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/workspace/index.d.ts

@@ -9,3 +9,4 @@ 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';

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

@@ -9,3 +9,4 @@ 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';

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

@@ -1 +1 @@
-export declare const manifests: import("../index.js").ManifestModal[];
+export declare const manifests: (import("../../../libs/extension-api/types.js").ManifestCondition | import("../index.js").ManifestModal)[];

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

@@ -1,2 +1,3 @@
 import { manifests as workspaceModals } from './workspace-modal/manifests.js';
-export const manifests = [...workspaceModals];
+import { manifest as workspaceCondition } from './workspace-alias.condition.js';
+export const manifests = [...workspaceModals, workspaceCondition];

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

@@ -1,9 +1,9 @@
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../workspace-context/index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../workspace-context/index.js';
 import { UmbContextConsumerController } from '../../../../libs/context-api/index.js';
 export class UmbWorkspaceActionBase {
     constructor(host) {
         this.host = host;
-        new UmbContextConsumerController(this.host, UMB_ENTITY_WORKSPACE_CONTEXT, (instance) => {
+        new UmbContextConsumerController(this.host, UMB_WORKSPACE_CONTEXT, (instance) => {
             // TODO: Be aware we are casting here. We should consider a better solution for typing the contexts. (But notice we still want to capture the first workspace...)
             this.workspaceContext = instance;
         });

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

@@ -7,12 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { UUITextStyles } from '../../../../external/uui/index.js';
 import { css, html, customElement, state } from '../../../../external/lit/index.js';
 import { UmbLitElement } from '../../../../shared/lit-element/index.js';
-import { UMB_ENTITY_WORKSPACE_CONTEXT } from '../index.js';
+import { UMB_WORKSPACE_CONTEXT } from '../index.js';
 export let UmbWorkspaceActionMenuElement = class UmbWorkspaceActionMenuElement extends UmbLitElement {
     constructor() {
         super();
         this._actionMenuIsOpen = false;
-        this.consumeContext(UMB_ENTITY_WORKSPACE_CONTEXT, (context) => {
+        this.consumeContext(UMB_WORKSPACE_CONTEXT, (context) => {
             this._workspaceContext = context;
             this._observeInfo();
         });
@@ -37,13 +37,17 @@ export let UmbWorkspaceActionMenuElement = class UmbWorkspaceActionMenuElement e
         return html ` ${this.#renderActionsMenu()} `;
     }
     #renderActionsMenu() {
-        return this._entityId
+        return this._entityId && this._entityType
             ? html `
 			<uui-popover  id="action-menu-popover" .open=${this._actionMenuIsOpen} @close=${this.#close}>
 				<uui-button slot="trigger" label="Actions" @click=${this.#open}></uui-button>
 				<div id="action-menu-dropdown" slot="popover">
 					<uui-scroll-container>
-						<umb-entity-action-list @executed=${this.#onActionExecuted} entity-type=${this._entityType} unique=${this._entityId}></umb-entity-action-list>
+						<umb-entity-action-list
+							@executed=${this.#onActionExecuted}
+							.entityType=${this._entityType}
+							.unique=${this._entityId}>
+						</umb-entity-action-list>
 					</uui-scroll-container>
 				</div>
 			</uui-popover>

package/dist-cms/packages/core/workspace/workspace-alias.condition.d.ts

@@ -0,0 +1,18 @@
+import { UmbBaseController } from '../../../libs/controller-api/index.js';
+import { ManifestCondition, UmbConditionConfigBase, UmbConditionControllerArguments, UmbExtensionCondition } from '../../../libs/extension-api/index.js';
+export declare class UmbWorkspaceAliasCondition extends UmbBaseController implements UmbExtensionCondition {
+    #private;
+    config: WorkspaceAliasConditionConfig;
+    permitted: boolean;
+    constructor(args: UmbConditionControllerArguments<WorkspaceAliasConditionConfig>);
+}
+export type WorkspaceAliasConditionConfig = UmbConditionConfigBase<'Umb.Condition.WorkspaceAlias'> & {
+    /**
+     * Define the workspace that this extension should be available in
+     *
+     * @example
+     * "Umb.Workspace.Document"
+     */
+    match: string;
+};
+export declare const manifest: ManifestCondition;