From 622eda924a50beb0faeec5de81063ffe32755c7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Sun, 3 Mar 2024 22:15:03 +0100 Subject: [PATCH] entityTypes half way --- .../common/delete/delete.action.kind.ts | 2 +- .../common/duplicate/duplicate.action.kind.ts | 2 +- .../entity-action/common/move/move.action.kind.ts | 2 +- .../common/rename/rename.action.kind.ts | 2 +- .../core/entity-action/entity-action-list.element.ts | 2 +- .../extension-registry/models/entity-action.model.ts | 2 +- .../models/entity-bulk-action.model.ts | 3 +-- .../extension-registry/models/tree-item.model.ts | 6 +----- .../reload-tree-item-children.action.kind.ts | 2 +- .../data-type/entity-actions/create/manifests.ts | 2 +- .../data-type/entity-actions/duplicate/manifests.ts | 2 +- .../packages/data-type/entity-actions/manifests.ts | 2 +- .../data-type/entity-actions/move/manifests.ts | 2 +- .../src/packages/data-type/tree/folder/manifests.ts | 4 ++-- .../src/packages/data-type/tree/manifests.ts | 5 ++--- .../tree/reload-tree-item-children/manifests.ts | 5 ++--- .../packages/dictionary/entity-action/manifests.ts | 10 +++++----- .../src/packages/dictionary/tree/manifests.ts | 4 +--- .../tree/reload-tree-item-children/manifests.ts | 4 +--- .../entity-actions/create/manifests.ts | 10 +++++----- .../document-types/entity-actions/manifests.ts | 8 ++++---- .../document-types/tree/folder/manifests.ts | 4 ++-- .../documents/document-types/tree/manifests.ts | 12 +++++------- .../tree/reload-tree-item-children/manifests.ts | 12 +++++------- .../documents/entity-actions/create/manifests.ts | 2 +- .../culture-and-hostnames/manifests.ts | 2 +- .../documents/documents/entity-actions/manifests.ts | 10 +++++----- .../entity-actions/public-access/manifests.ts | 2 +- .../documents/recycle-bin/entity-action/manifests.ts | 2 +- .../documents/recycle-bin/tree/manifests.ts | 4 +--- .../tree/reload-tree-item-children/manifests.ts | 4 +--- .../packages/documents/documents/tree/manifests.ts | 4 +--- .../tree/reload-tree-item-children/manifests.ts | 4 +--- .../documents/documents/workspace/manifests.ts | 6 +++--- .../packages/language/entity-actions/manifests.ts | 4 ++-- .../packages/media/media/entity-actions/manifests.ts | 2 +- 36 files changed, 66 insertions(+), 89 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.kind.ts index 45a72360a3..06c856c704 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/delete/delete.action.kind.ts @@ -11,12 +11,12 @@ export const manifest: UmbBackofficeManifestKind = { kind: 'delete', api: UmbDeleteEntityAction, weight: 900, + forEntityTypes: [], meta: { icon: 'icon-trash', label: 'Delete...', itemRepositoryAlias: '', detailRepositoryAlias: '', - entityTypes: [], }, }, }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts index a95831bb1f..31b4f8a151 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate.action.kind.ts @@ -11,10 +11,10 @@ export const manifest: UmbBackofficeManifestKind = { kind: 'duplicate', api: UmbDuplicateEntityAction, weight: 600, + forEntityTypes: [], meta: { icon: 'icon-documents', label: 'Duplicate to...', - entityTypes: [], itemRepositoryAlias: '', duplicateRepositoryAlias: '', pickerModalAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move.action.kind.ts index b51c65a489..d16f7b5329 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move.action.kind.ts @@ -11,10 +11,10 @@ export const manifest: UmbBackofficeManifestKind = { kind: 'move', api: UmbMoveEntityAction, weight: 700, + forEntityTypes: [], meta: { icon: 'icon-enter', label: 'Move to (TBD)...', - entityTypes: [], itemRepositoryAlias: '', moveRepositoryAlias: '', pickerModalAlias: '', diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/rename/rename.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/rename/rename.action.kind.ts index 583a7099a6..eaa95f54c1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/rename/rename.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/rename/rename.action.kind.ts @@ -11,10 +11,10 @@ export const manifest: UmbBackofficeManifestKind = { kind: 'rename', api: UmbRenameEntityAction, weight: 200, + forEntityTypes: [], meta: { icon: 'icon-edit', label: 'Rename...', - entityTypes: [], renameRepositoryAlias: '', itemRepositoryAlias: '', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts index c84dd0dbab..d0b285635a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/entity-action-list.element.ts @@ -13,7 +13,7 @@ export class UmbEntityActionListElement extends UmbLitElement { if (value === undefined || value === this._props.entityType) return; this._props.entityType = value; const oldValue = this._filter; - this._filter = (extension: ManifestEntityAction) => extension.meta.entityTypes.includes(value); + this._filter = (extension: ManifestEntityAction) => extension.forEntityTypes.includes(value); this.requestUpdate('_filter', oldValue); this.requestUpdate('_props'); } 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 005b44829d..9a21d60d09 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,7 +10,7 @@ export interface ManifestEntityAction extends ManifestElementAndApi>, ManifestWithDynamicConditions { type: 'entityAction'; - entityTypes: Array; + forEntityTypes: Array; meta: MetaType; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts index c7e1c385e9..25e7dcb6a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/entity-bulk-action.model.ts @@ -11,6 +11,7 @@ export interface ManifestEntityBulkAction extends ManifestElementAndApi>, ManifestWithDynamicConditions { type: 'entityBulkAction'; + forEntityTypes: Array; meta: MetaType; } @@ -24,6 +25,4 @@ export interface MetaEntityBulkAction { * ] */ label?: string; - - entityTypes: Array; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree-item.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree-item.model.ts index 908ca29034..2e681ab630 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree-item.model.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/tree-item.model.ts @@ -5,9 +5,5 @@ import type { ManifestElementAndApi } from '@umbraco-cms/backoffice/extension-ap export interface ManifestTreeItem extends ManifestElementAndApi> { type: 'treeItem'; - meta: MetaTreeItem; -} - -export interface MetaTreeItem { - entityTypes: Array; + forEntityTypes: Array; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.kind.ts index dfd61614db..b13ddf0b6d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/reload-tree-item-children/reload-tree-item-children.action.kind.ts @@ -11,10 +11,10 @@ export const manifest: UmbBackofficeManifestKind = { kind: 'reloadTreeItemChildren', api: UmbReloadTreeItemChildrenEntityAction, weight: 100, + forEntityTypes: [], meta: { icon: 'icon-refresh', label: 'Reload children', - entityTypes: [], }, }, }; diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/manifests.ts index bf5b9dce48..fd98cef9b1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/create/manifests.ts @@ -9,10 +9,10 @@ const entityActions: Array = [ name: 'Create Data Type Entity Action', weight: 1000, api: UmbCreateDataTypeEntityAction, + forEntityTypes: [UMB_DATA_TYPE_ROOT_ENTITY_TYPE, UMB_DATA_TYPE_FOLDER_ENTITY_TYPE], meta: { icon: 'icon-add', label: 'Create...', - entityTypes: [UMB_DATA_TYPE_ROOT_ENTITY_TYPE, UMB_DATA_TYPE_FOLDER_ENTITY_TYPE], }, }, { diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/manifests.ts index 7010012ebc..f14a28dd28 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/manifests.ts @@ -10,8 +10,8 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.DataType.Duplicate', name: 'Duplicate Data Type Entity Action', kind: 'duplicate', + forEntityTypes: [UMB_DATA_TYPE_ENTITY_TYPE], meta: { - entityTypes: [UMB_DATA_TYPE_ENTITY_TYPE], duplicateRepositoryAlias: UMB_COPY_DATA_TYPE_REPOSITORY_ALIAS, itemRepositoryAlias: UMB_DATA_TYPE_ITEM_REPOSITORY_ALIAS, pickerModalAlias: UMB_DATA_TYPE_PICKER_MODAL.toString(), diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/manifests.ts index 1c088cd242..1a95aa69ac 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/manifests.ts @@ -12,10 +12,10 @@ const entityActions: Array = [ kind: 'delete', alias: 'Umb.EntityAction.DataType.Delete', name: 'Delete Data Type Entity Action', + forEntityTypes: [UMB_DATA_TYPE_ENTITY_TYPE], meta: { detailRepositoryAlias: UMB_DATA_TYPE_DETAIL_REPOSITORY_ALIAS, itemRepositoryAlias: UMB_DATA_TYPE_ITEM_REPOSITORY_ALIAS, - entityTypes: [UMB_DATA_TYPE_ENTITY_TYPE], }, }, ]; 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 ae0755da65..5679f6f06d 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 @@ -10,8 +10,8 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.DataType.Move', name: 'Move Data Type Entity Action', kind: 'move', + forEntityTypes: [UMB_DATA_TYPE_ENTITY_TYPE], meta: { - entityTypes: [UMB_DATA_TYPE_ENTITY_TYPE], itemRepositoryAlias: UMB_DATA_TYPE_ITEM_REPOSITORY_ALIAS, moveRepositoryAlias: UMB_MOVE_DATA_TYPE_REPOSITORY_ALIAS, pickerModalAlias: UMB_DATA_TYPE_PICKER_MODAL.toString(), diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/manifests.ts index 06426f03fe..83cc7b5100 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/folder/manifests.ts @@ -19,11 +19,11 @@ const entityActions: Array = [ name: 'Rename Data Type Folder Entity Action', weight: 800, api: UmbFolderUpdateEntityAction, + forEntityTypes: [UMB_DATA_TYPE_FOLDER_ENTITY_TYPE], meta: { icon: 'icon-edit', label: 'Rename Folder...', repositoryAlias: UMB_DATA_TYPE_FOLDER_REPOSITORY_ALIAS, - entityTypes: [UMB_DATA_TYPE_FOLDER_ENTITY_TYPE], }, }, { @@ -32,11 +32,11 @@ const entityActions: Array = [ name: 'Delete Data Type Folder Entity Action', weight: 700, api: UmbDeleteFolderEntityAction, + forEntityTypes: [UMB_DATA_TYPE_FOLDER_ENTITY_TYPE], meta: { icon: 'icon-trash', label: 'Delete Folder...', repositoryAlias: UMB_DATA_TYPE_FOLDER_REPOSITORY_ALIAS, - entityTypes: [UMB_DATA_TYPE_FOLDER_ENTITY_TYPE], }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/manifests.ts index 3131fa4ca8..d14215a9b2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/manifests.ts @@ -41,9 +41,8 @@ const treeItem: ManifestTreeItem = { kind: 'default', alias: 'Umb.TreeItem.DataType', name: 'Data Type Tree Item', - meta: { - entityTypes: ['data-type-root', 'data-type', 'data-type-folder'], - }, + forEntityTypes: ['data-type-root', 'data-type', 'data-type-folder'], + meta: {}, }; export const manifests = [treeRepository, treeStore, tree, treeItem, ...folderManifests, ...reloadManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/reload-tree-item-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/reload-tree-item-children/manifests.ts index 5f46a41efd..70ebe420c6 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/reload-tree-item-children/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/tree/reload-tree-item-children/manifests.ts @@ -11,8 +11,7 @@ export const manifests: Array = [ alias: 'Umb.EntityAction.DataType.Tree.ReloadChildrenOf', name: 'Reload Data Type Tree Item Children Entity Action', kind: 'reloadTreeItemChildren', - meta: { - entityTypes: [UMB_DATA_TYPE_ENTITY_TYPE, UMB_DATA_TYPE_ROOT_ENTITY_TYPE, UMB_DATA_TYPE_FOLDER_ENTITY_TYPE], - }, + forEntityTypes: [UMB_DATA_TYPE_ENTITY_TYPE, UMB_DATA_TYPE_ROOT_ENTITY_TYPE, UMB_DATA_TYPE_FOLDER_ENTITY_TYPE], + meta: {}, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/manifests.ts index 5b838261ea..b49a2816e7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/manifests.ts @@ -18,11 +18,11 @@ const entityActions: Array = [ name: 'Create Dictionary Entity Action', weight: 600, api: UmbCreateDictionaryEntityAction, + forEntityTypes: [UMB_DICTIONARY_ENTITY_TYPE, UMB_DICTIONARY_ROOT_ENTITY_TYPE], meta: { icon: 'icon-add', label: 'Create', repositoryAlias: UMB_DICTIONARY_DETAIL_REPOSITORY_ALIAS, - entityTypes: [UMB_DICTIONARY_ENTITY_TYPE, UMB_DICTIONARY_ROOT_ENTITY_TYPE], }, }, { @@ -31,11 +31,11 @@ const entityActions: Array = [ name: 'Move Dictionary Entity Action', weight: 500, api: UmbMoveEntityAction, + forEntityTypes: [UMB_DICTIONARY_ENTITY_TYPE], meta: { icon: 'icon-enter', label: 'Move', repositoryAlias: UMB_DICTIONARY_DETAIL_REPOSITORY_ALIAS, - entityTypes: [UMB_DICTIONARY_ENTITY_TYPE], }, }, { @@ -44,11 +44,11 @@ const entityActions: Array = [ name: 'Export Dictionary Entity Action', weight: 400, api: UmbExportDictionaryEntityAction, + forEntityTypes: [UMB_DICTIONARY_ENTITY_TYPE], meta: { icon: 'icon-download-alt', label: 'Export', repositoryAlias: UMB_DICTIONARY_EXPORT_REPOSITORY_ALIAS, - entityTypes: [UMB_DICTIONARY_ENTITY_TYPE], }, }, { @@ -57,11 +57,11 @@ const entityActions: Array = [ name: 'Import Dictionary Entity Action', weight: 300, api: UmbImportDictionaryEntityAction, + forEntityTypes: [UMB_DICTIONARY_ENTITY_TYPE, UMB_DICTIONARY_ROOT_ENTITY_TYPE], meta: { icon: 'icon-page-up', label: 'Import', repositoryAlias: UMB_DICTIONARY_IMPORT_REPOSITORY_ALIAS, - entityTypes: [UMB_DICTIONARY_ENTITY_TYPE, UMB_DICTIONARY_ROOT_ENTITY_TYPE], }, }, { @@ -69,10 +69,10 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.Dictionary.Delete', name: 'Delete Dictionary Entity Action', kind: 'delete', + forEntityTypes: [UMB_DICTIONARY_ENTITY_TYPE], meta: { itemRepositoryAlias: UMB_DICTIONARY_ITEM_REPOSITORY_ALIAS, detailRepositoryAlias: UMB_DICTIONARY_DETAIL_REPOSITORY_ALIAS, - entityTypes: [UMB_DICTIONARY_ENTITY_TYPE], }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/manifests.ts index 1076ff9165..842d1b7820 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/manifests.ts @@ -42,9 +42,7 @@ const treeItem: ManifestTreeItem = { kind: 'default', alias: 'Umb.TreeItem.Dictionary', name: 'Dictionary Tree Item', - meta: { - entityTypes: [UMB_DICTIONARY_ROOT_ENTITY_TYPE, UMB_DICTIONARY_ENTITY_TYPE], - }, + forEntityTypes: [UMB_DICTIONARY_ROOT_ENTITY_TYPE, UMB_DICTIONARY_ENTITY_TYPE], }; export const manifests = [treeRepository, treeStore, tree, treeItem, ...reloadTreeItemChildrenManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/reload-tree-item-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/reload-tree-item-children/manifests.ts index 731b2d8294..48b77bcc14 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/reload-tree-item-children/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/tree/reload-tree-item-children/manifests.ts @@ -7,8 +7,6 @@ export const manifests: Array = [ alias: 'Umb.EntityAction.Dictionary.Tree.ReloadChildrenOf', name: 'Reload Dictionary Tree Item Children Entity Action', kind: 'reloadTreeItemChildren', - meta: { - entityTypes: [UMB_DICTIONARY_ROOT_ENTITY_TYPE, UMB_DICTIONARY_ENTITY_TYPE], - }, + forEntityTypes: [UMB_DICTIONARY_ROOT_ENTITY_TYPE, UMB_DICTIONARY_ENTITY_TYPE], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts index 67a20e1a00..f427c27beb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/manifests.ts @@ -13,14 +13,14 @@ const entityActions: Array = [ name: 'Create Document Type Entity Action', weight: 1000, api: UmbCreateDataTypeEntityAction, + forEntityTypes: [ + UMB_DOCUMENT_TYPE_ENTITY_TYPE, + UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE, + UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE, + ], meta: { icon: 'icon-add', label: 'Create...', - entityTypes: [ - UMB_DOCUMENT_TYPE_ENTITY_TYPE, - UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE, - UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE, - ], }, }, { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/manifests.ts index 2a4fae4b70..18128be515 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/manifests.ts @@ -15,10 +15,10 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.DocumentType.Delete', name: 'Delete Document-Type Entity Action', kind: 'delete', + forEntityTypes: [entityType], meta: { itemRepositoryAlias: DOCUMENT_TYPE_ITEM_REPOSITORY_ALIAS, detailRepositoryAlias: DOCUMENT_TYPE_DETAIL_REPOSITORY_ALIAS, - entityTypes: [entityType], }, }, { @@ -27,11 +27,11 @@ const entityActions: Array = [ name: 'Move Document-Type Entity Action', weight: 700, api: UmbMoveEntityAction, + forEntityTypes: [entityType], meta: { icon: 'icon-enter', label: 'Move', repositoryAlias: DOCUMENT_TYPE_DETAIL_REPOSITORY_ALIAS, - entityTypes: [entityType], }, }, { @@ -40,11 +40,11 @@ const entityActions: Array = [ name: 'Copy Document-Type Entity Action', weight: 600, api: UmbDuplicateEntityAction, + forEntityTypes: [entityType], meta: { icon: 'icon-documents', label: 'Copy', repositoryAlias: DOCUMENT_TYPE_DETAIL_REPOSITORY_ALIAS, - entityTypes: [entityType], }, }, { @@ -53,11 +53,11 @@ const entityActions: Array = [ name: 'Sort Document-Type Entity Action', weight: 500, api: UmbSortChildrenOfEntityAction, + forEntityTypes: [entityType], meta: { icon: 'icon-navigation-vertical', label: 'Sort', repositoryAlias: DOCUMENT_TYPE_DETAIL_REPOSITORY_ALIAS, - entityTypes: [entityType], }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/manifests.ts index 410d2f5096..cff1ee1156 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/folder/manifests.ts @@ -19,11 +19,11 @@ const entityActions: Array = [ name: 'Rename Document Type Folder Entity Action', weight: 800, api: UmbFolderUpdateEntityAction, + forEntityTypes: [UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE], meta: { icon: 'icon-edit', label: 'Rename Folder...', repositoryAlias: UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS, - entityTypes: [UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE], }, }, { @@ -32,11 +32,11 @@ const entityActions: Array = [ name: 'Delete Document Type Folder Entity Action', weight: 700, api: UmbDeleteFolderEntityAction, + forEntityTypes: [UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE], meta: { icon: 'icon-trash', label: 'Delete Folder...', repositoryAlias: UMB_DOCUMENT_TYPE_FOLDER_REPOSITORY_ALIAS, - entityTypes: [UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE], }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/manifests.ts index 649ca15c51..2753645169 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/manifests.ts @@ -47,13 +47,11 @@ const treeItem: ManifestTreeItem = { kind: 'default', alias: 'Umb.TreeItem.DocumentType', name: 'Document Type Tree Item', - meta: { - entityTypes: [ - UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE, - UMB_DOCUMENT_TYPE_ENTITY_TYPE, - UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE, - ], - }, + forEntityTypes: [ + UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE, + UMB_DOCUMENT_TYPE_ENTITY_TYPE, + UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE, + ], }; export const manifests = [treeRepository, treeStore, tree, treeItem, ...folderManifests, ...reloadManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/reload-tree-item-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/reload-tree-item-children/manifests.ts index 5ab61c5f90..9c6beeb7a3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/reload-tree-item-children/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/tree/reload-tree-item-children/manifests.ts @@ -11,12 +11,10 @@ export const manifests: Array = [ alias: 'Umb.EntityAction.DocumentType.Tree.ReloadChildrenOf', name: 'Reload Document Type Tree Item Children Entity Action', kind: 'reloadTreeItemChildren', - meta: { - entityTypes: [ - UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE, - UMB_DOCUMENT_TYPE_ENTITY_TYPE, - UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE, - ], - }, + forEntityTypes: [ + UMB_DOCUMENT_TYPE_ROOT_ENTITY_TYPE, + UMB_DOCUMENT_TYPE_ENTITY_TYPE, + UMB_DOCUMENT_TYPE_FOLDER_ENTITY_TYPE, + ], }, ]; 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 7c9d0f9980..c910128cdc 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 @@ -9,10 +9,10 @@ const entityActions: Array = [ name: 'Create Document Entity Action', weight: 1000, api: UmbCreateDocumentEntityAction, + forEntityTypes: [UMB_DOCUMENT_ROOT_ENTITY_TYPE, UMB_DOCUMENT_ENTITY_TYPE], meta: { icon: 'icon-add', label: 'Create', - entityTypes: [UMB_DOCUMENT_ROOT_ENTITY_TYPE, UMB_DOCUMENT_ENTITY_TYPE], }, /* removed until we have permissions in place conditions: [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts index 938723ade9..681aa1b31c 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/culture-and-hostnames/manifests.ts @@ -9,10 +9,10 @@ const entityActions: Array = [ name: 'Culture And Hostnames Document Entity Action', weight: 400, api: UmbDocumentCultureAndHostnamesEntityAction, + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { icon: 'icon-home', label: 'Culture and Hostnames', - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], }, }, ]; 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 64c7c099f4..7df9bacc71 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 @@ -20,8 +20,8 @@ const entityActions: Array = [ weight: 800, api: UmbCreateDocumentBlueprintEntityAction, kind: 'default', + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], icon: 'icon-blueprint', label: 'Create Document Blueprint (TBD)', }, @@ -31,8 +31,8 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.Document.Move', name: 'Move Document Entity Action ', kind: 'move', + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], moveRepositoryAlias: UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS, itemRepositoryAlias: UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS, pickerModelAlias: UMB_DOCUMENT_PICKER_MODAL.toString(), @@ -43,8 +43,8 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.Document.Copy', name: 'Duplicate Document Entity Action', kind: 'duplicate', + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], duplicateRepositoryAlias: UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS, itemRepositoryAlias: UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS, pickerModalAlias: UMB_DOCUMENT_PICKER_MODAL.toString(), @@ -56,8 +56,8 @@ const entityActions: Array = [ name: 'Publish Document Entity Action', api: UmbPublishDocumentEntityAction, kind: 'default', + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], icon: 'icon-globe', label: 'Publish', }, @@ -68,8 +68,8 @@ const entityActions: Array = [ name: 'Unpublish Document Entity Action', api: UmbUnpublishDocumentEntityAction, kind: 'default', + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], icon: 'icon-globe', label: 'Unpublish', }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts index b3842b56f2..e9398ea429 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/public-access/manifests.ts @@ -9,11 +9,11 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.Document.PublicAccess', name: 'Document Permissions Entity Action', api: UmbDocumentPublicAccessEntityAction, + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { icon: 'icon-lock', label: 'Restrict Public Access', repositoryAlias: UMB_DOCUMENT_PUBLIC_ACCESS_REPOSITORY_ALIAS, - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts index dcc1f4a59a..6d7792acd5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/entity-action/manifests.ts @@ -9,11 +9,11 @@ export const manifests = [ name: 'Trash Document Entity Action', weight: 900, api: UmbTrashEntityAction, + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { icon: 'icon-trash', label: 'Trash', repositoryAlias: UMB_DOCUMENT_DETAIL_REPOSITORY_ALIAS, - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], }, conditions: [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/manifests.ts index 6af74406b4..0b7795f149 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/manifests.ts @@ -42,9 +42,7 @@ const treeItem: ManifestTreeItem = { kind: 'default', alias: 'Umb.TreeItem.DocumentRecycleBin', name: 'DocumentRecycleBin Tree Item', - meta: { - entityTypes: [UMB_DOCUMENT_RECYCLE_BIN_ROOT_ENTITY_TYPE, UMB_DOCUMENT_RECYCLE_BIN_ENTITY_TYPE], - }, + forEntityTypes: [UMB_DOCUMENT_RECYCLE_BIN_ROOT_ENTITY_TYPE, UMB_DOCUMENT_RECYCLE_BIN_ENTITY_TYPE], }; export const manifests = [treeRepository, treeStore, tree, treeItem, ...reloadTreeItemChildrenManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/reload-tree-item-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/reload-tree-item-children/manifests.ts index bde7cbd798..eab0202163 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/reload-tree-item-children/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/recycle-bin/tree/reload-tree-item-children/manifests.ts @@ -7,8 +7,6 @@ export const manifests: Array = [ alias: 'Umb.EntityAction.DocumentRecycleBin.Tree.ReloadChildrenOf', name: 'Reload Document Recycle Bin Tree Item Children Entity Action', kind: 'reloadTreeItemChildren', - meta: { - entityTypes: [UMB_DOCUMENT_RECYCLE_BIN_ENTITY_TYPE, UMB_DOCUMENT_RECYCLE_BIN_ROOT_ENTITY_TYPE], - }, + forEntityTypes: [UMB_DOCUMENT_RECYCLE_BIN_ENTITY_TYPE, UMB_DOCUMENT_RECYCLE_BIN_ROOT_ENTITY_TYPE], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts index d070bd03ee..1ffb9ab703 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/manifests.ts @@ -42,9 +42,7 @@ const treeItem: ManifestTreeItem = { name: 'Document Tree Item', element: () => import('./tree-item/document-tree-item.element.js'), api: UmbDocumentTreeItemContext, - meta: { - entityTypes: [UMB_DOCUMENT_ROOT_ENTITY_TYPE, UMB_DOCUMENT_ENTITY_TYPE], - }, + forEntityTypes: [UMB_DOCUMENT_ROOT_ENTITY_TYPE, UMB_DOCUMENT_ENTITY_TYPE], }; export const manifests = [treeRepository, treeStore, tree, treeItem, ...reloadTreeItemChildrenManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/reload-tree-item-children/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/reload-tree-item-children/manifests.ts index fff6d159e0..1fd4461844 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/reload-tree-item-children/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/tree/reload-tree-item-children/manifests.ts @@ -7,8 +7,6 @@ export const manifests: Array = [ alias: 'Umb.EntityAction.Document.Tree.ReloadChildrenOf', name: 'Reload Document Tree Item Children Entity Action', kind: 'reloadTreeItemChildren', - meta: { - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_ROOT_ENTITY_TYPE], - }, + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE, UMB_DOCUMENT_ROOT_ENTITY_TYPE], }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts index 597cc20a3c..c27ad84b4d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/workspace/manifests.ts @@ -162,12 +162,12 @@ const workspaceActionMenuItems: Array = [ name: 'Unpublish', weight: 10, api: UmbUnpublishDocumentEntityAction, + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { workspaceActions: 'Umb.WorkspaceAction.Document.SaveAndPublish', label: 'Unpublish', icon: 'icon-globe', repositoryAlias: 'Umb.Repository.Document.Detail', - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], }, }, { @@ -176,12 +176,12 @@ const workspaceActionMenuItems: Array = [ name: 'Publish with descendants', weight: 20, api: UmbPublishDocumentEntityAction, + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { workspaceActions: 'Umb.WorkspaceAction.Document.SaveAndPublish', label: 'Publish with descendants (TBD)', icon: 'icon-globe', repositoryAlias: 'Umb.Repository.Document.Detail', - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], }, }, { @@ -190,12 +190,12 @@ const workspaceActionMenuItems: Array = [ name: 'Schedule publishing', weight: 20, api: UmbPublishDocumentEntityAction, + forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { workspaceActions: 'Umb.WorkspaceAction.Document.SaveAndPublish', label: 'Schedule publishing (TBD)', icon: 'icon-globe', repositoryAlias: 'Umb.Repository.Document.Detail', - entityTypes: [UMB_DOCUMENT_ENTITY_TYPE], }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/manifests.ts index 406cae84a2..618e7e6d60 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/language/entity-actions/manifests.ts @@ -9,10 +9,10 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.Language.Delete', name: 'Delete Language Entity Action', kind: 'delete', + forEntityTypes: [UMB_LANGUAGE_ENTITY_TYPE], meta: { itemRepositoryAlias: UMB_LANGUAGE_ITEM_REPOSITORY_ALIAS, detailRepositoryAlias: UMB_LANGUAGE_DETAIL_REPOSITORY_ALIAS, - entityTypes: [UMB_LANGUAGE_ENTITY_TYPE], }, }, { @@ -21,11 +21,11 @@ const entityActions: Array = [ name: 'Create Language Entity Action', weight: 900, api: UmbLanguageCreateEntityAction, + forEntityTypes: [UMB_LANGUAGE_ROOT_ENTITY_TYPE], meta: { icon: 'icon-add', label: 'Create', repositoryAlias: UMB_LANGUAGE_DETAIL_REPOSITORY_ALIAS, - entityTypes: [UMB_LANGUAGE_ROOT_ENTITY_TYPE], }, }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/manifests.ts index 72333eac27..3e355e7e9f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/manifests.ts @@ -9,10 +9,10 @@ const entityActions: Array = [ alias: 'Umb.EntityAction.Media.Delete', name: 'Delete Media Entity Action ', kind: 'delete', + forEntityTypes: ['media'], meta: { itemRepositoryAlias: UMB_MEDIA_ITEM_REPOSITORY_ALIAS, detailRepositoryAlias: UMB_MEDIA_DETAIL_REPOSITORY_ALIAS, - entityTypes: ['media'], }, }, ];