From f8c0f2cdfd91a64bdc91be076329a188e627d104 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:50:41 +0100 Subject: [PATCH] rename element to 'enable-provider' --- ...nt-user-mfa-enable-provider-modal.element.ts} | 12 ++++++------ ...nt-user-mfa-enable-provider-modal.stories.ts} | 13 ++++++------- ...rrent-user-mfa-enable-provider-modal.token.ts | 15 +++++++++++++++ .../current-user-mfa-provider-modal.token.ts | 16 ---------------- .../current-user-mfa-modal.element.ts | 4 ++-- .../current-user-mfa-modal.stories.ts | 3 +-- .../user/current-user/modals/manifests.ts | 6 +++--- 7 files changed, 33 insertions(+), 36 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/{current-user-mfa-provider/current-user-mfa-provider-modal.element.ts => current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.element.ts} (76%) rename src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/{current-user-mfa-provider/current-user-mfa-modal.stories.ts => current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.stories.ts} (72%) create mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.token.ts delete mode 100644 src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-provider-modal.token.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-provider-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.element.ts similarity index 76% rename from src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-provider-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.element.ts index c65c521f4c..14285bfad3 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-provider-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.element.ts @@ -1,15 +1,15 @@ import type { UmbMfaProviderConfigurationElementProps } from '../../types.js'; import { UmbCurrentUserRepository } from '../../repository/index.js'; -import type { UmbCurrentUserMfaProviderModalConfig } from './current-user-mfa-provider-modal.token.js'; +import type { UmbCurrentUserMfaEnableProviderModalConfig } from './current-user-mfa-enable-provider-modal.token.js'; import type { ManifestMfaLoginProvider } from '@umbraco-cms/backoffice/extension-registry'; import { customElement, html } from '@umbraco-cms/backoffice/external/lit'; import { UmbModalBaseElement } from '@umbraco-cms/backoffice/modal'; import '../../components/mfa-provider-default.element.js'; -@customElement('umb-current-user-mfa-provider-modal') -export class UmbCurrentUserMfaProviderModalElement extends UmbModalBaseElement< - UmbCurrentUserMfaProviderModalConfig, +@customElement('umb-current-user-mfa-enable-provider-modal') +export class UmbCurrentUserMfaEnableProviderModalElement extends UmbModalBaseElement< + UmbCurrentUserMfaEnableProviderModalConfig, never > { #currentUserRepository = new UmbCurrentUserRepository(this); @@ -48,10 +48,10 @@ export class UmbCurrentUserMfaProviderModalElement extends UmbModalBaseElement< }; } -export default UmbCurrentUserMfaProviderModalElement; +export default UmbCurrentUserMfaEnableProviderModalElement; declare global { interface HTMLElementTagNameMap { - 'umb-current-user-mfa-provider-modal': UmbCurrentUserMfaProviderModalElement; + 'umb-current-user-mfa-enable-provider-modal': UmbCurrentUserMfaEnableProviderModalElement; } } diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.stories.ts similarity index 72% rename from src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-modal.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.stories.ts index 5fb2862f7f..4c22f33046 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-modal.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.stories.ts @@ -1,11 +1,11 @@ import type { Meta, StoryObj } from '@storybook/web-components'; -import type { UmbCurrentUserMfaProviderModalElement } from './current-user-mfa-provider-modal.element.js'; +import type { UmbCurrentUserMfaEnableProviderModalElement } from './current-user-mfa-enable-provider-modal.element.js'; import { html } from '@umbraco-cms/backoffice/external/lit'; import { UmbServerExtensionRegistrator } from '@umbraco-cms/backoffice/extension-api'; import { umbExtensionsRegistry } from '@umbraco-cms/backoffice/extension-registry'; import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element'; -import './current-user-mfa-provider-modal.element.js'; +import './current-user-mfa-enable-provider-modal.element.js'; class UmbServerExtensionsHostElement extends UmbLitElement { constructor() { @@ -22,10 +22,9 @@ if (window.customElements.get('umb-server-extensions-host') === undefined) { customElements.define('umb-server-extensions-host', UmbServerExtensionsHostElement); } -const meta: Meta = { - id: 'umb-current-user-mfa-provider-modal', - title: 'Current User/Modals/MFA Provider Modal', - component: 'umb-current-user-mfa-provider-modal', +const meta: Meta = { + title: 'Current User/MFA/Enable MFA Provider', + component: 'umb-current-user-mfa-enable-provider-modal', decorators: [ (Story) => html`${Story()}`, @@ -45,6 +44,6 @@ const meta: Meta = { export default meta; -type Story = StoryObj; +type Story = StoryObj; export const Overview: Story = {}; diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.token.ts new file mode 100644 index 0000000000..33e14e1ba7 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.token.ts @@ -0,0 +1,15 @@ +import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; + +export interface UmbCurrentUserMfaEnableProviderModalConfig { + providerName: string; +} + +export const UMB_CURRENT_USER_MFA_ENABLE_PROVIDER_MODAL = new UmbModalToken< + UmbCurrentUserMfaEnableProviderModalConfig, + never +>('Umb.Modal.CurrentUserMfaProvider', { + modal: { + type: 'sidebar', + size: 'small', + }, +}); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-provider-modal.token.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-provider-modal.token.ts deleted file mode 100644 index d795664900..0000000000 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa-provider/current-user-mfa-provider-modal.token.ts +++ /dev/null @@ -1,16 +0,0 @@ -import type { UmbCurrentUserRepository } from '../../repository/index.js'; -import { UmbModalToken } from '@umbraco-cms/backoffice/modal'; - -export interface UmbCurrentUserMfaProviderModalConfig { - providerName: string; -} - -export const UMB_CURRENT_USER_MFA_PROVIDER_MODAL = new UmbModalToken( - 'Umb.Modal.CurrentUserMfaProvider', - { - modal: { - type: 'sidebar', - size: 'small', - }, - }, -); diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.element.ts index c3c87ae07a..9d77a657d1 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.element.ts @@ -1,4 +1,4 @@ -import { UMB_CURRENT_USER_MFA_PROVIDER_MODAL } from '../current-user-mfa-provider/current-user-mfa-provider-modal.token.js'; +import { UMB_CURRENT_USER_MFA_ENABLE_PROVIDER_MODAL } from '../current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.token.js'; import { UmbCurrentUserRepository } from '../../repository/index.js'; import type { UmbCurrentUserMfaProviderModel } from '../../types.js'; import { css, customElement, html, property, repeat, state, when } from '@umbraco-cms/backoffice/external/lit'; @@ -100,7 +100,7 @@ export class UmbCurrentUserMfaModalElement extends UmbLitElement { // Open the provider modal const modalManager = await this.getContext(UMB_MODAL_MANAGER_CONTEXT); return await modalManager - .open(this, UMB_CURRENT_USER_MFA_PROVIDER_MODAL, { + .open(this, UMB_CURRENT_USER_MFA_ENABLE_PROVIDER_MODAL, { data: { providerName: item.providerName }, }) .onSubmit() diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.stories.ts index e95eebc970..61ef9cc5c8 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/current-user-mfa/current-user-mfa-modal.stories.ts @@ -5,8 +5,7 @@ import { html } from '@umbraco-cms/backoffice/external/lit'; import './current-user-mfa-modal.element.js'; const meta: Meta = { - id: 'umb-current-user-mfa-modal', - title: 'Current User/Modals/MFA Modal', + title: 'Current User/MFA/Configure MFA Providers', component: 'umb-current-user-mfa-modal', decorators: [(Story) => html`
${Story()}
`], parameters: { diff --git a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts index b75d044505..f11f33720e 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/user/current-user/modals/manifests.ts @@ -15,9 +15,9 @@ const modals: Array = [ }, { type: 'modal', - alias: 'Umb.Modal.CurrentUserMfaProvider', - name: 'Current User MFA Provider Modal', - js: () => import('./current-user-mfa-provider/current-user-mfa-provider-modal.element.js'), + alias: 'Umb.Modal.CurrentUserMfaEnableProvider', + name: 'Current User MFA Enable Provider Modal', + js: () => import('./current-user-mfa-enable-provider/current-user-mfa-enable-provider-modal.element.js'), }, ];