diff --git a/src/Umbraco.Web.UI.Client/.eslintrc.json b/src/Umbraco.Web.UI.Client/.eslintrc.json index 55525707e8..4cd0e150db 100644 --- a/src/Umbraco.Web.UI.Client/.eslintrc.json +++ b/src/Umbraco.Web.UI.Client/.eslintrc.json @@ -32,6 +32,7 @@ "rules": { "no-var": "error", "import/no-unresolved": "error", + "import/order": "warn", "local-rules/bad-type-import": "error" }, "settings": { diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts index de6d164323..a966d8fd08 100644 --- a/src/Umbraco.Web.UI.Client/src/app.ts +++ b/src/Umbraco.Web.UI.Client/src/app.ts @@ -11,13 +11,13 @@ import { UUIIconRegistryEssential } from '@umbraco-ui/uui'; import { css, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; +import type { Guard, IRoute } from 'router-slot/model'; import { getManifests, getServerStatus } from './core/api/fetcher'; import { UmbContextProviderMixin } from './core/context'; import { UmbExtensionRegistry } from './core/extension'; import { internalManifests } from './temp-internal-manifests'; import type { ServerStatus } from './core/models'; -import type { Guard, IRoute } from 'router-slot/model'; @customElement('umb-app') export class UmbApp extends UmbContextProviderMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts index 7b703c05f6..a1bdf0d0e0 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/data-type/editor-data-type.element.ts @@ -7,6 +7,7 @@ import { UmbContextProviderMixin, UmbContextConsumerMixin } from '../../../core/ import { UmbNotificationService } from '../../../core/services/notification'; import { UmbDataTypeStore } from '../../../core/stores/data-type.store'; import { DataTypeEntity } from '../../../mocks/data/data-type.data'; +import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; import { UmbDataTypeContext } from './data-type.context'; import '../shared/editor-entity-layout/editor-entity-layout.element'; @@ -14,7 +15,6 @@ import '../shared/editor-entity-layout/editor-entity-layout.element'; // Lazy load // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node. import './views/editor-view-data-type-edit.element'; -import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; @customElement('umb-editor-data-type') export class UmbEditorDataTypeElement extends UmbContextProviderMixin(UmbContextConsumerMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts index 2093ab11b5..39606dc331 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/editor-document-type.element.ts @@ -7,6 +7,7 @@ import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/ import { UmbNotificationService } from '../../../core/services/notification'; import { UmbDocumentTypeStore } from '../../../core/stores/document-type.store'; import { DocumentTypeEntity } from '../../../mocks/data/document-type.data'; +import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; import { UmbDocumentTypeContext } from './document-type.context'; import '../shared/editor-entity-layout/editor-entity-layout.element'; @@ -14,7 +15,6 @@ import '../shared/editor-entity-layout/editor-entity-layout.element'; // Lazy load // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node. import './views/editor-view-document-type-design.element'; -import { UmbNotificationDefaultData } from '../../../core/services/notification/layouts/default'; @customElement('umb-editor-document-type') export class UmbEditorDocumentTypeElement extends UmbContextProviderMixin(UmbContextConsumerMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.element.ts index 4f5a744ac7..5850cb750a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/document-type/views/editor-view-document-type-design.element.ts @@ -1,9 +1,9 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; +import { Subscription, distinctUntilChanged } from 'rxjs'; import { UmbContextConsumerMixin } from '../../../../core/context'; import type { DocumentTypeEntity } from '../../../../mocks/data/document-type.data'; -import { Subscription, distinctUntilChanged } from 'rxjs'; import { UmbDocumentTypeContext } from '../document-type.context'; @customElement('umb-editor-view-document-type-design') diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts index 738adbda92..e5acff5594 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/editor-node.element.ts @@ -2,11 +2,12 @@ import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { css, html, LitElement, nothing } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; import { UUIInputElement, UUIInputEvent } from '@umbraco-ui/uui'; +import { distinctUntilChanged, Subscription } from 'rxjs'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../../core/context'; import { UmbNodeStore } from '../../../../core/stores/node.store'; -import { distinctUntilChanged, Subscription } from 'rxjs'; import { NodeEntity } from '../../../../mocks/data/node.data'; import type { UmbNotificationService } from '../../../../core/services/notification'; +import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default'; import { UmbNodeContext } from './node.context'; import '../../shared/editor-entity-layout/editor-entity-layout.element'; @@ -15,7 +16,6 @@ import '../../shared/editor-entity-layout/editor-entity-layout.element'; // TODO: Make this dynamic, use load-extensions method to loop over extensions for this node. import './views/edit/editor-view-node-edit.element'; import './views/info/editor-view-node-info.element'; -import { UmbNotificationDefaultData } from '../../../../core/services/notification/layouts/default'; @customElement('umb-editor-node') export class UmbEditorNodeElement extends UmbContextProviderMixin(UmbContextConsumerMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts index 171c1ec2a1..34d0a93f44 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/edit/editor-view-node-edit.element.ts @@ -1,10 +1,10 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; +import { Subscription, distinctUntilChanged } from 'rxjs'; import { NodeProperty, NodePropertyData } from '../../../../../../mocks/data/node.data'; import { UmbContextConsumerMixin } from '../../../../../../core/context'; import { UmbNodeContext } from '../../node.context'; -import { Subscription, distinctUntilChanged } from 'rxjs'; import '../../../../../components/node-property.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts index e987b05ea7..10110341f6 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/editors/shared/node/views/info/editor-view-node-info.element.ts @@ -1,9 +1,9 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; +import { Subscription, distinctUntilChanged } from 'rxjs'; import { UmbContextConsumerMixin } from '../../../../../../core/context'; import { UmbNodeContext } from '../../node.context'; -import { Subscription, distinctUntilChanged } from 'rxjs'; @customElement('umb-editor-view-node-info') export class UmbEditorViewNodeInfoElement extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts index 98b4450506..be8ada6606 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/data-types/tree-data-types.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbTreeDataTypesDataContext } from './tree-data-types-data.context'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; +import { UmbTreeDataTypesDataContext } from './tree-data-types-data.context'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts index d00ed53be6..6687e1c19c 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/document-types/tree-document-types.element.ts @@ -2,8 +2,8 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; -import { UmbTreeDocumentTypesDataContext } from './tree-document-types-data.context'; import { UmbTreeBase } from '../shared/tree-base.element'; +import { UmbTreeDocumentTypesDataContext } from './tree-document-types-data.context'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts index 75f7eb7115..9b565215ac 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/documents/tree-documents.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbTreeDocumentDataContext } from './tree-documents-data.context'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; +import { UmbTreeDocumentDataContext } from './tree-documents-data.context'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts index 55390ff8e9..6fc05b3ce7 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/extensions/tree-extensions.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbTreeExtensionsDataContext } from './tree-extensions-data.context'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; +import { UmbTreeExtensionsDataContext } from './tree-extensions-data.context'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts index cbfb56df44..05914fca5a 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/media/tree-media.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbTreeMediaDataContext } from './tree-media-data.context'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; +import { UmbTreeMediaDataContext } from './tree-media-data.context'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts index e3b8db1676..4382b5b7bb 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/member-groups/tree-member-groups.element.ts @@ -1,11 +1,11 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; -import { UmbTreeMemberGroupsDataContext } from './tree-member-groups-data.context'; +import { UmbTreeBase } from '../shared/tree-base.element'; import { UmbEntityStore } from '../../../core/stores/entity.store'; +import { UmbTreeMemberGroupsDataContext } from './tree-member-groups-data.context'; import '../shared/tree-navigator.element'; -import { UmbTreeBase } from '../shared/tree-base.element'; @customElement('umb-tree-member-groups') export class UmbTreeMemberGroups extends UmbContextProviderMixin(UmbContextConsumerMixin(UmbTreeBase)) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts index 1fbcbdd9bf..3241fb8636 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/members/tree-members.element.ts @@ -1,9 +1,9 @@ import { html } from 'lit'; import { customElement } from 'lit/decorators.js'; import { UmbContextConsumerMixin, UmbContextProviderMixin } from '../../../core/context'; -import { UmbTreeMembersDataContext } from './tree-members.context'; import { UmbEntityStore } from '../../../core/stores/entity.store'; import { UmbTreeBase } from '../shared/tree-base.element'; +import { UmbTreeMembersDataContext } from './tree-members.context'; import '../shared/tree-navigator.element'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts index dfa4ec58c8..c20e75dd96 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page-action-list.element.ts @@ -1,10 +1,10 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; +import { map, Subscription } from 'rxjs'; import type { ManifestTreeItemAction, ManifestTree } from '../../../../core/models'; import { UmbExtensionRegistry } from '../../../../core/extension'; import { UmbContextConsumerMixin } from '../../../../core/context'; -import { map, Subscription } from 'rxjs'; import { UmbSectionContext } from '../../../sections/section.context'; import { Entity } from '../../../../mocks/data/entities'; diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page.service.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page.service.ts index b34b9e8a2a..46a70487c5 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page.service.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/context-menu/tree-context-menu-page.service.ts @@ -1,9 +1,9 @@ import { UUITextStyles } from '@umbraco-ui/uui-css'; import { css, LitElement, nothing, PropertyValueMap } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; +import { BehaviorSubject, Observable } from 'rxjs'; import { UmbContextProviderMixin } from '../../../../core/context'; import UmbTreeItemActionElement, { ActionPageEntity } from '../tree-item-action.element'; -import { BehaviorSubject, Observable } from 'rxjs'; @customElement('umb-tree-context-menu-page-service') export class UmbTreeContextMenuPageService extends UmbContextProviderMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts index 1fb23c42d2..4b04aaf137 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-item.element.ts @@ -1,15 +1,15 @@ import { css, html, LitElement } from 'lit'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, property, state } from 'lit/decorators.js'; +import { UUIMenuItemEvent } from '@umbraco-ui/uui'; +import { map, Subscription } from 'rxjs'; +import { repeat } from 'lit/directives/repeat.js'; import { UmbContextConsumerMixin } from '../../../core/context'; import { UmbTreeContextBase } from '../tree.context'; -import { UUIMenuItemEvent } from '@umbraco-ui/uui'; import { UmbSectionContext } from '../../sections/section.context'; -import { map, Subscription } from 'rxjs'; import { Entity } from '../../../mocks/data/entities'; -import { UmbTreeContextMenuService } from './context-menu/tree-context-menu.service'; -import { repeat } from 'lit/directives/repeat.js'; import { UmbTreeDataContextBase } from '../tree-data.context'; +import { UmbTreeContextMenuService } from './context-menu/tree-context-menu.service'; @customElement('umb-tree-item') export class UmbTreeItem extends UmbContextConsumerMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts index 42cd24e380..1e564b65b3 100644 --- a/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts +++ b/src/Umbraco.Web.UI.Client/src/backoffice/trees/shared/tree-navigator.element.ts @@ -2,8 +2,8 @@ import { css, html, LitElement } from 'lit'; import { repeat } from 'lit/directives/repeat.js'; import { UUITextStyles } from '@umbraco-ui/uui-css/lib'; import { customElement, state } from 'lit/decorators.js'; -import { UmbContextConsumerMixin } from '../../../core/context'; import { Subscription } from 'rxjs'; +import { UmbContextConsumerMixin } from '../../../core/context'; import { Entity } from '../../../mocks/data/entities'; import { UmbTreeDataContextBase } from '../tree-data.context'; diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/create-extension-element.function.ts b/src/Umbraco.Web.UI.Client/src/core/extension/create-extension-element.function.ts index 354f44be0c..7e997d5417 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extension/create-extension-element.function.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extension/create-extension-element.function.ts @@ -1,8 +1,8 @@ +import type { ManifestTypes } from '../models'; import { hasDefaultExport } from './has-default-export.function'; import { isManifestElementType } from './is-extension.function'; import { loadExtension } from './load-extension.function'; -import type { ManifestTypes } from '../models'; export async function createExtensionElement(manifest: ManifestTypes): Promise { //TODO: Write tests for these extension options: diff --git a/src/Umbraco.Web.UI.Client/src/core/extension/extension.registry.ts b/src/Umbraco.Web.UI.Client/src/core/extension/extension.registry.ts index 4b8f2c9599..622425f146 100644 --- a/src/Umbraco.Web.UI.Client/src/core/extension/extension.registry.ts +++ b/src/Umbraco.Web.UI.Client/src/core/extension/extension.registry.ts @@ -1,11 +1,4 @@ import { BehaviorSubject, map, Observable } from 'rxjs'; - -import { createExtensionElement } from './create-extension-element.function'; - -export type UmbExtensionManifestJSModel = { - elementName?: string; -}; - import type { ManifestTypes, ManifestDashboard, @@ -20,6 +13,11 @@ import type { ManifestCustom, ManifestPackageView, } from '../models'; +import { createExtensionElement } from './create-extension-element.function'; + +export type UmbExtensionManifestJSModel = { + elementName?: string; +}; // TODO: add to schema export type ManifestBase = { diff --git a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts b/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts index 246d56ddea..84bb8ed79f 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts +++ b/src/Umbraco.Web.UI.Client/src/core/services/modal/modal.service.ts @@ -5,10 +5,10 @@ import './layouts/content-picker/modal-layout-content-picker.element'; import { UUIModalSidebarSize } from '@umbraco-ui/uui-modal-sidebar'; import { BehaviorSubject, Observable } from 'rxjs'; -import { UmbModalHandler } from './'; import type { UmbModalConfirmData } from './layouts/confirm/modal-layout-confirm.element'; import type { UmbModalContentPickerData } from './layouts/content-picker/modal-layout-content-picker.element'; +import { UmbModalHandler } from './'; export type UmbModelType = 'dialog' | 'sidebar'; 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/services/notification/layouts/default/notification-layout-default.element.ts index 3bd298daf3..63830d28df 100644 --- 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/services/notification/layouts/default/notification-layout-default.element.ts @@ -1,8 +1,8 @@ import { html, LitElement } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { UUITextStyles } from '@umbraco-ui/uui-css'; -import type { UmbNotificationHandler } from '../../'; import { ifDefined } from 'lit-html/directives/if-defined.js'; +import type { UmbNotificationHandler } from '../../'; export interface UmbNotificationDefaultData { message: string; 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/services/notification/layouts/default/notification-layout-default.test.ts index 1dd271e387..5a4f2b27d6 100644 --- 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/services/notification/layouts/default/notification-layout-default.test.ts @@ -1,8 +1,8 @@ import { fixture, expect, html } from '@open-wc/testing'; +import { UUIToastNotificationLayoutElement } from '@umbraco-ui/uui'; import { UmbNotificationHandler } from '../../'; import type { UmbNotificationLayoutDefaultElement, UmbNotificationDefaultData } from '.'; import '.'; -import { UUIToastNotificationLayoutElement } from '@umbraco-ui/uui'; describe('UmbNotificationLayoutDefault', () => { let element: UmbNotificationLayoutDefaultElement; diff --git a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts b/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts index 670ac5fa55..c96e3832ff 100644 --- a/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/core/services/notification/notification.stories.ts @@ -6,10 +6,10 @@ import { Meta, Story } from '@storybook/web-components'; import { html, LitElement } from 'lit'; import { customElement } from 'lit/decorators.js'; -import { UmbNotificationColor, UmbNotificationOptions, UmbNotificationService } from '.'; import { UmbContextConsumerMixin } from '../../context'; import type { UmbNotificationDefaultData } from './layouts/default'; +import { UmbNotificationColor, UmbNotificationOptions, UmbNotificationService } from '.'; export default { title: 'API/Notifications/Overview', component: 'ucp-notification-layout-default', diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts index 32c8d85937..327ed94964 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.stories.ts @@ -2,9 +2,9 @@ import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; import { rest } from 'msw'; -import type { UmbInstallerDatabaseElement } from './installer-database.element'; import type { UmbracoInstaller } from '../../core/models'; import { installerContextProvider } from '../shared/utils.story-helpers'; +import type { UmbInstallerDatabaseElement } from './installer-database.element'; import './installer-database.element'; export default { diff --git a/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.stories.ts b/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.stories.ts index 94318e2aa8..7d79afc6db 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/error/installer-error.stories.ts @@ -1,10 +1,11 @@ import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import type { UmbInstallerErrorElement } from './installer-error.element'; import { installerContextProvider } from '../shared/utils.story-helpers'; -import './installer-error.element'; import { UmbInstallerContext } from '../installer.context'; +import type { UmbInstallerErrorElement } from './installer-error.element'; + +import './installer-error.element'; const error = { type: 'validation', diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts b/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts index 94c8951064..d76defbb4b 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.element.ts @@ -8,9 +8,9 @@ import './user/installer-user.element'; import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; +import { Subscription } from 'rxjs'; import { UmbContextProviderMixin } from '../core/context'; import { UmbInstallerContext } from './installer.context'; -import { Subscription } from 'rxjs'; @customElement('umb-installer') export class UmbInstallerElement extends UmbContextProviderMixin(LitElement) { diff --git a/src/Umbraco.Web.UI.Client/src/installer/installing/installer-installing.stories.ts b/src/Umbraco.Web.UI.Client/src/installer/installing/installer-installing.stories.ts index c2797ff3ae..bfe7ecf6c9 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installing/installer-installing.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installing/installer-installing.stories.ts @@ -1,8 +1,8 @@ import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import type { UmbInstallerInstallingElement } from './installer-installing.element'; import { installerContextProvider } from '../shared/utils.story-helpers'; +import type { UmbInstallerInstallingElement } from './installer-installing.element'; import './installer-installing.element'; export default { diff --git a/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.stories.ts b/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.stories.ts index cf15a19b95..b26fe202c2 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.stories.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.stories.ts @@ -1,8 +1,8 @@ import { Meta, Story } from '@storybook/web-components'; import { html } from 'lit-html'; -import type { UmbInstallerUserElement } from './installer-user.element'; import { installerContextProvider } from '../shared/utils.story-helpers'; +import type { UmbInstallerUserElement } from './installer-user.element'; import './installer-user.element'; export default {