100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
UI update: Rollback Navigo to v7, too many issues with latest and no need to upgrade
Rich Turnerd6f09df06131
diff --git a/ui/app/or-app/package.json b/ui/app/or-app/package.jsonindex 0c08fe96c..d6f3a90a1 100644--- a/ui/app/or-app/package.json+++ b/ui/app/or-app/package.json@@ -31,7 +31,7 @@"@webcomponents/webcomponentsjs": "^2.2.10","lit-element": "^2.4.0","moment": "^2.24.0",- "navigo": "^8.7.1",+ "navigo": "^7.1.3","pwa-helpers": "^0.9.0"},"devDependencies": {diff --git a/ui/app/or-app/src/index.ts b/ui/app/or-app/src/index.tsindex 0f5784d23..91432a3c6 100644--- a/ui/app/or-app/src/index.ts+++ b/ui/app/or-app/src/index.ts@@ -71,7 +71,7 @@ export function headerItemGatewayConnection<S extends AppStateKeyed, A extends Areturn {icon: "cloud",value: "gateway",- href: "#gateway",+ href: "#!gateway",text: "gatewayConnection",roles: ["write:admin", "read:admin"]};@@ -296,8 +296,8 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {if (provider.routes) {provider.routes.forEach((route) => {router.on(- route, ({ data, params, queryString }) => {- this._store.dispatch(updatePage({page: pageName, params: data}));+ route, (params, query) => {+ this._store.dispatch(updatePage({page: pageName, params: params}));})});@@ -305,14 +305,10 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {});if (this.appConfig.pages.default) {- router.on(() => {+ router.on("*", (params, query) => {this._store.dispatch(updatePage("default"));});}-- // router.notFound(() => {- // this._store.dispatch(updatePage("default"));- // })router.resolve();} else {diff --git a/ui/app/or-app/src/or-header.ts b/ui/app/or-app/src/or-header.tsindex f191e8f32..4b851963f 100644--- a/ui/app/or-app/src/or-header.ts+++ b/ui/app/or-app/src/or-header.ts@@ -65,7 +65,8 @@ function hasRequiredRole(option: HeaderItem): boolean {}function getCurrentMenuItemRef(defaultRef?: string): string | undefined {- return window.location.hash && window.location.hash.length > 2 ? window.location.hash.substr(2).split("/")[0] : defaultRef;+ const menu = window.location.hash.split("/")[0].substr(2);+ return menu || defaultRef;}@customElement("or-header")@@ -473,11 +474,7 @@ class OrHeader extends LitElement {if (headerItem.action) {headerItem.action();} else if (headerItem.href) {- if (headerItem.absolute) {- window.location.href = headerItem.href!;- } else {- router.navigate(headerItem.href);- }+ router.navigate(headerItem.href, !!headerItem.absolute);}}diff --git a/ui/app/or-app/src/pages/page-assets.ts b/ui/app/or-app/src/pages/page-assets.tsindex 790c69059..fe57ed5cd 100644--- a/ui/app/or-app/src/pages/page-assets.ts+++ b/ui/app/or-app/src/pages/page-assets.ts@@ -25,7 +25,6 @@ import {EnhancedStore} from "@reduxjs/toolkit";import {showOkCancelDialog} from "@openremote/or-mwc-components/dist/or-mwc-dialog";import i18next from "i18next";import {AssetEventCause} from "@openremote/model";-import { NavigateOptions } from "navigo";export interface PageAssetsConfig {viewer?: ViewerConfig;@@ -242,7 +241,15 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {}protected _updateRoute(silent: boolean = true) {+ if (silent) {+ router.pause();+ }const assetId = this._assetIds && this._assetIds.length === 1 ? this._assetIds[0] : undefined;- router.navigate(getAssetsRoute(this._editMode, assetId), silent ? {callHandler: false} : undefined);+ router.navigate(getAssetsRoute(this._editMode, assetId));+ if (silent) {+ window.setTimeout(() => {+ router.resume();+ }, 0);+ }}}diff --git a/ui/app/or-app/src/types.ts b/ui/app/or-app/src/types.tsindex 91b47d3b6..0ab5a26f4 100644--- a/ui/app/or-app/src/types.ts+++ b/ui/app/or-app/src/types.ts@@ -8,14 +8,7 @@ import {ThunkMiddleware} from "redux-thunk";import Navigo from "navigo";// Configure routing-export const router = new Navigo("/", {hash: true, noMatchWarning: false}).hooks(- {- before(done, match) {- // do something- done();- }- }-);+export const router = new Navigo(null, true, "#!");export interface DefaultAppConfig {appTitle: string;