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 updates: refactor of exports to allow headers to be re-used in custom projects
Rich Turnerd06070fd14ca
diff --git a/ui/app/console_loader/src/pages/page-mobile-geofences.ts b/ui/app/console_loader/src/pages/page-mobile-geofences.tsindex 12de92399..07fd2af28 100644--- a/ui/app/console_loader/src/pages/page-mobile-geofences.ts+++ b/ui/app/console_loader/src/pages/page-mobile-geofences.ts@@ -26,7 +26,7 @@ export function pageMobileGeofencesProvider(store: EnhancedStore<AppStateKeyed>,const QUERY_VIEW = new URLSearchParams(window.location.search).get("view");const APP_ICON_POSITION = new URLSearchParams(window.location.search).get("appIconPosition");@customElement("page-mobile-geofences")-class PageMobileGeofences extends Page<AppStateKeyed> {+export class PageMobileGeofences extends Page<AppStateKeyed> {static get styles() {diff --git a/ui/app/console_loader/src/pages/page-mobile-onboarding.ts b/ui/app/console_loader/src/pages/page-mobile-onboarding.tsindex 133314c8c..33f180ada 100644--- a/ui/app/console_loader/src/pages/page-mobile-onboarding.ts+++ b/ui/app/console_loader/src/pages/page-mobile-onboarding.ts@@ -37,7 +37,7 @@ export function pageMobileOnboardingProvider(store: EnhancedStore<AppStateKeyed>}@customElement("page-mobile-onboarding")-class PageMobileOnboarding extends Page<AppStateKeyed> {+export class PageMobileOnboarding extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/console_loader/src/pages/page-mobile-splash.ts b/ui/app/console_loader/src/pages/page-mobile-splash.tsindex dfd5fbdbf..511932fc6 100644--- a/ui/app/console_loader/src/pages/page-mobile-splash.ts+++ b/ui/app/console_loader/src/pages/page-mobile-splash.ts@@ -24,7 +24,7 @@ export function pageMobileSplashProvider(store: EnhancedStore<AppStateKeyed>, co}@customElement("page-mobile-splash")-class PageMobileSplash extends Page<AppStateKeyed> {+export class PageMobileSplash extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/headers.ts b/ui/app/manager/src/headers.tsindex 378d77d27..45caf5810 100644--- a/ui/app/manager/src/headers.ts+++ b/ui/app/manager/src/headers.ts@@ -1,7 +1,7 @@import { manager } from "@openremote/core";import { AppStateKeyed, HeaderItem, OrApp } from "@openremote/or-app";import {AnyAction} from "@reduxjs/toolkit";-import { getMapRoute } from "./pages/page-map";+import { getMapRoute } from "./routes";export function headerItemMap<S extends AppStateKeyed, A extends AnyAction>(orApp: OrApp<S>): HeaderItem {return {diff --git a/ui/app/manager/src/pages/page-account.ts b/ui/app/manager/src/pages/page-account.tsindex 136f3d89d..da308751f 100644--- a/ui/app/manager/src/pages/page-account.ts+++ b/ui/app/manager/src/pages/page-account.ts@@ -20,7 +20,7 @@ export function pageAccountProvider(store: EnhancedStore<AppStateKeyed>): PagePr}@customElement("page-account")-class PageAccount extends Page<AppStateKeyed> {+export class PageAccount extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.tsindex ffedecae1..81f11f5c8 100644--- a/ui/app/manager/src/pages/page-assets.ts+++ b/ui/app/manager/src/pages/page-assets.ts@@ -26,6 +26,7 @@ import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";import i18next from "i18next";import {AssetEventCause, WellknownAssets} from "@openremote/model";import "@openremote/or-json-forms";+import {getAssetsRoute} from "../routes";export interface PageAssetsConfig {viewer?: ViewerConfig;@@ -67,17 +68,8 @@ export const PAGE_ASSETS_CONFIG_DEFAULT: PageAssetsConfig = {}};-export function getAssetsRoute(editMode?: boolean, assetId?: string) {- let route = "assets/" + (editMode ? "true" : "false");- if (assetId) {- route += "/" + assetId;- }-- return route;-}-@customElement("page-assets")-class PageAssets extends Page<AppStateKeyed> {+export class PageAssets extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/pages/page-export.ts b/ui/app/manager/src/pages/page-export.tsindex 72710f1a3..a12173d1d 100644--- a/ui/app/manager/src/pages/page-export.ts+++ b/ui/app/manager/src/pages/page-export.ts@@ -41,7 +41,7 @@ interface TableRow {}@customElement("page-export")-class PageExport extends Page<AppStateKeyed> {+export class PageExport extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/pages/page-gateway.ts b/ui/app/manager/src/pages/page-gateway.tsindex 6e4c82b50..e1b1fd590 100644--- a/ui/app/manager/src/pages/page-gateway.ts+++ b/ui/app/manager/src/pages/page-gateway.ts@@ -22,7 +22,7 @@ export function pageGatewayProvider(store: EnhancedStore<AppStateKeyed>): PagePr}@customElement("page-gateway")-class PageGateway extends Page<AppStateKeyed> {+export class PageGateway extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/pages/page-insights.ts b/ui/app/manager/src/pages/page-insights.tsindex 9aab7a48b..4eacce05b 100644--- a/ui/app/manager/src/pages/page-insights.ts+++ b/ui/app/manager/src/pages/page-insights.ts@@ -29,7 +29,7 @@ export function pageInsightsProvider(store: EnhancedStore<AppStateKeyed>, config}@customElement("page-insights")-class PageInsights extends Page<AppStateKeyed> {+export class PageInsights extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/pages/page-logs.ts b/ui/app/manager/src/pages/page-logs.tsindex b6ff38149..f43815e95 100644--- a/ui/app/manager/src/pages/page-logs.ts+++ b/ui/app/manager/src/pages/page-logs.ts@@ -25,7 +25,7 @@ export function pageLogsProvider(store: EnhancedStore<AppStateKeyed>, config?: P}@customElement("page-logs")-class PageLogs extends Page<AppStateKeyed> {+export class PageLogs extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/pages/page-map.ts b/ui/app/manager/src/pages/page-map.tsindex ce94680c9..c12e9405f 100644--- a/ui/app/manager/src/pages/page-map.ts+++ b/ui/app/manager/src/pages/page-map.ts@@ -22,7 +22,7 @@ import {WellknownAttributes,WellknownMetaItems} from "@openremote/model";-import {getAssetsRoute} from "./page-assets";+import {getAssetsRoute, getMapRoute} from "../routes";import {AppStateKeyed, Page, PageProvider, router} from "@openremote/or-app";export interface MapState {@@ -105,14 +105,6 @@ export function pageMapProvider(store: EnhancedStore<MapStateKeyed>, config?: Pa};}-export function getMapRoute(assetId?: string) {- let route = "map";- if (assetId) {- route += "/" + assetId;- }-- return route;-}@customElement("page-map")export class PageMap extends Page<MapStateKeyed> {diff --git a/ui/app/manager/src/pages/page-provisioning.ts b/ui/app/manager/src/pages/page-provisioning.tsindex e83e70d3d..99f14fbaf 100644--- a/ui/app/manager/src/pages/page-provisioning.ts+++ b/ui/app/manager/src/pages/page-provisioning.ts@@ -26,7 +26,7 @@ export function pageProvisioningProvider(store: EnhancedStore<AppStateKeyed>): P}@customElement("page-provisioning")-class PageProvisioning extends Page<AppStateKeyed> {+export class PageProvisioning extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/pages/page-realms.ts b/ui/app/manager/src/pages/page-realms.tsindex a7c813a19..7748f1e27 100644--- a/ui/app/manager/src/pages/page-realms.ts+++ b/ui/app/manager/src/pages/page-realms.ts@@ -32,7 +32,7 @@ export function pageRealmsProvider(store: EnhancedStore<AppStateKeyed>): PagePro@customElement("page-realms")-class PageRealms extends Page<AppStateKeyed> {+export class PageRealms extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/pages/page-roles.ts b/ui/app/manager/src/pages/page-roles.tsindex 37992d7af..2f9b0cc3d 100644--- a/ui/app/manager/src/pages/page-roles.ts+++ b/ui/app/manager/src/pages/page-roles.ts@@ -32,7 +32,7 @@ export function pageRolesProvider(store: EnhancedStore<AppStateKeyed>): PageProv@customElement("page-roles")-class PageRoles extends Page<AppStateKeyed> {+export class PageRoles extends Page<AppStateKeyed> {static get styles() {// language=CSSreturn [diff --git a/ui/app/manager/src/pages/page-rules.ts b/ui/app/manager/src/pages/page-rules.tsindex 530b3c759..9fd63cd45 100644--- a/ui/app/manager/src/pages/page-rules.ts+++ b/ui/app/manager/src/pages/page-rules.ts@@ -59,7 +59,7 @@ export const PAGE_RULES_CONFIG_DEFAULT: PageRulesConfig = {};@customElement("page-rules")-class PageRules extends Page<AppStateKeyed> {+export class PageRules extends Page<AppStateKeyed> {static get styles() {// language=CSSdiff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.tsindex 8688fc84f..983ef5a74 100644--- a/ui/app/manager/src/pages/page-users.ts+++ b/ui/app/manager/src/pages/page-users.ts@@ -41,7 +41,7 @@ interface UserModel extends User {const RESTRICTED_USER_REALM_ROLE = "restricted_user";@customElement("page-users")-class PageUsers extends Page<AppStateKeyed> {+export class PageUsers extends Page<AppStateKeyed> {static get styles() {// language=CSSreturn [diff --git a/ui/app/manager/src/routes.ts b/ui/app/manager/src/routes.tsnew file mode 100644index 000000000..a3711ce14--- /dev/null+++ b/ui/app/manager/src/routes.ts@@ -0,0 +1,18 @@++export function getMapRoute(assetId?: string) {+ let route = "map";+ if (assetId) {+ route += "/" + assetId;+ }++ return route;+}++export function getAssetsRoute(editMode?: boolean, assetId?: string) {+ let route = "assets/" + (editMode ? "true" : "false");+ if (assetId) {+ route += "/" + assetId;+ }++ return route;+}