From 9c88b4104eaef31cbe446301884664a5bf0eded6 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 12 Apr 2024 10:45:54 +0200 Subject: [PATCH] loosen up on repo name --- .../src/packages/core/entity-action/common/index.ts | 4 ++-- .../packages/core/entity-action/common/move-to/index.ts | 3 --- .../src/packages/core/entity-action/common/move/index.ts | 3 +++ .../entity-action/common/{move-to => move}/manifests.ts | 0 .../move-data-source.interface.ts} | 2 +- .../move-repository.interface.ts} | 2 +- .../common/{move-to => move}/move-to.action.kind.ts | 2 +- .../common/{move-to => move}/move-to.action.ts | 7 ++----- .../core/entity-action/common/{move-to => move}/types.ts | 0 .../src/packages/core/entity-action/manifests.ts | 2 +- .../core/extension-registry/models/entity-action.model.ts | 2 +- .../packages/data-type/entity-actions/move-to/manifests.ts | 4 ++-- .../packages/dictionary/entity-action/move-to/manifests.ts | 4 ++-- .../document-types/entity-actions/move-to/manifests.ts | 4 ++-- .../documents/entity-actions/move-to/manifests.ts | 4 ++-- .../documents/documents/entity-bulk-actions/manifests.ts | 2 +- .../media/media-types/entity-actions/move-to/manifests.ts | 4 ++-- .../media/media/entity-actions/move-to/manifests.ts | 4 ++-- .../packages/media/media/entity-bulk-actions/manifests.ts | 2 +- 19 files changed, 26 insertions(+), 29 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/index.ts create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/index.ts rename src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/{move-to => move}/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/{move-to/move-to-data-source.interface.ts => move/move-data-source.interface.ts} (84%) rename src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/{move-to/move-to-repository.interface.ts => move/move-repository.interface.ts} (84%) rename src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/{move-to => move}/move-to.action.kind.ts (95%) rename src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/{move-to => move}/move-to.action.ts (92%) rename src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/{move-to => move}/types.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/index.ts index 4d572c74d1..11a86bfa69 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/index.ts @@ -1,5 +1,5 @@ export * from './duplicate/duplicate.action.js'; -export * from './move-to/index.js'; +export * from './move/index.js'; export * from './delete/delete.action.js'; -export * from './move-to/move-to.action.js'; +export * from './move/move-to.action.js'; export * from './sort-children-of/sort-children-of.action.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/index.ts deleted file mode 100644 index 8c0582b72a..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/index.ts +++ /dev/null @@ -1,3 +0,0 @@ -export type { UmbMoveToDataSource } from './move-to-data-source.interface.js'; -export type { UmbMoveToRepository } from './move-to-repository.interface.js'; -export type { UmbMoveToRequestArgs } from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/index.ts new file mode 100644 index 0000000000..19b3a4c3d3 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/index.ts @@ -0,0 +1,3 @@ +export type { UmbMoveDataSource as UmbMoveToDataSource } from './move-data-source.interface.js'; +export type { UmbMoveRepository as UmbMoveToRepository } from './move-repository.interface.js'; +export type { UmbMoveToRequestArgs } from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-data-source.interface.ts similarity index 84% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to-data-source.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-data-source.interface.ts index 4a63cfb44c..61bae326d9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to-data-source.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-data-source.interface.ts @@ -1,6 +1,6 @@ import type { UmbMoveToRequestArgs } from './types.js'; import type { UmbDataSourceErrorResponse } from '@umbraco-cms/backoffice/repository'; -export interface UmbMoveToDataSource { +export interface UmbMoveDataSource { moveTo(args: UmbMoveToRequestArgs): Promise; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-repository.interface.ts similarity index 84% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to-repository.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-repository.interface.ts index ea59f9820f..4eb344bcd9 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-repository.interface.ts @@ -2,6 +2,6 @@ import type { UmbRepositoryErrorResponse } from '../../../repository/types.js'; import type { UmbMoveToRequestArgs } from './types.js'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; -export interface UmbMoveToRepository extends UmbApi { +export interface UmbMoveRepository extends UmbApi { requestMoveTo(args: UmbMoveToRequestArgs): Promise; } diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-to.action.kind.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to.action.kind.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-to.action.kind.ts index fffe19b027..c2116a51b8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-to.action.kind.ts @@ -17,7 +17,7 @@ export const manifest: UmbBackofficeManifestKind = { icon: 'icon-enter', label: '#actions_move', treeRepositoryAlias: '', - moveToRepositoryAlias: '', + moveRepositoryAlias: '', treePickerModal: '', }, }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-to.action.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-to.action.ts index 2cedd5bdf5..0be662cd87 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/move-to.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/move-to.action.ts @@ -1,6 +1,6 @@ import { UmbEntityActionBase } from '../../entity-action-base.js'; import { UmbRequestReloadStructureForEntityEvent } from '../../request-reload-structure-for-entity.event.js'; -import type { UmbMoveToRepository } from './move-to-repository.interface.js'; +import type { UmbMoveRepository } from './move-repository.interface.js'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import type { MetaEntityActionMoveToKind } from '@umbraco-cms/backoffice/extension-registry'; import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry'; @@ -17,10 +17,7 @@ export class UmbMoveToEntityAction extends UmbEntityActionBase( - this, - this.args.meta.moveToRepositoryAlias, - ); + const moveRepository = await createExtensionApiByAlias(this, this.args.meta.moveRepositoryAlias); if (!moveRepository) throw new Error('Move Repository is not available'); await moveRepository.requestMoveTo({ unique: this.args.unique, destination: { unique: destinationUnique } }); diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/types.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move-to/types.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/move/types.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts index 4eaa3a8f87..d5b95c0fa0 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts @@ -1,7 +1,7 @@ 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 moveToEntityActionManifests } from './common/move-to/manifests.js'; +import { manifests as moveToEntityActionManifests } from './common/move/manifests.js'; import { manifests as sortChildrenOfEntityActionManifests } from './common/sort-children-of/manifests.js'; export const manifests = [ 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 3e258922fe..45dfd7a47c 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 @@ -132,7 +132,7 @@ export interface ManifestEntityActionMoveToKind extends ManifestEntityAction = [ { type: 'entityAction', kind: 'moveTo', - alias: 'Umb.EntityAction.DataType.Move', + alias: 'Umb.EntityAction.DataType.MoveTo', name: 'Move Data Type Entity Action', forEntityTypes: [UMB_DATA_TYPE_ENTITY_TYPE], meta: { treeRepositoryAlias: UMB_DATA_TYPE_TREE_REPOSITORY_ALIAS, - moveToRepositoryAlias: UMB_MOVE_DATA_TYPE_REPOSITORY_ALIAS, + moveRepositoryAlias: UMB_MOVE_DATA_TYPE_REPOSITORY_ALIAS, treePickerModal: UMB_DATA_TYPE_PICKER_MODAL, }, }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/move-to/manifests.ts index 9cdfea804a..8e90859e84 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/move-to/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/dictionary/entity-action/move-to/manifests.ts @@ -9,12 +9,12 @@ const entityActions: Array = [ { type: 'entityAction', kind: 'moveTo', - alias: 'Umb.EntityAction.Dictionary.Move', + alias: 'Umb.EntityAction.Dictionary.MoveTo', name: 'Move Dictionary Entity Action', forEntityTypes: [UMB_DICTIONARY_ENTITY_TYPE], meta: { treeRepositoryAlias: UMB_DICTIONARY_TREE_REPOSITORY_ALIAS, - moveToRepositoryAlias: UMB_MOVE_DICTIONARY_REPOSITORY_ALIAS, + moveRepositoryAlias: UMB_MOVE_DICTIONARY_REPOSITORY_ALIAS, treePickerModal: UMB_DICTIONARY_PICKER_MODAL, }, }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/move-to/manifests.ts index 649dab4ea3..9fa0a59d12 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/move-to/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/move-to/manifests.ts @@ -9,12 +9,12 @@ const entityActions: Array = [ { type: 'entityAction', kind: 'moveTo', - alias: 'Umb.EntityAction.DocumentType.Move', + alias: 'Umb.EntityAction.DocumentType.MoveTo', name: 'Move Document Type Entity Action', forEntityTypes: [UMB_DOCUMENT_TYPE_ENTITY_TYPE], meta: { treeRepositoryAlias: UMB_DOCUMENT_TYPE_TREE_REPOSITORY_ALIAS, - moveToRepositoryAlias: UMB_MOVE_DOCUMENT_TYPE_REPOSITORY_ALIAS, + moveRepositoryAlias: UMB_MOVE_DOCUMENT_TYPE_REPOSITORY_ALIAS, treePickerModal: UMB_DOCUMENT_TYPE_PICKER_MODAL, }, }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/move-to/manifests.ts index e1ca209913..9f3cf4e379 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/move-to/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/move-to/manifests.ts @@ -10,12 +10,12 @@ const entityActions: Array = [ { type: 'entityAction', kind: 'moveTo', - alias: 'Umb.EntityAction.Document.Move', + alias: 'Umb.EntityAction.Document.MoveTo', name: 'Move Document Entity Action', forEntityTypes: [UMB_DOCUMENT_ENTITY_TYPE], meta: { treeRepositoryAlias: UMB_DOCUMENT_TREE_REPOSITORY_ALIAS, - moveToRepositoryAlias: UMB_MOVE_DOCUMENT_REPOSITORY_ALIAS, + moveRepositoryAlias: UMB_MOVE_DOCUMENT_REPOSITORY_ALIAS, treePickerModal: UMB_DOCUMENT_PICKER_MODAL, }, conditions: [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/manifests.ts index a509f88957..0c6940f22b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-bulk-actions/manifests.ts @@ -82,7 +82,7 @@ export const manifests: Array = [ { type: 'entityBulkAction', kind: 'default', - alias: 'Umb.EntityBulkAction.Document.Move', + alias: 'Umb.EntityBulkAction.Document.MoveTo', name: 'Move Document Entity Bulk Action', weight: 20, api: UmbMoveDocumentEntityBulkAction, diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/move-to/manifests.ts index 3f3f1089e3..cadd96a1ed 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/move-to/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/move-to/manifests.ts @@ -8,12 +8,12 @@ const entityActions: Array = [ { type: 'entityAction', kind: 'moveTo', - alias: 'Umb.EntityAction.MediaType.Move', + alias: 'Umb.EntityAction.MediaType.MoveTo', name: 'Move Media Type Entity Action', forEntityTypes: [UMB_MEDIA_TYPE_ENTITY_TYPE], meta: { treeRepositoryAlias: UMB_MEDIA_TYPE_TREE_REPOSITORY_ALIAS, - moveToRepositoryAlias: UMB_MOVE_MEDIA_TYPE_REPOSITORY_ALIAS, + moveRepositoryAlias: UMB_MOVE_MEDIA_TYPE_REPOSITORY_ALIAS, treePickerModal: UMB_MEDIA_TYPE_PICKER_MODAL, }, }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/move-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/move-to/manifests.ts index 9238d109ef..e95a79ddb8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/move-to/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-actions/move-to/manifests.ts @@ -8,12 +8,12 @@ const entityActions: Array = [ { type: 'entityAction', kind: 'moveTo', - alias: 'Umb.EntityAction.Media.Move', + alias: 'Umb.EntityAction.Media.MoveTo', name: 'Move Media Entity Action', forEntityTypes: [UMB_MEDIA_ENTITY_TYPE], meta: { treeRepositoryAlias: UMB_MEDIA_TREE_REPOSITORY_ALIAS, - moveToRepositoryAlias: UMB_MOVE_MEDIA_REPOSITORY_ALIAS, + moveRepositoryAlias: UMB_MOVE_MEDIA_REPOSITORY_ALIAS, treePickerModal: UMB_MEDIA_TREE_PICKER_MODAL, }, }, diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-bulk-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-bulk-actions/manifests.ts index dc643b3063..d7ea05ed49 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-bulk-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media/entity-bulk-actions/manifests.ts @@ -32,7 +32,7 @@ export const manifests: Array = [ }, { type: 'entityBulkAction', - alias: 'Umb.EntityBulkAction.Media.Move', + alias: 'Umb.EntityBulkAction.Media.MoveTo', name: 'Move Media Entity Bulk Action', weight: 20, api: UmbMediaMoveEntityBulkAction,