yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Niels Lyngsø
2024-09-29 19:39:38 +02:00
parent b1222b24c8 e7e15052f4
commit 782e5baa5c
25 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/packages/block/modals/manifest-viewer/manifest.ts
View File

@@ -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',

2
src/Umbraco.Web.UI.Client/src/packages/core/auth/modals/manifests.ts
View File

@@ -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> = [
{

2
src/Umbraco.Web.UI.Client/src/packages/core/content-type/modals/composition-picker/manifest.ts
View File

@@ -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',

1
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/index.ts
View File

@@ -2,5 +2,4 @@ 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';

3
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/index.ts
View File

@@ -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';
@@ -70,7 +69,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';
@@ -134,7 +132,6 @@ export type ManifestTypes =
| ManifestMenuItemTreeKind
| ManifestMenuItemLinkKind
| ManifestMfaLoginProvider
| ManifestModal
| ManifestMonacoMarkdownEditorAction
| ManifestPackageView
| ManifestPickerSearchResultItem

2
src/Umbraco.Web.UI.Client/src/packages/core/modal/component/modal-base.element.ts
View File

@@ -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,

2
src/Umbraco.Web.UI.Client/src/packages/core/modal/component/modal.element.ts
View File

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

9
src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/index.ts Normal file
View File

@@ -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;
}
}

2
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/interfaces/modal-extension-element.interface.ts → src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/modal-extension-element.interface.ts
View File

@@ -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<

2
src/Umbraco.Web.UI.Client/src/packages/core/extension-registry/models/modal.model.ts → src/Umbraco.Web.UI.Client/src/packages/core/modal/extensions/modal.extension.ts
View File

@@ -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

2
src/Umbraco.Web.UI.Client/src/packages/core/modal/types.ts
View File

@@ -1,3 +1,5 @@
export * from './extensions/index.js';
export interface UmbPickerModalData<ItemType> {
multiple?: boolean;
filter?: (item: ItemType) => boolean;

2
src/Umbraco.Web.UI.Client/src/packages/core/server-file-system/rename/modal/manifests.ts
View File

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

2
src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/duplicate-to/modal/manifests.ts
View File

@@ -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> = [
{

2
src/Umbraco.Web.UI.Client/src/packages/core/tree/entity-actions/sort-children-of/modal/manifests.ts
View File

@@ -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> = [
{

2
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/import/modal/manifests.ts
View File

@@ -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> = [
{

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/duplicate/modal/manifests.ts
View File

@@ -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> = [
{

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/notifications/modal/manifests.ts
View File

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

2
src/Umbraco.Web.UI.Client/src/packages/documents/documents/modals/manifests.ts
View File

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

3
src/Umbraco.Web.UI.Client/src/packages/documents/documents/rollback/modal/manifests.ts
View File

@@ -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,

2
src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/import/modal/manifests.ts
View File

@@ -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> = [
{

2
src/Umbraco.Web.UI.Client/src/packages/media/media/modals/image-cropper-editor/manifests.ts
View File

@@ -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> = [
{

2
src/Umbraco.Web.UI.Client/src/packages/media/media/modals/media-picker/manifests.ts
View File

@@ -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> = [
{

10
src/Umbraco.Web.UI.Client/src/packages/members/member/entity-actions/create/manifests.ts
View File

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

2
src/Umbraco.Web.UI.Client/src/packages/templating/modals/manifests.ts
View File

@@ -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> = [
{

10
src/Umbraco.Web.UI.Client/src/packages/user/current-user/external-login/manifests.ts
View File

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