From 24033a7c8f453091e0945b43f54375568f1e2eed Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 17 May 2023 21:34:11 +0200 Subject: [PATCH] move modals --- .../modal/common}/confirm/confirm-modal.element.ts | 0 .../modal/common}/confirm/confirm-modal.stories.ts | 0 .../common}/embedded-media/embedded-media-modal.element.ts | 0 .../common}/embedded-media/embedded-media-modal.stories.ts | 2 +- .../modal/common}/folder/folder-modal.element.ts | 0 .../modal/common}/icon-picker/icon-picker-modal.element.ts | 2 +- .../modal/common}/icon-picker/icon-picker-modal.stories.ts | 2 +- .../modal/common}/icon-picker/icon-picker-modal.test.ts | 0 .../modal/common}/link-picker/link-picker-modal.element.ts | 2 +- .../modal/common}/link-picker/link-picker-modal.stories.ts | 2 +- .../core/{modals => components/modal/common}/manifests.ts | 0 .../property-settings/property-settings-modal.element.ts | 0 .../common}/section-picker/section-picker-modal.element.ts | 0 .../modal/common}/section-picker/section-picker.test.ts | 0 .../modal/common}/template/template-modal.element.ts | 2 +- .../modal/common}/tree-picker/tree-picker-modal.element.ts | 2 +- src/Umbraco.Web.UI.Client/src/packages/core/index.ts | 2 +- .../uis/icon-picker/property-editor-ui-icon-picker.stories.ts | 2 +- 18 files changed, 9 insertions(+), 9 deletions(-) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/confirm/confirm-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/confirm/confirm-modal.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/embedded-media/embedded-media-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/embedded-media/embedded-media-modal.stories.ts (92%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/folder/folder-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/icon-picker/icon-picker-modal.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/icon-picker/icon-picker-modal.stories.ts (93%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/icon-picker/icon-picker-modal.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/link-picker/link-picker-modal.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/link-picker/link-picker-modal.stories.ts (91%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/manifests.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/property-settings/property-settings-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/section-picker/section-picker-modal.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/section-picker/section-picker.test.ts (100%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/template/template-modal.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/packages/core/{modals => components/modal/common}/tree-picker/tree-picker-modal.element.ts (96%) diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/confirm/confirm-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/confirm/confirm-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/confirm/confirm-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/confirm/confirm-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/confirm/confirm-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/confirm/confirm-modal.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/confirm/confirm-modal.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/confirm/confirm-modal.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/embedded-media/embedded-media-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/embedded-media/embedded-media-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/embedded-media/embedded-media-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/embedded-media/embedded-media-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/embedded-media/embedded-media-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/embedded-media/embedded-media-modal.stories.ts similarity index 92% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/embedded-media/embedded-media-modal.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/embedded-media/embedded-media-modal.stories.ts index 2638f0142c..f79c228b84 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modals/embedded-media/embedded-media-modal.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/embedded-media/embedded-media-modal.stories.ts @@ -1,4 +1,4 @@ -import '../../components/body-layout/body-layout.element'; +import '../../../body-layout/body-layout.element'; import './embedded-media-modal.element'; import { Meta } from '@storybook/web-components'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/folder/folder-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/folder/folder-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/folder/folder-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/folder/folder-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/icon-picker/icon-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/icon-picker/icon-picker-modal.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/icon-picker/icon-picker-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/icon-picker/icon-picker-modal.element.ts index 8c42d0242b..57c294080d 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modals/icon-picker/icon-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/icon-picker/icon-picker-modal.element.ts @@ -5,7 +5,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; -import icons from '../../../../../public-assets/icons/icons.json'; +import icons from '../../../../../../../public-assets/icons/icons.json'; import { UmbIconPickerModalData, UmbIconPickerModalResult } from '@umbraco-cms/backoffice/modal'; import { UmbModalBaseElement } from '@umbraco-cms/internal/modal'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/icon-picker/icon-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/icon-picker/icon-picker-modal.stories.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/icon-picker/icon-picker-modal.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/icon-picker/icon-picker-modal.stories.ts index 17de382faf..2fdfcff855 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modals/icon-picker/icon-picker-modal.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/icon-picker/icon-picker-modal.stories.ts @@ -1,4 +1,4 @@ -import '../../components/body-layout/body-layout.element'; +import '../../../body-layout/body-layout.element'; import './icon-picker-modal.element'; import { Meta, Story } from '@storybook/web-components'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/icon-picker/icon-picker-modal.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/icon-picker/icon-picker-modal.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/icon-picker/icon-picker-modal.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/icon-picker/icon-picker-modal.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/link-picker/link-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/link-picker/link-picker-modal.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/link-picker/link-picker-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/link-picker/link-picker-modal.element.ts index a9d87472ff..de35829b52 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modals/link-picker/link-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/link-picker/link-picker-modal.element.ts @@ -2,7 +2,7 @@ import { css, html, nothing } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, query, state } from 'lit/decorators.js'; import { UUIBooleanInputEvent, UUIInputElement } from '@umbraco-ui/uui'; -import { UmbTreeElement } from '../../components/tree/tree.element'; +import { UmbTreeElement } from '../../../tree/tree.element'; import { UmbLinkPickerConfig, UmbLinkPickerLink, diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/link-picker/link-picker-modal.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/link-picker/link-picker-modal.stories.ts similarity index 91% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/link-picker/link-picker-modal.stories.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/link-picker/link-picker-modal.stories.ts index 6408f338a7..664e344fce 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modals/link-picker/link-picker-modal.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/link-picker/link-picker-modal.stories.ts @@ -1,4 +1,4 @@ -import '../../components/body-layout/body-layout.element'; +import '../../../body-layout/body-layout.element'; import './link-picker-modal.element'; import { Meta, Story } from '@storybook/web-components'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/manifests.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/manifests.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/manifests.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/manifests.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/property-settings/property-settings-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/property-settings/property-settings-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/property-settings/property-settings-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/property-settings/property-settings-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/section-picker/section-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/section-picker/section-picker-modal.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/section-picker/section-picker-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/section-picker/section-picker-modal.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/section-picker/section-picker.test.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/section-picker/section-picker.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/section-picker/section-picker.test.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/section-picker/section-picker.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/template/template-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/template/template-modal.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/template/template-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/template/template-modal.element.ts index f1771e6a34..aaac7c7313 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modals/template/template-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/template/template-modal.element.ts @@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; 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 { UmbCodeEditor } from '../../../code-editor'; import { UmbTemplateModalData, UmbTemplateModalResult } from '@umbraco-cms/backoffice/modal'; import { UmbInputEvent } from '@umbraco-cms/backoffice/events'; import { TemplateResource, TemplateResponseModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/modals/tree-picker/tree-picker-modal.element.ts b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/tree-picker/tree-picker-modal.element.ts similarity index 96% rename from src/Umbraco.Web.UI.Client/src/packages/core/modals/tree-picker/tree-picker-modal.element.ts rename to src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/tree-picker/tree-picker-modal.element.ts index b3487b5b15..e22c4f29ab 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/modals/tree-picker/tree-picker-modal.element.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/components/modal/common/tree-picker/tree-picker-modal.element.ts @@ -1,7 +1,7 @@ import { css, html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; -import type { UmbTreeElement } from '../../components/tree/tree.element'; +import type { UmbTreeElement } from '../../../tree/tree.element'; import { UmbTreePickerModalData, UmbPickerModalResult } from '@umbraco-cms/backoffice/modal'; import { UmbModalBaseElement } from '@umbraco-cms/internal/modal'; import { TreeItemPresentationModel } from '@umbraco-cms/backoffice/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts index 18419c9f1a..9dfbc81834 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/index.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/index.ts @@ -1,7 +1,7 @@ import { manifests as componentManifests, UmbStoreExtensionInitializer } from './components'; import { manifests as propertyActionManifests } from './property-actions/manifests'; import { manifests as propertyEditorManifests } from './property-editors/manifests'; -import { manifests as modalManifests } from './modals/manifests'; +import { manifests as modalManifests } from './components/modal/common/manifests'; import { UmbBackofficeNotificationContainerElement } from './components/backoffice-notification-container/backoffice-notification-container.element'; import { UmbBackofficeModalContainerElement } from './components/backoffice-modal-container/backoffice-modal-container.element'; diff --git a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts index 81faef2692..349c882856 100644 --- a/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/packages/core/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts @@ -1,7 +1,7 @@ import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit'; -import type { UmbIconPickerModalElement } from '../../../modals/icon-picker/icon-picker-modal.element'; +import type { UmbIconPickerModalElement } from '../../../components/modal/common/icon-picker/icon-picker-modal.element'; import type { UmbPropertyEditorUIIconPickerElement } from './property-editor-ui-icon-picker.element'; import './property-editor-ui-icon-picker.element';