Skip to content

Commit 4834d94

Browse files
committed
Updated to latest openremote submodule
1 parent 1523b48 commit 4834d94

File tree

5 files changed

+841
-399
lines changed

5 files changed

+841
-399
lines changed

.gitmodules

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[submodule "openremote"]
2-
path = openremote
3-
url = [email protected]:openremote/openremote.git
4-
branch = master
2+
path = openremote
3+
url = [email protected]:openremote/openremote.git
4+
branch = master
55
update = rebase

openremote

Submodule openremote updated 384 files

ui/app/custom/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"clean": "npx tsc -b --clean && npx shx rm -rf dist",
1313
"modelBuild": "npx orutil build",
1414
"modelWatch": "npx orutil watch",
15-
"build": "npx tsc -b -f && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",
15+
"build": "npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack --mode production",
1616
"serve": "npx tsc -b --clean && npx shx rm -rf dist && npx orutil build && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --mode development",
1717
"serveNoModelBuild": "npx tsc -b --clean && npx cross-env NODE_OPTIONS=--max_old_space_size=4096 webpack serve --mode development",
1818
"test": "echo \"Error: no test specified\" && exit 1"

ui/app/custom/src/index.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ import {combineReducers, configureStore} from "@reduxjs/toolkit";
33
import "@openremote/or-app";
44
import {AnyAction, appReducer, AppStateKeyed, HeaderConfig, HeaderItem, OrApp, PageProvider, RealmAppConfig} from "@openremote/or-app";
55
import {headerItemAccount, headerItemLanguage, headerItemLogout, headerItemMap, headerItemAssets} from "@openremote/manager/headers";
6-
import {pageAssetsProvider} from "@openremote/manager/pages/page-assets";
6+
import {pageAssetsReducer, pageAssetsProvider} from "@openremote/manager/pages/page-assets";
77
import {pageMapReducer, pageMapProvider} from "@openremote/manager/pages/page-map";
88
import "./pages/page-custom";
99
import {pageCustomProvider} from "./pages/page-custom";
1010

1111
const rootReducer = combineReducers({
1212
app: appReducer,
13-
map: pageMapReducer
13+
map: pageMapReducer,
14+
assets: pageAssetsReducer
1415
});
1516

1617
type RootState = ReturnType<typeof rootReducer>;

0 commit comments

Comments
 (0)