Feature: Has Children Condition

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

@@ -48,7 +48,7 @@ export default {
 		notify: 'Notifications',
 		protect: 'Public Access',
 		publish: 'Publish',
-		refreshNode: 'Reload',
+		refreshNode: 'Reload children',
 		remove: 'Remove',
 		rename: 'Rename',
 		republish: 'Republish entire site',

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

@@ -48,7 +48,7 @@ export default {
 		protect: 'Public Access',
 		publish: 'Publish',
 		readOnly: 'Read-only',
-		refreshNode: 'Reload',
+		refreshNode: 'Reload children',
 		remove: 'Remove',
 		rename: 'Rename',
 		republish: 'Republish entire site',

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

@@ -1 +1,2 @@
 export * from './common/constants.js';
+export * from './has-children/constants.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/constants.ts

@@ -0,0 +1 @@
+export const UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS = 'Umb.Condition.EntityHasChildren';

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition-config.ts

@@ -0,0 +1,12 @@
+import type { UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS } from './constants.js';
+import type { UmbConditionConfigBase } from '@umbraco-cms/backoffice/extension-api';
+
+// eslint-disable-next-line @typescript-eslint/no-empty-object-type
+export interface UmbEntityHasChildrenConditionConfig
+	extends UmbConditionConfigBase<typeof UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS> {}
+
+declare global {
+	interface UmbExtensionConditionConfigMap {
+		UmbEntityHasChildrenConditionConfig: UmbEntityHasChildrenConditionConfig;
+	}
+}

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition.manifest.ts

@@ -0,0 +1,9 @@
+import { UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS } from './constants.js';
+import type { ManifestCondition } from '@umbraco-cms/backoffice/extension-api';
+
+export const manifest: ManifestCondition = {
+	type: 'condition',
+	name: 'Entity Has Children Condition',
+	alias: UMB_ENTITY_HAS_CHILDREN_CONDITION_ALIAS,
+	api: () => import('./entity-has-children.condition.js'),
+};

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/condition/entity-has-children.condition.ts

@@ -0,0 +1,25 @@
+import { UMB_HAS_CHILDREN_ENTITY_CONTEXT } from '../context/has-children.context-token.js';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import type {
+	UmbConditionConfigBase,
+	UmbConditionControllerArguments,
+	UmbExtensionCondition,
+} from '@umbraco-cms/backoffice/extension-api';
+import { UmbConditionBase } from '@umbraco-cms/backoffice/extension-registry';
+
+export class UmbEntityHasChildrenCondition
+	extends UmbConditionBase<UmbConditionConfigBase>
+	implements UmbExtensionCondition
+{
+	constructor(host: UmbControllerHost, args: UmbConditionControllerArguments<UmbConditionConfigBase>) {
+		super(host, args);
+
+		this.consumeContext(UMB_HAS_CHILDREN_ENTITY_CONTEXT, (context) => {
+			this.observe(context.hasChildren, (hasChildren) => {
+				this.permitted = hasChildren === true;
+			});
+		});
+	}
+}
+
+export { UmbEntityHasChildrenCondition as api };

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/constants.ts

@@ -0,0 +1,2 @@
+export * from './condition/constants.js';
+export * from './context/constants.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/constants.ts

@@ -0,0 +1 @@
+export * from './has-children.context-token.js';

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/has-children.context-token.ts

@@ -0,0 +1,6 @@
+import type { UmbHasChildrenEntityContext } from './has-children.entity-context.js';
+import { UmbContextToken } from '@umbraco-cms/backoffice/context-api';
+
+export const UMB_HAS_CHILDREN_ENTITY_CONTEXT = new UmbContextToken<UmbHasChildrenEntityContext>(
+	'UmbHasChildrenEntityContext',
+);

src/Umbraco.Web.UI.Client/src/packages/core/entity-action/has-children/context/has-children.entity-context.ts

@@ -0,0 +1,31 @@
+import { UMB_HAS_CHILDREN_ENTITY_CONTEXT } from './has-children.context-token.js';
+import { UmbContextBase } from '@umbraco-cms/backoffice/class-api';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import { UmbBooleanState } from '@umbraco-cms/backoffice/observable-api';
+
+export class UmbHasChildrenEntityContext extends UmbContextBase<UmbHasChildrenEntityContext> {
+	#hasChildren = new UmbBooleanState(undefined);
+	public readonly hasChildren = this.#hasChildren.asObservable();
+
+	constructor(host: UmbControllerHost) {
+		super(host, UMB_HAS_CHILDREN_ENTITY_CONTEXT);
+	}
+
+	/**
+	 * Gets the hasChildren state
+	 * @returns {boolean} - The hasChildren state
+	 * @memberof UmbHasChildrenEntityContext
+	 */
+	public getHasChildren(): boolean | undefined {
+		return this.#hasChildren.getValue();
+	}
+
+	/**
+	 * Sets the hasChildren state
+	 * @param {boolean} hasChildren - The hasChildren state
+	 * @memberof UmbHasChildrenEntityContext
+	 */
+	public setHasChildren(hasChildren: boolean) {
+		this.#hasChildren.setValue(hasChildren);
+	}
+}

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

@@ -0,0 +1 @@
+export * from './has-children.entity-context.js';

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

@@ -0,0 +1 @@
+export * from './context/index.js';

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

@@ -0,0 +1,4 @@
+import { manifest as conditionManifest } from './condition/entity-has-children.condition.manifest.js';
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+
+export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [conditionManifest];

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

@@ -5,7 +5,9 @@ export * from './constants.js';
 export * from './entity-action-base.js';
 export * from './entity-action-list.element.js';
 export * from './entity-action.event.js';
+export * from './has-children/index.js';
 export * from './entity-updated.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-action/manifests.ts

@@ -2,6 +2,7 @@ import { manifests as createEntityActionManifests } from './common/create/manife
 import { manifests as defaultEntityActionManifests } from './default/manifests.js';
 import { manifests as deleteEntityActionManifests } from './common/delete/manifests.js';
 import { manifests as duplicateEntityActionManifests } from './common/duplicate/manifests.js';
+import { manifests as hasChildrenManifests } from './has-children/manifests.js';
 
 import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
@@ -10,4 +11,5 @@ export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> =
 	...defaultEntityActionManifests,
 	...deleteEntityActionManifests,
 	...duplicateEntityActionManifests,
+	...hasChildrenManifests,
 ];

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

@@ -1,3 +1,3 @@
-export { UmbTrashEntityAction } from './trash/index.js';
+export { UmbTrashEntityAction, UmbEntityTrashedEvent } from './trash/index.js';
 export { UmbRestoreFromRecycleBinEntityAction } from './restore-from-recycle-bin/restore-from-recycle-bin.action.js';
 export { UmbEmptyRecycleBinEntityAction } from './empty-recycle-bin/empty-recycle-bin.action.js';

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

@@ -1,2 +1,3 @@
-export type * from './types.js';
 export * from './trash.action.js';
+export * from './trash.event.js';
+export type * from './types.js';

src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/trash.action.ts

@@ -2,6 +2,7 @@ import { UmbEntityActionBase } from '../../../entity-action/entity-action-base.j
 import { UmbRequestReloadStructureForEntityEvent } from '../../../entity-action/request-reload-structure-for-entity.event.js';
 import type { UmbRecycleBinRepository } from '../../recycle-bin-repository.interface.js';
 import type { MetaEntityActionTrashKind } from './types.js';
+import { UmbEntityTrashedEvent } from './trash.event.js';
 import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry';
 import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
 import type { UmbItemRepository } from '@umbraco-cms/backoffice/repository';
@@ -43,15 +44,25 @@ export class UmbTrashEntityAction extends UmbEntityActionBase<MetaEntityActionTr
 		);
 		await recycleBinRepository.requestTrash({ unique: this.args.unique });
 
