Merge branch 'main' into v15/feature/emm-theme

nielslyngsoe · nielslyngsoe · commit c80efd4442f0 · 2024-09-29T19:39:52.000+02:00
diff --git a/src/packages/block/modals/manifest-viewer/manifest.ts b/src/packages/block/modals/manifest-viewer/manifest.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifest: ManifestModal = {
 	type: 'modal',
diff --git a/src/packages/core/auth/modals/manifests.ts b/src/packages/core/auth/modals/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/core/content-type/modals/composition-picker/manifest.ts b/src/packages/core/content-type/modals/composition-picker/manifest.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifest: ManifestModal = {
 	type: 'modal',
diff --git a/src/packages/core/extension-registry/interfaces/index.ts b/src/packages/core/extension-registry/interfaces/index.ts
@@ -2,7 +2,6 @@ export * from './dashboard-element.interface.js';
 export * from './external-login-provider-element.interface.js';
 export * from './file-upload-preview.interface.js';
 export * from './menu-item-element.interface.js';
-export * from './modal-extension-element.interface.js';
 export * from './property-editor-ui-element.interface.js';
 export * from './section-element.interface.js';
 export * from './section-sidebar-app-element.interface.js';
diff --git a/src/packages/core/extension-registry/models/index.ts b/src/packages/core/extension-registry/models/index.ts
@@ -28,7 +28,6 @@ import type { ManifestIcons } from './icons.model.js';
 import type { ManifestLocalization } from './localization.model.js';
 import type { ManifestMenu } from './menu.model.js';
 import type { ManifestMenuItem, ManifestMenuItemLinkKind, ManifestMenuItemTreeKind } from './menu-item.model.js';
-import type { ManifestModal } from './modal.model.js';
 import type { ManifestPackageView } from './package-view.model.js';
 import type { ManifestPreviewAppProvider } from './preview-app.model.js';
 import type { ManifestPropertyAction, ManifestPropertyActionDefaultKind } from './property-action.model.js';
@@ -73,7 +72,6 @@ export type * from './localization.model.js';
 export type * from './menu-item.model.js';
 export type * from './menu.model.js';
 export type * from './mfa-login-provider.model.js';
-export type * from './modal.model.js';
 export type * from './monaco-markdown-editor-action.model.js';
 export type * from './package-view.model.js';
 export type * from './picker-search-result-item.model.js';
@@ -139,7 +137,6 @@ export type ManifestTypes =
 	| ManifestMenuItemTreeKind
 	| ManifestMenuItemLinkKind
 	| ManifestMfaLoginProvider
-	| ManifestModal
 	| ManifestMonacoMarkdownEditorAction
 	| ManifestPackageView
 	| ManifestPickerSearchResultItem
diff --git a/src/packages/core/modal/component/modal-base.element.ts b/src/packages/core/modal/component/modal-base.element.ts
@@ -1,7 +1,7 @@
 import type { UmbModalRejectReason, UmbModalContext } from '../context/index.js';
 import { property } from '@umbraco-cms/backoffice/external/lit';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import type { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/modal';
 
 export abstract class UmbModalBaseElement<
 		ModalDataType extends object = object,
diff --git a/src/packages/core/modal/component/modal.element.ts b/src/packages/core/modal/component/modal.element.ts
@@ -1,7 +1,7 @@
 import type { UmbModalContext } from '../context/modal.context.js';
 import { UMB_MODAL_CONTEXT } from '../context/modal.context-token.js';
 import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
 import { UmbTextStyles } from '@umbraco-cms/backoffice/style';
 import type { CSSResultGroup } from '@umbraco-cms/backoffice/external/lit';
diff --git a/src/packages/core/modal/extensions/index.ts b/src/packages/core/modal/extensions/index.ts
@@ -0,0 +1,9 @@
+export type * from './modal-extension-element.interface.js';
+export type * from './modal.extension.js';
+import type { ManifestModal } from './modal.extension.js';
+
+declare global {
+	interface UmbExtensionManifestMap {
+		UmbModalExtension: ManifestModal;
+	}
+}
diff --git a/src/packages/core/modal/extensions/modal-extension-element.interface.ts b/src/packages/core/modal/extensions/modal-extension-element.interface.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '../models/index.js';
+import type { ManifestModal } from './modal.extension.js';
 import type { UmbModalContext } from '@umbraco-cms/backoffice/modal';
 
 export interface UmbModalExtensionElement<
diff --git a/src/packages/core/modal/extensions/modal.extension.ts b/src/packages/core/modal/extensions/modal.extension.ts
@@ -1,4 +1,4 @@
-import type { UmbModalExtensionElement } from '../interfaces/modal-extension-element.interface.js';
+import type { UmbModalExtensionElement } from './modal-extension-element.interface.js';
 import type { ManifestElement } from '@umbraco-cms/backoffice/extension-api';
 
 export interface ManifestModal
diff --git a/src/packages/core/modal/types.ts b/src/packages/core/modal/types.ts
@@ -1,3 +1,5 @@
+export * from './extensions/index.js';
+
 export interface UmbPickerModalData<ItemType> {
 	multiple?: boolean;
 	filter?: (item: ItemType) => boolean;
diff --git a/src/packages/core/server-file-system/rename/modal/manifests.ts b/src/packages/core/server-file-system/rename/modal/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const UMB_RENAME_SERVER_FILE_MODAL_ALIAS = 'Umb.Modal.ServerFile.Rename';
 
diff --git a/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts b/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts
@@ -1,5 +1,5 @@
 import { UMB_DUPLICATE_TO_MODAL_ALIAS } from './constants.js';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts b/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts
@@ -1,5 +1,5 @@
 import { UMB_SORT_CHILDREN_OF_MODAL_ALIAS } from './constants.js';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/documents/document-types/entity-actions/import/modal/manifests.ts b/src/packages/documents/document-types/entity-actions/import/modal/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/documents/documents/entity-actions/duplicate/modal/manifests.ts b/src/packages/documents/documents/entity-actions/duplicate/modal/manifests.ts
@@ -1,5 +1,5 @@
 import { UMB_DUPLICATE_DOCUMENT_MODAL_ALIAS } from './constants.js';
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/documents/documents/entity-actions/notifications/modal/manifests.ts b/src/packages/documents/documents/entity-actions/notifications/modal/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const UMB_DOCUMENT_NOTIFICATIONS_MODAL_ALIAS = 'Umb.Modal.DocumentNotifications';
 
diff --git a/src/packages/documents/documents/modals/manifests.ts b/src/packages/documents/documents/modals/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const UMB_DOCUMENT_SAVE_MODAL_ALIAS = 'Umb.Modal.DocumentSave';
 export const UMB_DOCUMENT_PUBLISH_MODAL_ALIAS = 'Umb.Modal.DocumentPublish';
diff --git a/src/packages/documents/documents/rollback/modal/manifests.ts b/src/packages/documents/documents/rollback/modal/manifests.ts
@@ -1,7 +1,6 @@
 import { UMB_ROLLBACK_MODAL_ALIAS } from './constants.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-export const manifests: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		type: 'modal',
 		alias: UMB_ROLLBACK_MODAL_ALIAS,
diff --git a/src/packages/media/media-types/entity-actions/import/modal/manifests.ts b/src/packages/media/media-types/entity-actions/import/modal/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/media/media/modals/image-cropper-editor/manifests.ts b/src/packages/media/media/modals/image-cropper-editor/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 const modals: Array<ManifestModal> = [
 	{
diff --git a/src/packages/media/media/modals/media-picker/manifests.ts b/src/packages/media/media/modals/media-picker/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 const modals: Array<ManifestModal> = [
 	{
diff --git a/src/packages/members/member/entity-actions/create/manifests.ts b/src/packages/members/member/entity-actions/create/manifests.ts
@@ -1,7 +1,6 @@
 import { UMB_MEMBER_ROOT_ENTITY_TYPE } from '../../entity.js';
-import type { ManifestTypes } from '@umbraco-cms/backoffice/extension-registry';
 
-const entityActions: Array<ManifestTypes> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		type: 'entityAction',
 		kind: 'default',
@@ -16,15 +15,10 @@ const entityActions: Array<ManifestTypes> = [
 			additionalOptions: true,
 		},
 	},
-];
-
-const modals: Array<ManifestTypes> = [
 	{
 		type: 'modal',
 		alias: 'Umb.Modal.Member.CreateOptions',
 		name: 'Member Create Options Modal',
-		js: () => import('./member-create-options-modal.element.js'),
+		element: () => import('./member-create-options-modal.element.js'),
 	},
 ];
-
-export const manifests: Array<ManifestTypes> = [...entityActions, ...modals];
diff --git a/src/packages/templating/modals/manifests.ts b/src/packages/templating/modals/manifests.ts
@@ -1,4 +1,4 @@
-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';
 
 export const manifests: Array<ManifestModal> = [
 	{
diff --git a/src/packages/user/current-user/external-login/manifests.ts b/src/packages/user/current-user/external-login/manifests.ts
@@ -1,15 +1,10 @@
-import type { ManifestCurrentUserActionDefaultKind, ManifestModal } from '@umbraco-cms/backoffice/extension-registry';
-
-export const modals: Array<ManifestModal> = [
+export const manifests: Array<UmbExtensionManifest> = [
 	{
 		type: 'modal',
 		alias: 'Umb.Modal.CurrentUserExternalLogin',
 		name: 'External Login Modal',
-		js: () => import('./modals/external-login-modal.element.js'),
+		element: () => import('./modals/external-login-modal.element.js'),
 	},
-];
-
-export const userProfileApps: Array<ManifestCurrentUserActionDefaultKind> = [
 	{
 		type: 'currentUserAction',
 		kind: 'default',
@@ -29,4 +24,3 @@ export const userProfileApps: Array<ManifestCurrentUserActionDefaultKind> = [
 		],
 	},
 ];
-export const manifests = [...modals, ...userProfileApps];

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { ManifestModal } from '@umbraco-cms/backoffice/extension-registry';`
	`1`	`+import type { ManifestModal } from '@umbraco-cms/backoffice/modal';`
`2`	`2`
`3`	`3`	`export const manifest: ManifestModal = {`
`4`	`4`	`type: 'modal',`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { ManifestModal } from '../models/index.js';`
	`1`	`+import type { ManifestModal } from './modal.extension.js';`
`2`	`2`	`import type { UmbModalContext } from '@umbraco-cms/backoffice/modal';`
`3`	`3`
`4`	`4`	`export interface UmbModalExtensionElement<`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { UmbModalExtensionElement } from '../interfaces/modal-extension-element.interface.js';`
	`1`	`+import type { UmbModalExtensionElement } from './modal-extension-element.interface.js';`
`2`	`2`	`import type { ManifestElement } from '@umbraco-cms/backoffice/extension-api';`
`3`	`3`
`4`	`4`	`export interface ManifestModal`