diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts index 2c0733e9d1..94fadf772c 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/install.handlers.ts @@ -1,6 +1,6 @@ +import { rest } from 'msw'; import { DatabaseInstall, Install, InstallSettings, ProblemDetails, TelemetryLevel } from '@umbraco-cms/backend-api'; import { umbracoPath } from '@umbraco-cms/utils'; -import { rest } from 'msw'; export const handlers = [ rest.get(umbracoPath('/install/settings'), (_req, res, ctx) => { diff --git a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts index 6ca8c4c202..a13c1a9b37 100644 --- a/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts +++ b/src/Umbraco.Web.UI.Client/src/core/mocks/domains/server.handlers.ts @@ -1,8 +1,6 @@ +import { rest } from 'msw'; import { RuntimeLevel, ServerStatus, Version } from '@umbraco-cms/backend-api'; import { umbracoPath } from '@umbraco-cms/utils'; -import { rest } from 'msw'; - -console.log(umbracoPath('/server/status')); export const serverRunningHandler = rest.get(umbracoPath('/server/status'), (_req, res, ctx) => { return res( diff --git a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts index 9cd4ba4f98..708395f34b 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/consent/installer-consent.element.ts @@ -1,11 +1,11 @@ -import { ConsentLevel, Install, InstallSettings, Telemetry, TelemetryLevel } from '@umbraco-cms/backend-api'; -import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; -import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { css, CSSResultGroup, html, LitElement } from 'lit'; import { customElement, state } from 'lit/decorators.js'; import { unsafeHTML } from 'lit/directives/unsafe-html.js'; import { UmbInstallerContext } from '../installer.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import { ConsentLevel, Install, InstallSettings, Telemetry, TelemetryLevel } from '@umbraco-cms/backend-api'; @customElement('umb-installer-consent') export class UmbInstallerConsentElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { diff --git a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts index f8bccf3735..326c0a33a3 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/database/installer-database.element.ts @@ -1,20 +1,19 @@ -import { - ApiError, - DatabaseInstall, - DatabaseSettings, - Install, - InstallResource, - InstallSettings, - ProblemDetails, -} from '@umbraco-cms/backend-api'; -import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; -import { UmbObserverMixin } from '@umbraco-cms/observable-api'; import { UUIButtonElement } from '@umbraco-ui/uui'; import { css, CSSResultGroup, html, LitElement, nothing } from 'lit'; import { customElement, property, query, state } from 'lit/decorators.js'; -import { data } from 'src/core/mocks/data/node.data'; import { UmbInstallerContext } from '../installer.context'; +import { UmbObserverMixin } from '@umbraco-cms/observable-api'; +import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; +import { + ApiError, + DatabaseInstall, + DatabaseSettings, + Install, + InstallResource, + InstallSettings, + ProblemDetails, +} from '@umbraco-cms/backend-api'; @customElement('umb-installer-database') export class UmbInstallerDatabaseElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) { 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 bfd3262179..393136de64 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 @@ -1,13 +1,13 @@ import './installer-database.element'; import { Meta, Story } from '@storybook/web-components'; -import { InstallSettings } from '@umbraco-cms/backend-api'; import { html } from 'lit-html'; import { rest } from 'msw'; import { installerContextProvider } from '../shared/utils.story-helpers'; import type { UmbInstallerDatabaseElement } from './installer-database.element'; +import { InstallSettings } from '@umbraco-cms/backend-api'; export default { title: 'Apps/Installer/Steps', component: 'umb-installer-database', diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts index d89d32808f..9b24478fce 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.context.ts @@ -1,5 +1,5 @@ -import { Install, InstallResource, InstallSettings, ProblemDetails, TelemetryLevel } from '@umbraco-cms/backend-api'; import { BehaviorSubject, Observable, ReplaySubject } from 'rxjs'; +import { Install, InstallResource, InstallSettings, ProblemDetails, TelemetryLevel } from '@umbraco-cms/backend-api'; /** * Context API for the installer diff --git a/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts b/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts index 8f2f6324e1..f211f8c820 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts +++ b/src/Umbraco.Web.UI.Client/src/installer/user/installer-user.element.ts @@ -1,10 +1,10 @@ +import { css, CSSResultGroup, html, LitElement } from 'lit'; +import { customElement, state } from 'lit/decorators.js'; +import { UmbInstallerContext } from '../installer.context'; import { Install } from '@umbraco-cms/backend-api'; import { UmbContextConsumerMixin } from '@umbraco-cms/context-api'; import { UmbObserverMixin } from '@umbraco-cms/observable-api'; -import { css, CSSResultGroup, html, LitElement } from 'lit'; -import { customElement, state } from 'lit/decorators.js'; -import { UmbInstallerContext } from '../installer.context'; @customElement('umb-installer-user') export class UmbInstallerUserElement extends UmbContextConsumerMixin(UmbObserverMixin(LitElement)) {