+		this.#notify();
+	}
+
+	async #notify() {
 		const actionEventContext = await this.getContext(UMB_ACTION_EVENT_CONTEXT);
+
 		const event = new UmbRequestReloadStructureForEntityEvent({
 			unique: this.args.unique,
 			entityType: this.args.entityType,
 		});
 
 		actionEventContext.dispatchEvent(event);
 
-		// TODO: reload destination
+		const trashedEvent = new UmbEntityTrashedEvent({
+			unique: this.args.unique,
+			entityType: this.args.entityType,
+		});
+
+		actionEventContext.dispatchEvent(trashedEvent);
 	}
 }
 

src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/entity-action/trash/trash.event.ts

@@ -0,0 +1,9 @@
+import { UmbEntityActionEvent, type UmbEntityActionEventArgs } from '@umbraco-cms/backoffice/entity-action';
+
+export class UmbEntityTrashedEvent extends UmbEntityActionEvent {
+	static readonly TYPE = 'entity-trashed';
+
+	constructor(args: UmbEntityActionEventArgs) {
+		super(UmbEntityTrashedEvent.TYPE, args);
+	}
+}

src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/manifests.ts

@@ -1,12 +1,15 @@
-import { manifests as trashEntityActionManifests } from './entity-action/trash/manifests.js';
-import { manifests as restoreFromRecycleBinEntityActionManifests } from './entity-action/restore-from-recycle-bin/manifests.js';
-import { manifests as emptyRecycleBinEntityActionManifests } from './entity-action/empty-recycle-bin/manifests.js';
 import { manifests as conditionManifests } from './conditions/manifests.js';
