Feature: Bulk Delete/Trash referenced by

src/Umbraco.Web.UI.Client/package.json

@@ -45,6 +45,7 @@
 		"./entity-bulk-action": "./dist-cms/packages/core/entity-bulk-action/index.js",
 		"./entity-create-option-action": "./dist-cms/packages/core/entity-create-option-action/index.js",
 		"./entity": "./dist-cms/packages/core/entity/index.js",
+		"./entity-item": "./dist-cms/packages/core/entity-item/index.js",
 		"./event": "./dist-cms/packages/core/event/index.js",
 		"./extension-registry": "./dist-cms/packages/core/extension-registry/index.js",
 		"./health-check": "./dist-cms/packages/health-check/index.js",

src/Umbraco.Web.UI.Client/src/assets/lang/en.ts

@@ -511,6 +511,10 @@ export default {
 		confirmlogout: 'Are you sure?',
 		confirmSure: 'Are you sure?',
 		confirmTrash: (name: string) => `Are you sure you want to move <strong>${name}</strong> to the Recycle Bin?`,
+		confirmBulkTrash: (total: number) =>
+			`Are you sure you want to move <strong>${total} ${total === 1 ? 'item' : 'items'}</strong> to the Recycle Bin?`,
+		confirmBulkDelete: (total: number) =>
+			`Are you sure you want to delete <strong>${total} ${total === 1 ? 'item' : 'items'}</strong>?`,
 		cut: 'Cut',
 		editDictionary: 'Edit dictionary item',
 		editLanguage: 'Edit language',

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-deleted.event.ts

@@ -0,0 +1,10 @@
+import type { UmbEntityActionEventArgs } from './entity-action.event.js';
+import { UmbEntityActionEvent } from './entity-action.event.js';
+
+export class UmbEntityDeletedEvent extends UmbEntityActionEvent {
+	static readonly TYPE = 'entity-deleted';
+
+	constructor(args: UmbEntityActionEventArgs) {
+		super(UmbEntityDeletedEvent.TYPE, args);
+	}
+}

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/index.ts

@@ -6,6 +6,7 @@ export * from './entity-action-base.js';
 export * from './entity-action-list.element.js';
 export * from './entity-action.event.js';
 export * from './entity-updated.event.js';
+export * from './entity-deleted.event.js';
 export type * from './types.js';
 
 export { UmbRequestReloadStructureForEntityEvent } from './request-reload-structure-for-entity.event.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/bulk-delete/bulk-delete.action.kind.ts

@@ -0,0 +1,24 @@
+import { UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST } from '../../default/default.action.kind.js';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+
+export const UMB_ENTITY_BULK_ACTION_DELETE_KIND = 'delete';
+
+export const UMB_ENTITY_BULK_ACTION_DELETE_KIND_MANIFEST: UmbExtensionManifestKind = {
+	type: 'kind',
+	alias: 'Umb.Kind.EntityBulkAction.Delete',
+	matchKind: UMB_ENTITY_BULK_ACTION_DELETE_KIND,
+	matchType: 'entityBulkAction',
+	manifest: {
+		...UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST.manifest,
+		type: 'entityBulkAction',
+		kind: UMB_ENTITY_BULK_ACTION_DELETE_KIND,
+		api: () => import('./bulk-delete.action.js'),
+		weight: 1100,
+		meta: {
+			icon: 'icon-trash',
+			label: '#actions_delete',
+		},
+	},
+};
+
+export const manifest = UMB_ENTITY_BULK_ACTION_DELETE_KIND_MANIFEST;

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/bulk-delete/bulk-delete.action.ts

@@ -0,0 +1,121 @@
+import { UmbEntityBulkActionBase } from '../../entity-bulk-action-base.js';
+import type { MetaEntityBulkActionDeleteKind } from './types.js';
+import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry';
+import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
+import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
+import {
+	UmbEntityDeletedEvent,
+	UmbRequestReloadChildrenOfEntityEvent,
+	UmbRequestReloadStructureForEntityEvent,
+} from '@umbraco-cms/backoffice/entity-action';
+import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification';
+import { UmbLocalizationController } from '@umbraco-cms/backoffice/localization-api';
+import { UMB_ENTITY_CONTEXT, type UmbEntityModel } from '@umbraco-cms/backoffice/entity';
+import type { UmbDetailRepository, UmbItemRepository } from '@umbraco-cms/backoffice/repository';
+
+export class UmbDeleteEntityBulkAction<
+	MetaKindType extends MetaEntityBulkActionDeleteKind = MetaEntityBulkActionDeleteKind,
+> extends UmbEntityBulkActionBase<MetaKindType> {
+	#localize = new UmbLocalizationController(this);
+	_items: Array<any> = [];
+
+	override async execute() {
+		if (this.selection?.length === 0) {
+			throw new Error('No items selected.');
+		}
+
+		// TODO: Move item look up to a future bulk action context
+		await this.#requestItems();
+		await this._confirmDelete(this._items);
+		await this.#requestBulkDelete(this.selection);
+	}
+
+	protected async _confirmDelete(items: Array<any>) {
+		const headline = '#actions_delete';
+		const message = '#defaultdialogs_confirmBulkDelete';
+
+		// TODO: consider showing more details about the items being deleted
+		await umbConfirmModal(this._host, {
+			headline,
+			content: this.#localize.string(message, items.length),
+			color: 'danger',
+			confirmLabel: '#actions_delete',
+		});
+	}
+
+	async #requestItems() {
+		const itemRepository = await createExtensionApiByAlias<UmbItemRepository<any>>(
+			this,
+			this.args.meta.itemRepositoryAlias,
+		);
+
+		const { data } = await itemRepository.requestItems(this.selection);
+
+		this._items = data ?? [];
+	}
+
+	async #requestBulkDelete(uniques: Array<string>) {
+		const detailRepository = await createExtensionApiByAlias<UmbDetailRepository<UmbEntityModel>>(
+			this,
+			this.args.meta.detailRepositoryAlias,
+		);
+
+		const notificationContext = await this.getContext(UMB_NOTIFICATION_CONTEXT);
+
+		const succeeded: Array<string> = [];
+
+		for (const unique of uniques) {
+			const { error } = await detailRepository.delete(unique);
+
+			if (error) {
+				const notification = { data: { message: error.message } };
+				notificationContext?.peek('danger', notification);
+			} else {
+				succeeded.push(unique);
+			}
+		}
+
+		if (succeeded.length > 0) {
+			const notification = {
+				data: { message: `Deleted ${succeeded.length} ${succeeded.length === 1 ? 'item' : 'items'}` },
+			};
+			notificationContext?.peek('positive', notification);
+		}
+
+		await this.#notify(succeeded);
+	}
+
+	async #notify(succeeded: Array<string>) {
+		const entityContext = await this.getContext(UMB_ENTITY_CONTEXT);
+		if (!entityContext) throw new Error('Entity Context is not available');
+
+		const eventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+		if (!eventContext) throw new Error('Event Context is not available');
+
+		const entityType = entityContext.getEntityType();
+		const unique = entityContext.getUnique();
+
+		if (entityType && unique !== undefined) {
+			const args = { entityType, unique };
+
+			const reloadChildren = new UmbRequestReloadChildrenOfEntityEvent(args);
+			eventContext.dispatchEvent(reloadChildren);
+
+			const reloadStructure = new UmbRequestReloadStructureForEntityEvent(args);
+			eventContext.dispatchEvent(reloadStructure);
+		}
+
+		const succeededItems = this._items.filter((item) => succeeded.includes(item.unique));
+
+		succeededItems.forEach((item) => {
+			const deletedEvent = new UmbEntityDeletedEvent({
+				unique: item.unique,
+				entityType: item.entityType,
+			});
+
+			eventContext.dispatchEvent(deletedEvent);
+		});
+	}
+}
+
+export { UmbDeleteEntityBulkAction as api };

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/bulk-delete/constants.ts

