From 1a139f8547e9036740f6dfb8d3fa8868348b75d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Sat, 28 Sep 2024 22:30:58 +0200 Subject: [PATCH] move modal extension --- .../packages/block/modals/manifest-viewer/manifest.ts | 2 +- .../src/packages/core/auth/modals/manifests.ts | 2 +- .../content-type/modals/composition-picker/manifest.ts | 2 +- .../core/extension-registry/interfaces/index.ts | 1 - .../packages/core/extension-registry/models/index.ts | 3 --- .../core/modal/component/modal-base.element.ts | 2 +- .../src/packages/core/modal/component/modal.element.ts | 2 +- .../src/packages/core/modal/extensions/index.ts | 9 +++++++++ .../extensions}/modal-extension-element.interface.ts | 2 +- .../extensions/modal.extension.ts} | 2 +- .../src/packages/core/modal/types.ts | 2 ++ .../core/server-file-system/rename/modal/manifests.ts | 2 +- .../entity-actions/duplicate-to/modal/manifests.ts | 2 +- .../entity-actions/sort-children-of/modal/manifests.ts | 2 +- .../entity-actions/import/modal/manifests.ts | 2 +- .../entity-actions/duplicate/modal/manifests.ts | 2 +- .../entity-actions/notifications/modal/manifests.ts | 2 +- .../packages/documents/documents/modals/manifests.ts | 2 +- .../documents/documents/rollback/modal/manifests.ts | 3 +-- .../entity-actions/import/modal/manifests.ts | 2 +- .../media/modals/image-cropper-editor/manifests.ts | 2 +- .../media/media/modals/media-picker/manifests.ts | 2 +- .../members/member/entity-actions/create/manifests.ts | 10 ++-------- .../src/packages/templating/modals/manifests.ts | 2 +- .../user/current-user/external-login/manifests.ts | 10 ++-------- 25 files changed, 34 insertions(+), 40 deletions(-) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/index.ts rename src/Umbraco.Web.UI.Client/src/packages/core/{extension-registry/interfaces => modal/extensions}/modal-extension-element.interface.ts (86%) rename src/Umbraco.Web.UI.Client/src/packages/core/{extension-registry/models/modal.model.ts => modal/extensions/modal.extension.ts} (73%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest.ts b/src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest.ts index db4ef7f807..c1f0400386 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/core/auth/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/manifests.ts index a63cdcadd5..818da5d01a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/composition-picker/manifest.ts b/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/composition-picker/manifest.ts index e743da34a9..03888b214f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/composition-picker/manifest.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts index d6a9ee345c..1bd06b43a8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts index afa28545e2..9730851cfc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts +++ b/src/Umbraco.Web.UI.Client/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'; @@ -74,7 +73,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'; @@ -141,7 +139,6 @@ export type ManifestTypes = | ManifestMenuItemTreeKind | ManifestMenuItemLinkKind | ManifestMfaLoginProvider - | ManifestModal | ManifestMonacoMarkdownEditorAction | ManifestPackageView | ManifestPickerSearchResultItem diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/component/modal-base.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/component/modal-base.element.ts index 40ee28d5d3..fc620f1bb1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/component/modal-base.element.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/core/modal/component/modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/component/modal.element.ts index a245f30166..165adbea9d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/component/modal.element.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/index.ts new file mode 100644 index 0000000000..7e8ab828d3 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/modal-extension-element.interface.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/modal-extension-element.interface.ts similarity index 86% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/modal-extension-element.interface.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/modal-extension-element.interface.ts index b362b88fc9..2b5fc8933f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/modal-extension-element.interface.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/modal.model.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/modal.extension.ts similarity index 73% rename from src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/modal.model.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/modal.extension.ts index 4c281e3852..625c8bea27 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/modal.model.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts index f2d55fad4f..3549e429c8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts @@ -1,3 +1,5 @@ +export * from './extensions/index.js'; + export interface UmbPickerModalData { multiple?: boolean; filter?: (item: ItemType) => boolean; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/manifests.ts index 2b5695fff3..9bd74bb056 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts index 060ea42ef8..e9bda4ae2e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts index 7a2dbb915a..27e20f90fb 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/import/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/import/modal/manifests.ts index e4a851b196..c01d1b63f1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/import/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/modal/manifests.ts index 6575dc80bb..23a2e476b8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/notifications/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/notifications/modal/manifests.ts index 4a12f56a0f..4037bb0a4f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/notifications/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts index 33ad8b1464..de0d760aa7 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/modal/manifests.ts index 84f3f34590..fc382cb8e5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ +export const manifests: Array = [ { type: 'modal', alias: UMB_ROLLBACK_MODAL_ALIAS, diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/import/modal/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/import/modal/manifests.ts index 71d2eebc8f..552556dbd5 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/import/modal/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/image-cropper-editor/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/image-cropper-editor/manifests.ts index cc47081b46..a79a41c459 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/image-cropper-editor/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/manifests.ts index 14a43cb9f7..172ffefeea 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/members/member/entity-actions/create/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/members/member/entity-actions/create/manifests.ts index 3a145b2c02..9216d08ffc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/members/member/entity-actions/create/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ +export const manifests: Array = [ { type: 'entityAction', kind: 'default', @@ -16,15 +15,10 @@ const entityActions: Array = [ additionalOptions: true, }, }, -]; - -const modals: Array = [ { 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 = [...entityActions, ...modals]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/modals/manifests.ts index f641b53335..7ef92de699 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/manifests.ts index 1f104ac700..613bb7bed3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/manifests.ts +++ b/src/Umbraco.Web.UI.Client/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 = [ +export const manifests: Array = [ { 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 = [ { type: 'currentUserAction', kind: 'default', @@ -29,4 +24,3 @@ export const userProfileApps: Array = [ ], }, ]; -export const manifests = [...modals, ...userProfileApps];