diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/index.ts index 9b583fffe2..8bc801bf6e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/index.ts @@ -1,5 +1,2 @@ export { UmbDuplicateEntityAction } from './duplicate/index.js'; -export { UmbDuplicateToEntityAction } from './duplicate-to/index.js'; - export * from './duplicate/types.js'; -export * from './duplicate-to/types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/manifests.ts index eb6f76c981..cba1146315 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/manifests.ts @@ -1,8 +1,4 @@ import { manifests as duplicateManifests } from './duplicate/manifests.js'; -import { manifests as duplicateToManifests } from './duplicate-to/manifests.js'; import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; -export const manifests: Array = [ - ...duplicateManifests, - ...duplicateToManifests, -]; +export const manifests: Array = [...duplicateManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to-data-source.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to-data-source.interface.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to-data-source.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to-data-source.interface.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to-repository.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to-repository.interface.ts similarity index 76% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to-repository.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to-repository.interface.ts index 7bf0e42b48..7c4fd545e7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to-repository.interface.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to-repository.interface.ts @@ -1,5 +1,5 @@ -import type { UmbRepositoryErrorResponse } from '../../../../repository/types.js'; import type { UmbDuplicateToRequestArgs } from './types.js'; +import type { UmbRepositoryErrorResponse } from '@umbraco-cms/backoffice/repository'; import type { UmbApi } from '@umbraco-cms/backoffice/extension-api'; export interface UmbDuplicateToRepository extends UmbApi { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts similarity index 86% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to.action.kind.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts index bc9e256b06..7b71b4ecdd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.kind.ts @@ -1,4 +1,4 @@ -import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '../../../default/default.action.kind.js'; +import { UMB_ENTITY_ACTION_DEFAULT_KIND_MANIFEST } from '@umbraco-cms/backoffice/entity-action'; import type { UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; export const manifest: UmbBackofficeManifestKind = { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.ts similarity index 91% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.ts index 68c5713f10..7d6a81ae81 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/duplicate-to.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/duplicate-to.action.ts @@ -1,7 +1,6 @@ -import { UmbEntityActionBase } from '../../../entity-action-base.js'; -import { UmbRequestReloadStructureForEntityEvent } from '../../../request-reload-structure-for-entity.event.js'; import { UMB_DUPLICATE_TO_MODAL } from './modal/duplicate-to-modal.token.js'; import type { UmbDuplicateToRepository } from './types.js'; +import { UmbEntityActionBase, UmbRequestReloadStructureForEntityEvent } from '@umbraco-cms/backoffice/entity-action'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import type { MetaEntityActionDuplicateToKind } from '@umbraco-cms/backoffice/extension-registry'; import { createExtensionApiByAlias } from '@umbraco-cms/backoffice/extension-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/index.ts similarity index 71% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/index.ts index f43507de66..76d5881b53 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/index.ts @@ -1 +1,2 @@ export { UmbDuplicateToEntityAction } from './duplicate-to.action.js'; +export * from './types.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/constants.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/constants.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/duplicate-to-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/duplicate-to-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/duplicate-to-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/duplicate-to-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/duplicate-to-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/duplicate-to-modal.token.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/duplicate-to-modal.token.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/duplicate-to-modal.token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/modal/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/types.ts similarity index 73% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/types.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/types.ts index aca0f3d1e2..6a0089d5c7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/duplicate/duplicate-to/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/types.ts @@ -1,4 +1,4 @@ -import type { UmbDuplicateRequestArgs } from '../duplicate/types.js'; +import type { UmbDuplicateRequestArgs } from '@umbraco-cms/backoffice/entity-action'; export * from './duplicate-to-data-source.interface.js'; export * from './duplicate-to-repository.interface.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/manifests.ts index 360b26b922..db9fc604cf 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/manifests.ts @@ -1,5 +1,11 @@ -import { manifests as reloadTreeItemChildrenManifests } from './reload-tree-item-children/manifests.js'; +import { manifests as duplicateToManifests } from './duplicate-to/manifests.js'; import { manifests as moveManifests } from './move/manifests.js'; +import { manifests as reloadTreeItemChildrenManifests } from './reload-tree-item-children/manifests.js'; import { manifests as sortChildrenOfManifests } from './sort-children-of/manifests.js'; -export const manifests = [...reloadTreeItemChildrenManifests, ...moveManifests, ...sortChildrenOfManifests]; +export const manifests = [ + ...duplicateToManifests, + ...moveManifests, + ...reloadTreeItemChildrenManifests, + ...sortChildrenOfManifests, +]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/index.ts new file mode 100644 index 0000000000..2e789e1917 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/index.ts @@ -0,0 +1 @@ +export { UmbSortChildrenOfEntityAction } from './sort-children-of.action.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts index 85aba0170a..5277e210dd 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts @@ -5,13 +5,10 @@ export * from './tree-menu-item-default/index.js'; export * from './folder/index.js'; export * from './tree.element.js'; -export * from './entity-actions/sort-children-of/sort-children-of.action.js'; - -export { - UmbReloadTreeItemChildrenEntityAction, - UmbRequestReloadTreeItemChildrenEvent, -} from './entity-actions/reload-tree-item-children/index.js'; -export type { UmbMoveDataSource, UmbMoveRepository, UmbMoveToRequestArgs } from './entity-actions/move/index.js'; +export * from './entity-actions/sort-children-of/index.js'; +export * from './entity-actions/reload-tree-item-children/index.js'; +export * from './entity-actions/move/index.js'; +export * from './entity-actions/duplicate-to/index.js'; export type { UmbTreePickerModalData, UmbTreePickerModalValue } from './tree-picker/index.js'; export { UMB_TREE_PICKER_MODAL, UMB_TREE_PICKER_MODAL_ALIAS } from './tree-picker/index.js'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.repository.ts index 107a2f7ba4..5f15e629f2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.repository.ts @@ -1,6 +1,6 @@ import { UmbDuplicateDataTypeServerDataSource } from './data-type-duplicate.server.data-source.js'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; -import type { UmbDuplicateToRepository, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/entity-action'; +import type { UmbDuplicateToRepository, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/tree'; import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository'; export class UmbDuplicateDataTypeRepository extends UmbRepositoryBase implements UmbDuplicateToRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.server.data-source.ts index 5e7a653a4b..f6d717c241 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/data-type/entity-actions/duplicate/repository/data-type-duplicate.server.data-source.ts @@ -1,12 +1,7 @@ import { DataTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { - UmbDuplicateDataSource, - UmbDuplicateRequestArgs, - UmbDuplicateToDataSource, - UmbDuplicateToRequestArgs, -} from '@umbraco-cms/backoffice/entity-action'; +import type { UmbDuplicateToDataSource, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/tree'; /** * Duplicate Document Server Data Source diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/duplicate/repository/document-type-duplicate.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/duplicate/repository/document-type-duplicate.repository.ts index 11b964af6c..46e12812fa 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/duplicate/repository/document-type-duplicate.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/duplicate/repository/document-type-duplicate.repository.ts @@ -1,6 +1,6 @@ import { UmbDuplicateDocumentTypeServerDataSource } from './document-type-duplicate.server.data-source.js'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; -import type { UmbDuplicateToRepository, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/entity-action'; +import type { UmbDuplicateToRepository, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/tree'; import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository'; export class UmbDuplicateDocumentTypeRepository extends UmbRepositoryBase implements UmbDuplicateToRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/duplicate/repository/document-type-duplicate.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/duplicate/repository/document-type-duplicate.server.data-source.ts index cab788bd7e..a76db81f8a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/duplicate/repository/document-type-duplicate.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/duplicate/repository/document-type-duplicate.server.data-source.ts @@ -1,7 +1,7 @@ import { DocumentTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { UmbDuplicateToDataSource, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/entity-action'; +import type { UmbDuplicateToDataSource, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/tree'; /** * Duplicate Document Server Data Source diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/repository/types.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/repository/types.ts index afe4687093..d271eb4a77 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/repository/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/repository/types.ts @@ -1,4 +1,4 @@ -import type { UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/entity-action'; +import type { UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/tree'; export interface UmbDuplicateDocumentRequestArgs extends UmbDuplicateToRequestArgs { relateToOriginal: boolean; diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/duplicate/repository/media-type-duplicate.repository.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/duplicate/repository/media-type-duplicate.repository.ts index 2c9cd16028..c47968581f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/duplicate/repository/media-type-duplicate.repository.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/duplicate/repository/media-type-duplicate.repository.ts @@ -1,6 +1,6 @@ import { UmbDuplicateMediaTypeServerDataSource } from './media-type-duplicate.server.data-source.js'; import { UMB_NOTIFICATION_CONTEXT } from '@umbraco-cms/backoffice/notification'; -import type { UmbDuplicateToRepository, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/entity-action'; +import type { UmbDuplicateToRepository, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/tree'; import { UmbRepositoryBase } from '@umbraco-cms/backoffice/repository'; export class UmbDuplicateMediaTypeRepository extends UmbRepositoryBase implements UmbDuplicateToRepository { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/duplicate/repository/media-type-duplicate.server.data-source.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/duplicate/repository/media-type-duplicate.server.data-source.ts index 61d7e634ab..8887f75028 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/duplicate/repository/media-type-duplicate.server.data-source.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/duplicate/repository/media-type-duplicate.server.data-source.ts @@ -1,7 +1,7 @@ import { MediaTypeService } from '@umbraco-cms/backoffice/external/backend-api'; import type { UmbControllerHost } from '@umbraco-cms/backoffice/controller-api'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; -import type { UmbDuplicateToDataSource, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/entity-action'; +import type { UmbDuplicateToDataSource, UmbDuplicateToRequestArgs } from '@umbraco-cms/backoffice/tree'; /** * Duplicate Document Server Data Source