+import { manifests as emptyRecycleBinEntityActionManifests } from './entity-action/empty-recycle-bin/manifests.js';
+import { manifests as restoreFromRecycleBinEntityActionManifests } from './entity-action/restore-from-recycle-bin/manifests.js';
+import { manifests as trashEntityActionManifests } from './entity-action/trash/manifests.js';
+import { manifests as treeManifests } from './tree/manifests.js';
+
 import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
 
 export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [
 	...conditionManifests,
 	...emptyRecycleBinEntityActionManifests,
 	...restoreFromRecycleBinEntityActionManifests,
 	...trashEntityActionManifests,
+	...treeManifests,
 ];

src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/tree/manifests.ts

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

src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/tree/tree-item/manifests.ts

@@ -0,0 +1,17 @@
+import type { UmbExtensionManifestKind } from '@umbraco-cms/backoffice/extension-registry';
+import { UMB_TREE_ITEM_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/tree';
+
+export const manifests: Array<UmbExtensionManifest | UmbExtensionManifestKind> = [
+	{
+		type: 'kind',
+		alias: 'Umb.Kind.TreeItem.RecycleBin',
+		matchType: 'treeItem',
+		matchKind: 'recycleBin',
+		manifest: {
+			...UMB_TREE_ITEM_DEFAULT_KIND_MANIFEST.manifest,
+			type: 'treeItem',
+			kind: 'recycleBin',
+			api: () => import('./recycle-bin-tree-item.context.js'),
+		},
+	},
+];

src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/tree/tree-item/recycle-bin-tree-item.context.ts

@@ -0,0 +1,53 @@
+import type { ManifestTreeItemRecycleBinKind } from './types.js';
+import { UmbDefaultTreeItemContext, type UmbTreeItemModel, type UmbTreeRootModel } from '@umbraco-cms/backoffice/tree';
+import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api';
+import type { UmbActionEventContext } from '@umbraco-cms/backoffice/action';
+import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action';
+import { UmbEntityTrashedEvent } from '@umbraco-cms/backoffice/recycle-bin';
+
+export class UmbRecycleBinTreeItemContext<
+	RecycleBinTreeItemModelType extends UmbTreeItemModel,
+	RecycleBinTreeRootModelType extends UmbTreeRootModel,
+> extends UmbDefaultTreeItemContext<
+	RecycleBinTreeItemModelType,
+	RecycleBinTreeRootModelType,
+	ManifestTreeItemRecycleBinKind
+> {
+	#actionEventContext?: UmbActionEventContext;
+
+	constructor(host: UmbControllerHost) {
+		super(host);
+
+		this.consumeContext(UMB_ACTION_EVENT_CONTEXT, (instance) => {
+			this.#removeEventListener();
+			this.#actionEventContext = instance;
+			this.#actionEventContext?.addEventListener(UmbEntityTrashedEvent.TYPE, this.#onEntityTrashed as EventListener);
+		});
+	}
+
+	#onEntityTrashed = (event: UmbEntityTrashedEvent) => {
+		const entityType = event.getEntityType();
+		if (!entityType) throw new Error('Entity type is required');
+
+		const supportedEntityTypes = this.getManifest()?.meta.supportedEntityTypes;
+
+		if (!supportedEntityTypes) {
+			throw new Error('Entity types are missing from the manifest.');
+		}
+
+		if (supportedEntityTypes.includes(entityType)) {
+			this.loadChildren();
+		}
+	};
+
+	#removeEventListener = () => {
+		this.#actionEventContext?.removeEventListener(UmbEntityTrashedEvent.TYPE, this.#onEntityTrashed as EventListener);
+	};
+
+	override destroy(): void {
+		this.#removeEventListener();
+		super.destroy();
+	}
+}
+
+export { UmbRecycleBinTreeItemContext as api };

