From 5859fcfd81e9057c7d11f0e4e6b820dae527ddb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 5 Dec 2023 21:25:44 +0100 Subject: [PATCH] final TS corrections --- .../examine-fields-settings-modal.token.ts | 12 +++--- ...ut-document-granular-permission.element.ts | 10 +++-- .../entity-actions/create/create.action.ts | 4 +- .../permissions/permissions-modal.element.ts | 10 +++-- .../permissions/permissions.action.ts | 6 ++- .../document-info-workspace-view.element.ts | 2 +- .../log-viewer-search-input.element.ts | 4 +- .../entity-actions/create/create.action.ts | 4 +- ...media-type-create-options-modal.element.ts | 4 +- ...pe-workspace-view-edit-property.element.ts | 8 ++-- .../media-type-workspace-view-edit.element.ts | 4 +- .../packages-created-overview.element.ts | 10 +++-- ...lled-packages-section-view-item.element.ts | 10 +++-- ...nt.ts => fields-settings-modal.element.ts} | 43 ++++++------------- .../views/section-view-examine-indexers.ts | 20 +++++---- .../views/section-view-examine-searchers.ts | 22 +++++----- .../src/packages/search/manifests.ts | 2 +- .../dashboard-published-status.element.ts | 30 +++++++------ .../extension-root-workspace.element.ts | 11 ++--- .../create/create-from-snippet.action.ts | 4 +- .../create/create-from-snippet.modal.ts | 3 +- .../user-group-picker-modal.element.ts | 12 +----- 22 files changed, 121 insertions(+), 114 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/{fields-settings.element.ts => fields-settings-modal.element.ts} (60%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/examine-fields-settings-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/examine-fields-settings-modal.token.ts index cf681c597a..b6b029a410 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/examine-fields-settings-modal.token.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/modal/token/examine-fields-settings-modal.token.ts @@ -1,13 +1,15 @@ import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; -export type UmbExamineFieldsSettingsModalData = Array<{ +export type UmbExamineFieldsSettingsModalData = never; + +type FieldSettingsType = { name: string; exposed: boolean; -}>; +}; -export interface UmbExamineFieldsSettingsModalValue { - fields?: UmbExamineFieldsSettingsModalData; -} +export type UmbExamineFieldsSettingsModalValue = { + fields: Array; +}; export const UMB_EXAMINE_FIELDS_SETTINGS_MODAL = new UmbModalToken< UmbExamineFieldsSettingsModalData, diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts index 8db4c056e5..8f0ef5c5b4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/components/input-document-granular-permission/input-document-granular-permission.element.ts @@ -75,10 +75,12 @@ export class UmbInputDocumentGranularPermissionElement extends FormControlMixin( async #removeItem(item: DocumentItemResponseModel) { const modalContext = this.#modalContext?.open(UMB_CONFIRM_MODAL, { - color: 'danger', - headline: `Remove ${item.name}?`, - content: 'Are you sure you want to remove this item', - confirmLabel: 'Remove', + data: { + color: 'danger', + headline: `Remove ${item.name}?`, + content: 'Are you sure you want to remove this item', + confirmLabel: 'Remove', + }, }); await modalContext?.onSubmit(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts index 256afcb496..abd6f5b4cc 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/create/create.action.ts @@ -27,7 +27,9 @@ export class UmbCreateDocumentEntityAction extends UmbEntityActionBase userGroup.id == id); const modalContext = this.#modalManagerContext?.open(UMB_ENTITY_USER_PERMISSION_MODAL, { - unique: id, - entityType: this.data.entityType, - allowedPermissions: userGroupRef?.permissions || [], - headline: `Permissions for ${userGroupRef?.name}`, + data: { + unique: id, + entityType: this.data.entityType, + allowedPermissions: userGroupRef?.permissions || [], + headline: `Permissions for ${userGroupRef?.name}`, + }, }); modalContext?.onSubmit().then((value) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions.action.ts b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions.action.ts index 87271eb54e..21714c9c0d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/documents/documents/entity-actions/permissions/permissions.action.ts @@ -23,8 +23,10 @@ export class UmbDocumentPermissionsEntityAction extends UmbEntityActionBase { - return { entityType: 'document-type', preset: {} }; + return { data: { entityType: 'document-type', preset: {} } }; }) .observeRouteBuilder((routeBuilder) => { this._editDocumentTypePath = routeBuilder({}); diff --git a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts index b275156459..985aaf8c3a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/log-viewer/workspace/views/search/components/log-viewer-search-input.element.ts @@ -132,7 +132,9 @@ export class UmbLogViewerSearchInputElement extends UmbLitElement { } #openSaveSearchDialog() { - this.modalContext = this._modalContext?.open(UMB_LOG_VIEWER_SAVE_SEARCH_MODAL, { query: this._inputQuery }); + this.modalContext = this._modalContext?.open(UMB_LOG_VIEWER_SAVE_SEARCH_MODAL, { + data: { query: this._inputQuery }, + }); this.modalContext?.onSubmit().then((savedSearch) => { if (savedSearch) { this.#saveSearch(savedSearch); diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts index 84d6ecf8f0..43565e0070 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/entity-actions/create/create.action.ts @@ -20,7 +20,9 @@ export class UmbCreateMediaTypeEntityAction extends UmbEntityActionBase this.modalContext?.submit()); } diff --git a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.ts b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.ts index 3024e7f6cf..c9ce513c8f 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/media/media-types/workspace/views/design/media-type-workspace-view-edit-property.element.ts @@ -92,7 +92,7 @@ export class UmbMediaTypeWorkspacePropertyElement extends UmbLitElement { if (mediaTypeId === undefined) return false; const propertyData = this.property; if (propertyData === undefined) return false; - return { propertyData, documentTypeId: mediaTypeId }; //TODO: Should we have a separate modal for mediaTypes? + return { data: { documentTypeId: mediaTypeId }, value: propertyData }; //TODO: Should we have a separate modal for mediaTypes? }) .onSubmit((result) => { this._partialUpdate(result); @@ -104,7 +104,7 @@ export class UmbMediaTypeWorkspacePropertyElement extends UmbLitElement { new UmbModalRouteRegistrationController(this, UMB_WORKSPACE_MODAL) .addAdditionalPath('media-type') .onSetup(() => { - return { entityType: 'media-type', preset: {} }; + return { data: { entityType: 'media-type', preset: {} } }; }) .observeRouteBuilder((routeBuilder) => { this._editMediaTypePath = routeBuilder({}); @@ -138,7 +138,7 @@ export class UmbMediaTypeWorkspacePropertyElement extends UmbLitElement { e.stopImmediatePropagation(); if (!this.property || !this.property.id) return; - const Message: UmbConfirmModalData = { + const modalData: UmbConfirmModalData = { headline: `${this.localize.term('actions_delete')} property`, content: html` Are you sure you want to delete the tab ${tab?.name ?? tab?.id} @@ -202,7 +202,7 @@ export class UmbMediaTypeWorkspaceViewEditElement extends UmbLitElement implemen // TODO: If this tab is composed of other tabs, then notify that it will only delete the local tab. - const modalHandler = this._modalManagerContext?.open(UMB_CONFIRM_MODAL, Message); + const modalHandler = this._modalManagerContext?.open(UMB_CONFIRM_MODAL, { data: modalData }); modalHandler?.onSubmit().then(() => { this.#remove(tab?.id); diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/packages-created-overview.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/packages-created-overview.element.ts index ab51364ed1..011147b582 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/packages-created-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/created/packages-created-overview.element.ts @@ -109,10 +109,12 @@ export class UmbPackagesCreatedOverviewElement extends UmbLitElement { async #deletePackage(p: PackageDefinitionResponseModel) { if (!p.id) return; const modalContext = this._modalContext?.open(UMB_CONFIRM_MODAL, { - color: 'danger', - headline: `Remove ${p.name}?`, - content: 'Are you sure you want to delete this package', - confirmLabel: 'Delete', + data: { + color: 'danger', + headline: `Remove ${p.name}?`, + content: 'Are you sure you want to delete this package', + confirmLabel: 'Delete', + }, }); await modalContext?.onSubmit(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts index 3cf99e8cb6..6b49197e55 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/packages/package-section/views/installed/installed-packages-section-view-item.element.ts @@ -78,10 +78,12 @@ export class UmbInstalledPackagesSectionViewItemElement extends UmbLitElement { async _onMigration() { if (!this.name) return; const modalContext = 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}`, - confirmLabel: 'Run migrations', + data: { + color: 'positive', + headline: `Run migrations for ${this.name}?`, + content: `Do you want to start run migrations for ${this.name}`, + confirmLabel: 'Run migrations', + }, }); await modalContext?.onSubmit(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-settings.element.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-settings-modal.element.ts similarity index 60% rename from src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-settings.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-settings-modal.element.ts index 0c1dc9690e..b1a9aa4e61 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/modal-views/fields-settings-modal.element.ts @@ -1,61 +1,42 @@ -import { html, css, customElement, state } from '@umbraco-cms/backoffice/external/lit'; +import { html, css, customElement } from '@umbraco-cms/backoffice/external/lit'; import { UmbTextStyles } from '@umbraco-cms/backoffice/style'; import { UmbExamineFieldsSettingsModalValue, UmbExamineFieldsSettingsModalData, UmbModalBaseElement, } from '@umbraco-cms/backoffice/modal'; -import { ManifestModal, UmbModalExtensionElement } from '@umbraco-cms/backoffice/extension-registry'; @customElement('umb-examine-fields-settings-modal') -export default class UmbExamineFieldsSettingsModalElement - extends UmbModalBaseElement - implements UmbModalExtensionElement -{ - @state() - private _fields?: UmbExamineFieldsSettingsModalData; - - private _handleClose() { - this._value = { fields: this._fields }; - this.modalContext?.submit(); - } - - disconnectedCallback(): void { - super.disconnectedCallback(); - this._handleClose(); - } - - firstUpdated() { - this._fields = - this.data?.map((field) => { - return { name: field.name, exposed: field.exposed }; - }) || undefined; - } - +export default class UmbExamineFieldsSettingsModalElement extends UmbModalBaseElement< + UmbExamineFieldsSettingsModalData, + UmbExamineFieldsSettingsModalValue +> { render() { - if (this._fields) { + if (this._value.fields) { return html` - ${Object.values(this._fields).map((field, index) => { + ${Object.values(this._value.fields).map((field, index) => { return html`
`; })}
- Close + Close
`; - } else return html``; + } else { + return ''; + } } static styles = [ diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts index b8ee3e86bb..9e0beb658b 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-indexers.ts @@ -58,15 +58,17 @@ export class UmbDashboardExamineIndexElement extends UmbLitElement { private async _onRebuildHandler() { const modalContext = this._modalContext?.open(UMB_CONFIRM_MODAL, { - headline: `Rebuild ${this.indexName}`, - content: html` - This will cause the index to be rebuilt.
- Depending on how much content there is in your site this could take a while.
- It is not recommended to rebuild an index during times of high website traffic or when editors are editing - content. - `, - color: 'danger', - confirmLabel: 'Rebuild', + data: { + headline: `Rebuild ${this.indexName}`, + content: html` + This will cause the index to be rebuilt.
+ Depending on how much content there is in your site this could take a while.
+ It is not recommended to rebuild an index during times of high website traffic or when editors are editing + content. + `, + color: 'danger', + confirmLabel: 'Rebuild', + }, }); modalContext?.onSubmit().then(() => { this._rebuild(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts index edd5cf127a..75bcd37ce2 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/search/examine-management-dashboard/views/section-view-examine-searchers.ts @@ -14,10 +14,10 @@ import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources'; import './modal-views/fields-viewer.element.js'; -import './modal-views/fields-settings.element.js'; +import './modal-views/fields-settings-modal.element.js'; interface ExposedSearchResultField { - name?: string | null; + name: string; exposed: boolean; } @@ -82,9 +82,10 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement { }); if (document) { const newFieldNames = document.map((field) => { - return field.name; + return field.name ?? ''; }); + // TODO: I don't get this code, not sure what the purpose is, it seems like a mistake: this._exposedFields = this._exposedFields ? this._exposedFields.filter((field) => { return { name: field.name, exposed: field.exposed }; @@ -98,11 +99,10 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement { private _onFieldFilterClick() { const modalContext = this._modalContext?.open(UMB_EXAMINE_FIELDS_SETTINGS_MODAL, { - ...this._exposedFields, + value: { fields: this._exposedFields ?? [] }, }); - modalContext?.onSubmit().then(({ fields } = {}) => { - if (!fields) return; - this._exposedFields = fields; + modalContext?.onSubmit().then((value) => { + this._exposedFields = value.fields; }); } @@ -163,8 +163,10 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement { label="Open sidebar to see all fields" @click="${() => this._modalContext?.open('umb-modal-element-fields-viewer', { - type: 'sidebar', - size: 'medium', + config: { + type: 'sidebar', + size: 'medium', + }, data: { ...rowData, name: this.getSearchResultNodeName(rowData) }, })}"> ${rowData.fields ? Object.keys(rowData.fields).length : ''} fields @@ -197,7 +199,7 @@ export class UmbDashboardExamineSearcherElement extends UmbLitElement { compact @click="${() => { this._exposedFields = this._exposedFields?.map((f) => { - return f.name == field.name ? { name: f.name, exposed: false } : f; + return f.name === field.name ? { name: f.name, exposed: false } : f; }); }}" >x = [ type: 'modal', alias: 'Umb.Modal.ExamineFieldsSettings', name: 'Examine Field Settings Modal', - js: () => import('./examine-management-dashboard/views/modal-views/fields-settings.element.js'), + js: () => import('./examine-management-dashboard/views/modal-views/fields-settings-modal.element.js'), }, ]; diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts index b6bbbb3ee0..9b38810983 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/dashboards/published-status/dashboard-published-status.element.ts @@ -72,10 +72,12 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement { } private async _onReloadCacheHandler() { const modalContext = this._modalContext?.open(UMB_CONFIRM_MODAL, { - headline: 'Reload', - content: html` Trigger a in-memory and local file cache reload on all servers.`, - color: 'danger', - confirmLabel: 'Continue', + data: { + headline: 'Reload', + content: html` Trigger a in-memory and local file cache reload on all servers.`, + color: 'danger', + confirmLabel: 'Continue', + }, }); modalContext?.onSubmit().then(() => { this._reloadMemoryCache(); @@ -95,10 +97,12 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement { private async _onRebuildCacheHandler() { const modalContex = this._modalContext?.open(UMB_CONFIRM_MODAL, { - headline: 'Rebuild', - content: html` Rebuild content in cmsContentNu database table. Expensive.`, - color: 'danger', - confirmLabel: 'Continue', + data: { + headline: 'Rebuild', + content: html` Rebuild content in cmsContentNu database table. Expensive.`, + color: 'danger', + confirmLabel: 'Continue', + }, }); modalContex?.onSubmit().then(() => { this._rebuildDatabaseCache(); @@ -118,10 +122,12 @@ export class UmbDashboardPublishedStatusElement extends UmbLitElement { private async _onSnapshotCacheHandler() { const modalContex = this._modalContext?.open(UMB_CONFIRM_MODAL, { - headline: 'Snapshot', - content: html` Trigger a NuCache snapshots collection.`, - color: 'danger', - confirmLabel: 'Continue', + data: { + headline: 'Snapshot', + content: html` Trigger a NuCache snapshots collection.`, + color: 'danger', + confirmLabel: 'Continue', + }, }); modalContex?.onSubmit().then(() => { this._cacheCollect(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/extension-root-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/extension-root-workspace.element.ts index 387950c4bc..24ac727cf4 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/extension-root-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/settings/extensions/workspace/extension-root-workspace.element.ts @@ -1,6 +1,5 @@ import { css, html, customElement, state } from '@umbraco-cms/backoffice/external/lit'; import { map } from '@umbraco-cms/backoffice/external/rxjs'; -import { isManifestElementNameType } from '@umbraco-cms/backoffice/extension-api'; import { ManifestTypes, umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; import { @@ -48,10 +47,12 @@ export class UmbExtensionRootWorkspaceElement extends UmbLitElement { async #removeExtension(extension: ManifestTypes) { const modalContext = this._modalContext?.open(UMB_CONFIRM_MODAL, { - headline: 'Unload extension', - confirmLabel: 'Unload', - content: html`

Are you sure you want to unload the extension ${extension.alias}?

`, - color: 'danger', + data: { + headline: 'Unload extension', + confirmLabel: 'Unload', + content: html`

Are you sure you want to unload the extension ${extension.alias}?

`, + color: 'danger', + }, }); await modalContext?.onSubmit(); diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create-from-snippet.action.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create-from-snippet.action.ts index 97fa02b582..270c8f7a7a 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create-from-snippet.action.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create-from-snippet.action.ts @@ -34,7 +34,9 @@ export class UmbCreateFromSnippetPartialViewAction< const snippets = (await this.repository?.getSnippets({}))?.data?.items ?? []; const modalContext = this.#modalContext?.open(UMB_PARTIAL_VIEW_FROM_SNIPPET_MODAL, { - snippets, + data: { + snippets, + }, }); await modalContext?.onSubmit().then((snippetName) => { diff --git a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create-from-snippet.modal.ts b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create-from-snippet.modal.ts index 5f206b4bf3..9de01e0661 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create-from-snippet.modal.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/templating/partial-views/entity-actions/create/create-from-snippet.modal.ts @@ -18,7 +18,8 @@ export default class UmbPartialViewCreateFromSnippetModalElement extends UmbModa } private _submit(snippetName: string) { - this.modalContext?.submit(snippetName); + this._value = snippetName; + this.modalContext?.submit(); } private _close() { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts index 88af248707..7e7fc07654 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/user-group/modals/user-group-picker/user-group-picker-modal.element.ts @@ -55,14 +55,6 @@ export class UmbUserGroupPickerModalElement extends UmbModalBaseElement @@ -81,8 +73,8 @@ export class UmbUserGroupPickerModalElement extends UmbModalBaseElement
- - + +
`;