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

use full location.href for initial routing

Browse Source
This commit is contained in:
Jacob Overgaard
2023-04-05 10:38:03 +02:00
parent 0057e1f457
commit ee348745a0
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ import { customElement, property } from 'lit/decorators.js';
import { UmbIconStore } from './core/stores/icon/icon.store';
import type { Guard, IRoute } from '@umbraco-cms/backoffice/router';
import { pathWithoutBasePath, queryString } from '@umbraco-cms/backoffice/router';
import { pathWithoutBasePath } from '@umbraco-cms/backoffice/router';
import { UmbLitElement } from '@umbraco-cms/internal/lit-element';
import { tryExecuteAndNotify } from '@umbraco-cms/backoffice/resources';
import { OpenAPI, RuntimeLevelModel, ServerResource } from '@umbraco-cms/backoffice/backend-api';
@@ -126,21 +126,11 @@ export class UmbAppElement extends UmbLitElement {
break;
case RuntimeLevelModel.RUN: {
const pathname = pathWithoutBasePath();
const pathname = pathWithoutBasePath({ start: true, end: false });
// If we are on the installer or upgrade page, redirect to the root
// but if not, keep the current path but replace state anyway to initialize the router
let finalPath = pathname === 'install' || pathname === 'upgrade' ? '/' : pathname;
const qs = queryString();
if (qs) {
finalPath += qs;
}
if (location.hash) {
finalPath += `#${location.hash}`;
}
const finalPath = pathname === '/install' || pathname === '/upgrade' ? '/' : location.href;
history.replaceState(null, '', finalPath);
break;