src/Umbraco.Web.UI.Client/src/packages/core/recycle-bin/tree/tree-item/types.ts

@@ -0,0 +1,17 @@
+import type { ManifestTreeItem } from '@umbraco-cms/backoffice/tree';
+
+export interface ManifestTreeItemRecycleBinKind extends ManifestTreeItem {
+	type: 'treeItem';
+	kind: 'recycleBin';
+	meta: MetaTreeItemRecycleBinKind;
+}
+
+export interface MetaTreeItemRecycleBinKind {
+	supportedEntityTypes: Array<string>;
+}
+
+declare global {
+	interface UmbExtensionManifestMap {
+		umbManifestTreeItemRecycleBinKind: ManifestTreeItemRecycleBinKind;
+	}
+}

src/Umbraco.Web.UI.Client/src/packages/core/tree/default/default-tree.context.ts

@@ -161,6 +161,8 @@ export class UmbDefaultTreeContext<
 			this.#loadRootItems(reload);
 			return;
 		}
+
+		this.#loadTreeRoot();
 	}
 
 	async #loadTreeRoot() {
@@ -300,24 +302,10 @@ export class UmbDefaultTreeContext<
 
 	#consumeContexts() {
 		this.consumeContext(UMB_ACTION_EVENT_CONTEXT, (instance) => {
+			this.#removeEventListeners();
 			this.#actionEventContext = instance;
 
-			this.#actionEventContext.removeEventListener(
-				UmbRequestReloadChildrenOfEntityEvent.TYPE,
-				this.#onReloadRequest as EventListener,
-			);
-
-			this.#actionEventContext.removeEventListener(
-				UmbRequestReloadChildrenOfEntityEvent.TYPE,
-				this.#onReloadRequest as EventListener,
-			);
-
-			this.#actionEventContext.addEventListener(
-				UmbRequestReloadChildrenOfEntityEvent.TYPE,
-				this.#onReloadRequest as EventListener,
-			);
-
-			this.#actionEventContext.addEventListener(
+			this.#actionEventContext?.addEventListener(
 				UmbRequestReloadChildrenOfEntityEvent.TYPE,
 				this.#onReloadRequest as EventListener,
 			);
@@ -354,17 +342,15 @@ export class UmbDefaultTreeContext<
 		this.loadTree();
 	};
 
-	override destroy(): void {
-		this.#actionEventContext?.removeEventListener(
-			UmbRequestReloadChildrenOfEntityEvent.TYPE,
-			this.#onReloadRequest as EventListener,
-		);
-
+	#removeEventListeners() {
 		this.#actionEventContext?.removeEventListener(
 			UmbRequestReloadChildrenOfEntityEvent.TYPE,
 			this.#onReloadRequest as EventListener,
 		);
+	}
 
+	override destroy(): void {
+		this.#removeEventListeners();
 		super.destroy();
 	}
 }