@umbraco-cms/backoffice 14.0.0-8a5fc0ad → 14.0.0-8d2a75e2

package/dist-cms/packages/core/localization/registry/translation.registry.js

@@ -0,0 +1,79 @@
+import { registerTranslation, translations, } from '../../../../libs/localization-api/index.js';
+import { hasDefaultExport, loadExtension } from '../../../../libs/extension-api/index.js';
+import { umbExtensionsRegistry } from '../../extension-registry/index.js';
+import { BehaviorSubject, Subject, combineLatest, map, distinctUntilChanged, filter, startWith } from '../../../../external/rxjs/index.js';
+export class UmbTranslationRegistry {
+    /**
+     * Get the current registered translations.
+     */
+    get translations() {
+        return translations;
+    }
+    get isDefaultLoaded() {
+        return this.#isDefaultLoaded.asObservable();
+    }
+    #currentLanguage = new Subject();
+    #isDefaultLoaded = new BehaviorSubject(false);
+    constructor(extensionRegistry) {
+        const currentLanguage$ = this.#currentLanguage.pipe(startWith(document.documentElement.lang || 'en-us'), map((x) => x.toLowerCase()), distinctUntilChanged());
+        const currentExtensions$ = extensionRegistry.extensionsOfType('translations').pipe(filter((x) => x.length > 0), distinctUntilChanged((prev, curr) => prev.length === curr.length && prev.every((x) => curr.includes(x))));
+        combineLatest([currentLanguage$, currentExtensions$]).subscribe(async ([userCulture, extensions]) => {
+            const locale = new Intl.Locale(userCulture);
+            const translations = await Promise.all(extensions
+                .filter((x) => x.meta.culture.toLowerCase() === locale.baseName.toLowerCase() ||
+                x.meta.culture.toLowerCase() === locale.language.toLowerCase())
+                .map(async (extension) => {
+                const innerDictionary = {};
+                // If extension contains a dictionary, add it to the inner dictionary.
+                if (extension.meta.translations) {
+                    for (const [dictionaryName, dictionary] of Object.entries(extension.meta.translations)) {
+                        this.#addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
+                    }
+                }
+                // If extension contains a js file, load it and add the default dictionary to the inner dictionary.
+                const loadedExtension = await loadExtension(extension);
+                if (loadedExtension && hasDefaultExport(loadedExtension)) {
+                    for (const [dictionaryName, dictionary] of Object.entries(loadedExtension.default)) {
+                        this.#addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary);
+                    }
+                }
+                // Notify subscribers that the inner dictionary has changed.
+                return {
+                    $code: extension.meta.culture.toLowerCase(),
+                    $dir: extension.meta.direction ?? 'ltr',
+                    ...innerDictionary,
+                };
+            }));
+            if (translations.length) {
+                registerTranslation(...translations);
+                // Set the document language
+                const newLang = locale.baseName.toLowerCase();
+                if (document.documentElement.lang.toLowerCase() !== newLang) {
+                    document.documentElement.lang = newLang;
+                }
+                // Set the document direction to the direction of the primary language
+                const newDir = translations[0].$dir ?? 'ltr';
+                if (document.documentElement.dir !== newDir) {
+                    document.documentElement.dir = newDir;
+                }
+            }
+            if (!this.#isDefaultLoaded.value) {
+                this.#isDefaultLoaded.next(true);
+                this.#isDefaultLoaded.complete();
+            }
+        });
+    }
+    /**
+     * Load a language from the extension registry.
+     * @param locale The locale to load.
+     */
+    loadLanguage(locale) {
+        this.#currentLanguage.next(locale);
+    }
+    #addOrUpdateDictionary(innerDictionary, dictionaryName, dictionary) {
+        for (const [key, value] of Object.entries(dictionary)) {
+            innerDictionary[`${dictionaryName}_${key}`] = value;
+        }
+    }
+}
+export const umbTranslationRegistry = new UmbTranslationRegistry(umbExtensionsRegistry);

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

