From 0cf9dd7d1e00cb5ca5a0599e4855d08158d9f3d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Wed, 29 Mar 2023 22:29:03 +0200 Subject: [PATCH] Move Modal Tokens --- .../libs/modal/token/index.ts | 2 ++ .../modal/token/template-modal.token.ts} | 2 +- .../modal/token/template-picker-modal.token.ts} | 15 +++++++-------- .../input-template-picker.element.ts | 8 ++++---- .../template-picker-modal.element.ts | 2 +- .../modals/template/template-modal.element.ts | 2 +- 6 files changed, 16 insertions(+), 15 deletions(-) rename src/Umbraco.Web.UI.Client/{src/backoffice/shared/modals/template/index.ts => libs/modal/token/template-modal.token.ts} (77%) rename src/Umbraco.Web.UI.Client/{src/backoffice/shared/modals/template-picker/index.ts => libs/modal/token/template-picker-modal.token.ts} (52%) diff --git a/src/Umbraco.Web.UI.Client/libs/modal/token/index.ts b/src/Umbraco.Web.UI.Client/libs/modal/token/index.ts index 295472a896..ed363f7165 100644 --- a/src/Umbraco.Web.UI.Client/libs/modal/token/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/token/index.ts @@ -21,5 +21,7 @@ export * from './property-editor-ui-picker-modal.token'; export * from './property-settings-modal.token'; export * from './search-modal.token'; export * from './section-picker-modal.token'; +export * from './template-modal.token'; +export * from './template-picker-modal.token'; export * from './user-group-picker-modal.token'; export * from './user-picker-modal.token'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/index.ts b/src/Umbraco.Web.UI.Client/libs/modal/token/template-modal.token.ts similarity index 77% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/index.ts rename to src/Umbraco.Web.UI.Client/libs/modal/token/template-modal.token.ts index 5551bfe2ee..84460178f6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/token/template-modal.token.ts @@ -10,7 +10,7 @@ export interface UmbTemplateModalResult { } // TODO: Move to libs: -export const UMB_TEMPLATE_MODAL_TOKEN = new UmbModalToken( +export const UMB_TEMPLATE_MODAL = new UmbModalToken( 'Umb.Modal.Template', { type: 'sidebar', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/index.ts b/src/Umbraco.Web.UI.Client/libs/modal/token/template-picker-modal.token.ts similarity index 52% rename from src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/index.ts rename to src/Umbraco.Web.UI.Client/libs/modal/token/template-picker-modal.token.ts index 00bafdd64a..a4660816e9 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/index.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/token/template-picker-modal.token.ts @@ -9,11 +9,10 @@ export interface UmbTemplatePickerModalResult { selection: string[] | undefined; } -// TODO: Move to libs: -export const UMB_TEMPLATE_PICKER_MODAL_TOKEN = new UmbModalToken< - UmbTemplatePickerModalData, - UmbTemplatePickerModalResult ->('Umb.Modal.TemplatePicker', { - type: 'sidebar', - size: 'small', -}); +export const UMB_TEMPLATE_PICKER_MODAL = new UmbModalToken( + 'Umb.Modal.TemplatePicker', + { + type: 'sidebar', + size: 'small', + } +); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-template-picker/input-template-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-template-picker/input-template-picker.element.ts index ca6480f1db..22dfcd63fe 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-template-picker/input-template-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-template-picker/input-template-picker.element.ts @@ -3,8 +3,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import { FormControlMixin } from '@umbraco-ui/uui-base/lib/mixins'; import { UmbTemplateCardElement } from '../template-card/template-card.element'; -import { UMB_TEMPLATE_PICKER_MODAL_TOKEN } from '../../modals/template-picker'; -import { UMB_TEMPLATE_MODAL_TOKEN } from '../../modals/template'; +import { UMB_TEMPLATE_PICKER_MODAL } from '../../../../../libs/modal/token/template-picker-modal.token'; +import { UMB_TEMPLATE_MODAL } from '../../../../../libs/modal/token/template-modal.token'; import { UmbTemplateRepository } from '../../../templating/templates/repository/template.repository'; import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/backoffice/modal'; import { UmbLitElement } from '@umbraco-cms/internal/lit-element'; @@ -104,7 +104,7 @@ export class UmbInputTemplatePickerElement extends FormControlMixin(UmbLitElemen } #openPicker() { - const modalHandler = this._modalContext?.open(UMB_TEMPLATE_PICKER_MODAL_TOKEN, { + const modalHandler = this._modalContext?.open(UMB_TEMPLATE_PICKER_MODAL, { multiple: true, selection: [...this.allowedKeys], }); @@ -132,7 +132,7 @@ export class UmbInputTemplatePickerElement extends FormControlMixin(UmbLitElemen #openTemplate(e: CustomEvent) { const key = (e.target as UmbTemplateCardElement).value; - this._modalContext?.open(UMB_TEMPLATE_MODAL_TOKEN, { + this._modalContext?.open(UMB_TEMPLATE_MODAL, { key: key as string, language: 'razor', }); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts index 49a14aa0d0..ef63b2064b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template-picker/template-picker-modal.element.ts @@ -2,7 +2,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { UmbTreeElement } from '../../components/tree/tree.element'; -import { UmbTemplatePickerModalData, UmbTemplatePickerModalResult } from '.'; +import { UmbTemplatePickerModalData, UmbTemplatePickerModalResult } from '@umbraco-cms/backoffice/modal'; import { UmbModalBaseElement } from '@umbraco-cms/internal/modal'; //TODO: make a default tree-picker that can be used across multiple pickers diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts index d7711f4287..1ad00017e4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/modals/template/template-modal.element.ts @@ -4,7 +4,7 @@ import { customElement, query, state } from 'lit/decorators.js'; import { ifDefined } from 'lit/directives/if-defined.js'; import { UUIInputEvent } from '@umbraco-ui/uui'; import { UmbCodeEditor } from '../../components/code-editor'; -import { UmbTemplateModalData, UmbTemplateModalResult } from '.'; +import { UmbTemplateModalData, UmbTemplateModalResult } from '@umbraco-cms/backoffice/modal'; import { UmbInputEvent } from '@umbraco-cms/backoffice/events'; import { TemplateResource, TemplateResponseModel } from '@umbraco-cms/backoffice/backend-api'; import { UmbModalBaseElement } from '@umbraco-cms/internal/modal';