diff --git a/src/Umbraco.Web.UI.Client/src/app.ts b/src/Umbraco.Web.UI.Client/src/app.ts index 1980d5f434..5660d1453d 100644 --- a/src/Umbraco.Web.UI.Client/src/app.ts +++ b/src/Umbraco.Web.UI.Client/src/app.ts @@ -1,28 +1,28 @@ -import './core/css/custom-properties.css'; +// TODO: remove these imports when they are part of UUI +import '@umbraco-ui/uui-color-swatch'; +import '@umbraco-ui/uui-color-swatches'; import '@umbraco-ui/uui-modal'; import '@umbraco-ui/uui-modal-container'; import '@umbraco-ui/uui-modal-dialog'; import '@umbraco-ui/uui-modal-sidebar'; -import '@umbraco-ui/uui-color-swatch'; -import '@umbraco-ui/uui-color-swatches'; -import 'router-slot'; import 'element-internals-polyfill'; +import 'router-slot'; +import './core/css/custom-properties.css'; +import './auth'; -// TODO: remove these imports when they are part of UUI import type { Guard, IRoute } from 'router-slot/model'; import { UUIIconRegistryEssential } from '@umbraco-ui/uui'; -import { css, html, LitElement } from 'lit'; +import { css, html } from 'lit'; import { customElement, property, state } from 'lit/decorators.js'; -import { UmbIconStore } from '@umbraco-cms/stores/icon/icon.store'; +import { UmbLitElement } from './core/element/lit-element.element'; +import { tryExecuteAndNotify } from './core/resources/tryExecuteAndNotify.method'; import { OpenAPI, RuntimeLevel, ServerResource } from '@umbraco-cms/backend-api'; -import { UmbContextProviderMixin } from '@umbraco-cms/context-api'; - -import './auth'; +import { UmbIconStore } from '@umbraco-cms/stores/icon/icon.store'; @customElement('umb-app') -export class UmbApp extends UmbContextProviderMixin(LitElement) { +export class UmbApp extends UmbLitElement { static styles = css` :host { overflow: hidden; @@ -95,14 +95,8 @@ export class UmbApp extends UmbContextProviderMixin(LitElement) { } private async _setInitStatus() { - try { - const serverStatus = await ServerResource.getServerStatus(); - if (serverStatus.serverStatus) { - this._runtimeLevel = serverStatus.serverStatus; - } - } catch (error) { - console.log(error); - } + const { data } = await tryExecuteAndNotify(this, ServerResource.getServerStatus()); + this._runtimeLevel = data?.serverStatus ?? RuntimeLevel.UNKNOWN; } private _redirect() {