From d14a82d1bc3557a160224585f517b1f1eb14b4cd Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Sun, 3 Mar 2024 21:52:35 +0100 Subject: [PATCH] add default kind --- .../models/entity-action.model.ts | 26 +++++++++++-------- .../documents/entity-actions/manifests.ts | 1 - .../entity-actions/unpublish.action.ts | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts index 06cc8b974e..005b44829d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-action.model.ts @@ -10,10 +10,17 @@ export interface ManifestEntityAction extends ManifestElementAndApi>, ManifestWithDynamicConditions { type: 'entityAction'; + entityTypes: Array; meta: MetaType; } -export interface MetaEntityAction { +export interface MetaEntityAction {} +export interface ManifestEntityActionDefaultKind extends ManifestEntityAction { + type: 'entityAction'; + kind: 'default'; +} + +export interface MetaEntityActionDefaultKind extends MetaEntityAction { /** * An icon to represent the action to be performed * @@ -22,7 +29,7 @@ export interface MetaEntityAction { * "icon-grid" * ] */ - icon?: string; + icon: string; /** * The friendly name of the action to perform @@ -32,9 +39,7 @@ export interface MetaEntityAction { * "Create Content Template" * ] */ - label?: string; - - entityTypes: Array; + label: string; } // DELETE @@ -43,7 +48,7 @@ export interface ManifestEntityActionDeleteKind extends ManifestEntityAction { @@ -74,20 +79,19 @@ export interface ManifestEntityActionDuplicateKind extends ManifestEntityAction< kind: 'duplicate'; } -export interface MetaEntityActionDuplicateKind extends MetaEntityAction { +export interface MetaEntityActionDuplicateKind extends MetaEntityActionDefaultKind { duplicateRepositoryAlias: string; itemRepositoryAlias: string; pickerModalAlias: string; } // MOVE - export interface ManifestEntityActionMoveKind extends ManifestEntityAction { type: 'entityAction'; kind: 'move'; } -export interface MetaEntityActionMoveKind extends MetaEntityAction { +export interface MetaEntityActionMoveKind extends MetaEntityActionDefaultKind { moveRepositoryAlias: string; itemRepositoryAlias: string; pickerModalAlias: string; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts index 02e2584737..ec11ea9295 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/manifests.ts @@ -89,7 +89,6 @@ const entityActions: Array = [ meta: { icon: 'icon-globe', label: 'Unpublish', - repositoryAlias: UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS, entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], }, }, 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 33b7447d7d..d241ac0f93 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 @@ -5,7 +5,7 @@ import { UmbLanguageCollectionRepository } from '@umbraco-cms/backoffice/languag 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');