diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts index b4ad4e787b..3d1c122342 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/collection/components/collection-selection-actions.element.ts @@ -13,7 +13,7 @@ export class UmbCollectionSelectionActionsElement extends UmbLitElement { private _selectionLength = 0; @state() - private _extensionProps = {}; + private _elementProps = {}; private _selection: Array = []; @@ -53,7 +53,7 @@ export class UmbCollectionSelectionActionsElement extends UmbLitElement { (selection) => { this._selectionLength = selection.length; this._selection = selection; - this._extensionProps = { selection: this._selection }; + this._elementProps = { selection: this._selection }; }, 'umbSelectionObserver', ); @@ -86,8 +86,8 @@ export class UmbCollectionSelectionActionsElement extends UmbLitElement { id="actions" type="entityBulkAction" default-element="umb-entity-bulk-action" - .props=${this._extensionProps} - .apiArgs=${[this._extensionProps]} + .elementProps=${this._elementProps} + .apiArgs=${[this._elementProps]} @action-executed=${this.#onActionExecuted}> diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/extension-with-api-slot.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/extension-with-api-slot.element.ts index ab9e1e3668..7bb11562ff 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/extension-with-api-slot.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/extension-with-api-slot/extension-with-api-slot.element.ts @@ -77,13 +77,13 @@ export class UmbExtensionWithApiSlotElement extends UmbLitElement { * @type {Record} * @memberof UmbExtensionSlot * @example - * + * */ - @property({ type: Object, attribute: false }) - get props(): Record | undefined { + @property({ attribute: false }) + get elementProps(): Record | undefined { return this.#props; } - set props(newVal: Record | undefined) { + set elementProps(newVal: Record | undefined) { // TODO, compare changes since last time. only reset the ones that changed. This might be better done by the controller is self: this.#props = newVal; if (this.#extensionsController) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts index 23b8d31e43..c84dd0dbab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts @@ -40,7 +40,7 @@ export class UmbEntityActionListElement extends UmbLitElement { type="entityAction" default-element="umb-entity-action" .filter=${this._filter} - .props=${this._props} + .elementProps=${this._props} .apiArgs=${[this._props]}> ` : ''; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action-base.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action-base.ts index de4d10fceb..ab77a5702a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action-base.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action-base.ts @@ -1,8 +1,9 @@ import type { UmbEntityBulkAction } from './entity-bulk-action.interface.js'; import type { UmbEntityBulkActionArgs } from './types.js'; +import type { MetaEntityBulkAction } from '@umbraco-cms/backoffice/extension-registry'; import { UmbActionBase } from '@umbraco-cms/backoffice/action'; -export abstract class UmbEntityBulkActionBase +export abstract class UmbEntityBulkActionBase extends UmbActionBase> implements UmbEntityBulkAction { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts index 9e70a3ad03..4df57b2469 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.element.ts @@ -6,7 +6,7 @@ import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; @customElement('umb-entity-bulk-action') export class UmbEntityBulkActionElement< - MetaType = MetaEntityBulkAction, + MetaType extends MetaEntityBulkAction = MetaEntityBulkAction, ApiType extends UmbEntityBulkActionBase = UmbEntityBulkActionBase, > extends UmbLitElement { @property({ attribute: false }) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.interface.ts index f399e101b8..aec4bdd613 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/entity-bulk-action.interface.ts @@ -1,7 +1,9 @@ import type { UmbEntityBulkActionArgs } from './types.js'; +import type { MetaEntityBulkAction } from '@umbraco-cms/backoffice/extension-registry'; import type { UmbAction } from '@umbraco-cms/backoffice/action'; -export interface UmbEntityBulkAction extends UmbAction> { +export interface UmbEntityBulkAction + extends UmbAction> { selection: Array; // I don't think we need this one, now that we have the above one? [NL] diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/types.ts index f9588623f5..fe56b791bf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/types.ts @@ -1,4 +1,6 @@ -export interface UmbEntityBulkActionArgs { +import type { MetaEntityBulkAction } from '../extension-registry/models/entity-bulk-action.model.js'; + +export interface UmbEntityBulkActionArgs { entityType: string; meta: MetaArgsType; }