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 bb9c090ee4..3b99c25a8c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts @@ -2,8 +2,8 @@ import { defineElement } from '@umbraco-ui/uui-base/lib/registration'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; -import { UmbModalService } from '../core/services/modal'; -import { UmbNotificationService } from '../core/services/notification'; +import { UmbModalService } from '../core/modal'; +import { UmbNotificationService } from '../core/notification'; import { UmbUserStore } from './users/users/user.store'; import { UmbUserGroupStore } from './users/user-groups/user-group.store'; import { UmbCurrentUserStore } from './users/current-user/current-user.store'; 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 bf8b2add9e..24e56f4695 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 @@ -7,7 +7,7 @@ import { UmbWorkspaceDocumentTypeContext } from './document-type-workspace.conte import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import type { DocumentTypeDetails } from '@umbraco-cms/models'; -import { UmbModalService } from 'src/core/services/modal'; +import { UmbModalService } from 'src/core/modal'; import '../../../shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/actions/action-document-delete.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/actions/action-document-delete.element.ts index adc684160c..042c5787f3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/actions/action-document-delete.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/documents/documents/tree/actions/action-document-delete.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbModalService } from '../../../../../core/services/modal'; +import { UmbModalService } from '../../../../../core/modal'; import { UmbDocumentStore } from '../../document.store'; import UmbTreeItemActionElement from '../../../../shared/components/tree/action/tree-item-action.element'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/packages-installed-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/packages-installed-item.element.ts index 70f80e4134..1a18879e15 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/packages-installed-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/packages/package-section/views/installed/packages-installed-item.element.ts @@ -2,7 +2,7 @@ import { html, LitElement, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { firstValueFrom, map } from 'rxjs'; -import type { UmbModalService } from '../../../../../core/services/modal'; +import type { UmbModalService } from '../../../../../core/modal'; import { createExtensionElement } from '@umbraco-cms/extensions-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; 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 d22b8ade4e..ab1e999c0d 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/services/modal'; +import { UmbModalLayoutElement } from '../../../../../../core/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 9ec81505b2..be77bffe68 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/services/modal'; +import { UmbModalLayoutElement } from '../../../../../../core/modal'; import { SearchResult } from '@umbraco-cms/backend-api'; @customElement('umb-modal-layout-fields-viewer') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts index d1ce3f64d1..166c1749c8 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-indexers.ts @@ -4,9 +4,9 @@ import { customElement, property, state } from 'lit/decorators.js'; import { UUIButtonState } from '@umbraco-ui/uui-button'; -import { UmbModalService } from '../../../../../core/services/modal'; -import { UmbNotificationService } from '../../../../../core/services/notification'; -import { UmbNotificationDefaultData } from '../../../../../core/services/notification/layouts/default'; +import { UmbModalService } from '../../../../../core/modal'; +import { UmbNotificationService } from '../../../../../core/notification'; +import { UmbNotificationDefaultData } from '../../../../../core/notification/layouts/default'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import './section-view-examine-searchers'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts index 0987176ef6..dd17f71c5d 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-overview.ts @@ -2,8 +2,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbNotificationService } from '../../../../../core/services/notification'; -import { UmbNotificationDefaultData } from '../../../../../core/services/notification/layouts/default'; +import { UmbNotificationService } from '../../../../../core/notification'; +import { UmbNotificationDefaultData } from '../../../../../core/notification/layouts/default'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import { ApiError, ProblemDetails, Searcher, Index, IndexerResource, SearcherResource } from '@umbraco-cms/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts index 025f634c6a..a3e1e0c2fc 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/examine-management/views/section-view-examine-searchers.ts @@ -2,9 +2,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement, nothing } from 'lit'; import { customElement, state, query, property } from 'lit/decorators.js'; -import { UmbModalService } from '../../../../../core/services/modal'; -import { UmbNotificationService } from '../../../../../core/services/notification'; -import { UmbNotificationDefaultData } from '../../../../../core/services/notification/layouts/default'; +import { UmbModalService } from '../../../../../core/modal'; +import { UmbNotificationService } from '../../../../../core/notification'; +import { UmbNotificationDefaultData } from '../../../../../core/notification/layouts/default'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts index 29f06102ce..f014d089d7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/models-builder/dashboard-models-builder.element.ts @@ -3,8 +3,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbNotificationService } from '../../../../core/services/notification'; -import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default'; +import { UmbNotificationService } from '../../../../core/notification'; +import { UmbNotificationDefaultData } from '../../../../core/notification/layouts/default'; import { ApiError, ModelsBuilder, ModelsBuilderResource, ModelsMode, ProblemDetails } from '@umbraco-cms/backend-api'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/published-status/dashboard-published-status.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/published-status/dashboard-published-status.element.ts index 50986b5c77..b25e3452ab 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/published-status/dashboard-published-status.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/dashboards/published-status/dashboard-published-status.element.ts @@ -3,9 +3,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbModalService } from '../../../../core/services/modal'; -import { UmbNotificationService } from '../../../../core/services/notification'; -import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default'; +import { UmbModalService } from '../../../../core/modal'; +import { UmbNotificationService } from '../../../../core/notification'; +import { UmbNotificationDefaultData } from '../../../../core/notification/layouts/default'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import { ApiError, ProblemDetails, PublishedCacheResource } from '@umbraco-cms/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/tree/actions/delete/action-data-type-delete.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/tree/actions/delete/action-data-type-delete.element.ts index e5a1ac3577..94ee5a73d0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/tree/actions/delete/action-data-type-delete.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/tree/actions/delete/action-data-type-delete.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbModalService } from '../../../../../../core/services/modal'; +import { UmbModalService } from '../../../../../../core/modal'; import { UmbDataTypeStore } from '../../../data-type.store'; import UmbTreeItemActionElement from '../../../../../shared/components/tree/action/tree-item-action.element'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/workspace-view-data-type-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/workspace-view-data-type-edit.element.ts index de421a9118..522c0581c4 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/workspace-view-data-type-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/settings/data-types/workspace/views/edit/workspace-view-data-type-edit.element.ts @@ -1,7 +1,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement, nothing } from 'lit'; import { customElement, state } from 'lit/decorators.js'; -import { UmbModalService } from '../../../../../../core/services/modal'; +import { UmbModalService } from '../../../../../../core/modal'; import { UmbWorkspaceDataTypeContext } from '../../workspace-data-type.context'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts index 491cc2d95a..367253b35b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-modal-container.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import { UmbModalHandler, UmbModalService } from '../../../../core/services/modal'; +import { UmbModalHandler, UmbModalService } from '../../../../core/modal'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts index 0ff056a662..af76d24a02 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element.ts @@ -2,7 +2,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { repeat } from 'lit/directives/repeat.js'; -import type { UmbNotificationHandler, UmbNotificationService } from '../../../../core/services/notification'; +import type { UmbNotificationHandler, UmbNotificationService } from '../../../../core/notification'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts index e1f3081cad..3b5e73fb7b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/input-list-base/input-list-base.ts @@ -1,14 +1,14 @@ import { html, LitElement } from 'lit'; import { property } from 'lit/decorators.js'; import { UUIModalSidebarSize } from '@umbraco-ui/uui-modal-sidebar'; -import { UmbPickerData } from '../../../../core/services/modal/layouts/modal-layout-picker-base'; -import { UmbModalService, UmbModalType } from '../../../../core/services/modal'; +import { UmbPickerData } from '../../../../core/modal/layouts/modal-layout-picker-base'; +import { UmbModalService, UmbModalType } from '../../../../core/modal'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; //TODO: These should probably be imported dynamically. -import '../../../../core/services/modal/layouts/picker-section/picker-layout-section.element'; -import '../../../../core/services/modal/layouts/picker-user-group/picker-layout-user-group.element'; -import '../../../../core/services/modal/layouts/picker-user/picker-layout-user.element'; +import '../../../../core/modal/layouts/picker-section/picker-layout-section.element'; +import '../../../../core/modal/layouts/picker-user-group/picker-layout-user-group.element'; +import '../../../../core/modal/layouts/picker-user/picker-layout-user.element'; /** TODO: Make use of UUI FORM Mixin, to make it easily take part of a form. */ export class UmbInputListBase extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-node.context.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-node.context.ts index b445f9ddc5..ea22e261db 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-node.context.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/components/workspace/workspace-context/workspace-node.context.ts @@ -1,5 +1,5 @@ -import { UmbNotificationService } from '../../../../../core/services/notification'; -import { UmbNotificationDefaultData } from '../../../../../core/services/notification/layouts/default'; +import { UmbNotificationService } from '../../../../../core/notification'; +import { UmbNotificationDefaultData } from '../../../../../core/notification/layouts/default'; import { UmbWorkspaceWithStoreContext } from './workspace-with-store.context'; import { UmbNodeStoreBase } from '@umbraco-cms/stores/store'; import { ContentTreeItem } from '@umbraco-cms/backend-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts index 99ee0b4baa..9287b19726 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-actions/copy/property-action-copy.element.ts @@ -1,7 +1,7 @@ import { html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; -import type { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default'; -import type { UmbNotificationService } from '../../../../core/services/notification'; +import type { UmbNotificationDefaultData } from '../../../../core/notification/layouts/default'; +import type { UmbNotificationService } from '../../../../core/notification'; import type { UmbPropertyAction } from '../shared/property-action/property-action.model'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-content-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-content-picker.element.ts index f9bb999867..6c86d999c7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-content-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-content-picker.element.ts @@ -2,7 +2,7 @@ import { css, html, LitElement, nothing } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import { ifDefined } from 'lit-html/directives/if-defined.js'; -import type { UmbModalService } from 'src/core/services/modal'; +import type { UmbModalService } from 'src/core/modal'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import { UmbDocumentStore } from 'src/backoffice/documents/documents/document.store'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-content-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-content-picker.stories.ts index 873796ff27..d30e6bc21c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-content-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/content-picker/property-editor-ui-content-picker.stories.ts @@ -2,7 +2,7 @@ import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; import type { UmbPropertyEditorUIContentPickerElement } from './property-editor-ui-content-picker.element'; -import { UmbModalService } from 'src/core/services/modal'; +import { UmbModalService } from 'src/core/modal'; import './property-editor-ui-content-picker.element'; import '../../../components/backoffice-frame/backoffice-modal-container.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts index caad7fb573..c90c56990b 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.element.ts @@ -1,7 +1,7 @@ import { html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property } from 'lit/decorators.js'; -import type { UmbModalService } from 'src/core/services/modal'; +import type { UmbModalService } from 'src/core/modal'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; /** diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts index dcb3d339aa..d9a0a21ff6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/shared/property-editors/uis/icon-picker/property-editor-ui-icon-picker.stories.ts @@ -3,7 +3,7 @@ import { html } from 'lit-html'; import type { UmbPropertyEditorUIIconPickerElement } from './property-editor-ui-icon-picker.element'; import './property-editor-ui-icon-picker.element'; -import type { UmbModalLayoutIconPickerElement } from 'src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element'; +import type { UmbModalLayoutIconPickerElement } from 'src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element'; export default { title: 'Property Editor UIs/Icon Picker', 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 575de1fa2a..e38bab22e2 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 @@ -5,7 +5,7 @@ import { UmbCurrentUserStore } from './current-user.store'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import type { UserDetails } from '@umbraco-cms/models'; -import { UmbModalService } from 'src/core/services/modal'; +import { UmbModalService } from 'src/core/modal'; @customElement('umb-current-user-header-app') export class UmbCurrentUserHeaderApp extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { 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 5dea557306..5f9f327894 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 @@ -5,9 +5,9 @@ import { UUIInputPasswordElement } from '@umbraco-ui/uui'; import { UmbInputPickerUserGroupElement } from 'src/auth/components/input-user-group/input-user-group.element'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { UserDetails } from '@umbraco-cms/models'; -import { UmbNotificationService } from 'src/core/services/notification'; -import { UmbNotificationDefaultData } from 'src/core/services/notification/layouts/default'; -import { UmbModalLayoutElement } from 'src/core/services/modal'; +import { UmbNotificationService } from 'src/core/notification'; +import { UmbNotificationDefaultData } from 'src/core/notification/layouts/default'; +import { UmbModalLayoutElement } from 'src/core/modal'; import { UmbUserStore } from 'src/backoffice/users/users/user.store'; export type UsersViewType = 'list' | 'grid'; 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 6456d821de..88b08bb495 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 @@ -4,7 +4,7 @@ import { customElement, query, state } from 'lit/decorators.js'; import { UmbInputPickerUserGroupElement } from 'src/auth/components/input-user-group/input-user-group.element'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { UserDetails } from '@umbraco-cms/models'; -import { UmbModalLayoutElement } from 'src/core/services/modal'; +import { UmbModalLayoutElement } from 'src/core/modal'; import { UmbUserStore } from 'src/backoffice/users/users/user.store'; export type UsersViewType = 'list' | 'grid'; 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 0335adf44b..42ae6d032a 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 @@ -7,7 +7,7 @@ import { UUIPopoverElement } from '@umbraco-ui/uui'; import type { UmbSectionViewUsersElement } from './section-view-users.element'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; -import { UmbModalService } from 'src/core/services/modal'; +import { UmbModalService } from 'src/core/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 a4adfd3cee..6ec5c59d31 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 @@ -13,7 +13,7 @@ import { UmbWorkspaceUserContext } from './user-workspace.context'; import { UmbContextProviderMixin, UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import type { UserDetails } from '@umbraco-cms/models'; -import { UmbModalService } from 'src/core/services/modal'; +import { UmbModalService } from 'src/core/modal'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import 'src/auth/components/input-user-group/input-user-group.element'; diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/index.ts b/src/Umbraco.Web.UI.Client/src/core/modal/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/index.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/confirm/modal-layout-confirm.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/confirm/modal-layout-confirm.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/confirm/modal-layout-confirm.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/confirm/modal-layout-confirm.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/confirm/modal-layout-confirm.stories.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/confirm/modal-layout-confirm.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/confirm/modal-layout-confirm.stories.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/confirm/modal-layout-confirm.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.element.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.element.ts index d5be6f5674..922d32db43 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/core/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 '../../../../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/services/modal/layouts/content-picker/modal-layout-content-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.stories.ts similarity index 90% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.stories.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.stories.ts index 73cdd28ff0..632d63f007 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/content-picker/modal-layout-content-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/content-picker/modal-layout-content-picker.stories.ts @@ -1,4 +1,4 @@ -import '../../../../../backoffice/shared/components/body-layout/body-layout.element'; +import '../../../../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/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts index 2cddda7fb4..9559ec62a9 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts +++ b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.element.ts @@ -5,7 +5,7 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; import { UmbModalLayoutElement } from '../modal-layout.element'; -import icons from '../../../../../../public-assets/icons/icons.json'; +import icons from '../../../../../public-assets/icons/icons.json'; import '@umbraco-ui/uui-color-swatch'; import '@umbraco-ui/uui-color-swatches'; diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts similarity index 90% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts index 0fbeaeb9e6..b36e9f04aa 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.stories.ts @@ -1,4 +1,4 @@ -import '../../../../../backoffice/shared/components/body-layout/body-layout.element'; +import '../../../../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/services/modal/layouts/icon-picker/modal-layout-icon-picker.test.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/icon-picker/modal-layout-icon-picker.test.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/icon-picker/modal-layout-icon-picker.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-change-password.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-change-password.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-change-password.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-change-password.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-current-user.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-current-user.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-current-user.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-picker-base.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-picker-base.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout-picker-base.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout-picker-base.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/modal-layout.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/modal-layout.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-section/picker-layout-section.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-section/picker-layout-section.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-section/picker-layout-section.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-section/picker-layout-section.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-section/picker-layout-section.test.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-section/picker-layout-section.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-section/picker-layout-section.test.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-section/picker-layout-section.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user-group/picker-layout-user-group.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user-group/picker-layout-user-group.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user-group/picker-layout-user-group.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user-group/picker-layout-user-group.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user-group/picker-layout-user-group.test.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user-group/picker-layout-user-group.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user-group/picker-layout-user-group.test.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user-group/picker-layout-user-group.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user/picker-layout-user.element.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user/picker-layout-user.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user/picker-layout-user.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user/picker-layout-user.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user/picker-layout-user.test.ts b/src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user/picker-layout-user.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/picker-user/picker-layout-user.test.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/picker-user/picker-layout-user.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts b/src/Umbraco.Web.UI.Client/src/core/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/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/core/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/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts index c77a7951bb..917bce04dc 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/modal/layouts/property-editor-ui-picker/modal-layout-property-editor-ui-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/core/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 '../../../../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/services/modal/modal-handler.ts b/src/Umbraco.Web.UI.Client/src/core/modal/modal-handler.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/modal-handler.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/modal-handler.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts b/src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/modal.service.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.mdx b/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.mdx similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.mdx rename to src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.mdx diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.ts b/src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/modal/modal.stories.ts rename to src/Umbraco.Web.UI.Client/src/core/modal/modal.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/index.ts b/src/Umbraco.Web.UI.Client/src/core/notification/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/index.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/layouts/default/index.ts b/src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/index.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/layouts/default/index.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/index.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/layouts/default/notification-layout-default.element.ts b/src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/layouts/default/notification-layout-default.element.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/layouts/default/notification-layout-default.stories.ts b/src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/layouts/default/notification-layout-default.stories.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/layouts/default/notification-layout-default.test.ts b/src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/layouts/default/notification-layout-default.test.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/layouts/default/notification-layout-default.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification-handler.test.ts b/src/Umbraco.Web.UI.Client/src/core/notification/notification-handler.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/notification-handler.test.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/notification-handler.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification-handler.ts b/src/Umbraco.Web.UI.Client/src/core/notification/notification-handler.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/notification-handler.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/notification-handler.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.service.test.ts b/src/Umbraco.Web.UI.Client/src/core/notification/notification.service.test.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/notification.service.test.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/notification.service.test.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.service.ts b/src/Umbraco.Web.UI.Client/src/core/notification/notification.service.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/notification.service.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/notification.service.ts diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.mdx b/src/Umbraco.Web.UI.Client/src/core/notification/notification.stories.mdx similarity index 100% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.mdx rename to src/Umbraco.Web.UI.Client/src/core/notification/notification.stories.mdx diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts b/src/Umbraco.Web.UI.Client/src/core/notification/notification.stories.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts rename to src/Umbraco.Web.UI.Client/src/core/notification/notification.stories.ts index 62c1eb18ee..2c4053718a 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/core/notification/notification.stories.ts @@ -1,12 +1,12 @@ import 'src/backoffice/shared/components/backoffice-frame/backoffice-notification-container.element'; -import '../../context-api/provide/context-provider.element'; +import '../context-api/provide/context-provider.element'; import './layouts/default'; import { Meta, Story } from '@storybook/web-components'; import { html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../context-api'; +import { UmbContextConsumerMixin } from '../context-api'; import type { UmbNotificationDefaultData } from './layouts/default'; import { UmbNotificationColor, UmbNotificationOptions, UmbNotificationService } from '.'; diff --git a/src/Umbraco.Web.UI.Client/src/core/resources/resource.controller.ts b/src/Umbraco.Web.UI.Client/src/core/resources/resource.controller.ts index 54068407ae..d2199dce87 100644 --- a/src/Umbraco.Web.UI.Client/src/core/resources/resource.controller.ts +++ b/src/Umbraco.Web.UI.Client/src/core/resources/resource.controller.ts @@ -3,8 +3,8 @@ import { UmbController } from '../controller/controller.class'; import { UmbControllerHostInterface } from '../controller/controller-host.mixin'; import { UmbContextConsumerController } from '../context-api/consume/context-consumer.controller'; import { ApiError, CancelablePromise, ProblemDetails } from '@umbraco-cms/backend-api'; -import { UmbNotificationOptions, UmbNotificationService } from 'src/core/services/notification'; -import { UmbNotificationDefaultData } from 'src/core/services/notification/layouts/default'; +import { UmbNotificationOptions, UmbNotificationService } from 'src/core/notification'; +import { UmbNotificationDefaultData } from 'src/core/notification/layouts/default'; /** * Extract the ProblemDetails object from an ApiError. diff --git a/src/Umbraco.Web.UI.Client/src/core/resources/tryExecuteAndNotify.method.ts b/src/Umbraco.Web.UI.Client/src/core/resources/tryExecuteAndNotify.method.ts index 9f8af7f2b0..8c1bb647c9 100644 --- a/src/Umbraco.Web.UI.Client/src/core/resources/tryExecuteAndNotify.method.ts +++ b/src/Umbraco.Web.UI.Client/src/core/resources/tryExecuteAndNotify.method.ts @@ -1,7 +1,7 @@ import { UmbControllerHostInterface } from '../controller/controller-host.mixin'; import type { ProblemDetails } from '../backend-api/models/ProblemDetails'; import { UmbResourceController } from './resource.controller'; -import { UmbNotificationOptions } from 'src/core/services/notification'; +import { UmbNotificationOptions } from 'src/core/notification'; export async function tryExecuteAndNotify( host: UmbControllerHostInterface,