diff --git a/src/Umbraco.Web.UI.Client/libs/entity-action/actions/delete/delete.action.ts b/src/Umbraco.Web.UI.Client/libs/entity-action/actions/delete/delete.action.ts index bba0636c12..54ce0c66a7 100644 --- a/src/Umbraco.Web.UI.Client/libs/entity-action/actions/delete/delete.action.ts +++ b/src/Umbraco.Web.UI.Client/libs/entity-action/actions/delete/delete.action.ts @@ -1,7 +1,7 @@ import { UmbEntityActionBase } from '@umbraco-cms/entity-action'; import { UmbContextConsumerController } from '@umbraco-cms/context-api'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; export class UmbDeleteEntityAction< T extends { delete(unique: string): Promise; requestItems(uniques: Array): any } diff --git a/src/Umbraco.Web.UI.Client/libs/entity-action/actions/trash/trash.action.ts b/src/Umbraco.Web.UI.Client/libs/entity-action/actions/trash/trash.action.ts index a72b543ac8..f6b496dada 100644 --- a/src/Umbraco.Web.UI.Client/libs/entity-action/actions/trash/trash.action.ts +++ b/src/Umbraco.Web.UI.Client/libs/entity-action/actions/trash/trash.action.ts @@ -1,7 +1,7 @@ import { UmbEntityActionBase } from '@umbraco-cms/entity-action'; import { UmbContextConsumerController } from '@umbraco-cms/context-api'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; export class UmbTrashEntityAction< T extends { trash(unique: Array): Promise; requestTreeItems(uniques: Array): any } diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/index.ts b/src/Umbraco.Web.UI.Client/libs/modal/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/index.ts rename to src/Umbraco.Web.UI.Client/libs/modal/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/basic/modal-layout-basic.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/basic/modal-layout-basic.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/basic/modal-layout-basic.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/basic/modal-layout-basic.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/basic/modal-layout-basic.stories.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/basic/modal-layout-basic.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/basic/modal-layout-basic.stories.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/basic/modal-layout-basic.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/confirm/modal-layout-confirm.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/confirm/modal-layout-confirm.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/confirm/modal-layout-confirm.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/confirm/modal-layout-confirm.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/confirm/modal-layout-confirm.stories.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/confirm/modal-layout-confirm.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/confirm/modal-layout-confirm.stories.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/confirm/modal-layout-confirm.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/content-picker/modal-layout-content-picker.element.ts similarity index 96% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/content-picker/modal-layout-content-picker.element.ts index cc00f957aa..920bc61aad 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/content-picker/modal-layout-content-picker.element.ts @@ -8,7 +8,7 @@ export interface UmbModalContentPickerData { selection?: Array; } -import { UmbTreeElement } from '../../../../backoffice/shared/components/tree/tree.element'; +import { UmbTreeElement } from '../../../../src/backoffice/shared/components/tree/tree.element'; // TODO: make use of UmbPickerLayoutBase @customElement('umb-modal-layout-content-picker') diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.stories.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/content-picker/modal-layout-content-picker.stories.ts similarity index 90% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.stories.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/content-picker/modal-layout-content-picker.stories.ts index 632d63f007..9c8480da88 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/content-picker/modal-layout-content-picker.stories.ts @@ -1,4 +1,4 @@ -import '../../../../backoffice/shared/components/body-layout/body-layout.element'; +import '../../../../src/backoffice/shared/components/body-layout/body-layout.element'; import './modal-layout-content-picker.element'; import { Meta, Story } from '@storybook/web-components'; diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts index 1fbfcfba62..7643360961 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts @@ -6,7 +6,7 @@ import { customElement, property, state } from 'lit/decorators.js'; import { styleMap } from 'lit/directives/style-map.js'; import { UmbModalLayoutElement } from '../modal-layout.element'; -import icons from '../../../../../public-assets/icons/icons.json'; +import icons from '../../../../public-assets/icons/icons.json'; export interface UmbModalIconPickerData { multiple: boolean; diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts similarity index 90% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts index b36e9f04aa..4e86e5e9c3 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts @@ -1,4 +1,4 @@ -import '../../../../backoffice/shared/components/body-layout/body-layout.element'; +import '../../../../src/backoffice/shared/components/body-layout/body-layout.element'; import './modal-layout-icon-picker.element'; import { Meta, Story } from '@storybook/web-components'; diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.test.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/icon-picker/modal-layout-icon-picker.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.test.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/icon-picker/modal-layout-icon-picker.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/link-picker/modal-layout-link-picker.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/link-picker/modal-layout-link-picker.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/link-picker/modal-layout-link-picker.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/link-picker/modal-layout-link-picker.element.ts index a67c8fd4d6..45b4215e6c 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/link-picker/modal-layout-link-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/link-picker/modal-layout-link-picker.element.ts @@ -4,7 +4,7 @@ import { customElement, query, state } from 'lit/decorators.js'; import { UUIBooleanInputEvent, UUIInputElement } from '@umbraco-ui/uui'; import { UUIModalSidebarSize } from '@umbraco-ui/uui-modal-sidebar'; import { UmbModalLayoutElement } from '../modal-layout.element'; -import { UmbTreeElement } from '../../../../backoffice/shared/components/tree/tree.element'; +import { UmbTreeElement } from '../../../../src/backoffice/shared/components/tree/tree.element'; import { buildUdi, getKeyFromUdi } from '@umbraco-cms/utils'; export interface UmbModalLinkPickerData { diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/link-picker/modal-layout-multi-url-picker.stories.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/link-picker/modal-layout-multi-url-picker.stories.ts similarity index 88% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/link-picker/modal-layout-multi-url-picker.stories.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/link-picker/modal-layout-multi-url-picker.stories.ts index 6f9b80f05f..67a5448760 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/link-picker/modal-layout-multi-url-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/link-picker/modal-layout-multi-url-picker.stories.ts @@ -1,4 +1,4 @@ -import '../../../../backoffice/shared/components/body-layout/body-layout.element'; +import '../../../../src/backoffice/shared/components/body-layout/body-layout.element'; import './modal-layout-link-picker.element'; import { Meta, Story } from '@storybook/web-components'; diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/media-picker/modal-layout-media-picker.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/media-picker/modal-layout-media-picker.element.ts similarity index 96% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/media-picker/modal-layout-media-picker.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/media-picker/modal-layout-media-picker.element.ts index 15f5d39ada..354061a302 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/media-picker/modal-layout-media-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/media-picker/modal-layout-media-picker.element.ts @@ -8,7 +8,7 @@ export interface UmbModalMediaPickerData { selection: Array; } -import { UmbTreeElement } from '../../../../backoffice/shared/components/tree/tree.element'; +import { UmbTreeElement } from '../../../../src/backoffice/shared/components/tree/tree.element'; @customElement('umb-modal-layout-media-picker') export class UmbModalLayoutMediaPickerElement extends UmbModalLayoutElement { diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-change-password.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-change-password.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-change-password.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-change-password.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-current-user.element.ts similarity index 97% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-current-user.element.ts index e8bafe3cb1..15e80e6cbd 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-current-user.element.ts @@ -6,11 +6,11 @@ import { UmbCurrentUserHistoryStore, UmbCurrentUserHistoryItem, UMB_CURRENT_USER_HISTORY_STORE_CONTEXT_TOKEN, -} from '../../../backoffice/users/current-user/current-user-history.store'; +} from '../../../src/backoffice/users/current-user/current-user-history.store'; import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN, -} from '../../../backoffice/users/current-user/current-user.store'; +} from '../../../src/backoffice/users/current-user/current-user.store'; import type { UserDetails } from '@umbraco-cms/models'; import { UmbLitElement } from '@umbraco-cms/element'; diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-picker-base.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-picker-base.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-picker-base.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout-picker-base.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/modal-layout.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-section/picker-layout-section.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-section/picker-layout-section.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-section/picker-layout-section.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-section/picker-layout-section.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-section/picker-layout-section.test.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-section/picker-layout-section.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-section/picker-layout-section.test.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-section/picker-layout-section.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user-group/picker-layout-user-group.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user-group/picker-layout-user-group.element.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user-group/picker-layout-user-group.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user-group/picker-layout-user-group.element.ts index 9d103d4d19..22a3dd7b4e 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user-group/picker-layout-user-group.element.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user-group/picker-layout-user-group.element.ts @@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbModalLayoutPickerBase } from '../modal-layout-picker-base'; -import { UMB_USER_GROUP_STORE_CONTEXT_TOKEN } from '../../../../backoffice/users/user-groups/user-group.store'; -import type { UmbUserGroupStore } from '../../../../backoffice/users/user-groups/user-group.store'; +import { UMB_USER_GROUP_STORE_CONTEXT_TOKEN } from '../../../../src/backoffice/users/user-groups/user-group.store'; +import type { UmbUserGroupStore } from '../../../../src/backoffice/users/user-groups/user-group.store'; import type { UserGroupDetails } from '@umbraco-cms/models'; @customElement('umb-picker-layout-user-group') diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user-group/picker-layout-user-group.test.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user-group/picker-layout-user-group.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user-group/picker-layout-user-group.test.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user-group/picker-layout-user-group.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user/picker-layout-user.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user/picker-layout-user.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user/picker-layout-user.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user/picker-layout-user.element.ts index b2c0ddbb56..144576a292 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user/picker-layout-user.element.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user/picker-layout-user.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbModalLayoutPickerBase } from '../modal-layout-picker-base'; -import { UmbUserStore, UMB_USER_STORE_CONTEXT_TOKEN } from '../../../../backoffice/users/users/user.store'; +import { UmbUserStore, UMB_USER_STORE_CONTEXT_TOKEN } from '../../../../src/backoffice/users/users/user.store'; import type { UserDetails } from '@umbraco-cms/models'; @customElement('umb-picker-layout-user') diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user/picker-layout-user.test.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user/picker-layout-user.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user/picker-layout-user.test.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/picker-user/picker-layout-user.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts similarity index 89% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts index 917bce04dc..f6c428375f 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts @@ -6,7 +6,7 @@ import type { } from './modal-layout-property-editor-ui-picker.element'; import './modal-layout-property-editor-ui-picker.element'; -import '../../../../backoffice/shared/components/body-layout/body-layout.element'; +import '../../../../src/backoffice/shared/components/body-layout/body-layout.element'; export default { title: 'API/Modals/Layouts/Property Editor UI Picker', diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/layouts/search/modal-layout-search.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/layouts/search/modal-layout-search.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/layouts/search/modal-layout-search.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/layouts/search/modal-layout-search.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/modal-handler.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/modal-handler.ts rename to src/Umbraco.Web.UI.Client/libs/modal/modal-handler.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/modal.context.ts b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/core/modal/modal.context.ts rename to src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts index 1bf8696341..9672e0a38f 100644 --- a/src/Umbraco.Web.UI.Client/src/core/modal/modal.context.ts +++ b/src/Umbraco.Web.UI.Client/libs/modal/modal.context.ts @@ -5,7 +5,7 @@ import './layouts/media-picker/modal-layout-media-picker.element'; import './layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element'; import './layouts/modal-layout-current-user.element'; import './layouts/icon-picker/modal-layout-icon-picker.element'; -import '../../backoffice/settings/languages/language-picker/language-picker-modal-layout.element'; +import '../../src/backoffice/settings/languages/language-picker/language-picker-modal-layout.element'; import './layouts/link-picker/modal-layout-link-picker.element'; import './layouts/basic/modal-layout-basic.element'; import './layouts/search/modal-layout-search.element.ts'; diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/stories/modal.mdx b/src/Umbraco.Web.UI.Client/libs/modal/stories/modal.mdx similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/stories/modal.mdx rename to src/Umbraco.Web.UI.Client/libs/modal/stories/modal.mdx diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/stories/modal.stories.ts b/src/Umbraco.Web.UI.Client/libs/modal/stories/modal.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/stories/modal.stories.ts rename to src/Umbraco.Web.UI.Client/libs/modal/stories/modal.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/modal/stories/story-modal-service-example.element.ts b/src/Umbraco.Web.UI.Client/libs/modal/stories/story-modal-service-example.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/modal/stories/story-modal-service-example.element.ts rename to src/Umbraco.Web.UI.Client/libs/modal/stories/story-modal-service-example.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts index cee5fd1db9..26d669bebd 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -2,7 +2,7 @@ import { defineElement } from '@umbraco-ui/uui-base/lib/registration'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html } from 'lit'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '../core/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '../../libs/modal'; import { UmbUserStore } from './users/users/user.store'; import { UmbUserGroupStore } from './users/user-groups/user-group.store'; import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from './users/current-user/current-user.store'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts index e18076cf58..d7c9d2089b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/dashboards/redirect-management/dashboard-redirect-management.element.ts @@ -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 { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '../../../../core/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '../../../../../libs/modal'; import { UmbLitElement } from '@umbraco-cms/element'; import { RedirectManagementResource, RedirectStatusModel, RedirectUrlModel } from '@umbraco-cms/backend-api'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts index fd5c9537ea..e3881a8b96 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/document-types/workspace/document-type-workspace.element.ts @@ -6,7 +6,7 @@ import type { UmbWorkspaceEntityElement } from '../../../shared/components/works import { UmbWorkspaceDocumentTypeContext } from './document-type-workspace.context'; import type { DocumentTypeModel } from '@umbraco-cms/backend-api'; import { UmbLitElement } from '@umbraco-cms/element'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; @customElement('umb-document-type-workspace') export class UmbDocumentTypeWorkspaceElement extends UmbLitElement implements UmbWorkspaceEntityElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/entity-bulk-actions/move/move.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/entity-bulk-actions/move/move.action.ts index 30ae1aeac3..fc474fba0e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/entity-bulk-actions/move/move.action.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/entity-bulk-actions/move/move.action.ts @@ -2,7 +2,7 @@ import type { UmbMediaRepository } from '../../repository/media.repository'; import { UmbEntityBulkActionBase } from '@umbraco-cms/entity-action'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; import { UmbContextConsumerController } from '@umbraco-cms/context-api'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; export class UmbMediaMoveEntityBulkAction extends UmbEntityBulkActionBase { #modalContext?: UmbModalContext; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/entity-bulk-actions/trash/trash.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/entity-bulk-actions/trash/trash.action.ts index 672bcc49b8..8865f1dc4d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/media/media/entity-bulk-actions/trash/trash.action.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/media/media/entity-bulk-actions/trash/trash.action.ts @@ -3,7 +3,7 @@ import type { UmbMediaRepository } from '../../repository/media.repository'; import { UmbEntityBulkActionBase } from '@umbraco-cms/entity-action'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; import { UmbContextConsumerController } from '@umbraco-cms/context-api'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; export class UmbMediaTrashEntityBulkAction extends UmbEntityBulkActionBase { #modalContext?: UmbModalContext; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/packages-created-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/packages-created-overview.element.ts index 20b33ad3f8..e0096d7834 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/packages-created-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/created/packages-created-overview.element.ts @@ -6,7 +6,7 @@ import { UUIPaginationEvent } from '@umbraco-ui/uui'; import { PackageDefinitionModel, PackageResource } from '@umbraco-cms/backend-api'; import { UmbLitElement } from '@umbraco-cms/element'; import { tryExecuteAndNotify } from '@umbraco-cms/resources'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; @customElement('umb-packages-created-overview') export class UmbPackagesCreatedOverviewElement extends UmbLitElement { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/installed-packages-section-view-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/installed-packages-section-view-item.element.ts index 3df5afd999..3bad31e995 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/installed-packages-section-view-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/installed-packages-section-view-item.element.ts @@ -4,7 +4,7 @@ import { customElement, property, state } from 'lit/decorators.js'; import { firstValueFrom, map } from 'rxjs'; import { UUIButtonState } from '@umbraco-ui/uui'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '../../../../../core/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '../../../../../../libs/modal'; import { createExtensionElement, umbExtensionsRegistry } from '@umbraco-cms/extensions-api'; import type { ManifestPackageView } from '@umbraco-cms/models'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/search/umb-search-header-app.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/search/umb-search-header-app.element.ts index 64a53e5e3b..3e2964f415 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/search/umb-search-header-app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/search/umb-search-header-app.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, CSSResultGroup, html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-search-header-app') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-settings.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-settings.element.ts index ce43b2b8cd..63d0b916ed 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-settings.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-settings.element.ts @@ -1,7 +1,7 @@ import { html, css } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; -import { UmbModalLayoutElement } from '../../../../../../core/modal'; +import { UmbModalLayoutElement } from '../../../../../../../libs/modal'; export interface UmbModalFieldsSettingsData { name: string; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts index e55b6b4b22..fee68a89cc 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/modal-views/fields-viewer.element.ts @@ -1,7 +1,7 @@ import { html, css, nothing } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement } from 'lit/decorators.js'; -import { UmbModalLayoutElement } from '../../../../../../core/modal'; +import { UmbModalLayoutElement } from '../../../../../../../libs/modal'; import type { SearchResultModel } from '@umbraco-cms/backend-api'; @customElement('umb-modal-layout-fields-viewer') @@ -16,7 +16,6 @@ export class UmbModalLayoutFieldsViewerElement extends UmbModalLayoutElement + parentName: Observable; } export interface UmbCreateDictionaryModalResultData { @@ -21,15 +21,15 @@ export class UmbCreateDictionaryModalLayoutElement extends UmbModalLayoutElement @query('#form') private _form!: HTMLFormElement; - #parentName?: string; + #parentName?: string; - connectedCallback() { - super.connectedCallback(); + connectedCallback() { + super.connectedCallback(); - if (this.data?.parentName) { - this.observe(this.data.parentName, (value) => this.#parentName = value); - } - } + if (this.data?.parentName) { + this.observe(this.data.parentName, (value) => (this.#parentName = value)); + } + } #handleCancel() { this.modalHandler?.close({}); @@ -47,33 +47,33 @@ export class UmbCreateDictionaryModalLayoutElement extends UmbModalLayoutElement const formData = new FormData(form); - this.modalHandler?.close({ + this.modalHandler?.close({ name: formData.get('name') as string, - }); + }); } render() { - return html` - ${when(this.#parentName, () => html`

