From 9717fd8a973e629d4e0ab057c93cd3e5d1967954 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 2 May 2023 21:32:49 +0200 Subject: [PATCH] move examine dashboard into search package --- .../libs/modal/modal.context.ts | 2 +- .../dashboard-examine-management.element.ts | 0 .../dashboard-examine-management.stories.ts | 0 .../modal-views/fields-settings.element.ts | 0 .../modal-views/fields-viewer.element.ts | 0 .../views/section-view-examine-indexers.ts | 0 .../views/section-view-examine-overview.ts | 0 .../views/section-view-examine-searchers.ts | 0 .../src/backoffice/search/index.ts | 1 + .../src/backoffice/search/manifests.ts | 22 ++++++++++++++++++- .../src/backoffice/search/modals/manifests.ts | 12 ---------- .../search-modal.element.ts | 0 .../settings/dashboards/manifests.ts | 17 +------------- 13 files changed, 24 insertions(+), 30 deletions(-) rename src/Umbraco.Web.UI.Client/src/backoffice/{settings/dashboards/examine-management => search/examine-management-dashboard}/dashboard-examine-management.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/backoffice/{settings/dashboards/examine-management => search/examine-management-dashboard}/dashboard-examine-management.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/backoffice/{settings/dashboards/examine-management => search/examine-management-dashboard}/views/modal-views/fields-settings.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/backoffice/{settings/dashboards/examine-management => search/examine-management-dashboard}/views/modal-views/fields-viewer.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/backoffice/{settings/dashboards/examine-management => search/examine-management-dashboard}/views/section-view-examine-indexers.ts (100%) rename src/Umbraco.Web.UI.Client/src/backoffice/{settings/dashboards/examine-management => search/examine-management-dashboard}/views/section-view-examine-overview.ts (100%) rename src/Umbraco.Web.UI.Client/src/backoffice/{settings/dashboards/examine-management => search/examine-management-dashboard}/views/section-view-examine-searchers.ts (100%) delete mode 100644 src/Umbraco.Web.UI.Client/src/backoffice/search/modals/manifests.ts rename src/Umbraco.Web.UI.Client/src/backoffice/search/{modals/search => search-modal}/search-modal.element.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts index 1d58c827df..2f874ca487 100644 --- a/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts @@ -1,5 +1,5 @@ // TODO: remove this import when the search hack is removed -import '../../src/backoffice/search/modals/search/search-modal.element'; +import '../../src/backoffice/search/search-modal/search-modal.element'; import type { UUIModalDialogElement, UUIModalSidebarSize } from '@umbraco-ui/uui'; import { BehaviorSubject } from 'rxjs'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/dashboard-examine-management.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/dashboard-examine-management.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/dashboard-examine-management.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/dashboard-examine-management.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/dashboard-examine-management.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/dashboard-examine-management.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/dashboard-examine-management.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/dashboard-examine-management.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-settings.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/modal-views/fields-settings.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-settings.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/modal-views/fields-settings.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/modal-views/fields-viewer.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/modal-views/fields-viewer.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/section-view-examine-indexers.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/section-view-examine-indexers.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/section-view-examine-overview.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/section-view-examine-overview.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/section-view-examine-searchers.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/search/examine-management-dashboard/views/section-view-examine-searchers.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/search/index.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/index.ts index 49613bb9ed..e6506e9d76 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/search/index.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/search/index.ts @@ -1,4 +1,5 @@ import { manifests as searchManifests } from '../search/manifests'; + import type { UmbEntrypointOnInit } from '@umbraco-cms/backoffice/extensions-api'; export const manifests = [...searchManifests]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/search/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/manifests.ts index adc42d3da1..c7c827ab26 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/search/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/search/manifests.ts @@ -13,7 +13,27 @@ const headerApps: Array = [ pathname: 'search', }, }, - + { + type: 'modal', + alias: 'Umb.Modal.Search', + name: 'Search Modal', + loader: () => import('./search-modal/search-modal.element'), + }, + { + type: 'dashboard', + alias: 'Umb.Dashboard.ExamineManagement', + name: 'Examine Management Dashboard', + elementName: 'umb-dashboard-examine-management', + loader: () => import('./examine-management-dashboard/dashboard-examine-management.element'), + weight: 400, + meta: { + label: 'Examine Management', + pathname: 'examine-management', + }, + conditions: { + sections: ['Umb.Section.Settings'], + }, + }, { type: 'headerApp', kind: 'button', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/search/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/modals/manifests.ts deleted file mode 100644 index e90acac916..0000000000 --- a/src/Umbraco.Web.UI.Client/src/backoffice/search/modals/manifests.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { ManifestModal } from '@umbraco-cms/backoffice/extensions-registry'; - -const modals: Array = [ - { - type: 'modal', - alias: 'Umb.Modal.Search', - name: 'Search Modal', - loader: () => import('./search/search-modal.element'), - }, -]; - -export const manifests = [...modals]; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/search/modals/search/search-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/search-modal/search-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/search/modals/search/search-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/search/search-modal/search-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/manifests.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/manifests.ts index a3227bd94e..3f336c9820 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/manifests.ts @@ -16,21 +16,6 @@ const dashboards: Array = [ sections: ['Umb.Section.Settings'], }, }, - { - type: 'dashboard', - alias: 'Umb.Dashboard.ExamineManagement', - name: 'Examine Management Dashboard', - elementName: 'umb-dashboard-examine-management', - loader: () => import('./examine-management/dashboard-examine-management.element'), - weight: 400, - meta: { - label: 'Examine Management', - pathname: 'examine-management', - }, - conditions: { - sections: ['Umb.Section.Settings'], - }, - }, { type: 'dashboard', alias: 'Umb.Dashboard.ModelsBuilder', @@ -113,7 +98,7 @@ const modals: Array = [ type: 'modal', alias: 'Umb.Modal.ExamineFieldsSettings', name: 'Examine Field Settings Modal', - loader: () => import('./examine-management/views/modal-views/fields-settings.element'), + loader: () => import('../../search/examine-management-dashboard/views/modal-views/fields-settings.element'), }, ];