yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove double request to get init status

Browse Source
This commit is contained in:
Mads Rasmussen
2023-04-13 13:48:10 +02:00
committed by Jacob Overgaard
parent 0e77570527
commit 94cbe725af
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/Umbraco.Web.UI.Client/src/app.ts
View File

@@ -46,26 +46,24 @@ export class UmbAppElement extends UmbLitElement {
{
path: 'upgrade',
component: () => import('./upgrader/upgrader.element'),
guards: [this._isAuthorizedGuard('/upgrade')],
guards: [this.#isAuthorizedGuard('/upgrade')],
},
{
path: '**',
component: () => import('./backoffice/backoffice.element'),
guards: [this._isAuthorizedGuard()],
guards: [this.#isAuthorizedGuard()],
},
];
private _umbIconRegistry = new UmbIconStore();
private _iconRegistry = new UUIIconRegistryEssential();
private _runtimeLevel = RuntimeLevelModel.UNKNOWN;
#umbIconRegistry = new UmbIconStore();
#uuiIconRegistry = new UUIIconRegistryEssential();
#runtimeLevel = RuntimeLevelModel.UNKNOWN;
constructor() {
super();
this._umbIconRegistry.attach(this);
this._setup();
this.#umbIconRegistry.attach(this);
this.#uuiIconRegistry.attach(this);
this.#setInitStatus();
}
connectedCallback() {
@@ -79,8 +77,6 @@ export class UmbAppElement extends UmbLitElement {
this.provideContext('UMBRACOBASE', OpenAPI.BASE);
this._setInitStatus();
// Listen for the debug event from the <umb-debug> component
this.addEventListener(umbDebugContextEventType, (event: any) => {
// Once we got to the outter most component <umb-app>
@@ -104,19 +100,14 @@ export class UmbAppElement extends UmbLitElement {
});
}
private async _setup() {
await this._setInitStatus();
this._iconRegistry.attach(this);
}
private async _setInitStatus() {
async #setInitStatus() {
const { data } = await tryExecuteAndNotify(this, ServerResource.getServerStatus());
this._runtimeLevel = data?.serverStatus ?? RuntimeLevelModel.UNKNOWN;
this._redirect();
this.#runtimeLevel = data?.serverStatus ?? RuntimeLevelModel.UNKNOWN;
this.#redirect();
}
private _redirect() {
switch (this._runtimeLevel) {
#redirect() {
switch (this.#runtimeLevel) {
case RuntimeLevelModel.INSTALL:
history.replaceState(null, '', 'install');
break;
@@ -137,18 +128,18 @@ export class UmbAppElement extends UmbLitElement {
}
default:
throw new Error(`Unsupported runtime level: ${this._runtimeLevel}`);
throw new Error(`Unsupported runtime level: ${this.#runtimeLevel}`);
}
}
private _isAuthorized(): boolean {
#isAuthorized(): boolean {
return true; // TODO: Return true for now, until new login page is up and running
//return sessionStorage.getItem('is-authenticated') === 'true';
}
private _isAuthorizedGuard(redirectTo?: string): Guard {
#isAuthorizedGuard(redirectTo?: string): Guard {
return () => {
if (this._isAuthorized()) {
if (this.#isAuthorized()) {
return true;
}