Merge branch 'main' into chore/split-components

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';

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];

src/Umbraco.Web.UI.Client/src/backoffice/search/manifests.ts

@@ -13,7 +13,27 @@ const headerApps: Array<ManifestTypes> = [
 			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',

src/Umbraco.Web.UI.Client/src/backoffice/search/modals/manifests.ts

@@ -1,12 +0,0 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extensions-registry';
-
-const modals: Array<ManifestModal> = [
-	{
-		type: 'modal',
-		alias: 'Umb.Modal.Search',
-		name: 'Search Modal',
-		loader: () => import('./search/search-modal.element'),
-	},
-];
-
-export const manifests = [...modals];

src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/manifests.ts

@@ -16,21 +16,6 @@ const dashboards: Array<ManifestDashboard> = [
 			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<ManifestModal> = [
 		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'),
 	},
 ];