@@ -1,3 +1,4 @@
 export * from './menu-item/index.js';
 export * from './menu-item-base/index.js';
 export * from './menu.element.js';
+export * from './menu.context.js';

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

@@ -1,3 +1,4 @@
 export * from './menu-item/index.js';
 export * from './menu-item-base/index.js';
 export * from './menu.element.js';
+export * from './menu.context.js';

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

@@ -0,0 +1,9 @@
+import type { ManifestMenu } from '../extension-registry/models/index.js';
+import { UmbContextToken } from '../../../libs/context-api/index.js';
+export declare class UmbMenuContext {
+    #private;
+    readonly manifest: import("rxjs").Observable<ManifestMenu | undefined>;
+    readonly alias: import("rxjs").Observable<string | undefined>;
+    setManifest(manifest: ManifestMenu | undefined): void;
+}
+export declare const UMB_MENU_CONTEXT_TOKEN: UmbContextToken<UmbMenuContext>;

package/dist-cms/packages/core/menu/menu.context.js

@@ -0,0 +1,14 @@
+import { UmbContextToken } from '../../../libs/context-api/index.js';
+import { UmbDeepState } from '../../../libs/observable-api/index.js';
+export class UmbMenuContext {
+    constructor() {
+        this.#manifest = new UmbDeepState(undefined);
+        this.manifest = this.#manifest.asObservable();
+        this.alias = this.#manifest.asObservablePart((x) => x?.alias);
+    }
+    #manifest;
+    setManifest(manifest) {
+        this.#manifest.next(manifest);
+    }
+}
+export const UMB_MENU_CONTEXT_TOKEN = new UmbContextToken('UMB_MENU_CONTEXT_TOKEN');

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

@@ -3,6 +3,7 @@ import { UmbLitElement } from '../../../shared/lit-element/index.js';
 import './menu-item/menu-item.element.js';
 export declare class UmbMenuElement extends UmbLitElement {
     manifest?: ManifestMenu;
+    constructor();
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];
 }

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

