From 6cbdc683d47625e7fdd78371c212b743e525b372 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 19:41:46 +0100 Subject: [PATCH] fixing more entity actions --- .../entity-actions/create/create.action.ts | 3 +-- .../entity-action/create/create.action.ts | 2 +- .../entity-actions/create/create.action.ts | 3 +-- .../entity-actions/create-blueprint.action.ts | 2 +- .../culture-and-hostnames.action.ts | 7 +++++- .../entity-actions/unpublish.action.ts | 2 +- .../language-create-entity-action.ts | 2 +- .../entity-actions/create/create.action.ts | 7 +++++- .../entity-actions/create/create.action.ts | 2 +- .../entity-actions/create.action.ts | 2 +- .../entity-actions/create.action.ts | 2 +- .../entity-actions/create/create.action.ts | 11 ++++++--- .../entity-actions/create/create.action.ts | 2 +- .../enable/enable-user.action.ts | 24 +++++++++---------- .../user/user/entity-actions/manifests.ts | 1 - .../user/invite/entity-action/manifests.ts | 2 -- 16 files changed, 42 insertions(+), 32 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts index 2e7e92b59d..60d1c7d6ef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/create.action.ts @@ -1,9 +1,8 @@ import { UMB_DATA_TYPE_CREATE_OPTIONS_MODAL } from './modal/index.js'; -import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase> { +export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase { async execute() { const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); const modalContext = modalManager.open(this, UMB_DATA_TYPE_CREATE_OPTIONS_MODAL, { diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/create/create.action.ts index 0a4b9730b3..939b638866 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/create/create.action.ts @@ -2,7 +2,7 @@ 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'; -export default class UmbCreateDictionaryEntityAction extends UmbEntityActionBase> { +export default class UmbCreateDictionaryEntityAction extends UmbEntityActionBase { constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { super(host, args); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts index b272547d5f..11f2638c26 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/create.action.ts @@ -1,9 +1,8 @@ import { UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL } from './modal/index.js'; -import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase> { +export class UmbCreateDataTypeEntityAction extends UmbEntityActionBase { async execute() { const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); const modalContext = modalManager.open(this, UMB_DOCUMENT_TYPE_CREATE_OPTIONS_MODAL, { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint.action.ts index 1061f20487..b9df3a6430 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create-blueprint.action.ts @@ -2,7 +2,7 @@ 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'; -export class UmbCreateDocumentBlueprintEntityAction extends UmbEntityActionBase> { +export class UmbCreateDocumentBlueprintEntityAction extends UmbEntityActionBase { constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { super(host, args); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts index 02a8b247a5..aed6a698fd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/culture-and-hostnames.action.ts @@ -2,8 +2,13 @@ import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action' import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import { UMB_CULTURE_AND_HOSTNAMES_MODAL } from '@umbraco-cms/backoffice/document'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; + +export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionBase { + constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { + super(host, args); + } -export class UmbDocumentCultureAndHostnamesEntityAction extends UmbEntityActionBase> { async execute() { const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); modalManager.open(this, UMB_CULTURE_AND_HOSTNAMES_MODAL, { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/unpublish.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/unpublish.action.ts index 8b74ed89b8..85a5db008d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/unpublish.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/unpublish.action.ts @@ -6,7 +6,7 @@ import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action' import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import { UmbVariantId } from '@umbraco-cms/backoffice/variant'; -export class UmbUnpublishDocumentEntityAction extends UmbEntityActionBase> { +export class UmbUnpublishDocumentEntityAction extends UmbEntityActionBase { async execute() { if (!this.args.unique) throw new Error('The document unique identifier is missing'); diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/language-create-entity-action.ts b/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/language-create-entity-action.ts index d6fb394461..80af6c2b76 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/language-create-entity-action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/language-create-entity-action.ts @@ -2,7 +2,7 @@ import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action' import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controller-api'; -export class UmbLanguageCreateEntityAction extends UmbEntityActionBase> { +export class UmbLanguageCreateEntityAction extends UmbEntityActionBase { constructor(host: UmbControllerHostElement, args: UmbEntityActionArgs) { super(host, args); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts index d0576f7b5c..4c7f6a73ef 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts @@ -1,9 +1,14 @@ import { UMB_MEDIA_TYPE_CREATE_OPTIONS_MODAL } from './modal/index.js'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -export class UmbCreateMediaTypeEntityAction extends UmbEntityActionBase> { +export class UmbCreateMediaTypeEntityAction extends UmbEntityActionBase { + constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { + super(host, args); + } + async execute() { const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); const modalContext = modalManager.open(this, UMB_MEDIA_TYPE_CREATE_OPTIONS_MODAL, { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts index a7dd8ff04c..c9c7747fd9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/create/create.action.ts @@ -6,7 +6,7 @@ import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -export class UmbCreateMediaEntityAction extends UmbEntityActionBase> { +export class UmbCreateMediaEntityAction extends UmbEntityActionBase { #itemRepository; constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/entity-actions/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/entity-actions/create.action.ts index ad1ca59305..d6d07909b7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member-type/entity-actions/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/members/member-type/entity-actions/create.action.ts @@ -2,7 +2,7 @@ import type { UmbControllerHostElement } from '@umbraco-cms/backoffice/controlle import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; -export class UmbCreateMemberTypeEntityAction extends UmbEntityActionBase> { +export class UmbCreateMemberTypeEntityAction extends UmbEntityActionBase { constructor(host: UmbControllerHostElement, args: UmbEntityActionArgs) { super(host, args); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/entity-actions/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/entity-actions/create.action.ts index 19f50b07be..88782767dd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/entity-actions/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/relations/relation-types/entity-actions/create.action.ts @@ -2,7 +2,7 @@ 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'; -export class UmbCreateRelationTypeEntityAction extends UmbEntityActionBase> { +export class UmbCreateRelationTypeEntityAction extends UmbEntityActionBase { constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { super(host, args); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create.action.ts index 19ad8dbc4f..9669135416 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create.action.ts @@ -1,16 +1,21 @@ import { UMB_PARTIAL_VIEW_CREATE_OPTIONS_MODAL } from './options-modal/index.js'; +import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import type { UmbEntityActionArgs } from '@umbraco-cms/backoffice/entity-action'; import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; -export class UmbPartialViewCreateOptionsEntityAction extends UmbEntityActionBase> { +export class UmbPartialViewCreateOptionsEntityAction extends UmbEntityActionBase { + constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { + super(host, args); + } + async execute() { const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); const modalContext = modalManager.open(this, UMB_PARTIAL_VIEW_CREATE_OPTIONS_MODAL, { data: { parent: { - unique: this.args.meta.unique, - entityType: this.args.meta.entityType, + unique: this.args.unique, + entityType: this.args.entityType, }, }, }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/entity-actions/create/create.action.ts index 222ebc038c..99a5e7aa29 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/templates/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/templates/entity-actions/create/create.action.ts @@ -2,7 +2,7 @@ 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'; -export class UmbCreateEntityAction extends UmbEntityActionBase> { +export class UmbCreateEntityAction extends UmbEntityActionBase { constructor(host: UmbControllerHost, args: UmbEntityActionArgs) { super(host, args); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/enable/enable-user.action.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/enable/enable-user.action.ts index 58aac6afc2..1932920e1a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/enable/enable-user.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/entity-actions/enable/enable-user.action.ts @@ -1,23 +1,20 @@ -import type { UmbEnableUserRepository } from '../../repository/enable/enable-user.repository.js'; +import { UmbEnableUserRepository } from '../../repository/enable/enable-user.repository.js'; import { UmbUserItemRepository } from '../../repository/item/user-item.repository.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 UmbEnableUserEntityAction 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 UmbEnableUserEntityAction 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]; @@ -28,7 +25,10 @@ export class UmbEnableUserEntityAction extends UmbEntityActionBase = [ meta: { icon: 'icon-check', label: 'Enable', - repositoryAlias: UMB_ENABLE_USER_REPOSITORY_ALIAS, entityTypes: [UMB_USER_ENTITY_TYPE], }, conditions: [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts index bdd9989993..ca944ef840 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user/invite/entity-action/manifests.ts @@ -1,4 +1,3 @@ -import { UMB_INVITE_USER_REPOSITORY_ALIAS } from '../repository/manifests.js'; import { UMB_USER_ENTITY_TYPE } from '../../entity.js'; import { UmbResendInviteToUserEntityAction } from './resend-invite/resend-invite.action.js'; import { manifest as conditionManifest } from './resend-invite/resend-invite.action.condition.js'; @@ -14,7 +13,6 @@ const entityActions: Array = [ meta: { icon: 'icon-message', label: 'Resend Invite', - repositoryAlias: UMB_INVITE_USER_REPOSITORY_ALIAS, entityTypes: [UMB_USER_ENTITY_TYPE], }, conditions: [