Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates

Rich Turner0cc4a23ff696
diff --git a/build.gradle b/build.gradle
index 7e2830e29..d0b832f95 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,11 +15,3 @@
allprojects {
apply from: "${findProject(":openremote") != null ? project(":openremote").projectDir : rootDir}/project.gradle"
}
-
-task clean {
- if (isCustomProject()) {
- doFirst {
- delete "node_modules"
- }
- }
-}
diff --git a/docker-compose.yml b/docker-compose.yml
index 7e5c4c553..7ed830a3f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,15 +13,6 @@ volumes:
postgresql-data:
btmesh-data:
-x-logging: &awslogs
- logging:
- driver: awslogs
- options:
- awslogs-region: ${AWS_REGION:-eu-west-1}
- awslogs-group: ${OR_HOSTNAME}
- awslogs-create-group: 'true'
- tag: "{{.Name}}/{{.ID}}"
-
services:
proxy:
@@ -42,7 +33,6 @@ services:
DOMAINNAMES: ${OR_ADDITIONAL_HOSTNAMES:-}
# USE A CUSTOM PROXY CONFIG - COPY FROM https://github.com/openremote/proxy/blob/main/haproxy.cfg
#HAPROXY_CONFIG: '/data/proxy/haproxy.cfg'
- <<: *awslogs
postgresql:
restart: always
@@ -50,7 +40,6 @@ services:
volumes:
- postgresql-data:/var/lib/postgresql/data
- temp-data:/tmp
- <<: *awslogs
keycloak:
restart: always
@@ -65,7 +54,6 @@ services:
KEYCLOAK_FRONTEND_URL: https://${OR_HOSTNAME:-localhost}/auth
# Use the following if OR_SSL_PORT is not the default 443
#KEYCLOAK_FRONTEND_URL: https://${OR_HOSTNAME:-localhost}:${OR_SSL_PORT:-443}/auth
- <<: *awslogs
manager:
# privileged: true
@@ -102,4 +90,3 @@ services:
# - btmesh-data:/btmesh
# devices:
# - /dev/ttyACM0:/dev/ttyS0
- <<: *awslogs
diff --git a/ui/app/console_loader/src/pages/page-mobile-geofences.ts b/ui/app/console_loader/src/pages/page-mobile-geofences.ts
index 07fd2af28..7224685af 100644
--- a/ui/app/console_loader/src/pages/page-mobile-geofences.ts
+++ b/ui/app/console_loader/src/pages/page-mobile-geofences.ts
@@ -2,7 +2,7 @@ import {css, html, PropertyValues} from "lit";
import {customElement, property} from "lit/decorators.js";
import {Page, PageProvider, AppStateKeyed} from "@openremote/or-app";
import {NavigationControl} from "maplibre-gl";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
import manager, {Util} from "@openremote/core";
import {JsonRulesetDefinition} from "@openremote/model";
import {OrMap, OrMapClickedEvent, OrMapMarker, OrMapMarkerClickedEvent} from "@openremote/or-map";
@@ -10,7 +10,7 @@ import {OrMap, OrMapClickedEvent, OrMapMarker, OrMapMarkerClickedEvent} from "@o
export interface GeofencesConfig {
}
-export function pageMobileGeofencesProvider(store: EnhancedStore<AppStateKeyed>, config?: GeofencesConfig): PageProvider<AppStateKeyed> {
+export function pageMobileGeofencesProvider(store: Store<AppStateKeyed>, config?: GeofencesConfig): PageProvider<AppStateKeyed> {
return {
name: "geofences",
routes: [
@@ -202,7 +202,7 @@ export class PageMobileGeofences extends Page<AppStateKeyed> {
return "mobile-geofences";
}
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
this.getGeoNotifications();
this.addEventListener(OrMapMarkerClickedEvent.NAME, this.onMapMarkerClick);
diff --git a/ui/app/console_loader/src/pages/page-mobile-onboarding.ts b/ui/app/console_loader/src/pages/page-mobile-onboarding.ts
index 33f180ada..211ee346e 100644
--- a/ui/app/console_loader/src/pages/page-mobile-onboarding.ts
+++ b/ui/app/console_loader/src/pages/page-mobile-onboarding.ts
@@ -1,7 +1,7 @@
import {css, html} from "lit";
import {customElement, property} from "lit/decorators.js";
import {Page, PageProvider, AppStateKeyed} from "@openremote/or-app";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
import manager from "@openremote/core";
export interface ConsoleProvider {
@@ -22,7 +22,7 @@ export interface OnboardingConfig {
redirect: string;
}
-export function pageMobileOnboardingProvider(store: EnhancedStore<AppStateKeyed>, config?: OnboardingConfig): PageProvider<AppStateKeyed> {
+export function pageMobileOnboardingProvider(store: Store<AppStateKeyed>, config?: OnboardingConfig): PageProvider<AppStateKeyed> {
return {
name: "onboarding",
routes: [
@@ -92,7 +92,7 @@ export class PageMobileOnboarding extends Page<AppStateKeyed> {
return "mobile-onboarding";
}
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
}
diff --git a/ui/app/console_loader/src/pages/page-mobile-splash.ts b/ui/app/console_loader/src/pages/page-mobile-splash.ts
index 511932fc6..54dba06eb 100644
--- a/ui/app/console_loader/src/pages/page-mobile-splash.ts
+++ b/ui/app/console_loader/src/pages/page-mobile-splash.ts
@@ -1,7 +1,7 @@
import {css, html} from "lit";
import {customElement, property} from "lit/decorators.js";
import {Page, PageProvider, AppStateKeyed} from "@openremote/or-app";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
export interface SplashConfig {
redirect: string;
@@ -9,7 +9,7 @@ export interface SplashConfig {
logoMobile?: HTMLTemplateElement | string;
}
-export function pageMobileSplashProvider(store: EnhancedStore<AppStateKeyed>, config?: SplashConfig): PageProvider<AppStateKeyed> {
+export function pageMobileSplashProvider(store: Store<AppStateKeyed>, config?: SplashConfig): PageProvider<AppStateKeyed> {
return {
name: "splash",
routes: [
@@ -42,7 +42,7 @@ export class PageMobileSplash extends Page<AppStateKeyed> {
return "mobile-splash";
}
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
}
diff --git a/ui/app/manager/src/pages/page-account.ts b/ui/app/manager/src/pages/page-account.ts
index da308751f..c25c5f086 100644
--- a/ui/app/manager/src/pages/page-account.ts
+++ b/ui/app/manager/src/pages/page-account.ts
@@ -3,11 +3,11 @@ import {customElement} from "lit/decorators.js";
import manager from "@openremote/core";
import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
import {Page, PageProvider} from "@openremote/or-app";
import {AppStateKeyed} from "@openremote/or-app";
-export function pageAccountProvider(store: EnhancedStore<AppStateKeyed>): PageProvider<AppStateKeyed> {
+export function pageAccountProvider(store: Store<AppStateKeyed>): PageProvider<AppStateKeyed> {
return {
name: "account",
routes: [
@@ -36,7 +36,7 @@ export class PageAccount extends Page<AppStateKeyed> {
return "account";
}
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
}
diff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.ts
index 81f11f5c8..b3891b7b9 100644
--- a/ui/app/manager/src/pages/page-assets.ts
+++ b/ui/app/manager/src/pages/page-assets.ts
@@ -21,7 +21,7 @@ import {
} from "@openremote/or-asset-tree";
import manager, {DefaultBoxShadow, Util} from "@openremote/core";
import {AppStateKeyed, Page, PageProvider, router} from "@openremote/or-app";
-import {EnhancedStore, createSelector} from "@reduxjs/toolkit";
+import {Store, createSelector} from "@reduxjs/toolkit";
import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
import i18next from "i18next";
import {AssetEventCause, WellknownAssets} from "@openremote/model";
@@ -33,7 +33,7 @@ export interface PageAssetsConfig {
tree?: AssetTreeConfig;
}
-export function pageAssetsProvider(store: EnhancedStore<AppStateKeyed>, config?: PageAssetsConfig): PageProvider<AppStateKeyed> {
+export function pageAssetsProvider(store: Store<AppStateKeyed>, config?: PageAssetsConfig): PageProvider<AppStateKeyed> {
return {
name: "assets",
routes: [
@@ -141,7 +141,7 @@ export class PageAssets extends Page<AppStateKeyed> {
}
)
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
this.addEventListener(OrAssetTreeRequestSelectionEvent.NAME, this._onAssetSelectionRequested);
this.addEventListener(OrAssetTreeSelectionEvent.NAME, this._onAssetSelectionChanged);
diff --git a/ui/app/manager/src/pages/page-export.ts b/ui/app/manager/src/pages/page-export.ts
index 8a386eb08..ffcaa5a78 100644
--- a/ui/app/manager/src/pages/page-export.ts
+++ b/ui/app/manager/src/pages/page-export.ts
@@ -1,7 +1,7 @@
import {css, html, unsafeCSS, TemplateResult} from "lit";
import {customElement, property} from "lit/decorators.js";
import "@openremote/or-rules";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
import {Page, PageProvider} from "@openremote/or-app";
import {AppStateKeyed} from "@openremote/or-app";
import {i18next} from "@openremote/or-translate";
@@ -15,7 +15,7 @@ import {createSelector} from "reselect";
import { showDialog } from "@openremote/or-mwc-components/or-mwc-dialog";
const tableStyle = require("@material/data-table/dist/mdc.data-table.css");
-export function pageExportProvider(store: EnhancedStore<AppStateKeyed>): PageProvider<AppStateKeyed> {
+export function pageExportProvider(store: Store<AppStateKeyed>): PageProvider<AppStateKeyed> {
return {
name: "export",
routes: [
@@ -217,7 +217,7 @@ export class PageExport extends Page<AppStateKeyed> {
return "export";
}
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
}
diff --git a/ui/app/manager/src/pages/page-gateway.ts b/ui/app/manager/src/pages/page-gateway.ts
index e1b1fd590..4469d4e60 100644
--- a/ui/app/manager/src/pages/page-gateway.ts
+++ b/ui/app/manager/src/pages/page-gateway.ts
@@ -7,9 +7,9 @@ import manager, {DefaultColor1, OREvent} from "@openremote/core";
import {InputType, OrInputChangedEvent} from "@openremote/or-mwc-components/or-mwc-input";
import {Page, PageProvider} from "@openremote/or-app";
import {AppStateKeyed} from "@openremote/or-app";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
-export function pageGatewayProvider(store: EnhancedStore<AppStateKeyed>): PageProvider<AppStateKeyed> {
+export function pageGatewayProvider(store: Store<AppStateKeyed>): PageProvider<AppStateKeyed> {
return {
name: "gateway",
routes: [
@@ -133,7 +133,7 @@ export class PageGateway extends Page<AppStateKeyed> {
return "gatewayConnection";
}
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
}
diff --git a/ui/app/manager/src/pages/page-insights.ts b/ui/app/manager/src/pages/page-insights.ts
index 4eacce05b..05d0c9d6c 100644
--- a/ui/app/manager/src/pages/page-insights.ts
+++ b/ui/app/manager/src/pages/page-insights.ts
@@ -4,7 +4,7 @@ import "@openremote/or-data-viewer";
import {DataViewerConfig, OrDataViewer} from "@openremote/or-data-viewer";
import {Page, PageProvider} from "@openremote/or-app";
import {AppStateKeyed} from "@openremote/or-app";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
import i18next from "i18next";
import {createSelector} from "reselect";
import { manager } from "@openremote/core";
@@ -13,7 +13,7 @@ export interface PageInsightsConfig {
dataViewer?: DataViewerConfig
}
-export function pageInsightsProvider(store: EnhancedStore<AppStateKeyed>, config?: PageInsightsConfig): PageProvider<AppStateKeyed> {
+export function pageInsightsProvider(store: Store<AppStateKeyed>, config?: PageInsightsConfig): PageProvider<AppStateKeyed> {
return {
name: "insights",
routes: [
@@ -104,7 +104,7 @@ export class PageInsights extends Page<AppStateKeyed> {
}
)
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
}
diff --git a/ui/app/manager/src/pages/page-logs.ts b/ui/app/manager/src/pages/page-logs.ts
index f43815e95..bf0563f6e 100644
--- a/ui/app/manager/src/pages/page-logs.ts
+++ b/ui/app/manager/src/pages/page-logs.ts
@@ -4,13 +4,13 @@ import "@openremote/or-log-viewer";
import {ViewerConfig} from "@openremote/or-log-viewer";
import {Page, PageProvider} from "@openremote/or-app";
import {AppStateKeyed} from "@openremote/or-app";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
export interface PageLogsConfig {
viewer?: ViewerConfig
}
-export function pageLogsProvider(store: EnhancedStore<AppStateKeyed>, config?: PageLogsConfig): PageProvider<AppStateKeyed> {
+export function pageLogsProvider(store: Store<AppStateKeyed>, config?: PageLogsConfig): PageProvider<AppStateKeyed> {
return {
name: "logs",
routes: [
@@ -48,7 +48,7 @@ export class PageLogs extends Page<AppStateKeyed> {
return "logs";
}
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
}
diff --git a/ui/app/manager/src/pages/page-map.ts b/ui/app/manager/src/pages/page-map.ts
index bc7384ad5..3b54a7682 100644
--- a/ui/app/manager/src/pages/page-map.ts
+++ b/ui/app/manager/src/pages/page-map.ts
@@ -1,6 +1,6 @@
import {css, html} from "lit";
import {customElement, property, query, state} from "lit/decorators.js";
-import {createSlice, EnhancedStore, PayloadAction} from "@reduxjs/toolkit";
+import {createSlice, Store, PayloadAction} from "@reduxjs/toolkit";
import "@openremote/or-map";
import {
MapAssetCardConfig,
@@ -110,7 +110,7 @@ export interface PageMapConfig {
markers?: MapMarkerAssetConfig
}
-export function pageMapProvider(store: EnhancedStore<MapStateKeyed>, config?: PageMapConfig): PageProvider<MapStateKeyed> {
+export function pageMapProvider(store: Store<MapStateKeyed>, config?: PageMapConfig): PageProvider<MapStateKeyed> {
return {
name: "map",
routes: [
@@ -334,7 +334,7 @@ export class PageMap extends Page<MapStateKeyed> {
return "map";
}
- constructor(store: EnhancedStore<MapStateKeyed>) {
+ constructor(store: Store<MapStateKeyed>) {
super(store);
this.addEventListener(OrMapAssetCardLoadAssetEvent.NAME, this.onLoadAssetEvent);
}
diff --git a/ui/app/manager/src/pages/page-provisioning.ts b/ui/app/manager/src/pages/page-provisioning.ts
index 99f14fbaf..7222a085d 100644
--- a/ui/app/manager/src/pages/page-provisioning.ts
+++ b/ui/app/manager/src/pages/page-provisioning.ts
@@ -3,7 +3,7 @@ import {customElement, state} from "lit/decorators.js";
import manager, {DefaultColor3} from "@openremote/core";
import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
import {AppStateKeyed, Page, PageProvider} from "@openremote/or-app";
import {ClientRole, ProvisioningConfig, X509ProvisioningData} from "@openremote/model";
import {i18next} from "@openremote/or-translate";
@@ -15,7 +15,7 @@ import {GenericAxiosResponse} from "@openremote/rest";
const tableStyle = require("@material/data-table/dist/mdc.data-table.css");
-export function pageProvisioningProvider(store: EnhancedStore<AppStateKeyed>): PageProvider<AppStateKeyed> {
+export function pageProvisioningProvider(store: Store<AppStateKeyed>): PageProvider<AppStateKeyed> {
return {
name: "provisioning",
routes: ["provisioning"],
diff --git a/ui/app/manager/src/pages/page-realms.ts b/ui/app/manager/src/pages/page-realms.ts
index 7748f1e27..edb04b9e4 100644
--- a/ui/app/manager/src/pages/page-realms.ts
+++ b/ui/app/manager/src/pages/page-realms.ts
@@ -9,7 +9,7 @@ import {customElement, property} from "lit/decorators.js";
import manager, { OREvent, DefaultColor3 } from "@openremote/core";
import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
-import { EnhancedStore } from "@reduxjs/toolkit";
+import { Store } from "@reduxjs/toolkit";
import {Page, PageProvider} from "@openremote/or-app";
import {AppStateKeyed} from "@openremote/or-app";
import { ClientRole, Tenant } from "@openremote/model";
@@ -20,7 +20,7 @@ import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
const tableStyle = require("@material/data-table/dist/mdc.data-table.css");
-export function pageRealmsProvider(store: EnhancedStore<AppStateKeyed>): PageProvider<AppStateKeyed> {
+export function pageRealmsProvider(store: Store<AppStateKeyed>): PageProvider<AppStateKeyed> {
return {
name: "realms",
routes: ["realms"],
@@ -222,7 +222,7 @@ export class PageRealms extends Page<AppStateKeyed> {
return "realm_plural";
}
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
this._getTenants();
}
diff --git a/ui/app/manager/src/pages/page-roles.ts b/ui/app/manager/src/pages/page-roles.ts
index 9d9919b84..9bdc31230 100644
--- a/ui/app/manager/src/pages/page-roles.ts
+++ b/ui/app/manager/src/pages/page-roles.ts
@@ -9,7 +9,7 @@ import {customElement, property, state} from "lit/decorators.js";
import manager, { OREvent, DefaultColor3 } from "@openremote/core";
import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
-import { EnhancedStore } from "@reduxjs/toolkit";
+import { Store } from "@reduxjs/toolkit";
import {Page, PageProvider} from "@openremote/or-app";
import {AppStateKeyed} from "@openremote/or-app";
import { ClientRole, Role } from "@openremote/model";
@@ -20,7 +20,7 @@ import {showOkCancelDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
const tableStyle = require("@material/data-table/dist/mdc.data-table.css");
-export function pageRolesProvider(store: EnhancedStore<AppStateKeyed>): PageProvider<AppStateKeyed> {
+export function pageRolesProvider(store: Store<AppStateKeyed>): PageProvider<AppStateKeyed> {
return {
name: "roles",
routes: ["roles"],
diff --git a/ui/app/manager/src/pages/page-rules.ts b/ui/app/manager/src/pages/page-rules.ts
index 9fd63cd45..bb39d96f8 100644
--- a/ui/app/manager/src/pages/page-rules.ts
+++ b/ui/app/manager/src/pages/page-rules.ts
@@ -3,7 +3,7 @@ import {customElement, property, query} from "lit/decorators.js";
import "@openremote/or-rules";
import {OrRules, RulesConfig} from "@openremote/or-rules";
import {NotificationTargetType, RulesetLang, WellknownAssets} from "@openremote/model";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
import {Page, PageProvider} from "@openremote/or-app";
import {AppStateKeyed} from "@openremote/or-app";
import manager from "@openremote/core";
@@ -13,7 +13,7 @@ export interface PageRulesConfig {
rules: RulesConfig;
}
-export function pageRulesProvider(store: EnhancedStore<AppStateKeyed>, config: PageRulesConfig = PAGE_RULES_CONFIG_DEFAULT): PageProvider<AppStateKeyed> {
+export function pageRulesProvider(store: Store<AppStateKeyed>, config: PageRulesConfig = PAGE_RULES_CONFIG_DEFAULT): PageProvider<AppStateKeyed> {
return {
name: "rules",
routes: [
@@ -96,7 +96,7 @@ export class PageRules extends Page<AppStateKeyed> {
return "rules";
}
- constructor(store: EnhancedStore<AppStateKeyed>) {
+ constructor(store: Store<AppStateKeyed>) {
super(store);
}
diff --git a/ui/app/manager/src/pages/page-users.ts b/ui/app/manager/src/pages/page-users.ts
index 3305772f9..71b77a204 100644
--- a/ui/app/manager/src/pages/page-users.ts
+++ b/ui/app/manager/src/pages/page-users.ts
@@ -3,7 +3,7 @@ import {customElement, property, state} from "lit/decorators.js";
import manager, {DefaultColor3, Util} from "@openremote/core";
import "@openremote/or-components/or-panel";
import "@openremote/or-translate";
-import {EnhancedStore} from "@reduxjs/toolkit";
+import {Store} from "@reduxjs/toolkit";
import {AppStateKeyed, Page, PageProvider} from "@openremote/or-app";
import {ClientRole, RealmRole, Role, User, UserAssetLink, UserQuery} from "@openremote/model";
import {i18next} from "@openremote/or-translate";
@@ -16,7 +16,7 @@ import {OrAssetTreeSelectionEvent} from "@openremote/or-asset-tree";
const tableStyle = require("@material/data-table/dist/mdc.data-table.css");
-export function pageUsersProvider(store: EnhancedStore<AppStateKeyed>): PageProvider<AppStateKeyed> {
+export function pageUsersProvider(store: Store<AppStateKeyed>): PageProvider<AppStateKeyed> {
return {
name: "users",
routes: ["users"],
diff --git a/ui/component/or-app/package.json b/ui/component/or-app/package.json
index f05deebf8..1dfb0a92b 100644
--- a/ui/component/or-app/package.json
+++ b/ui/component/or-app/package.json
@@ -31,7 +31,7 @@
"@openremote/or-smart-notify": "^1.0.4",
"@openremote/or-timeline": "^1.0.4",
"@openremote/rest": "workspace:*",
- "@reduxjs/toolkit": "^1.6.2",
+ "@reduxjs/toolkit": "^1.8.1",
"@webcomponents/webcomponentsjs": "^2.6.0",
"lit": "^2.0.2",
"moment": "^2.24.0",
diff --git a/ui/component/or-app/src/index.ts b/ui/component/or-app/src/index.ts
index eba7b79e9..5b7073ddc 100644
--- a/ui/component/or-app/src/index.ts
+++ b/ui/component/or-app/src/index.ts
@@ -19,7 +19,7 @@ import manager, {Auth, DefaultColor2, DefaultColor3, DefaultColor4, ManagerConfi
import {DEFAULT_LANGUAGES, HeaderConfig} from "./or-header";
import {OrMwcDialog, showErrorDialog, showDialog} from "@openremote/or-mwc-components/or-mwc-dialog";
import {OrMwcSnackbar} from "@openremote/or-mwc-components/or-mwc-snackbar";
-import {AnyAction, EnhancedStore, Unsubscribe} from "@reduxjs/toolkit";
+import {AnyAction, Store, Unsubscribe} from "@reduxjs/toolkit";
import {ThunkMiddleware} from "redux-thunk";
import {AppStateKeyed, updatePage, updateRealm} from "./app";
import { InputType, OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
@@ -98,7 +98,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
protected _activeMenu?: string;
protected _realms!: Tenant[];
- protected _store: EnhancedStore<S, AnyAction, ReadonlyArray<ThunkMiddleware<S>>>;
+ protected _store: Store<S, AnyAction>;
protected _storeUnsubscribe!: Unsubscribe;
// language=CSS
@@ -150,7 +150,7 @@ export class OrApp<S extends AppStateKeyed> extends LitElement {
`;
}
- constructor(store: EnhancedStore<S, AnyAction, ReadonlyArray<ThunkMiddleware<S>>>) {
+ constructor(store: Store<S, AnyAction>) {
super();
this._store = store;
diff --git a/ui/component/or-app/src/or-header.ts b/ui/component/or-app/src/or-header.ts
index 5b5e1e1ba..5bec0b572 100644
--- a/ui/component/or-app/src/or-header.ts
+++ b/ui/component/or-app/src/or-header.ts
@@ -16,7 +16,7 @@ import {getContentWithMenuTemplate} from "@openremote/or-mwc-components/or-mwc-m
import {ListItem} from "@openremote/or-mwc-components/or-mwc-list";
import {Tenant} from "@openremote/model";
import {AppStateKeyed, router, updateRealm} from "./index";
-import {AnyAction, EnhancedStore} from "@reduxjs/toolkit";
+import {AnyAction, Store} from "@reduxjs/toolkit";
import {ThunkMiddleware} from "redux-thunk";
export interface HeaderConfig {
@@ -341,7 +341,7 @@ export class OrHeader extends LitElement {
public realm!: string;
@property({type: Object})
- public store!: EnhancedStore<AppStateKeyed, AnyAction, ReadonlyArray<ThunkMiddleware<AppStateKeyed>>>;
+ public store!: Store<AppStateKeyed, AnyAction>;
@property({type: String})
public logo?: string;
diff --git a/ui/component/or-app/src/types.ts b/ui/component/or-app/src/types.ts
index fad20f298..67eaa4abc 100644
--- a/ui/component/or-app/src/types.ts
+++ b/ui/component/or-app/src/types.ts
@@ -1,10 +1,9 @@
import {HeaderConfig, Languages} from "./or-header";
import {AppStateKeyed} from "./app";
-import { TemplateResult, LitElement } from "lit";
+import {LitElement, TemplateResult} from "lit";
import i18next from "i18next";
-import { translate } from "@openremote/or-translate";
-import { EnhancedStore, AnyAction, Unsubscribe } from "@reduxjs/toolkit";
-import {ThunkMiddleware} from "redux-thunk";
+import {translate} from "@openremote/or-translate";
+import {AnyAction, Store, Unsubscribe} from "@reduxjs/toolkit";
import Navigo from "navigo";
// Configure routing
@@ -41,11 +40,11 @@ export abstract class Page<S extends AppStateKeyed> extends translate(i18next)(L
abstract get name(): string;
- protected _store: EnhancedStore<S, AnyAction, ReadonlyArray<ThunkMiddleware<S>>>;
+ protected _store: Store<S, AnyAction>;
protected _storeUnsubscribe!: Unsubscribe;
- constructor(store: EnhancedStore<S, AnyAction, ReadonlyArray<ThunkMiddleware<S>>>) {
+ constructor(store: Store<S, AnyAction>) {
super();
this._store = store;
}
diff --git a/ui/tsconfig.json b/ui/tsconfig.json
index 78206272d..007bcbc88 100644
--- a/ui/tsconfig.json
+++ b/ui/tsconfig.json
@@ -9,7 +9,6 @@
"es2017",
"es2019"
],
- "noEmitOnError": true,
"strict": true,
"declaration": true,
"sourceMap": true,
diff --git a/yarn.lock b/yarn.lock
index 40a598d95..cd66ea7fe 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3157,7 +3157,7 @@ __metadata:
"@openremote/or-timeline": ^1.0.4
"@openremote/rest": "workspace:*"
"@openremote/util": "workspace:*"
- "@reduxjs/toolkit": ^1.6.2
+ "@reduxjs/toolkit": ^1.8.1
"@webcomponents/webcomponentsjs": ^2.6.0
lit: ^2.0.2
moment: ^2.24.0
@@ -3581,23 +3581,23 @@ __metadata:
languageName: node
linkType: hard
-"@reduxjs/toolkit@npm:^1.6.2":
- version: 1.7.1
- resolution: "@reduxjs/toolkit@npm:1.7.1"
+"@reduxjs/toolkit@npm:^1.8.1":
+ version: 1.8.1
+ resolution: "@reduxjs/toolkit@npm:1.8.1"
dependencies:
immer: ^9.0.7
redux: ^4.1.2
redux-thunk: ^2.4.1
reselect: ^4.1.5
peerDependencies:
- react: ^16.9.0 || ^17.0.0 || 18.0.0-beta
+ react: ^16.9.0 || ^17.0.0 || ^18
react-redux: ^7.2.1 || ^8.0.0-beta
peerDependenciesMeta:
react:
optional: true
react-redux:
optional: true
- checksum: 77e027b9480e83e503509863eb6480ffae7766180c0e746c3a055df4571ebf1dd1cd9f2323399edea6e6cb3be86c7394218a75d8e3f25be3f9c1d67b596ee381
+ checksum: be5cdea975a8a631fe2d88cafc7077554c7bc3621a4a7031556cc17e5dec26359018f2614c325895e7ab50865f5c511025d1e589ca01de7e2bd88d95e0a1a963
languageName: node
linkType: hard