From 99c983980cb0cf201ad46de99ea14910a91ddc7b Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 20:16:59 +0100 Subject: [PATCH 1/2] use manifest types --- .../src/packages/data-type/entity-actions/move/manifests.ts | 6 +++--- .../documents/documents/entity-actions/create/manifests.ts | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/move/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/move/manifests.ts index caede41cf5..ae0755da65 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/move/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/move/manifests.ts @@ -1,10 +1,10 @@ -import { UMB_DATA_TYPE_PICKER_MODAL } from '@umbraco-cms/backoffice/modal'; import { UMB_DATA_TYPE_ENTITY_TYPE } from '../../entity.js'; import { UMB_DATA_TYPE_ITEM_REPOSITORY_ALIAS } from '../../repository/index.js'; import { UMB_MOVE_DATA_TYPE_REPOSITORY_ALIAS } from '../../repository/move/manifests.js'; -import type { ManifestEntityAction } from '@umbraco-cms/backoffice/extension-registry'; +import { UMB_DATA_TYPE_PICKER_MODAL } from '@umbraco-cms/backoffice/modal'; +import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -const entityActions: Array = [ +const entityActions: Array = [ { type: 'entityAction', alias: 'Umb.EntityAction.DataType.Move', diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts index 936972efa7..7c9d0f9980 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/manifests.ts @@ -1,9 +1,8 @@ -import { UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS } from '../../repository/index.js'; import { UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_ROOT_ENTITY_TYPE } from '../../entity.js'; import { UmbCreateDocumentEntityAction } from './create.action.js'; -import type { ManifestEntityAction, ManifestModal } from '@umbraco-cms/backoffice/extension-registry'; +import type { ManifestModal, ManifestTypes } from '@umbraco-cms/backoffice/extension-registry'; -const entityActions: Array = [ +const entityActions: Array = [ { type: 'entityAction', alias: 'Umb.EntityAction.Document.Create', From c63d5d995154bb4ae07b341c78607163e8467cbd Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 20:29:17 +0100 Subject: [PATCH 2/2] disable user entity action --- .../disable/disable-user.action.ts | 24 +++++++++---------- .../user/user/entity-actions/manifests.ts | 1 - 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/disable/disable-user.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/disable/disable-user.action.ts index efde5abad0..03fd614c90 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/disable/disable-user.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/disable/disable-user.action.ts @@ -1,23 +1,20 @@ -import type { UmbDisableUserRepository } from '../../repository/disable/disable-user.repository.js'; import { UmbUserItemRepository } from '../../repository/item/user-item.repository.js'; +import { UmbDisableUserRepository } from '../../repository/index.js'; +import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { umbConfirmModal } from '@umbraco-cms/backoffice/modal'; -export class UmbDisableUserEntityAction extends UmbEntityActionBase { - #itemRepository: UmbUserItemRepository; - - constructor(host: UmbControllerHost, repositoryAlias: string, unique: string, entityType: string) { - super(host, repositoryAlias, unique, entityType); - - this.#itemRepository = new UmbUserItemRepository(this); +export class UmbDisableUserEntityAction extends UmbEntityActionBase { + constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { + super(host, args); } async execute() { - if (!this.unique) throw new Error('Unique is not available'); - if (!this.repository) return; + if (!this.args.unique) throw new Error('Unique is not available'); - const { data } = await this.#itemRepository.requestItems([this.unique]); + const itemRepository = new UmbUserItemRepository(this); + const { data } = await itemRepository.requestItems([this.args.unique]); if (data) { const item = data[0]; @@ -29,7 +26,10 @@ export class UmbDisableUserEntityAction extends UmbEntityActionBase = [ meta: { icon: 'icon-block', label: 'Disable', - repositoryAlias: UMB_DISABLE_USER_REPOSITORY_ALIAS, entityTypes: [UMB_USER_ENTITY_TYPE], }, conditions: [