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

confirm modal

Browse Source
This commit is contained in:
Niels Lyngsø
2023-03-23 21:27:28 +01:00
parent 90db955f87
commit c7a77c23e2
21 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/libs/entity-action/actions/delete/delete.action.ts
View File

@@ -1,4 +1,4 @@
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../src/backoffice/shared/modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../modal/token/confirm-modal.token';
import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
@@ -25,7 +25,7 @@ export class UmbDeleteEntityAction<
if (data) {
const item = data[0];
const modalHandler = this.#modalContext.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this.#modalContext.open(UMB_CONFIRM_MODAL, {
headline: `Delete ${item.name}`,
content: 'Are you sure you want to delete this item?',
color: 'danger',

4
src/Umbraco.Web.UI.Client/libs/entity-action/actions/trash/trash.action.ts
View File

@@ -1,4 +1,4 @@
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../src/backoffice/shared/modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../modal/token/confirm-modal.token';
import { UmbEntityActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
@@ -25,7 +25,7 @@ export class UmbTrashEntityAction<
if (data) {
const item = data[0];
const modalHandler = this.#modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this.#modalContext?.open(UMB_CONFIRM_MODAL, {
headline: `Trash ${item.name}`,
content: 'Are you sure you want to move this item to the recycle bin?',
color: 'danger',

0
src/Umbraco.Web.UI.Client/libs/modal/token/change-password-modal.ts → src/Umbraco.Web.UI.Client/libs/modal/token/change-password-modal.token.ts
View File

9
src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/index.ts → src/Umbraco.Web.UI.Client/libs/modal/token/confirm-modal.token.ts
View File

@@ -10,9 +10,6 @@ export interface UmbConfirmModalData {
export type UmbConfirmModalResult = undefined;
export const UMB_CONFIRM_MODAL_TOKEN = new UmbModalToken<UmbConfirmModalData, UmbConfirmModalResult>(
'Umb.Modal.Confirm',
{
type: 'dialog',
}
);
export const UMB_CONFIRM_MODAL = new UmbModalToken<UmbConfirmModalData, UmbConfirmModalResult>('Umb.Modal.Confirm', {
type: 'dialog',
});

2
src/Umbraco.Web.UI.Client/libs/modal/token/index.ts
View File

@@ -1,2 +1,2 @@
export * from './modal-token';
export * from './change-password-modal';
export * from './change-password-modal.token';

8
src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts
View File

@@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { css, html, nothing } from 'lit';
import { customElement, state, query, property } from 'lit/decorators.js';
import { UUIButtonState, UUIPaginationElement, UUIPaginationEvent } from '@umbraco-ui/uui';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../shared/modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../libs/modal/token/confirm-modal.token';
import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import {
@@ -21,7 +21,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
display: block;
margin: var(--uui-size-layout-1);
}
.actions {
display: flex;
gap: var(--uui-size-space-1);
@@ -136,7 +136,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
}
private _removeRedirectHandler(data: RedirectUrlResponseModel) {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
headline: 'Delete',
content: html`
<div style="width:300px">
@@ -167,7 +167,7 @@ export class UmbDashboardRedirectManagementElement extends UmbLitElement {
}
private _disableRedirectHandler() {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
headline: 'Disable URL tracker',
content: html`Are you sure you want to disable the URL tracker?`,
color: 'danger',

4
src/Umbraco.Web.UI.Client/src/backoffice/media/media/entity-bulk-actions/trash/trash.action.ts
View File

@@ -1,6 +1,6 @@
import { html } from 'lit';
import type { UmbMediaRepository } from '../../repository/media.repository';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../shared/modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../../libs/modal/token/confirm-modal.token';
import { UmbEntityBulkActionBase } from '@umbraco-cms/backoffice/entity-action';
import { UmbControllerHostInterface } from '@umbraco-cms/backoffice/controller';
import { UmbContextConsumerController } from '@umbraco-cms/backoffice/context-api';
@@ -26,7 +26,7 @@ export class UmbMediaTrashEntityBulkAction extends UmbEntityBulkActionBase<UmbMe
if (data) {
// TODO: use correct markup
const modalHandler = this.#modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this.#modalContext?.open(UMB_CONFIRM_MODAL, {
headline: `Deleting ${this.selection.length} items`,
content: html`
This will delete the following files:

4
src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/packages-created-overview.element.ts
View File

@@ -3,7 +3,7 @@ import { ifDefined } from 'lit/directives/if-defined.js';
import { customElement, state } from 'lit/decorators.js';
import { repeat } from 'lit/directives/repeat.js';
import { UUIPaginationEvent } from '@umbraco-ui/uui';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../shared/modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../../libs/modal/token/confirm-modal.token';
import { PackageDefinitionResponseModel, PackageResource } from '@umbraco-cms/backoffice/backend-api';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
@@ -135,7 +135,7 @@ export class UmbPackagesCreatedOverviewElement extends UmbLitElement {
async #deletePackage(p: PackageDefinitionResponseModel) {
if (!p.key) return;
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
color: 'danger',
headline: `Remove ${p.name}?`,
content: 'Are you sure you want to delete this package',

4
src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/installed-packages-section-view-item.element.ts
View File

@@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js';
import { firstValueFrom, map } from 'rxjs';
import { UUIButtonState } from '@umbraco-ui/uui';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../shared/modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../../libs/modal/token/confirm-modal.token';
import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { createExtensionElement, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
@@ -82,7 +82,7 @@ export class UmbInstalledPackagesSectionViewItem extends UmbLitElement {
async _onMigration() {
if (!this.name) return;
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
color: 'positive',
headline: `Run migrations for ${this.name}?`,
content: `Do you want to start run migrations for ${this.name}`,

4
src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts
View File

@@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { css, html, nothing } from 'lit';
import { customElement, property, state } from 'lit/decorators.js';
import { UUIButtonState } from '@umbraco-ui/uui-button';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../shared/modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../../libs/modal/token/confirm-modal.token';
import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { HealthStatusModel, IndexResponseModel, IndexerResource } from '@umbraco-cms/backoffice/backend-api';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -118,7 +118,7 @@ export class UmbDashboardExamineIndexElement extends UmbLitElement {
}
private async _onRebuildHandler() {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
headline: `Rebuild ${this.indexName}`,
content: html`
This will cause the index to be rebuilt.<br />

12
src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/published-status/dashboard-published-status.element.ts
View File

@@ -2,7 +2,7 @@ import { UUIButtonState } from '@umbraco-ui/uui';
import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { css, html } from 'lit';
import { customElement, state } from 'lit/decorators.js';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../shared/modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../libs/modal/token/confirm-modal.token';
import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { PublishedCacheResource } from '@umbraco-cms/backoffice/backend-api';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
@@ -14,10 +14,10 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement {
UUITextStyles,
css`
:host {
display:block;
margin:var(--uui-size-layout-1);
display: block;
margin: var(--uui-size-layout-1);
}
uui-box + uui-box {
margin-top: var(--uui-size-space-5);
}
@@ -86,7 +86,7 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement {
}
}
private async _onReloadCacheHandler() {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
headline: 'Reload',
content: html` Trigger a in-memory and local file cache reload on all servers. `,
color: 'danger',
@@ -109,7 +109,7 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement {
}
private async _onRebuildCacheHandler() {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
headline: 'Rebuild',
content: html` Rebuild content in cmsContentNu database table. Expensive.`,
color: 'danger',

16
src/Umbraco.Web.UI.Client/src/backoffice/settings/extensions/workspace/extension-root-workspace.element.ts
View File

@@ -1,7 +1,7 @@
import { css, html } from 'lit';
import { customElement, state } from 'lit/decorators.js';
import { map } from 'rxjs';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../shared/modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../libs/modal/token/confirm-modal.token';
import { isManifestElementNameType, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extensions-api';
import type { ManifestTypes } from '@umbraco-cms/backoffice/extensions-registry';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -9,11 +9,13 @@ import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffic
@customElement('umb-extension-root-workspace')
export class UmbExtensionRootWorkspaceElement extends UmbLitElement {
static styles = [css`
uui-box {
margin: var(--uui-size-layout-1);
}
`]
static styles = [
css`
uui-box {
margin: var(--uui-size-layout-1);
}
`,
];
@state()
private _extensions?: Array<ManifestTypes> = undefined;
@@ -50,7 +52,7 @@ export class UmbExtensionRootWorkspaceElement extends UmbLitElement {
}
async #removeExtension(extension: ManifestTypes) {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
headline: 'Unload extension',
confirmLabel: 'Unload',
content: html`<p>Are you sure you want to unload the extension <strong>${extension.alias}</strong>?</p>`,

4
src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-document-picker/input-document-picker.element.ts
View File

@@ -5,7 +5,7 @@ import { ifDefined } from 'lit/directives/if-defined.js';
import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins';
import { UMB_DOCUMENT_TREE_STORE_CONTEXT_TOKEN } from '../../../documents/documents/repository/document.tree.store';
import type { UmbDocumentTreeStore } from '../../../documents/documents/repository/document.tree.store';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../libs/modal/token/confirm-modal.token';
import { UMB_DOCUMENT_PICKER_MODAL_TOKEN } from '../../../documents/documents/modals/document-picker';
import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -134,7 +134,7 @@ export class UmbInputDocumentPickerElement extends FormControlMixin(UmbLitElemen
}
private async _removeItem(item: EntityTreeItemResponseModel) {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
color: 'danger',
headline: `Remove ${item.name}?`,
content: 'Are you sure you want to remove this item',

4
src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-language-picker/input-language-picker.element.ts
View File

@@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js';
import { ifDefined } from 'lit/directives/if-defined.js';
import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins';
import { UmbLanguageRepository } from '../../../settings/languages/repository/language.repository';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../libs/modal/token/confirm-modal.token';
import { UMB_LANGUAGE_PICKER_MODAL_TOKEN } from '../../../settings/languages/modals/language-picker';
import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UmbChangeEvent } from '@umbraco-cms/backoffice/events';
@@ -133,7 +133,7 @@ export class UmbInputLanguagePickerElement extends FormControlMixin(UmbLitElemen
}
private _removeItem(item: LanguageResponseModel) {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
color: 'danger',
headline: `Remove ${item.name}?`,
content: 'Are you sure you want to remove this item',

4
src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-media-picker/input-media-picker.element.ts
View File

@@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js';
import { ifDefined } from 'lit/directives/if-defined.js';
import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins';
import { UmbMediaRepository } from '../../../media/media/repository/media.repository';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../libs/modal/token/confirm-modal.token';
import { UMB_MEDIA_PICKER_MODAL_TOKEN } from '../../../media/media/modals/media-picker';
import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -148,7 +148,7 @@ export class UmbInputMediaPickerElement extends FormControlMixin(UmbLitElement)
}
private _removeItem(item: EntityTreeItemResponseModel) {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
color: 'danger',
headline: `Remove ${item.name}?`,
content: 'Are you sure you want to remove this item',

2
src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.element.ts
View File

@@ -1,7 +1,7 @@
import { html } from 'lit';
import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { customElement, property } from 'lit/decorators.js';
import { UmbConfirmModalData, UmbConfirmModalResult } from '.';
import { UmbConfirmModalData, UmbConfirmModalResult } from '../../../../../libs/modal/token/confirm-modal.token';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { UmbModalHandler } from '@umbraco-cms/backoffice/modal';

2
src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/confirm/confirm-modal.stories.ts
View File

@@ -4,7 +4,7 @@ import { Meta, Story } from '@storybook/web-components';
import { html } from 'lit';
import type { UmbConfirmModalElement } from './confirm-modal.element';
import type { UmbConfirmModalData } from './';
import type { UmbConfirmModalData } from '../../../../../libs/modal/token/confirm-modal.token';
export default {
title: 'API/Modals/Layouts/Confirm',

4
src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/multiple-text-string/input-multiple-text-string-item/input-multiple-text-string-item.element.ts
View File

@@ -4,7 +4,7 @@ import { customElement, property, query } from 'lit/decorators.js';
import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins';
import { UUIInputEvent } from '@umbraco-ui/uui-input';
import { UUIInputElement } from '@umbraco-ui/uui';
import { UMB_CONFIRM_MODAL_TOKEN } from '../../../../modals/confirm';
import { UMB_CONFIRM_MODAL } from '../../../../../../../libs/modal/token/confirm-modal.token';
import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import { UmbChangeEvent, UmbInputEvent, UmbDeleteEvent } from '@umbraco-cms/backoffice/events';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
@@ -66,7 +66,7 @@ export class UmbInputMultipleTextStringItemElement extends FormControlMixin(UmbL
}
#onDelete() {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL_TOKEN, {
const modalHandler = this._modalContext?.open(UMB_CONFIRM_MODAL, {
headline: `Delete ${this.value || 'item'}`,
content: 'Are you sure you want to delete this item?',
color: 'danger',

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

@@ -1,7 +1,7 @@
import { UUITextStyles } from '@umbraco-ui/uui-css/lib';
import { css, CSSResultGroup, html, nothing } from 'lit';
import { customElement, property } from 'lit/decorators.js';
import { UmbChangePasswordModalData } from '../../../../../../libs/modal/token/change-password-modal';
import { UmbChangePasswordModalData } from '../../../../../../libs/modal/token/change-password-modal.token';
import { UmbModalHandler } from '@umbraco-cms/backoffice/modal';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

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

@@ -7,7 +7,7 @@ import {
UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_TOKEN,
} from '../../current-user-history.store';
import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../current-user.store';
import { UMB_CHANGE_PASSWORD_MODAL } from '../../../../../../libs/modal/token/change-password-modal';
import { UMB_CHANGE_PASSWORD_MODAL } from '../../../../../../libs/modal/token/change-password-modal.token';
import { UmbModalHandler, UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal';
import type { UserDetails } from '@umbraco-cms/backoffice/models';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';

2
src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace-edit.element.ts
View File

@@ -6,7 +6,7 @@ import { ifDefined } from 'lit/directives/if-defined.js';
import { repeat } from 'lit/directives/repeat.js';
import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../current-user/current-user.store';
import { UMB_CHANGE_PASSWORD_MODAL } from '../../../../../libs/modal/token/change-password-modal';
import { UMB_CHANGE_PASSWORD_MODAL } from '../../../../../libs/modal/token/change-password-modal.token';
import { UmbUserWorkspaceContext } from './user-workspace.context';
import type { UmbModalContext } from '@umbraco-cms/backoffice/modal';
import { getLookAndColorFromUserStatus } from '@umbraco-cms/backoffice/utils';