From 115bbafa13f87f4a97d0e24118f3a92ec867ed33 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 24 May 2024 10:37:55 +0200 Subject: [PATCH] move "sort children of"-entity-action to tree module --- .../src/packages/core/entity-action/common/index.ts | 1 - .../src/packages/core/entity-action/manifests.ts | 2 -- .../src/packages/core/tree/entity-actions/manifests.ts | 3 ++- .../entity-actions}/sort-children-of/manifests.ts | 0 .../entity-actions}/sort-children-of/modal/constants.ts | 0 .../entity-actions}/sort-children-of/modal/index.ts | 0 .../entity-actions}/sort-children-of/modal/manifests.ts | 0 .../sort-children-of/modal/sort-children-of-modal.element.ts | 0 .../sort-children-of/modal/sort-children-of-modal.token.ts | 0 .../sort-children-of/sort-children-of.action.kind.ts | 2 +- .../sort-children-of/sort-children-of.action.ts | 3 +-- src/Umbraco.Web.UI.Client/src/packages/core/tree/index.ts | 2 ++ 12 files changed, 6 insertions(+), 7 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/{entity-action/common => tree/entity-actions}/sort-children-of/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{entity-action/common => tree/entity-actions}/sort-children-of/modal/constants.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{entity-action/common => tree/entity-actions}/sort-children-of/modal/index.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{entity-action/common => tree/entity-actions}/sort-children-of/modal/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{entity-action/common => tree/entity-actions}/sort-children-of/modal/sort-children-of-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{entity-action/common => tree/entity-actions}/sort-children-of/modal/sort-children-of-modal.token.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{entity-action/common => tree/entity-actions}/sort-children-of/sort-children-of.action.kind.ts (86%) rename src/Umbraco.Web.UI.Client/src/packages/core/{entity-action/common => tree/entity-actions}/sort-children-of/sort-children-of.action.ts (86%) 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 5f53e0ebb1..f93aaf2bd8 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,3 +1,2 @@ export * from './duplicate/index.js'; export * from './delete/delete.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/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/manifests.ts index f84df0a54e..3deded0b21 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,12 +1,10 @@ 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 sortChildrenOfEntityActionManifests } from './common/sort-children-of/manifests.js'; import type { ManifestTypes, UmbBackofficeManifestKind } from '@umbraco-cms/backoffice/extension-registry'; export const manifests: Array = [ ...defaultEntityActionManifests, ...deleteEntityActionManifests, ...duplicateEntityActionManifests, - ...sortChildrenOfEntityActionManifests, ]; 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 3132b869d9..360b26b922 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,4 +1,5 @@ import { manifests as reloadTreeItemChildrenManifests } from './reload-tree-item-children/manifests.js'; import { manifests as moveManifests } from './move/manifests.js'; +import { manifests as sortChildrenOfManifests } from './sort-children-of/manifests.js'; -export const manifests = [...reloadTreeItemChildrenManifests, ...moveManifests]; +export const manifests = [...reloadTreeItemChildrenManifests, ...moveManifests, ...sortChildrenOfManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/constants.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/constants.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/constants.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/constants.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/index.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/sort-children-of-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/sort-children-of-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/sort-children-of-modal.token.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/modal/sort-children-of-modal.token.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/sort-children-of-modal.token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/sort-children-of.action.kind.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.ts similarity index 86% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/sort-children-of.action.kind.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.kind.ts index 3845a19139..bad57bb155 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/sort-children-of.action.kind.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.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/sort-children-of/sort-children-of.action.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.ts similarity index 86% rename from src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/sort-children-of.action.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.ts index c2f34778ba..8996dd23c1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/entity-action/common/sort-children-of/sort-children-of.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/sort-children-of.action.ts @@ -1,6 +1,5 @@ -import { UmbEntityActionBase } from '../../entity-action-base.js'; -import { UmbRequestReloadChildrenOfEntityEvent } from '../../request-reload-children-of-entity.event.js'; import { UMB_SORT_CHILDREN_OF_MODAL } from './modal/index.js'; +import { UmbEntityActionBase, UmbRequestReloadChildrenOfEntityEvent } from '@umbraco-cms/backoffice/entity-action'; import { UMB_MODAL_MANAGER_CONTEXT } from '@umbraco-cms/backoffice/modal'; import type { MetaEntityActionSortChildrenOfKind } from '@umbraco-cms/backoffice/extension-registry'; import { UMB_ACTION_EVENT_CONTEXT } from '@umbraco-cms/backoffice/action'; 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 e9746b2468..85aba0170a 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,6 +5,8 @@ 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,