From 4726327c7c08b2d8be6ef3462269d628c4c9e9f6 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Fri, 23 Dec 2022 14:34:26 +0100 Subject: [PATCH] fix import paths --- src/Umbraco.Web.UI.Client/src/app.ts | 9 ++- .../{ => test/core}/backoffice.element.ts | 75 +++++++++---------- .../{ => test/core}/backoffice.stories.ts | 0 .../backoffice-header-apps.element.ts | 7 +- .../backoffice-header-sections.element.ts | 2 +- .../backoffice-header.element.ts | 0 .../backoffice-main.element.ts | 4 +- .../backoffice-modal-container.element.ts | 2 +- ...ckoffice-notification-container.element.ts | 2 +- .../{ => components/section}/section.store.ts | 0 ...operty-editor-ui-content-picker.stories.ts | 2 +- 11 files changed, 53 insertions(+), 50 deletions(-) rename src/Umbraco.Web.UI.Client/src/backoffice/{ => test/core}/backoffice.element.ts (57%) rename src/Umbraco.Web.UI.Client/src/backoffice/{ => test/core}/backoffice.stories.ts (100%) rename src/Umbraco.Web.UI.Client/src/backoffice/{ => test/core}/components/backoffice-frame/backoffice-header-apps.element.ts (86%) rename src/Umbraco.Web.UI.Client/src/backoffice/{ => test/core}/components/backoffice-frame/backoffice-header-sections.element.ts (98%) rename src/Umbraco.Web.UI.Client/src/backoffice/{ => test/core}/components/backoffice-frame/backoffice-header.element.ts (100%) rename src/Umbraco.Web.UI.Client/src/backoffice/{ => test/core}/components/backoffice-frame/backoffice-main.element.ts (95%) rename src/Umbraco.Web.UI.Client/src/backoffice/{ => test/core}/components/backoffice-frame/backoffice-modal-container.element.ts (93%) rename src/Umbraco.Web.UI.Client/src/backoffice/{ => test/core}/components/backoffice-frame/backoffice-notification-container.element.ts (97%) rename src/Umbraco.Web.UI.Client/src/backoffice/test/core/{ => components/section}/section.store.ts (100%) diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts index 9af771d025..a321ec9da6 100644 --- a/src/Umbraco.Web.UI.Client/src/app.ts +++ b/src/Umbraco.Web.UI.Client/src/app.ts @@ -13,7 +13,7 @@ import type { Guard, IRoute } from 'router-slot/model'; import { UUIIconRegistryEssential } from '@umbraco-ui/uui'; import { css, html, LitElement } from 'lit'; -import {customElement, property, state} from 'lit/decorators.js'; +import { customElement, property, state } from 'lit/decorators.js'; import { OpenAPI, RuntimeLevel, ServerResource } from '@umbraco-cms/backend-api'; import { UmbContextProviderMixin } from '@umbraco-cms/context-api'; @@ -53,7 +53,7 @@ export class UmbApp extends UmbContextProviderMixin(LitElement) { }, { path: '**', - component: () => import('./backoffice/backoffice.element'), + component: () => import('./backoffice/test/core/backoffice.element'), guards: [this._isAuthorizedGuard()], }, ]; @@ -70,7 +70,10 @@ export class UmbApp extends UmbContextProviderMixin(LitElement) { async connectedCallback() { super.connectedCallback(); - OpenAPI.BASE = import.meta.env.VITE_UMBRACO_USE_MSW === 'on' ? '' : this.umbracoUrl ?? import.meta.env.VITE_UMBRACO_API_URL ?? ''; + OpenAPI.BASE = + import.meta.env.VITE_UMBRACO_USE_MSW === 'on' + ? '' + : this.umbracoUrl ?? import.meta.env.VITE_UMBRACO_API_URL ?? ''; OpenAPI.WITH_CREDENTIALS = true; this.provideContext('UMBRACOBASE', OpenAPI.BASE); diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/backoffice.element.ts similarity index 57% rename from src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/test/core/backoffice.element.ts index 19034b8ba0..77c47e65b8 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/backoffice.element.ts @@ -3,50 +3,49 @@ import './components/backoffice-frame/backoffice-header.element'; import './components/backoffice-frame/backoffice-main.element'; import './components/backoffice-frame/backoffice-modal-container.element'; import './components/backoffice-frame/backoffice-notification-container.element'; - -import './test/core/components/ref-property-editor-ui/ref-property-editor-ui.element'; -import './test/core/components/content-property/content-property.element'; -import './test/core/components/table/table.element'; -import './test/core/components/code-block/code-block.element'; -import './test/core/components/extension-slot/extension-slot.element'; -import './test/core/components/workspace/workspace-entity/workspace-entity.element'; -import './test/core/components/section/section-main/section-main.element'; -import './test/core/components/section/section-sidebar/section-sidebar.element'; -import './test/core/components/section/section.element'; -import './test/core/components/tree/tree.element'; -import './test/core/components/workspace/workspace-content/workspace-content.element'; +import './components/ref-property-editor-ui/ref-property-editor-ui.element'; +import './components/content-property/content-property.element'; +import './components/table/table.element'; +import './components/code-block/code-block.element'; +import './components/extension-slot/extension-slot.element'; +import './components/workspace/workspace-entity/workspace-entity.element'; +import './components/section/section-main/section-main.element'; +import './components/section/section-sidebar/section-sidebar.element'; +import './components/section/section.element'; +import './components/tree/tree.element'; +import './components/workspace/workspace-content/workspace-content.element'; 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 './test/core/services/modal'; -import { UmbNotificationService } from './test/core/services/notification'; -import { UmbIconStore } from './test/core/stores/icon/icon.store'; -import { manifests as externalLoginProviderManifests } from '../auth/external-login-providers/manifests'; -import { UmbDataTypeStore } from './test/core/data-types/data-type.store'; -import { UmbDocumentTypeStore } from './test/documents/document-types/document-type.store'; -import { UmbMediaTypeStore } from './test/media/media-types/media-type.store'; -import { UmbMemberTypeStore } from './test/members/member-types/member-type.store'; -import { UmbDocumentStore } from './test/documents/documents/document.store'; -import { UmbMediaStore } from './test/media/media/media.store'; -import { UmbMemberGroupStore } from './test/members/member-groups/member-group.store'; -import { UmbSectionStore } from './test/core/section.store'; -import { UmbUserStore } from '../auth/users/user.store'; -import { UmbUserGroupStore } from '../auth/user-groups/user-group.store'; -import { UmbCurrentUserHistoryStore } from '../auth/current-user/current-user-history.store'; -import { UmbDictionaryStore } from './test/translation/dictionary/dictionary.store'; -import { UmbDocumentBlueprintStore } from './test/documents/document-blueprints/document-blueprint.store'; +import { manifests as externalLoginProviderManifests } from '../../../auth/external-login-providers/manifests'; +import { UmbDocumentTypeStore } from '../documents/document-types/document-type.store'; +import { UmbMediaTypeStore } from '../media/media-types/media-type.store'; +import { UmbMemberTypeStore } from '../members/member-types/member-type.store'; +import { UmbDocumentStore } from '../documents/documents/document.store'; +import { UmbMediaStore } from '../media/media/media.store'; +import { UmbMemberGroupStore } from '../members/member-groups/member-group.store'; +import { UmbUserStore } from '../../../auth/users/user.store'; +import { UmbUserGroupStore } from '../../../auth/user-groups/user-group.store'; +import { UmbCurrentUserHistoryStore } from '../../../auth/current-user/current-user-history.store'; +import { UmbDictionaryStore } from '../translation/dictionary/dictionary.store'; +import { UmbDocumentBlueprintStore } from '../documents/document-blueprints/document-blueprint.store'; -import { manifests as sectionManifests } from './sections.manifest'; -import { manifests as propertyEditorModelManifests } from './test/core/property-editors/models/manifests'; -import { manifests as propertyEditorUIManifests } from './test/core/property-editors/uis/manifests'; -import { manifests as treeManifests } from './trees.manifest'; -import { manifests as editorManifests } from './workspaces.manifest'; -import { manifests as propertyActionManifests } from './test/core/property-actions/manifests'; -import { manifests as userDashboards } from '../auth/current-user/user-dashboards/manifests'; -import { manifests as collectionBulkActionManifests } from './test/core/components/collection/bulk-actions/manifests'; -import { manifests as collectionViewManifests } from './test/core/components/collection/views/manifests'; +import { manifests as sectionManifests } from '../../sections.manifest'; +import { manifests as treeManifests } from '../../trees.manifest'; +import { manifests as editorManifests } from '../../workspaces.manifest'; +import { manifests as userDashboards } from '../../../auth/current-user/user-dashboards/manifests'; +import { manifests as propertyEditorModelManifests } from './property-editors/models/manifests'; +import { manifests as propertyEditorUIManifests } from './property-editors/uis/manifests'; +import { manifests as propertyActionManifests } from './property-actions/manifests'; +import { UmbSectionStore } from './components/section/section.store'; +import { UmbDataTypeStore } from './data-types/data-type.store'; +import { UmbIconStore } from './stores/icon/icon.store'; +import { UmbNotificationService } from './services/notification'; +import { UmbModalService } from './services/modal'; +import { manifests as collectionBulkActionManifests } from './components/collection/bulk-actions/manifests'; +import { manifests as collectionViewManifests } from './components/collection/views/manifests'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import { umbExtensionsRegistry } from '@umbraco-cms/extensions-registry'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/backoffice.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/backoffice.stories.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/backoffice.stories.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/test/core/backoffice.stories.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-header-apps.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-header-apps.element.ts similarity index 86% rename from src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-header-apps.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-header-apps.element.ts index 6b91ff629a..220ae9b2d0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-header-apps.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-header-apps.element.ts @@ -21,13 +21,14 @@ export class UmbBackofficeHeaderApps extends LitElement { this._registerHeaderApps(); } + // TODO: these registrations should be moved private _registerHeaderApps() { const headerApps: Array = [ { type: 'headerApp', alias: 'Umb.HeaderApp.Search', name: 'Header App Search', - loader: () => import('../../test/core/components/header-app/header-app-button.element'), + loader: () => import('../header-app/header-app-button.element'), weight: 10, meta: { label: 'Search', @@ -39,7 +40,7 @@ export class UmbBackofficeHeaderApps extends LitElement { type: 'headerApp', alias: 'Umb.HeaderApp.Favorites', name: 'Header App Favorites', - loader: () => import('../../test/core/components/header-app/header-app-button.element'), + loader: () => import('../header-app/header-app-button.element'), weight: 100, meta: { label: 'Favorites', @@ -51,7 +52,7 @@ export class UmbBackofficeHeaderApps extends LitElement { type: 'headerApp', alias: 'Umb.HeaderApp.CurrentUser', name: 'Current User', - loader: () => import('../../../auth/current-user/header-app-current-user.element'), + loader: () => import('../../../../../auth/current-user/header-app-current-user.element'), weight: 1000, meta: { label: 'TODO: how should we enable this to not be set.', diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-header-sections.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-header-sections.element.ts similarity index 98% rename from src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-header-sections.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-header-sections.element.ts index ee9afa0389..790732a0b7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-header-sections.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-header-sections.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 { when } from 'lit/directives/when.js'; -import { UmbSectionStore } from '../../test/core/section.store'; +import { UmbSectionStore } from '../section/section.store'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; import type { ManifestSection } from '@umbraco-cms/models'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-header.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-header.element.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-header.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-header.element.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-main.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-main.element.ts similarity index 95% rename from src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-main.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-main.element.ts index 77e59cba4e..073fe0d7aa 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-main.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-main.element.ts @@ -3,8 +3,8 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement } from 'lit'; import { state } from 'lit/decorators.js'; import { IRoutingInfo } from 'router-slot'; -import { UmbSectionStore } from '../../test/core/section.store'; -import { UmbSectionContext } from '../../test/core/components/section/section.context'; +import { UmbSectionStore } from '../section/section.store'; +import { UmbSectionContext } from '../section/section.context'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { createExtensionElement } from '@umbraco-cms/extensions-api'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '@umbraco-cms/context-api'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-modal-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-modal-container.element.ts similarity index 93% rename from src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-modal-container.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-modal-container.element.ts index 9adfd17d89..d685271478 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-modal-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/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 '../../test/core/services/modal'; +import { UmbModalHandler, UmbModalService } from '../../../../test/core/services/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/components/backoffice-frame/backoffice-notification-container.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-notification-container.element.ts similarity index 97% rename from src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-notification-container.element.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/backoffice-frame/backoffice-notification-container.element.ts index aee1debd7e..73f9cabd5e 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/components/backoffice-frame/backoffice-notification-container.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/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 '../../test/core/services/notification'; +import type { UmbNotificationHandler, UmbNotificationService } from '../../services/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/test/core/section.store.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/section/section.store.ts similarity index 100% rename from src/Umbraco.Web.UI.Client/src/backoffice/test/core/section.store.ts rename to src/Umbraco.Web.UI.Client/src/backoffice/test/core/components/section/section.store.ts diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/test/core/property-editors/uis/content-picker/property-editor-ui-content-picker.stories.ts b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/property-editors/uis/content-picker/property-editor-ui-content-picker.stories.ts index 074ef9c69e..b6ce7f53e2 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/test/core/property-editors/uis/content-picker/property-editor-ui-content-picker.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/test/core/property-editors/uis/content-picker/property-editor-ui-content-picker.stories.ts @@ -4,7 +4,7 @@ import { html } from 'lit-html'; import type { UmbPropertyEditorUIContentPickerElement } from './property-editor-ui-content-picker.element'; import { UmbModalService } from 'src/backoffice/test/core/services/modal'; import './property-editor-ui-content-picker.element'; -import '../../../../../components/backoffice-frame/backoffice-modal-container.element'; +import '../../../components/backoffice-frame/backoffice-modal-container.element'; export default { title: 'Property Editor UIs/Content Picker',