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

rename modal handler

Browse Source
This commit is contained in:
Niels Lyngsø
2023-06-05 10:48:26 +02:00
parent 6668a5cb66
commit 8a60db615b
20 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/packages/core/components/backoffice-modal-container/backoffice-modal-container.element.ts
View File

@@ -1,7 +1,7 @@
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { css, CSSResultGroup, html, repeat, customElement, state } from '@umbraco-cms/backoffice/external/lit';
import {
UmbModalHandler,
UmbModalContext,
UmbModalManagerContext,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
} from '@umbraco-cms/backoffice/modal';
@@ -10,7 +10,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@customElement('umb-backoffice-modal-container')
export class UmbBackofficeModalContainerElement extends UmbLitElement {
@state()
private _modals?: UmbModalHandler[];
private _modals?: UmbModalContext[];
private _modalContext?: UmbModalManagerContext;

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

@@ -1,5 +1,5 @@
import type { ManifestModal } from '../models/index.js';
import type { UmbModalHandler } from '@umbraco-cms/backoffice/modal';
import type { UmbModalContext } from '@umbraco-cms/backoffice/modal';
export interface UmbModalExtensionElement<
UmbModalData extends object = object,
@@ -8,7 +8,7 @@ export interface UmbModalExtensionElement<
> extends HTMLElement {
manifest?: ModalManifestType;
modalHandler?: UmbModalHandler<UmbModalData, UmbModalResult>;
modalHandler?: UmbModalContext<UmbModalData, UmbModalResult>;
data?: UmbModalData;
}

4
src/Umbraco.Web.UI.Client/src/packages/core/modal/common/confirm/confirm-modal.element.ts
View File

@@ -1,12 +1,12 @@
import { html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbConfirmModalData, UmbConfirmModalResult, UmbModalHandler } from '@umbraco-cms/backoffice/modal';
import { UmbConfirmModalData, UmbConfirmModalResult, UmbModalContext } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@customElement('umb-confirm-modal')
export class UmbConfirmModalElement extends UmbLitElement {
@property({ attribute: false })
modalHandler?: UmbModalHandler<UmbConfirmModalData, UmbConfirmModalResult>;
modalHandler?: UmbModalContext<UmbConfirmModalData, UmbConfirmModalResult>;
@property({ type: Object })
data?: UmbConfirmModalData;

4
src/Umbraco.Web.UI.Client/src/packages/core/modal/common/embedded-media/embedded-media-modal.element.ts
View File

@@ -5,7 +5,7 @@ import {
OEmbedStatus,
UmbEmbeddedMediaModalData,
UmbEmbeddedMediaModalResult,
UmbModalHandler,
UmbModalContext,
} from '@umbraco-cms/backoffice/modal';
import { umbracoPath } from '@umbraco-cms/backoffice/utils';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -27,7 +27,7 @@ export class UmbEmbeddedMediaModalElement extends UmbLitElement {
#embedResult!: OEmbedResult;
@property({ attribute: false })
modalHandler?: UmbModalHandler<UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalResult>;
modalHandler?: UmbModalContext<UmbEmbeddedMediaModalData, UmbEmbeddedMediaModalResult>;
@property({ type: Object })
data?: UmbEmbeddedMediaModalData;

4
src/Umbraco.Web.UI.Client/src/packages/core/modal/common/folder/folder-modal.element.ts
View File

@@ -1,6 +1,6 @@
import { css, html, customElement, property, query, state } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { UmbFolderModalData, UmbFolderModalResult, UmbModalHandler } from '@umbraco-cms/backoffice/modal';
import { UmbFolderModalData, UmbFolderModalResult, UmbModalContext } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { UmbFolderRepository } from '@umbraco-cms/backoffice/repository';
import { createExtensionClass, ManifestBase } from '@umbraco-cms/backoffice/extension-api';
@@ -11,7 +11,7 @@ import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registr
@customElement('umb-folder-modal')
export class UmbFolderModalElement extends UmbLitElement {
@property({ attribute: false })
modalHandler?: UmbModalHandler<UmbFolderModalData, UmbFolderModalResult>;
modalHandler?: UmbModalContext<UmbFolderModalData, UmbFolderModalResult>;
private _data?: UmbFolderModalData;
@property({ type: Object, attribute: false })

6
src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-handler.ts
View File

@@ -19,7 +19,7 @@ import { UmbContextProviderController, UmbContextToken } from '@umbraco-cms/back
/**
* Type which omits the real submit method, and replaces it with a submit method which accepts an optional argument depending on the generic type.
*/
export type UmbModalHandler<ModalData extends object = object, ModalResult = any> = Omit<
export type UmbModalContext<ModalData extends object = object, ModalResult = any> = Omit<
UmbModalContextClass<ModalData, ModalResult>,
'submit'
> &
@@ -110,7 +110,7 @@ export class UmbModalContextClass<ModalData extends object = object, ModalResult
new UmbContextProviderController(
host,
UMB_MODAL_CONTEXT_TOKEN,
this as unknown as UmbModalHandler<ModalData, ModalResult>
this as unknown as UmbModalContext<ModalData, ModalResult>
);
}
@@ -201,4 +201,4 @@ export class UmbModalContextClass<ModalData extends object = object, ModalResult
}
}
export const UMB_MODAL_CONTEXT_TOKEN = new UmbContextToken<UmbModalHandler>('UmbModalContext');
export const UMB_MODAL_CONTEXT_TOKEN = new UmbContextToken<UmbModalContext>('UmbModalContext');

4
src/Umbraco.Web.UI.Client/src/packages/core/modal/modal-route-registration.ts
View File

@@ -1,4 +1,4 @@
import { UmbModalHandler } from './modal-handler.js';
import { UmbModalContext } from './modal-handler.js';
import { UmbModalConfig, UmbModalManagerContext } from './modal.context.js';
import { UmbModalToken } from './token/modal-token.js';
import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot';
@@ -18,7 +18,7 @@ export class UmbModalRouteRegistration<UmbModalTokenData extends object = object
#onSubmitCallback?: (data: UmbModalTokenResult) => void;
#onRejectCallback?: () => void;
#modalHandler: UmbModalHandler<UmbModalTokenData, UmbModalTokenResult> | undefined;
#modalHandler: UmbModalContext<UmbModalTokenData, UmbModalTokenResult> | undefined;
#routeBuilder?: UmbModalRouteBuilder;
#urlBuilderCallback: ((urlBuilder: UmbModalRouteBuilder) => void) | undefined;

10
src/Umbraco.Web.UI.Client/src/packages/core/modal/modal.context.ts
View File

@@ -1,4 +1,4 @@
import { UmbModalHandler, UmbModalContextClass } from './modal-handler.js';
import { UmbModalContext, UmbModalContextClass } from './modal-handler.js';
import type { UmbModalToken } from './token/modal-token.js';
import type { IRouterSlot } from '@umbraco-cms/backoffice/external/router-slot';
import type { UUIModalSidebarSize } from '@umbraco-cms/backoffice/external/uui';
@@ -18,7 +18,7 @@ export interface UmbModalConfig {
export class UmbModalManagerContext {
host: UmbControllerHostElement;
// TODO: Investigate if we can get rid of HTML elements in our store, so we can use one of our states.
#modals = new BehaviorSubject(<Array<UmbModalHandler>>[]);
#modals = new BehaviorSubject(<Array<UmbModalContext>>[]);
public readonly modals = this.#modals.asObservable();
constructor(host: UmbControllerHostElement) {
@@ -45,7 +45,7 @@ export class UmbModalManagerContext {
modalAlias,
data,
config
) as unknown as UmbModalHandler<ModalData, ModalResult>;
) as unknown as UmbModalContext<ModalData, ModalResult>;
modalHandler.modalElement.addEventListener('close-end', () => this.#onCloseEnd(modalHandler));
@@ -76,10 +76,10 @@ export class UmbModalManagerContext {
/**
* Handles the close-end event
* @private
* @param {UmbModalHandler} modalHandler
* @param {UmbModalContext} modalHandler
* @memberof UmbModalContext
*/
#onCloseEnd(modalHandler: UmbModalHandler<any, any>) {
#onCloseEnd(modalHandler: UmbModalContext<any, any>) {
modalHandler.modalElement.removeEventListener('close-end', () => this.#onCloseEnd(modalHandler));
this.#remove(modalHandler.key);
}

4
src/Umbraco.Web.UI.Client/src/packages/core/workspace/workspace-modal/workspace-modal.element.ts
View File

@@ -1,12 +1,12 @@
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { css, CSSResultGroup, html, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UmbModalHandler, UmbWorkspaceData, UmbWorkspaceResult } from '@umbraco-cms/backoffice/modal';
import { UmbModalContext, UmbWorkspaceData, UmbWorkspaceResult } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@customElement('umb-workspace-modal')
export class UmbWorkspaceModalElement extends UmbLitElement {
@property({ attribute: false })
modalHandler?: UmbModalHandler;
modalHandler?: UmbModalContext;
@property()
data?: UmbWorkspaceData;

4
src/Umbraco.Web.UI.Client/src/packages/documents/document-types/entity-actions/create/modal/document-type-create-options-modal.element.ts
View File

@@ -4,7 +4,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import {
UmbModalManagerContext,
UmbModalHandler,
UmbModalContext,
UMB_FOLDER_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
} from '@umbraco-cms/backoffice/modal';
@@ -13,7 +13,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@customElement('umb-document-type-create-options-modal')
export class UmbDataTypeCreateOptionsModalElement extends UmbLitElement {
@property({ attribute: false })
modalHandler?: UmbModalHandler<UmbDocumentTypeCreateOptionsModalData>;
modalHandler?: UmbModalContext<UmbDocumentTypeCreateOptionsModalData>;
@property({ type: Object })
data?: UmbDocumentTypeCreateOptionsModalData;

4
src/Umbraco.Web.UI.Client/src/packages/settings/data-types/entity-actions/create/modal/data-type-create-options-modal.element.ts
View File

@@ -4,7 +4,7 @@ import { html, customElement, property } from '@umbraco-cms/backoffice/external/
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import {
UmbModalManagerContext,
UmbModalHandler,
UmbModalContext,
UMB_FOLDER_MODAL,
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
} from '@umbraco-cms/backoffice/modal';
@@ -13,7 +13,7 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@customElement('umb-data-type-create-options-modal')
export class UmbDataTypeCreateOptionsModalElement extends UmbLitElement {
@property({ attribute: false })
modalHandler?: UmbModalHandler<UmbDataTypeCreateOptionsModalData>;
modalHandler?: UmbModalContext<UmbDataTypeCreateOptionsModalData>;
@property({ type: Object })
data?: UmbDataTypeCreateOptionsModalData;

4
src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-data-type-picker-modal.element.ts
View File

@@ -2,7 +2,7 @@ import { UmbDataTypeRepository } from '../../repository/data-type.repository.js'
import { css, html, customElement, property, state, repeat } from '@umbraco-cms/backoffice/external/lit';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import {
UmbModalHandler,
UmbModalContext,
UmbDataTypePickerFlowDataTypePickerModalData,
UmbDataTypePickerFlowDataTypePickerModalResult,
} from '@umbraco-cms/backoffice/modal';
@@ -72,7 +72,7 @@ export class UmbDataTypePickerFlowDataTypePickerModalElement extends UmbLitEleme
}
@property({ attribute: false })
modalHandler?: UmbModalHandler<
modalHandler?: UmbModalContext<
UmbDataTypePickerFlowDataTypePickerModalData,
UmbDataTypePickerFlowDataTypePickerModalResult
>;

4
src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/data-type-picker-flow/data-type-picker-flow-modal.element.ts
View File

@@ -8,7 +8,7 @@ import {
UMB_WORKSPACE_MODAL,
UmbDataTypePickerFlowModalData,
UmbDataTypePickerFlowModalResult,
UmbModalHandler,
UmbModalContext,
UmbModalRouteBuilder,
UmbModalRouteRegistrationController,
} from '@umbraco-cms/backoffice/modal';
@@ -22,7 +22,7 @@ interface GroupedItems<T> {
@customElement('umb-data-type-picker-flow-modal')
export class UmbDataTypePickerFlowModalElement extends UmbLitElement {
@property({ attribute: false })
modalHandler?: UmbModalHandler<UmbDataTypePickerFlowModalData, UmbDataTypePickerFlowModalResult>;
modalHandler?: UmbModalContext<UmbDataTypePickerFlowModalData, UmbDataTypePickerFlowModalResult>;
@property({ type: Object })
public get data(): UmbDataTypePickerFlowModalData | undefined {

4
src/Umbraco.Web.UI.Client/src/packages/settings/data-types/modals/property-editor-ui-picker/property-editor-ui-picker-modal.element.ts
View File

@@ -5,7 +5,7 @@ import type { UUIInputEvent } from '@umbraco-cms/backoffice/external/uui';
import {
UmbPropertyEditorUIPickerModalData,
UmbPropertyEditorUIPickerModalResult,
UmbModalHandler,
UmbModalContext,
} from '@umbraco-cms/backoffice/modal';
import { ManifestPropertyEditorUi, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -76,7 +76,7 @@ export class UmbPropertyEditorUIPickerModalElement extends UmbLitElement {
}
@property({ attribute: false })
modalHandler?: UmbModalHandler<UmbPropertyEditorUIPickerModalData, UmbPropertyEditorUIPickerModalResult>;
modalHandler?: UmbModalContext<UmbPropertyEditorUIPickerModalData, UmbPropertyEditorUIPickerModalResult>;
private _submit() {
this.modalHandler?.submit({ selection: this._selection });

4
src/Umbraco.Web.UI.Client/src/packages/settings/logviewer/workspace/views/search/components/log-viewer-search-input.element.ts
View File

@@ -14,7 +14,7 @@ import { query as getQuery, path, toQueryString } from '@umbraco-cms/backoffice/
import {
UMB_MODAL_MANAGER_CONTEXT_TOKEN,
UmbModalManagerContext,
UmbModalHandler,
UmbModalContext,
UmbModalToken,
} from '@umbraco-cms/backoffice/modal';
@@ -134,7 +134,7 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement {
this.#logViewerContext?.setFilterExpression('');
}
#modalHandler?: UmbModalHandler;
#modalHandler?: UmbModalContext;
#saveSearch(savedSearch: SavedLogSearchResponseModel) {
this.#logViewerContext?.saveSearch(savedSearch);

4
src/Umbraco.Web.UI.Client/src/packages/templating/components/insert-menu/templating-insert-menu.element.ts
View File

@@ -14,7 +14,7 @@ import {
UMB_PARTIAL_VIEW_PICKER_MODAL,
UmbDictionaryItemPickerModalResult,
UmbModalManagerContext,
UmbModalHandler,
UmbModalContext,
UmbModalToken,
UmbPartialViewPickerModalResult,
} from '@umbraco-cms/backoffice/modal';
@@ -35,7 +35,7 @@ export class UmbTemplatingInsertMenuElement extends UmbLitElement {
private _modalContext?: UmbModalManagerContext;
#openModal?: UmbModalHandler;
#openModal?: UmbModalContext;
#dictionaryRepository = new UmbDictionaryRepository(this);

4
src/Umbraco.Web.UI.Client/src/packages/templating/modals/insert-choose-type-sidebar.element.ts
View File

@@ -7,7 +7,7 @@ import {
UmbModalManagerContext,
UmbModalToken,
UMB_PARTIAL_VIEW_PICKER_MODAL,
UmbModalHandler,
UmbModalContext,
UMB_DICTIONARY_ITEM_PICKER_MODAL,
UmbDictionaryItemPickerModalResult,
} from '@umbraco-cms/backoffice/modal';
@@ -53,7 +53,7 @@ export default class UmbChooseInsertTypeModalElement extends UmbModalBaseElement
});
}
#openModal?: UmbModalHandler;
#openModal?: UmbModalContext;
#openInsertValueSidebar() {
this.#openModal = this._modalContext?.open(UMB_MODAL_TEMPLATING_INSERT_FIELD_SIDEBAR_MODAL);

6
src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/change-password/change-password-modal.element.ts
View File

@@ -1,12 +1,12 @@
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { css, CSSResultGroup, html, nothing , customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UmbModalHandler, UmbChangePasswordModalData } from '@umbraco-cms/backoffice/modal';
import { css, CSSResultGroup, html, nothing, customElement, property } from '@umbraco-cms/backoffice/external/lit';
import { UmbModalContext, UmbChangePasswordModalData } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@customElement('umb-change-password-modal')
export class UmbChangePasswordModalElement extends UmbLitElement {
@property({ attribute: false })
modalHandler?: UmbModalHandler;
modalHandler?: UmbModalContext;
@property()
data?: UmbChangePasswordModalData;

6
src/Umbraco.Web.UI.Client/src/packages/users/current-user/modals/current-user/current-user-modal.element.ts
View File

@@ -1,14 +1,14 @@
import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../current-user.store.js';
import type { UmbLoggedInUser } from '../../types.js';
import { UUITextStyles } from '@umbraco-cms/backoffice/external/uui';
import { css, CSSResultGroup, html , customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbModalHandler } from '@umbraco-cms/backoffice/modal';
import { css, CSSResultGroup, html, customElement, property, state } from '@umbraco-cms/backoffice/external/lit';
import { UmbModalContext } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@customElement('umb-current-user-modal')
export class UmbCurrentUserModalElement extends UmbLitElement {
@property({ attribute: false })
modalHandler?: UmbModalHandler;
modalHandler?: UmbModalContext;
@state()
private _currentUser?: UmbLoggedInUser;

4
src/Umbraco.Web.UI.Client/src/shared/modal/modal-element.element.ts
View File

@@ -1,6 +1,6 @@
import { property } from '@umbraco-cms/backoffice/external/lit';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { UmbModalHandler } from '@umbraco-cms/backoffice/modal';
import { UmbModalContext } from '@umbraco-cms/backoffice/modal';
import type { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/extension-registry';
export abstract class UmbModalBaseElement<
@@ -15,7 +15,7 @@ export abstract class UmbModalBaseElement<
public manifest?: ModalManifestType;
@property({ attribute: false })
public modalHandler?: UmbModalHandler<ModalDataType, ModalResultType>;
public modalHandler?: UmbModalContext<ModalDataType, ModalResultType>;
@property({ type: Object, attribute: false })
public data?: ModalDataType;