@umbraco-cms/backoffice 16.0.0-rc → 16.0.0-rc3

package/dist-cms/packages/content/content-type/workspace/views/design/content-type-design-editor-properties.element.js

@@ -98,18 +98,41 @@ let UmbContentTypeDesignEditorPropertiesElement = class UmbContentTypeDesignEdit
                     i++;
                 }
             },
+            onRequestDrop: async ({ unique }) => {
+                const context = await this.getContext(UMB_CONTENT_TYPE_WORKSPACE_CONTEXT);
+                if (!context) {
+                    throw new Error('Could not get Workspace Context');
+                }
+                return context.structure.getOwnerPropertyById(unique);
+            },
+            requestExternalRemove: async ({ item }) => {
+                const context = await this.getContext(UMB_CONTENT_TYPE_WORKSPACE_CONTEXT);
+                if (!context) {
+                    throw new Error('Could not get Workspace Context');
+                }
+                return await context.structure.removeProperty(null, item.unique).then(() => true, () => false);
+            },
+            requestExternalInsert: async ({ item }) => {
+                const context = await this.getContext(UMB_CONTENT_TYPE_WORKSPACE_CONTEXT);
+                if (!context) {
+                    throw new Error('Could not get Workspace Context');
+                }
+                const parent = this._containerId ? { id: this._containerId } : null;
+                const updatedItem = { ...item, parent };
+                return await context.structure.insertProperty(null, updatedItem).then(() => true, () => false);
+            },
         });
         this.#propertyStructureHelper = new UmbContentTypePropertyStructureHelper(this);
         this._properties = [];
-        this.#sorter.disable();
+        //this.#sorter.disable();
         this.consumeContext(UMB_CONTENT_TYPE_DESIGN_EDITOR_CONTEXT, (context) => {
             this.observe(context?.isSorting, (isSorting) => {
                 this._sortModeActive = isSorting;
                 if (isSorting) {
-                    this.#sorter.enable();
+                    //this.#sorter.enable();
                 }
                 else {
-                    this.#sorter.disable();
+                    //this.#sorter.disable();
                 }
             }, '_observeIsSorting');
         });