@@ -9,16 +9,20 @@ import { html, customElement, property } from '../../../external/lit/index.js';
 import { UmbLitElement } from '../../../shared/lit-element/index.js';
 import './menu-item/menu-item.element.js';
 export let UmbMenuElement = class UmbMenuElement extends UmbLitElement {
+    constructor() {
+        super();
+        //this.provideContext(UMB_MENU_CONTEXT_TOKEN, new UmbMenuContext());
+    }
     render() {
         return html ` <umb-extension-slot
 			type="menuItem"
-			.filter=${(items) => items.conditions.menus.includes(this.manifest.alias)}
+			.filter=${(items) => items.meta.menus.includes(this.manifest.alias)}
 			default-element="umb-menu-item"></umb-extension-slot>`;
     }
     static { this.styles = [UUITextStyles]; }
 };
 __decorate([
-    property()
+    property({ attribute: false })
 ], UmbMenuElement.prototype, "manifest", void 0);
 UmbMenuElement = __decorate([
     customElement('umb-menu')

package/dist-cms/packages/core/modal/common/folder/folder-modal.element.d.ts

@@ -1,13 +1,13 @@
 import { UmbFolderModalData, UmbFolderModalResult, UmbModalContext } from '../../index.js';
 import { UmbLitElement } from '../../../../../shared/lit-element/index.js';
-import { FolderReponseModel } from '../../../../../external/backend-api/index.js';
+import { FolderResponseModel } from '../../../../../external/backend-api/index.js';
 export declare class UmbFolderModalElement extends UmbLitElement {
     #private;
     modalContext?: UmbModalContext<UmbFolderModalData, UmbFolderModalResult>;
     private _data?;
     get data(): UmbFolderModalData | undefined;
     set data(value: UmbFolderModalData | undefined);
-    _folder?: FolderReponseModel;
+    _folder?: FolderResponseModel;
     _headline?: string;
     _isNew: boolean;
     private _formElement?;

package/dist-cms/packages/core/modal/common/folder/folder-modal.element.js

@@ -13,6 +13,7 @@ export let UmbFolderModalElement = class UmbFolderModalElement extends UmbLitEle
     constructor() {
         super(...arguments);
         this.#unique = null;
+        this.#parentUnique = null;
         this._isNew = false;
     }
     get data() {
@@ -21,11 +22,13 @@ export let UmbFolderModalElement = class UmbFolderModalElement extends UmbLitEle
     set data(value) {
         this._data = value;
         this.#unique = value?.unique || null;
+        this.#parentUnique = value?.parentUnique || null;
         this.#repositoryAlias = value?.repositoryAlias;
         this.#observeRepository();
     }
     #repositoryAlias;
     #unique;
+    #parentUnique;
     #repository;
     #repositoryObserver;
     #observeRepository() {
@@ -58,7 +61,7 @@ export let UmbFolderModalElement = class UmbFolderModalElement extends UmbLitEle
     async #create() {
         if (!this.#repository)
             throw new Error('Repository is required to create folder');
-        const { data } = await this.#repository.createFolderScaffold(this.#unique);
+        const { data } = await this.#repository.createFolderScaffold(this.#parentUnique);
         this._folder = data;
         this._isNew = true;
     }

package/dist-cms/packages/core/modal/common/property-settings/property-settings-modal.element.js

@@ -9,6 +9,7 @@ import { css, html, nothing, customElement, state } from '../../../../../externa
 import { UmbModalBaseElement } from '../../../../../shared/modal/index.js';
 import { generateAlias } from '../../../../../shared/utils/index.js';
 // TODO: Could base take a token to get its types?.
+// TODO: Missing a workspace context... unless this should not be a workspace any way.
 export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalElement extends UmbModalBaseElement {
     constructor() {
         super(...arguments);
@@ -133,7 +134,6 @@ export let UmbPropertySettingsModalElement = class UmbPropertySettingsModalEleme
         this._customValidationOptions.forEach((option) => {
             option.selected = option.value === regEx;
         });
-        console.log(this._customValidationOptions);
         this._returnData.validation.regEx = regEx ?? null;
         this.requestUpdate('_returnData');
         this.requestUpdate('_customValidationOptions');

package/dist-cms/packages/core/modal/modal-route-registration.d.ts

@@ -28,8 +28,8 @@ export declare class UmbModalRouteRegistration<UmbModalTokenData extends object
     get modalContext(): UmbModalContext<UmbModalTokenData, UmbModalTokenResult> | undefined;
     observeRouteBuilder(callback: (urlBuilder: UmbModalRouteBuilder) => void): this;
     _internal_setRouteBuilder(urlBuilder: UmbModalRouteBuilder): void;
-    onSetup(callback: (routingInfo: Params) => UmbModalTokenData | false): this;
+    onSetup(callback: (routingInfo: Params) => Promise<UmbModalTokenData | false> | UmbModalTokenData | false): this;
     onSubmit(callback: (data: UmbModalTokenResult) => void): this;
     onReject(callback: () => void): this;
-    routeSetup(router: IRouterSlot, modalContext: UmbModalManagerContext, params: Params): UmbModalContext<UmbModalTokenData, UmbModalTokenResult> | null | undefined;
+    routeSetup(router: IRouterSlot, modalContext: UmbModalManagerContext, params: Params): Promise<UmbModalContext<UmbModalTokenData, UmbModalTokenResult> | null | undefined>;
 }

package/dist-cms/packages/core/modal/modal-route-registration.js

@@ -81,11 +81,11 @@ export class UmbModalRouteRegistration {
         this.#onRejectCallback?.();
         this.#modalContext = undefined;
     };
-    routeSetup(router, modalContext, params) {
+    async routeSetup(router, modalContext, params) {
         // If already open, don't do anything:
         if (this.active)
             return;
-        const modalData = this.#onSetupCallback ? this.#onSetupCallback(params) : undefined;
+        const modalData = this.#onSetupCallback ? await this.#onSetupCallback(params) : undefined;
         if (modalData !== false) {
             this.#modalContext = modalContext.open(this.#modalAlias, modalData, this.modalConfig, router);
             this.#modalContext.onSubmit().then(this.#onSubmit, this.#onReject);

package/dist-cms/packages/core/modal/token/folder-modal.token.d.ts

@@ -1,10 +1,11 @@
 import { UmbModalToken } from '../index.js';
-import { FolderReponseModel } from '../../../../external/backend-api/index.js';
+import { FolderResponseModel } from '../../../../external/backend-api/index.js';
 export interface UmbFolderModalData {
     repositoryAlias: string;
     unique?: string;
+    parentUnique?: string | null;
 }
 export interface UmbFolderModalResult {
-    folder: FolderReponseModel;
+    folder: FolderResponseModel;
 }
 export declare const UMB_FOLDER_MODAL: UmbModalToken<UmbFolderModalData, UmbFolderModalResult>;

package/dist-cms/packages/core/property-action/manifests.js

@@ -4,7 +4,7 @@ export const manifests = [
         alias: 'Umb.PropertyAction.Copy',
         name: 'Copy Property Action',
         loader: () => import('./common/copy/property-action-copy.element.js'),
-        conditions: {
+        meta: {
             propertyEditors: ['Umb.PropertyEditorUi.TextBox'],
         },
     },
@@ -13,7 +13,7 @@ export const manifests = [
         alias: 'Umb.PropertyAction.Clear',
         name: 'Clear Property Action',
         loader: () => import('./common/clear/property-action-clear.element.js'),
-        conditions: {
+        meta: {
             propertyEditors: ['Umb.PropertyEditorUi.TextBox'],
         },
     },

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

@@ -32,7 +32,7 @@ export let UmbPropertyActionMenuElement = class UmbPropertyActionMenuElement ext
         this._actionsObserver?.destroy();
         // TODO: Align property actions with entity actions.
         this._actionsObserver = this.observe(umbExtensionsRegistry.extensionsOfType('propertyAction').pipe(map((propertyActions) => {
-            return propertyActions.filter((propertyAction) => propertyAction.conditions.propertyEditors.includes(alias));
+            return propertyActions.filter((propertyAction) => propertyAction.meta.propertyEditors.includes(alias));
         })), (manifests) => {
             this._actions = manifests;
         });
@@ -44,6 +44,7 @@ export let UmbPropertyActionMenuElement = class UmbPropertyActionMenuElement ext
         this._propertyActionMenuContext.close();
         event.stopPropagation();
     }
+    // TODO: Implement extension-slot on change event. And use the extension slot instead of custom implementation.
     render() {
         return this._actions.length > 0
             ? html `

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

@@ -1,3 +1,3 @@
 export * from './types/index.js';
 export * from './events/index.js';
-export declare const UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT = "Umbraco.JSON";
+export declare const UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT = "Umbraco.Label";

package/dist-cms/packages/core/property-editor/index.js

@@ -1,3 +1,3 @@
 export * from './types/index.js';
 export * from './events/index.js';
-export const UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT = 'Umbraco.JSON';
+export const UMB_PROPERTY_EDITOR_SCHEMA_ALIAS_DEFAULT = 'Umbraco.Label';

package/dist-cms/packages/core/property-editor/manifests.d.ts

@@ -1 +1 @@
-export declare const manifests: (import("../index.js").ManifestPropertyEditorUi | import("../index.js").ManifestPropertyEditorSchema)[];
+export declare const manifests: (import("../index.js").ManifestPropertyEditorSchema | import("../index.js").ManifestPropertyEditorUi)[];

package/dist-cms/packages/core/property-editor/schemas/manifests.js

@@ -10,7 +10,6 @@ import { manifest as eyeDropper } from './Umbraco.ColorPicker.EyeDropper.js';
 import { manifest as iconPicker } from './Umbraco.IconPicker.js';
 import { manifest as imageCropper } from './Umbraco.ImageCropper.js';
 import { manifest as integer } from './Umbraco.Integer.js';
-import { manifest as json } from './Umbraco.JSON.js';
 import { manifest as label } from './Umbraco.Label.js';
 import { manifest as listView } from './Umbraco.ListView.js';
 import { manifest as markdownEditor } from './Umbraco.MarkdownEditor.js';
@@ -42,7 +41,6 @@ export const manifests = [
     iconPicker,
     imageCropper,
     integer,
-    json,
     label,
     listView,
     markdownEditor,

package/dist-cms/packages/core/property-editor/uis/icon-picker/manifests.js

@@ -5,7 +5,7 @@ export const manifest = {
     loader: () => import('./property-editor-ui-icon-picker.element.js'),
     meta: {
         label: 'Icon Picker',
-        propertyEditorSchemaAlias: 'Umbraco.JSON',
+        propertyEditorSchemaAlias: 'Umbraco.IconPicker',
         icon: 'umb:autofill',
         group: 'common',
     },

package/dist-cms/packages/core/property-editor/uis/value-type/manifests.js

@@ -7,6 +7,5 @@ export const manifest = {
         label: 'Value Type',
         icon: 'umb:autofill',
         group: 'common',
-        propertyEditorSchemaAlias: 'Umbraco.JSON',
     },
 };

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

@@ -3,6 +3,6 @@ export * from './section-sidebar/index.js';
 export * from './section-sidebar-context-menu/index.js';
 export * from './section-sidebar-menu/index.js';
 export * from './section-sidebar-menu-with-entity-actions/index.js';
-export * from './section-views/index.js';
+export * from './section-main-views/index.js';
 export * from './section-default.element.js';
 export * from './section.context.js';

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

@@ -3,6 +3,6 @@ export * from './section-sidebar/index.js';
 export * from './section-sidebar-context-menu/index.js';
 export * from './section-sidebar-menu/index.js';
 export * from './section-sidebar-menu-with-entity-actions/index.js';
-export * from './section-views/index.js';
+export * from './section-main-views/index.js';
 export * from './section-default.element.js';
 export * from './section.context.js';

package/dist-cms/packages/core/section/section-default.element.d.ts

@@ -11,7 +11,7 @@ export declare class UmbSectionDefaultElement extends UmbLitElement implements U
     get manifest(): ManifestSection | undefined;
     set manifest(value: ManifestSection | undefined);
     private _routes?;
-    private _menus?;
+    private _sidebarApps?;
     constructor();
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("@lit/reactive-element/css-tag.js").CSSResult[];

package/dist-cms/packages/core/section/section-default.element.js

@@ -5,10 +5,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UUITextStyles } from '../../../external/uui/index.js';
-import { css, html, nothing, customElement, property, state, } from '../../../external/lit/index.js';
-import { map } from '../../../external/rxjs/index.js';
+import { css, html, nothing, customElement, property, state, repeat } from '../../../external/lit/index.js';
 import { umbExtensionsRegistry, } from '../extension-registry/index.js';
 import { UmbLitElement } from '../../../shared/lit-element/index.js';
+import { UmbExtensionsElementController } from '../../../libs/extension-api/index.js';
 /**
  * @export
  * @class UmbBaseSectionElement
@@ -23,11 +23,15 @@ export let UmbSectionDefaultElement = class UmbSectionDefaultElement extends Umb
         if (oldValue === value)
             return;
         this._manifest = value;
-        this.#observeSectionSidebarApps();
         this.requestUpdate('manifest', oldValue);
     }
     constructor() {
         super();
+        new UmbExtensionsElementController(this, umbExtensionsRegistry, 'sectionSidebarApp', null, (sidebarApps) => {
+            const oldValue = this._sidebarApps;
+            this._sidebarApps = sidebarApps;
+            this.requestUpdate('_sidebarApps', oldValue);
+        });
         this.#createRoutes();
     }
     #createRoutes() {
@@ -41,32 +45,20 @@ export let UmbSectionDefaultElement = class UmbSectionDefaultElement extends Umb
             },
             {
                 path: '**',
-                component: () => import('./section-views/section-views.element.js'),
+                component: () => import('./section-main-views/section-main-views.element.js'),
                 setup: (element) => {
                     element.sectionAlias = this.manifest?.alias;
                 },
             },
         ];
     }
-    // TODO: Can this be omitted? or can the same data be used for the extension slot or alike extension presentation?
-    #observeSectionSidebarApps() {
-        this.observe(umbExtensionsRegistry
-            .extensionsOfType('sectionSidebarApp')
-            .pipe(map((manifests) => manifests.filter((manifest) => manifest.conditions.sections.includes(this._manifest?.alias ?? '')))), (manifests) => {
-            const oldValue = this._menus;
-            this._menus = manifests;
-            this.requestUpdate('_menu', oldValue);
-        });
-    }
     render() {
         return html `
-			${this._menus && this._menus.length > 0
+			${this._sidebarApps && this._sidebarApps.length > 0
             ? html `
 						<!-- TODO: these extensions should be combined into one type: sectionSidebarApp with a "subtype" -->
 						<umb-section-sidebar>
-							<umb-extension-slot
-								type="sectionSidebarApp"
-								.filter=${(items) => items.conditions.sections.includes(this.manifest?.alias ?? '')}></umb-extension-slot>
+							${repeat(this._sidebarApps, (app) => app.alias, (app) => app.component)}
 						</umb-section-sidebar>
 				  `
             : nothing}
@@ -94,14 +86,14 @@ export let UmbSectionDefaultElement = class UmbSectionDefaultElement extends Umb
     ]; }
 };
 __decorate([
-    property()
-], UmbSectionDefaultElement.prototype, "_manifest", void 0);
+    property({ type: Object, attribute: false })
+], UmbSectionDefaultElement.prototype, "manifest", null);
 __decorate([
     state()
 ], UmbSectionDefaultElement.prototype, "_routes", void 0);
 __decorate([
     state()
-], UmbSectionDefaultElement.prototype, "_menus", void 0);
+], UmbSectionDefaultElement.prototype, "_sidebarApps", void 0);
 UmbSectionDefaultElement = __decorate([
     customElement('umb-section-default')
 ], UmbSectionDefaultElement);

package/dist-cms/packages/core/section/section-main-views/index.d.ts

@@ -0,0 +1 @@
+export * from './section-main-views.element.js';

package/dist-cms/packages/core/section/section-main-views/index.js

@@ -0,0 +1 @@
+export * from './section-main-views.element.js';

package/dist-cms/packages/core/section/section-main-views/section-main-views.element.d.ts

@@ -0,0 +1,19 @@
+import { UmbLitElement } from '../../../../shared/lit-element/index.js';
+export declare class UmbSectionMainViewElement extends UmbLitElement {
+    #private;
+    sectionAlias?: string;
+    private _views;
+    private _dashboards;
+    private _routerPath?;
+    private _activePath?;
+    private _routes;
+    constructor();
+    render(): import("lit-html").TemplateResult<1>;
+    static styles: import("@lit/reactive-element/css-tag").CSSResult[];
+}
+export default UmbSectionMainViewElement;
+declare global {
+    interface HTMLElementTagNameMap {
+        'umb-section-main-views': UmbSectionMainViewElement;
+    }
+}

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