Create a dictionary item under ${this.#parentName}

`)} - -
- - Name -
- -
- -
- - - - `; + return html` + ${when(this.#parentName, () => html`

Create a dictionary item under ${this.#parentName}

`)} + +
+ + Name +
+ +
+ +
+ + + + `; } } @@ -81,4 +81,4 @@ declare global { interface HTMLElementTagNameMap { 'umb-create-dictionary-modal-layout': UmbCreateDictionaryModalLayoutElement; } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/create/create.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/create/create.action.ts index 2560f5b2ea..0be665ac9e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/create/create.action.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/create/create.action.ts @@ -8,7 +8,7 @@ import type { UmbCreateDictionaryModalResultData } from './create-dictionary-mod import { UmbEntityActionBase } from '@umbraco-cms/entity-action'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; import { UmbContextConsumerController } from '@umbraco-cms/context-api'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; // TODO: temp import import './create-dictionary-modal-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export-dictionary-modal-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export-dictionary-modal-layout.element.ts index 690cea3993..9906f3e5af 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export-dictionary-modal-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export-dictionary-modal-layout.element.ts @@ -1,7 +1,7 @@ import { html } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, query } from 'lit/decorators.js'; -import { UmbModalLayoutElement } from '@umbraco-cms/modal'; +import { UmbModalLayoutElement } from 'libs/modal'; export interface UmbExportDictionaryModalData { unique: string | null; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export.action.ts index 8b50b1b2a9..a6d153b2c5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export.action.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/export/export.action.ts @@ -4,7 +4,7 @@ import type { UmbExportDictionaryModalResultData } from './export-dictionary-mod import { UmbEntityActionBase } from '@umbraco-cms/entity-action'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; import { UmbContextConsumerController } from '@umbraco-cms/context-api'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; import './export-dictionary-modal-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts index a2fe92a240..4d02ef2676 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import-dictionary-modal-layout.element.ts @@ -6,7 +6,7 @@ import { repeat } from 'lit/directives/repeat.js'; import { UmbTreeElement } from '../../../../shared/components/tree/tree.element'; import { UmbDictionaryRepository } from '../../repository/dictionary.repository'; import { DictionaryUploadModel } from '@umbraco-cms/backend-api'; -import { UmbModalLayoutElement } from '@umbraco-cms/modal'; +import { UmbModalLayoutElement } from 'libs/modal'; export interface UmbImportDictionaryModalData { unique: string | null; @@ -138,7 +138,12 @@ export class UmbImportDictionaryModalLayoutElement extends UmbModalLayoutElement selectable> - + `; } diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import.action.ts b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import.action.ts index 98a14e6e9e..219d2db945 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import.action.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/translation/dictionary/entity-actions/import/import.action.ts @@ -4,7 +4,7 @@ import type { UmbImportDictionaryModalResultData } from './import-dictionary-mod import { UmbEntityActionBase } from '@umbraco-cms/entity-action'; import { UmbControllerHostInterface } from '@umbraco-cms/controller'; import { UmbContextConsumerController } from '@umbraco-cms/context-api'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; import './import-dictionary-modal-layout.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-header-app.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-header-app.element.ts index 1f8451c341..1d98a94381 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-header-app.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/current-user/current-user-header-app.element.ts @@ -3,7 +3,7 @@ import { css, CSSResultGroup, html } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from './current-user.store'; import type { UserDetails } from '@umbraco-cms/models'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from '@umbraco-cms/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; import { UmbLitElement } from '@umbraco-cms/element'; @customElement('umb-current-user-header-app') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-create.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-create.element.ts index d5aa8702e4..06a866c263 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-create.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-create.element.ts @@ -3,7 +3,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, query, state } from 'lit/decorators.js'; import { UUIInputPasswordElement } from '@umbraco-ui/uui'; import { UmbInputPickerUserGroupElement } from '../../../../shared/components/input-user-group/input-user-group.element'; -import { UmbModalLayoutElement } from '../../../../../core/modal'; +import { UmbModalLayoutElement } from '../../../../../../libs/modal'; import { UmbUserStore, UMB_USER_STORE_CONTEXT_TOKEN } from '../../../users/user.store'; import type { UserDetails } from '@umbraco-cms/models'; import { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-invite.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-invite.element.ts index 6a5e16aca7..c964691ea4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-invite.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-invite.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 { UmbInputPickerUserGroupElement } from '../../../../shared/components/input-user-group/input-user-group.element'; -import { UmbModalLayoutElement } from '../../../../../core/modal'; +import { UmbModalLayoutElement } from '../../../../../../libs/modal'; import { UmbUserStore, UMB_USER_STORE_CONTEXT_TOKEN } from '../../../users/user.store'; import type { UserDetails } from '@umbraco-cms/models'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-overview.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-overview.element.ts index 1b38d55de7..0cbba67347 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-overview.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/user-section/views/users/workspace-view-users-overview.element.ts @@ -6,7 +6,7 @@ import { UUIPopoverElement } from '@umbraco-ui/uui'; import type { UmbSectionViewUsersElement } from './section-view-users.element'; import { UmbLitElement } from '@umbraco-cms/element'; -import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'src/core/modal'; +import { UmbModalContext, UMB_MODAL_CONTEXT_TOKEN } from 'libs/modal'; import './list-view-layouts/table/workspace-view-users-table.element'; import './list-view-layouts/grid/workspace-view-users-grid.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts index 928c6516a4..e3c4234c30 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/users/users/workspace/user-workspace.element.ts @@ -8,7 +8,7 @@ import { repeat } from 'lit/directives/repeat.js'; import { distinctUntilChanged } from 'rxjs'; import { UmbCurrentUserStore, UMB_CURRENT_USER_STORE_CONTEXT_TOKEN } from '../../current-user/current-user.store'; -import type { UmbModalContext } from '../../../../core/modal'; +import type { UmbModalContext } from '../../../../../libs/modal'; import type { UmbWorkspaceEntityElement } from '../../../shared/components/workspace/workspace-entity-element.interface'; import { UmbWorkspaceUserContext } from './user-workspace.context'; import { getLookAndColorFromUserStatus } from '@umbraco-cms/utils'; diff --git a/src/Umbraco.Web.UI.Client/tsconfig.json b/src/Umbraco.Web.UI.Client/tsconfig.json index 1e55e986af..42a4db4b11 100644 --- a/src/Umbraco.Web.UI.Client/tsconfig.json +++ b/src/Umbraco.Web.UI.Client/tsconfig.json @@ -21,7 +21,7 @@ "baseUrl": ".", "paths": { "@umbraco-cms/css": ["libs/css/custom-properties.css"], - "@umbraco-cms/modal": ["src/core/modal"], + "@umbraco-cms/modal": ["libs/modal"], "@umbraco-cms/models": ["libs/models"], "@umbraco-cms/backend-api": ["libs/backend-api"], "@umbraco-cms/context-api": ["libs/context-api"],