@@ -214,6 +237,16 @@ let UmbContentTypeDesignEditorPropertiesElement = class UmbContentTypeDesignEdit
     static { this.styles = [
         UmbTextStyles,
         css `
+			:host {
+				display: block;
+			}
+
+			#property-list {
+				/* enables dropping things into this despite it begin empty. */
+				margin-top: -20px;
+				padding-top: 20px;
+			}
+
 			#btn-add {
 				width: 100%;
 				--uui-button-height: var(--uui-size-14);

package/dist-cms/packages/content/content-type/workspace/views/design/content-type-design-editor-tab.element.js

@@ -83,6 +83,29 @@ let UmbContentTypeDesignEditorTabElement = class UmbContentTypeDesignEditorTabEl
                     i++;
                 }
             },
+            onRequestDrop: async ({ unique }) => {
+                const context = await this.getContext(UMB_CONTENT_TYPE_WORKSPACE_CONTEXT);
+                if (!context) {
+                    throw new Error('Could not get Workspace Context');
+                }
+                return context.structure.getOwnerContainerById(unique);
+            },
+            requestExternalRemove: async ({ item }) => {
+                const context = await this.getContext(UMB_CONTENT_TYPE_WORKSPACE_CONTEXT);
+                if (!context) {
+                    throw new Error('Could not get Workspace Context');
+                }
+                return await context.structure.removeContainer(null, item.id, { preventRemovingProperties: true }).then(() => true, () => false);
+            },
+            requestExternalInsert: async ({ item }) => {
+                const context = await this.getContext(UMB_CONTENT_TYPE_WORKSPACE_CONTEXT);
+                if (!context) {
+                    throw new Error('Could not get Workspace Context');
+                }
+                const parent = this.#containerId ? { id: this.#containerId } : null;
+                const updatedItem = { ...item, parent };
+                return await context.structure.insertContainer(null, updatedItem).then(() => true, () => false);
+            },
         });
         this._groups = [];
         this._hasProperties = false;
@@ -185,9 +208,10 @@ let UmbContentTypeDesignEditorTabElement = class UmbContentTypeDesignEditorTabEl
 			.container-list {
 				display: grid;
 				gap: 10px;
+				align-content: start;
 			}
 
-			#convert-to-tab {
+			.container-list #convert-to-tab {
 				margin-bottom: var(--uui-size-layout-1);
 				display: flex;
 			}

package/dist-cms/packages/content/content-type/workspace/views/design/content-type-design-editor.element.js

@@ -301,14 +301,17 @@ let UmbContentTypeDesignEditorElement = class UmbContentTypeDesignEditorElement
         const currentInheritanceCompositions = currentCompositions.filter((composition) => composition.compositionType === CompositionTypeModel.INHERITANCE);
         const currentOwnerCompositions = await this.#workspaceContext.structure.getOwnerContentTypeCompositions();
         const currentOwnerCompositionCompositions = currentOwnerCompositions.filter((composition) => composition.compositionType === CompositionTypeModel.COMPOSITION);
+        const currentOwnerCompositionCompositionUniques = currentOwnerCompositionCompositions.map((composition) => composition.contentType.unique);
         const currentOwnerInheritanceCompositions = currentOwnerCompositions.filter((composition) => composition.compositionType === CompositionTypeModel.INHERITANCE);
+        const currentPropertyAliases = await this.#workspaceContext.structure.getContentTypePropertyAliases();
         const compositionConfiguration = {
             compositionRepositoryAlias: this._compositionRepositoryAlias,
             unique: unique,
-            selection: currentOwnerCompositionCompositions.map((composition) => composition.contentType.unique),
+            selection: currentOwnerCompositionCompositionUniques,
             usedForInheritance: currentInheritanceCompositions.map((composition) => composition.contentType.unique),
+            usedForComposition: currentOwnerCompositionCompositionUniques,
             isElement: ownerContentType.isElement,
-            currentPropertyAliases: [],
+            currentPropertyAliases,
             isNew: this.#workspaceContext.getIsNew(),
         };
         const value = await umbOpenModal(this, UMB_COMPOSITION_PICKER_MODAL, {
@@ -328,6 +331,12 @@ let UmbContentTypeDesignEditorElement = class UmbContentTypeDesignEditorElement
             }),
         ]);
     }
+    #onDragOver(event, path) {
+        if (this._activePath === path)
+            return;
+        event.preventDefault();
+        window.history.replaceState(null, '', path);
+    }
     render() {
         return html `
 			<umb-body-layout header-fit-height>
@@ -396,8 +405,8 @@ let UmbContentTypeDesignEditorElement = class UmbContentTypeDesignEditorElement
 		`;
     }
     renderRootTab() {
-        const rootTabPath = this._routerPath + '/root';
-        const rootTabActive = rootTabPath === this._activePath;
+        const path = this._routerPath + '/root';
+        const rootTabActive = path === this._activePath;
         if (!this._hasRootGroups && !this._sortModeActive) {
             // If we don't have any root groups and we are not in sort mode, then we don't want to render the root tab.
             return nothing;
@@ -409,7 +418,8 @@ let UmbContentTypeDesignEditorElement = class UmbContentTypeDesignEditorElement
 				class=${this._hasRootGroups || rootTabActive ? '' : 'content-tab-is-empty'}
 				label=${this.localize.term('general_generic')}
 				.active=${rootTabActive}
-				href=${rootTabPath}>
+				href=${path}
+				@dragover=${(event) => this.#onDragOver(event, path)}>
 				${this.localize.term('general_generic')}
 			</uui-tab>
 		`;
@@ -424,7 +434,8 @@ let UmbContentTypeDesignEditorElement = class UmbContentTypeDesignEditorElement
 			href=${path}
 			data-umb-tab-id=${ifDefined(tab.id)}
 			data-mark="tab:${tab.name}"
-			?sortable=${ownedTab}>
+			?sortable=${ownedTab}
+			@dragover=${(event) => this.#onDragOver(event, path)}>
 			${this.renderTabInner(tab, tabActive, ownedTab)}
 		</uui-tab>`;
     }

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

@@ -210,7 +210,7 @@ export class UmbAuthContext extends UmbContextBase {
         return {
             base: config.baseUrl,
             credentials: config.credentials,
-            token: this.getLatestToken,
+            token: () => this.getLatestToken(),
         };
     }
     /**

package/dist-cms/packages/core/auth/modals/umb-app-auth-modal.element.js

@@ -142,7 +142,7 @@ let UmbAppAuthModalElement = class UmbAppAuthModalElement extends UmbModalBaseEl
         css `
 			:host {
 				display: block;
-				background: var(--uui-color-surface, #f4f4f4);
+				background: var(--uui-color-background, #f4f4f4);
 
 				--curves-color: var(--umb-login-curves-color, #f5c1bc);
 				--curves-display: var(--umb-login-curves-display, inline);
@@ -176,13 +176,13 @@ let UmbAppAuthModalElement = class UmbAppAuthModalElement extends UmbModalBaseEl
 			}
 
 			#curve-top {
-				top: 0px;
-				right: 0px;
+				top: -9%;
+				right: -9%;
 			}
 
 			#curve-bottom {
-				bottom: 0px;
-				left: 0px;
+				bottom: -0.5%;
+				left: -0.1%;
 			}
 
 			#content-container {

package/dist-cms/packages/core/backend-api/types.gen.d.ts

@@ -5808,6 +5808,7 @@ export type GetItemDocumentSearchData = {
     query?: {
         query?: string;
         trashed?: boolean;
+        culture?: string;
         skip?: number;
         take?: number;
         parentId?: string;
@@ -7794,6 +7795,7 @@ export type GetItemMediaSearchData = {
     query?: {
         query?: string;
         trashed?: boolean;
+        culture?: string;
         skip?: number;
         take?: number;
         parentId?: string;

package/dist-cms/packages/core/collection/default/collection-default.context.d.ts

@@ -44,6 +44,7 @@ export declare class UmbDefaultCollectionContext<CollectionItemType extends {
     getConfig(): UmbCollectionConfiguration | undefined;
     set manifest(manifest: ManifestCollection | undefined);
     get manifest(): ManifestCollection | undefined;
+    getEmptyLabel(): string;
     /**
      * Requests the collection from the repository.
      * @returns {*}
@@ -56,6 +57,7 @@ export declare class UmbDefaultCollectionContext<CollectionItemType extends {
      * @memberof UmbCollectionContext
      */
     setFilter(filter: Partial<FilterModelType>): void;
+    updateFilter(filter: Partial<FilterModelType>): void;
     getLastSelectedView(unique: string | undefined): string | undefined;
     setLastSelectedView(unique: string | undefined, viewAlias: string): void;
     destroy(): void;

package/dist-cms/packages/core/collection/default/collection-default.context.js

@@ -8,7 +8,7 @@ import { UmbExtensionApiInitializer } from '@umbraco-cms/backoffice/extension-ap
 import { UmbSelectionManager, UmbPaginationManager, UmbDeprecation } from '@umbraco-cms/backoffice/utils';
 import { UmbRequestReloadChildrenOfEntityEvent, UmbRequestReloadStructureForEntityEvent, } from '@umbraco-cms/backoffice/entity-action';
 import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
-import { UMB_ENTITY_CONTEXT } from '@umbraco-cms/backoffice/entity';
+import { UMB_ENTITY_CONTEXT, UmbParentEntityContext } from '@umbraco-cms/backoffice/entity';
 import { UMB_WORKSPACE_MODAL } from '@umbraco-cms/backoffice/workspace';
 import { UmbModalRouteRegistrationController } from '@umbraco-cms/backoffice/router';
 const LOCAL_STORAGE_KEY = 'umb-collection-view';
@@ -22,6 +22,7 @@ export class UmbDefaultCollectionContext extends UmbContextBase {
     #initResolver;
     #initialized;
     #actionEventContext;
+    #parentEntityContext;
     constructor(host, defaultViewAlias, defaultFilter = {}) {
         super(host, UMB_COLLECTION_CONTEXT);
         this.#config = { pageSize: 50 };
@@ -52,6 +53,7 @@ export class UmbDefaultCollectionContext extends UmbContextBase {
                 this.#initResolver = resolve;
             }
         });
+        this.#parentEntityContext = new UmbParentEntityContext(this);
         this._configured = false;
         this.#onPageChange = (event) => {
             const target = event.target;
@@ -80,6 +82,19 @@ export class UmbDefaultCollectionContext extends UmbContextBase {
         this.#defaultFilter = defaultFilter;
         this.pagination.addEventListener(UmbChangeEvent.TYPE, this.#onPageChange);
         this.#listenToEntityEvents();
+        // The parent entity context is used to get the parent entity for the collection items
+        // All items in the collection are children of the current entity context
+        this.consumeContext(UMB_ENTITY_CONTEXT, (context) => {
+            const currentEntityUnique = context?.getUnique();
+            const currentEntityType = context?.getEntityType();
+            const parent = currentEntityUnique && currentEntityType
+                ? {
+                    unique: currentEntityUnique,
+                    entityType: currentEntityType,
+                }
+                : undefined;
+            this.#parentEntityContext?.setParent(parent);
+        });
     }
     setupView(viewElement) {
         new UmbModalRouteRegistrationController(viewElement, UMB_WORKSPACE_MODAL)
@@ -168,6 +183,9 @@ export class UmbDefaultCollectionContext extends UmbContextBase {
     get manifest() {
         return this._manifest;
     }
+    getEmptyLabel() {
+        return this.manifest?.meta.noItemsLabel ?? this.#config?.noItemsLabel ?? '#collection_noItemsTitle';
+    }
     /**
      * Requests the collection from the repository.
      * @returns {*}
@@ -198,6 +216,9 @@ export class UmbDefaultCollectionContext extends UmbContextBase {
         this._filter.setValue({ ...this._filter.getValue(), ...filter });
         this.requestCollection();
     }
+    updateFilter(filter) {
+        this._filter.setValue({ ...this._filter.getValue(), ...filter });
+    }
     getLastSelectedView(unique) {
         if (!unique)
             return;

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

@@ -5,6 +5,7 @@ export declare class UmbCollectionDefaultElement extends UmbLitElement {
     private _routes;
     private _hasItems;
     private _isDoneLoading;
+    private _emptyLabel?;
     constructor();
     render(): typeof nothing | import("lit-html").TemplateResult<1>;
     protected renderToolbar(): import("lit-html").TemplateResult<1>;

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

@@ -24,6 +24,7 @@ const manifest = {
 };
 umbExtensionsRegistry.register(manifest);
 let UmbCollectionDefaultElement = class UmbCollectionDefaultElement extends UmbLitElement {
+    //
     #collectionContext;
     constructor() {
         super();
@@ -34,6 +35,7 @@ let UmbCollectionDefaultElement = class UmbCollectionDefaultElement extends UmbL
             this.#collectionContext = context;
             this.#observeCollectionRoutes();
             this.#observeTotalItems();
+            this.#getEmptyStateLabel();
             await this.#collectionContext?.requestCollection();
             this._isDoneLoading = true;
         });
@@ -52,6 +54,9 @@ let UmbCollectionDefaultElement = class UmbCollectionDefaultElement extends UmbL
             this._hasItems = totalItems > 0;
         }, 'umbCollectionTotalItemsObserver');
     }
+    #getEmptyStateLabel() {
+        this._emptyLabel = this.#collectionContext?.getEmptyLabel();
+    }
     render() {
         return this._routes
             ? html `
@@ -79,7 +84,7 @@ let UmbCollectionDefaultElement = class UmbCollectionDefaultElement extends UmbL
             return nothing;
         return html `
 			<div id="empty-state" class="uui-text">
-				<h4><umb-localize key="collection_noItemsTitle"></umb-localize></h4>
+				<h4>${this.localize.string(this._emptyLabel)}</h4>
 			</div>
 		`;
     }
@@ -124,6 +129,9 @@ __decorate([
 __decorate([
     state()
 ], UmbCollectionDefaultElement.prototype, "_isDoneLoading", void 0);
+__decorate([
+    state()
+], UmbCollectionDefaultElement.prototype, "_emptyLabel", void 0);
 UmbCollectionDefaultElement = __decorate([
     customElement('umb-collection-default')
 ], UmbCollectionDefaultElement);

package/dist-cms/packages/core/collection/extensions/collection.extension.d.ts

@@ -5,6 +5,7 @@ export interface ManifestCollection extends ManifestElementAndApi, ManifestWithD
 }
 export interface MetaCollection {
     repositoryAlias: string;
+    noItemsLabel?: string;
 }
 declare global {
     interface UmbExtensionManifestMap {

package/dist-cms/packages/core/collection/types.d.ts

@@ -22,6 +22,7 @@ export interface UmbCollectionConfiguration {
     orderBy?: string;
     orderDirection?: string;
     pageSize?: number;
+    noItemsLabel?: string;
     userDefinedProperties?: Array<UmbCollectionColumnConfiguration>;
 }
 export interface UmbCollectionColumnConfiguration {

package/dist-cms/packages/core/components/body-layout/body-layout.element.js

@@ -76,13 +76,6 @@ let UmbBodyLayoutElement = class UmbBodyLayoutElement extends LitElement {
 					@slotchange=${(e) => {
             this._headerSlotHasChildren = this.#hasNodes(e);
             this.#setSlotVisibility(e.target, this._headerSlotHasChildren);
-        }}></slot>
-				<slot
-					id="navigation-slot"
-					name="navigation"
-					@slotchange=${(e) => {
-            this._navigationSlotHasChildren = this.#hasNodes(e);
-            this.#setSlotVisibility(e.target, this._navigationSlotHasChildren);
         }}></slot>
 				<slot
 					id="action-menu-slot"
@@ -90,6 +83,13 @@ let UmbBodyLayoutElement = class UmbBodyLayoutElement extends LitElement {
 					@slotchange=${(e) => {
             this._actionsMenuSlotHasChildren = this.#hasNodes(e);
             this.#setSlotVisibility(e.target, this._actionsMenuSlotHasChildren);
+        }}></slot>
+				<slot
+					id="navigation-slot"
+					name="navigation"
+					@slotchange=${(e) => {
+            this._navigationSlotHasChildren = this.#hasNodes(e);
+            this.#setSlotVisibility(e.target, this._navigationSlotHasChildren);
         }}></slot>
 			</div>
 
@@ -179,7 +179,6 @@ let UmbBodyLayoutElement = class UmbBodyLayoutElement extends LitElement {
 				box-sizing: border-box;
 				min-width: 0;
 			}
-
 			#navigation-slot {
 				margin-left: auto;
 			}

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

@@ -3,15 +3,17 @@ import type { PropertyValueMap } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 export declare class UmbDropdownElement extends UmbLitElement {
     #private;
-    popoverContainerElement?: UUIPopoverContainerElement;
     open: boolean;
-    label: string;
+    label?: string;
     look: UUIInterfaceLook;
     color: UUIInterfaceColor;
     placement: PopoverContainerPlacement;
     compact: boolean;
     hideExpand: boolean;
+    popoverContainerElement?: UUIPopoverContainerElement;
     protected updated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;
+    openDropdown(): void;
+    closeDropdown(): void;
     render(): import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];
 }

package/dist-cms/packages/core/components/dropdown/dropdown.element.js

@@ -12,7 +12,6 @@ let UmbDropdownElement = class UmbDropdownElement extends UmbLitElement {
     constructor() {
         super(...arguments);
         this.open = false;
-        this.label = '';
         this.look = 'default';
         this.color = 'default';
         this.placement = 'bottom-start';
@@ -23,16 +22,10 @@ let UmbDropdownElement = class UmbDropdownElement extends UmbLitElement {
         super.updated(_changedProperties);
         if (_changedProperties.has('open') && this.popoverContainerElement) {
             if (this.open) {
-                // TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
-                this.popoverContainerElement.showPopover();
+                this.openDropdown();
             }
             else {
-                // TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
-                // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-                // @ts-ignore
-                this.popoverContainerElement.hidePopover();
+                this.closeDropdown();
             }
         }
     }
@@ -42,14 +35,27 @@ let UmbDropdownElement = class UmbDropdownElement extends UmbLitElement {
         // @ts-ignore
         this.open = event.newState === 'open';
     }
+    openDropdown() {
+        // TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        this.popoverContainerElement?.showPopover();
+    }
+    closeDropdown() {
+        // TODO: This ignorer is just needed for JSON SCHEMA TO WORK, As its not updated with latest TS jet.
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        this.popoverContainerElement?.hidePopover();
+    }
     render() {
         return html `
 			<uui-button
 				id="dropdown-button"
 				popovertarget="dropdown-popover"
+				data-mark="open-dropdown"
 				.look=${this.look}
 				.color=${this.color}
-				.label=${this.label}
+				.label=${this.label ?? ''}
 				.compact=${this.compact}>
 				<slot name="label"></slot>
 				${when(!this.hideExpand, () => html `<uui-symbol-expand id="symbol-expand" .open=${this.open}></uui-symbol-expand>`)}
@@ -77,9 +83,6 @@ let UmbDropdownElement = class UmbDropdownElement extends UmbLitElement {
 		`,
     ]; }
 };
-__decorate([
-    query('#dropdown-popover')
-], UmbDropdownElement.prototype, "popoverContainerElement", void 0);
 __decorate([
     property({ type: Boolean, reflect: true })
 ], UmbDropdownElement.prototype, "open", void 0);
@@ -101,6 +104,9 @@ __decorate([
 __decorate([
     property({ type: Boolean, attribute: 'hide-expand' })
 ], UmbDropdownElement.prototype, "hideExpand", void 0);
+__decorate([
+    query('#dropdown-popover')
+], UmbDropdownElement.prototype, "popoverContainerElement", void 0);
 UmbDropdownElement = __decorate([
     customElement('umb-dropdown')
 ], UmbDropdownElement);

package/dist-cms/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.d.ts

@@ -10,7 +10,7 @@ export declare class UmbEntityActionsBundleElement extends UmbLitElement {
     private _firstActionManifest?;
     private _firstActionApi?;
     private _firstActionHref?;
-    _dropdownIsOpen: boolean;
+    private _dropdownElement?;
     protected updated(_changedProperties: PropertyValueMap<any> | Map<PropertyKey, unknown>): void;
     render(): typeof nothing | import("lit-html").TemplateResult<1>;
     static styles: import("lit").CSSResult[];

package/dist-cms/packages/core/components/entity-actions-bundle/entity-actions-bundle.element.js

@@ -5,7 +5,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { UmbEntityContext } from '../../entity/entity.context.js';
-import { html, nothing, customElement, property, state, ifDefined, css } from '@umbraco-cms/backoffice/external/lit';
+import { html, nothing, customElement, property, state, ifDefined, css, query, } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbExtensionsManifestInitializer, createExtensionApi } from '@umbraco-cms/backoffice/extension-api';
@@ -13,7 +13,6 @@ let UmbEntityActionsBundleElement = class UmbEntityActionsBundleElement extends
     constructor() {
         super(...arguments);
         this._numberOfActions = 0;
-        this._dropdownIsOpen = false;
         // TODO: provide the entity context on a higher level, like the root element of this entity, tree-item/workspace/... [NL]
         this.#entityContext = new UmbEntityContext(this);
     }
@@ -40,7 +39,10 @@ let UmbEntityActionsBundleElement = class UmbEntityActionsBundleElement extends
         this._firstActionApi = await createExtensionApi(this, this._firstActionManifest, [
             { unique: this.unique, entityType: this.entityType, meta: this._firstActionManifest.meta },
         ]);
-        this._firstActionHref = await this._firstActionApi?.getHref();
+        if (this._firstActionApi) {
+            this._firstActionApi.manifest = this._firstActionManifest;
+            this._firstActionHref = await this._firstActionApi.getHref();
+        }
     }
     async #onFirstActionClick(event) {
         // skip if href is defined
@@ -51,7 +53,7 @@ let UmbEntityActionsBundleElement = class UmbEntityActionsBundleElement extends
         await this._firstActionApi?.execute().catch(() => { });
     }
     #onActionExecuted() {
-        this._dropdownIsOpen = false;
+        this._dropdownElement?.closeDropdown();
     }
     #onDropdownClick(event) {
         event.stopPropagation();
@@ -65,25 +67,27 @@ let UmbEntityActionsBundleElement = class UmbEntityActionsBundleElement extends
         if (this._numberOfActions === 1)
             return nothing;
         return html `
-			<umb-dropdown id="action-modal" .open=${this._dropdownIsOpen} @click=${this.#onDropdownClick} compact hide-expand>
-				<uui-symbol-more slot="label" label="Open actions menu"></uui-symbol-more>
+			<umb-dropdown id="action-modal" @click=${this.#onDropdownClick} .label=${this.label} compact hide-expand>
+				<uui-symbol-more slot="label" .label=${this.label}></uui-symbol-more>
 				<uui-scroll-container>
 					<umb-entity-action-list
 						@action-executed=${this.#onActionExecuted}
 						.entityType=${this.entityType}
-						.unique=${this.unique}></umb-entity-action-list>
+						.unique=${this.unique}
+						.label=${this.label}></umb-entity-action-list>
 				</uui-scroll-container>
 			</umb-dropdown>
 		`;
     }
     #renderFirstAction() {
-        if (!this._firstActionApi)
+        if (!this._firstActionApi || !this._firstActionManifest)
             return nothing;
         return html `<uui-button
-			label=${ifDefined(this._firstActionManifest?.meta.label)}
+			label=${this.localize.string(this._firstActionManifest.meta.label)}
+			data-mark=${'entity-action:' + this._firstActionManifest.alias}
 			@click=${this.#onFirstActionClick}
 			href="${ifDefined(this._firstActionHref)}">
-			<uui-icon name=${ifDefined(this._firstActionManifest?.meta.icon)}></uui-icon>
+			<uui-icon name=${ifDefined(this._firstActionManifest.meta.icon)}></uui-icon>
 		</uui-button>`;
     }
     static { this.styles = [
@@ -116,8 +120,8 @@ __decorate([
     state()
 ], UmbEntityActionsBundleElement.prototype, "_firstActionHref", void 0);
 __decorate([
-    state()
-], UmbEntityActionsBundleElement.prototype, "_dropdownIsOpen", void 0);
+    query('#action-modal')
+], UmbEntityActionsBundleElement.prototype, "_dropdownElement", void 0);
 UmbEntityActionsBundleElement = __decorate([
     customElement('umb-entity-actions-bundle')
 ], UmbEntityActionsBundleElement);