@@ -0,0 +1,4 @@
+export {
+	UMB_ENTITY_BULK_ACTION_DELETE_KIND_MANIFEST,
+	UMB_ENTITY_BULK_ACTION_DELETE_KIND,
+} from './bulk-delete.action.kind.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/bulk-delete/index.ts

@@ -0,0 +1,2 @@
+export * from './bulk-delete.action.js';
+export type * from './types.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/bulk-delete/manifests.ts

@@ -0,0 +1,4 @@
+import { manifest as deleteKindManifest } from './bulk-delete.action.kind.js';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+
+export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [deleteKindManifest];

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/bulk-delete/types.ts

@@ -0,0 +1,20 @@
+import type {
+	ManifestEntityBulkAction,
+	MetaEntityBulkActionDefaultKind,
+} from '@umbraco-cms/backoffice/extension-registry';
+
+export interface ManifestEntityBulkActionDeleteKind extends ManifestEntityBulkAction<MetaEntityBulkActionDeleteKind> {
+	type: 'entityBulkAction';
+	kind: 'delete';
+}
+
+export interface MetaEntityBulkActionDeleteKind extends MetaEntityBulkActionDefaultKind {
+	detailRepositoryAlias: string;
+	itemRepositoryAlias: string;
+}
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbManifestEntityBulkActionDeleteKind: ManifestEntityBulkActionDeleteKind;
+	}
+}

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/constants.ts

@@ -0,0 +1 @@
+export const UMB_ENTITY_BULK_ACTION_TRASH_KIND = 'trash';

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/trash-repository.interface.ts

@@ -1,7 +1,12 @@
 import type { UmbRepositoryErrorResponse } from '../../../repository/types.js';
 import type { UmbBulkTrashRequestArgs } from './types.js';
 import type { UmbApi } from '@umbraco-cms/backoffice/extension-api';
-
+/**
+ * @deprecated since 15.3.0. Will be removed in 17.0.0. Call trash method on UmbRecycleBin repositories instead.
+ * @exports
+ * @interface UmbBulkTrashRepository
+ * @augments UmbApi
+ */
 export interface UmbBulkTrashRepository extends UmbApi {
 	requestBulkTrash(args: UmbBulkTrashRequestArgs): Promise<UmbRepositoryErrorResponse>;
 }

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/trash.action.kind.ts

@@ -1,15 +1,16 @@
 import { UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST } from '../../default/default.action.kind.js';
+import { UMB_ENTITY_BULK_ACTION_TRASH_KIND } from './constants.js';
 import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
 export const manifest: UmbExtensionManifestKind = {
 	type: 'kind',
 	alias: 'Umb.Kind.EntityBulkAction.Trash',
-	matchKind: 'trash',
+	matchKind: UMB_ENTITY_BULK_ACTION_TRASH_KIND,
 	matchType: 'entityBulkAction',
 	manifest: {
 		...UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST.manifest,
 		type: 'entityBulkAction',
-		kind: 'trash',
+		kind: UMB_ENTITY_BULK_ACTION_TRASH_KIND,
 		api: () => import('./trash.action.js'),
 		weight: 700,
 		forEntityTypes: [],

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/trash/trash.action.ts

@@ -1,6 +1,6 @@
 import type { UmbBulkTrashRepository } from './trash-repository.interface.js';
 import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry';
-import { UmbEntityBulkActionBase } from '@umbraco-cms/backoffice/entity-bulk-action';
+import { UmbEntityBulkActionBase, type UmbEntityBulkActionArgs } from '@umbraco-cms/backoffice/entity-bulk-action';
 import {
 	UmbRequestReloadChildrenOfEntityEvent,
 	UmbRequestReloadStructureForEntityEvent,
@@ -9,8 +9,26 @@ import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
 import { UMB_ENTITY_CONTEXT } from '@umbraco-cms/backoffice/entity';
 import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
 import type { MetaEntityBulkActionTrashKind } from '@umbraco-cms/backoffice/extension-registry';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UmbDeprecation } from '@umbraco-cms/backoffice/utils';
 
+/**
+ * @deprecated since v15.3.0. Will be removed in v17.0.0. import `UmbMediaTrashEntityBulkAction` from @umbraco-cms/backoffice/recycle-bin instead.
+ * @exports
+ * @class UmbMediaTrashEntityBulkAction
+ * @augments {UmbEntityBulkActionBase<MetaEntityBulkActionTrashKind>}
+ */
 export class UmbMediaTrashEntityBulkAction extends UmbEntityBulkActionBase<MetaEntityBulkActionTrashKind> {
+	constructor(host: UmbControllerHost, args: UmbEntityBulkActionArgs<MetaEntityBulkActionTrashKind>) {
+		super(host, args);
+
+		new UmbDeprecation({
+			removeInVersion: '17.0.0',
+			deprecated: 'UmbMediaTrashEntityBulkAction',
+			solution: 'import UmbMediaTrashEntityBulkAction from @umbraco-cms/backoffice/recycle-bin instead.',
+		}).warn();
+	}
+
 	async execute() {
 		if (this.selection?.length === 0) return;
 

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/index.ts → src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/common/types.ts

@@ -1,3 +1,4 @@
 export type * from './duplicate-to/index.js';
 export type * from './move-to/index.js';
 export type * from './trash/index.js';
+export type * from './bulk-delete/index.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/index.ts

@@ -1,8 +1,12 @@
-export type * from './common/index.js';
 export * from './entity-bulk-action-base.js';
 export * from './entity-bulk-action.element.js';
-export type * from './entity-bulk-action.interface.js';
-export type * from './entity-bulk-action-element.interface.js';
+export * from './common/bulk-delete/index.js';
 export type * from './types.js';
 
 export { UMB_ENTITY_BULK_ACTION_DEFAULT_KIND_MANIFEST } from './default/default.action.kind.js';
+export {
+	UMB_ENTITY_BULK_ACTION_DELETE_KIND_MANIFEST,
+	UMB_ENTITY_BULK_ACTION_DELETE_KIND,
+} from './common/bulk-delete/bulk-delete.action.kind.js';
+
+export { UMB_ENTITY_BULK_ACTION_TRASH_KIND } from './common/trash/constants.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/manifests.ts

@@ -2,11 +2,14 @@ import { manifests as defaultEntityBulkActionManifests } from './default/manifes
 import { manifests as duplicateEntityBulkActionManifests } from './common/duplicate-to/manifests.js';
 import { manifests as moveToEntityBulkActionManifests } from './common/move-to/manifests.js';
 import { manifests as trashEntityBulkActionManifests } from './common/trash/manifests.js';
+import { manifests as deleteEntityBulkActionManifests } from './common/bulk-delete/manifests.js';
+
 import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
 export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [
 	...defaultEntityBulkActionManifests,
 	...duplicateEntityBulkActionManifests,
 	...moveToEntityBulkActionManifests,
 	...trashEntityBulkActionManifests,
+	...deleteEntityBulkActionManifests,
 ];

src/Umbraco.Web.UI.Client/src/packages/core/entity-bulk-action/types.ts

@@ -1,5 +1,9 @@
 import type { MetaEntityBulkAction } from '../extension-registry/extensions/entity-bulk-action.extension.js';
 
+export type * from './common/types.js';
+export type * from './entity-bulk-action.interface.js';
+export type * from './entity-bulk-action-element.interface.js';
+
 export interface UmbEntityBulkActionArgs<MetaArgsType extends MetaEntityBulkAction> {
 	entityType: string;
 	meta: MetaArgsType;

src/Umbraco.Web.UI.Client/src/packages/core/entity/entity-item-ref/entity-item-ref.element.ts → src/Umbraco.Web.UI.Client/src/packages/core/entity-item/entity-item-ref/entity-item-ref.element.ts

@@ -1,13 +1,13 @@
-import type { UmbEntityModel } from '../types.js';
 import type { ManifestEntityItemRef } from './entity-item-ref.extension.js';
 import { customElement, property, type PropertyValueMap, state, css, html } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
 import { UmbExtensionsElementInitializer } from '@umbraco-cms/backoffice/extension-api';
 import { UMB_MARK_ATTRIBUTE_NAME } from '@umbraco-cms/backoffice/const';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
+import { UmbRoutePathAddendumContext } from '@umbraco-cms/backoffice/router';
+import type { UmbEntityModel } from '@umbraco-cms/backoffice/entity';
 
 import './default-item-ref.element.js';
-import { UmbRoutePathAddendumContext } from '@umbraco-cms/backoffice/router';
 
 @customElement('umb-entity-item-ref')
 export class UmbEntityItemRefElement extends UmbLitElement {

src/Umbraco.Web.UI.Client/src/packages/core/entity-item/entity-item-ref/global-components.ts

@@ -0,0 +1 @@
+import './entity-item-ref.element.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity/entity-item-ref/index.ts → src/Umbraco.Web.UI.Client/src/packages/core/entity-item/entity-item-ref/index.ts

@@ -1,3 +1 @@
-import './entity-item-ref.element.js';
-
 export * from './entity-item-ref.element.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-item/global-components.ts

@@ -0,0 +1 @@
+import './entity-item-ref/global-components.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-item/index.ts

@@ -0,0 +1 @@
+export * from './entity-item-ref/index.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-item/types.ts

@@ -0,0 +1,5 @@
+import type { UmbNamedEntityModel } from '@umbraco-cms/backoffice/entity';
+
+export interface UmbDefaultItemModel extends UmbNamedEntityModel {
+	icon?: string;
+}

src/Umbraco.Web.UI.Client/src/packages/core/entity/index.ts

@@ -1,4 +1,3 @@
 export { UMB_ENTITY_CONTEXT } from './entity.context-token.js';
 export { UmbEntityContext } from './entity.context.js';
-export * from './entity-item-ref/index.js';
 export type * from './types.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity/types.ts

@@ -8,7 +8,3 @@ export interface UmbEntityModel {
 export interface UmbNamedEntityModel extends UmbEntityModel {
 	name: string;
 }
-
-export interface UmbDefaultItemModel extends UmbNamedEntityModel {
-	icon?: string;
-}

src/Umbraco.Web.UI.Client/src/packages/core/entry-point.ts

@@ -9,6 +9,7 @@ import { UmbExtensionsApiInitializer, type UmbEntryPointOnInit } from '@umbraco-
 import './property-action/components/index.js';
 import './menu/components/index.js';
 import './extension-registry/components/index.js';
+import './entity-item/global-components.js';
 
 export const onInit: UmbEntryPointOnInit = (host, extensionRegistry) => {
 	new UmbExtensionsApiInitializer(host, extensionRegistry, 'globalContext', [host]);

src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/extensions/entity-bulk-action.extension.ts

@@ -17,7 +17,9 @@ export interface ManifestEntityBulkAction<MetaType extends MetaEntityBulkAction
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface MetaEntityBulkAction {}
 
-export interface ManifestEntityBulkActionDefaultKind extends ManifestEntityBulkAction<MetaEntityBulkActionDefaultKind> {
+export interface ManifestEntityBulkActionDefaultKind<
+	MetaKindType extends MetaEntityBulkActionDefaultKind = MetaEntityBulkActionDefaultKind,
+> extends ManifestEntityBulkAction<MetaKindType> {
 	type: 'entityBulkAction';
 	kind: 'default';
 }