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: Fix package versioning
Rich Turnerf95e7989d9dc
diff --git a/ui/app/main/package.json b/ui/app/main/package.jsonindex 98572481d..e17a88d24 100644--- a/ui/app/main/package.json+++ b/ui/app/main/package.json@@ -15,7 +15,7 @@"test": "echo \"Error: no test specified\" && exit 1"},"dependencies": {- "@openremote/or-app": "^1.1.0"+ "@openremote/or-app": "^1.0.3"},"devDependencies": {"@babel/core": "^7.2.2",diff --git a/ui/app/mobile/package.json b/ui/app/mobile/package.jsonindex 8e7bf9030..b3c20d86c 100644--- a/ui/app/mobile/package.json+++ b/ui/app/mobile/package.json@@ -15,7 +15,7 @@"test": "echo \"Error: no test specified\" && exit 1"},"dependencies": {- "@openremote/or-app": "^1.1.0"+ "@openremote/or-app": "^1.0.3"},"devDependencies": {"@babel/core": "^7.2.2",diff --git a/ui/app/or-app/package.json b/ui/app/or-app/package.jsonindex 35f1ddcfe..3dda732f8 100644--- a/ui/app/or-app/package.json+++ b/ui/app/or-app/package.json@@ -18,15 +18,15 @@"test": "echo \"Error: no test specified\" && exit 1"},"dependencies": {- "@openremote/core": "^1.1.0",- "@openremote/or-asset-tree": "^1.1.0",- "@openremote/or-asset-viewer": "^1.1.0",- "@openremote/or-chart": "^1.1.0",- "@openremote/or-map": "^1.1.0",- "@openremote/or-rules": "^1.1.0",- "@openremote/or-smart-notify": "^1.1.0",- "@openremote/or-timeline": "^1.1.0",- "@openremote/rest": "^1.1.0",+ "@openremote/core": "^1.0.3",+ "@openremote/or-asset-tree": "^1.0.3",+ "@openremote/or-asset-viewer": "^1.0.3",+ "@openremote/or-chart": "^1.0.3",+ "@openremote/or-map": "^1.0.3",+ "@openremote/or-rules": "^1.0.3",+ "@openremote/or-smart-notify": "^1.0.3",+ "@openremote/or-timeline": "^1.0.3",+ "@openremote/rest": "^1.0.3","@reduxjs/toolkit": "^1.3.6","@types/navigo": "^7.0.1","@webcomponents/webcomponentsjs": "^2.2.10",diff --git a/ui/app/or-app/src/pages/page-assets.ts b/ui/app/or-app/src/pages/page-assets.tsindex 48d56d73e..e6f0c03b9 100644--- a/ui/app/or-app/src/pages/page-assets.ts+++ b/ui/app/or-app/src/pages/page-assets.ts@@ -135,8 +135,13 @@ class PageAssets<S extends AppStateKeyed> extends Page<S> {event.detail.allow = false;const assetId = event.detail.detail.node.asset.id;const action = () => {- this._assetId = assetId;- this._updateRoute(false);+ if (this._assetId === assetId && this._viewer.isModified()) {+ // User has selected the same asset so reload it to discard changes+ this._viewer.reloadAsset();+ } else {+ this._assetId = assetId;+ this._updateRoute(false);+ }};this._checkIfModified(action);}diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex 105efb252..0429f5cfa 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -1,7 +1,7 @@// Declare require method which we'll use for importing webpack resources (using ES6 imports will confuse typescript parser)declare function require(name: string): any;-import {customElement, html, LitElement, property, PropertyValues, TemplateResult, unsafeCSS} from "lit-element";+import {customElement, html, LitElement, property, PropertyValues, TemplateResult, unsafeCSS, query} from "lit-element";import "@openremote/or-icon";import "@openremote/or-input";import "@openremote/or-attribute-input";@@ -754,6 +754,12 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemprotected _attributes?: Attribute[];protected resizeHandler = () => OrAssetViewer.generateGrid(this.shadowRoot);+ @query("#wrapper")+ protected wrapperElem!: HTMLDivElement;++ @query("#save-btn")+ protected saveBtnElem!: OrInput;+constructor() {super();this.addEventListener(OrAssetViewerComputeGridEvent.NAME, () => OrAssetViewer.generateGrid(this.shadowRoot));@@ -875,7 +881,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemsuper.assetIds = undefined;}} else if (_changedProperties.has("editMode") && !this.editMode) {- this._reloadAsset();+ this.reloadAsset();}this.onCompleted().then(() => {@@ -885,7 +891,7 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElem});}- protected _reloadAsset() {+ public reloadAsset() {this.asset = undefined;this._assetModified = false;if (this.assetId) {@@ -906,14 +912,19 @@ export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElemif (!this.asset) {return;}++ this.saveBtnElem.disabled = true;+ this.wrapperElem.classList.add("saving");const response = await manager.rest.api.AssetResource.update(this.asset.id!, this.asset);+ this.wrapperElem.classList.remove("saving");+ this.saveBtnElem.disabled = false;this.dispatchEvent(new OrAssetViewerSaveResultEvent({asset: this.asset,statusCode: response.status}));if (response.status === 204) {- this._reloadAsset();+ this.reloadAsset();}}diff --git a/ui/component/or-asset-viewer/src/style.ts b/ui/component/or-asset-viewer/src/style.tsindex 56467cadf..a811556f9 100644--- a/ui/component/or-asset-viewer/src/style.ts+++ b/ui/component/or-asset-viewer/src/style.ts@@ -80,6 +80,11 @@ export const style = css`overflow: auto;}+ #wrapper.saving {+ opacity: 0.5;+ pointer-events: none;+ }+#container {box-sizing: border-box;display: grid;diff --git a/ui/demo/demo-core/package.json b/ui/demo/demo-core/package.jsonindex fa4ddc9fc..194689432 100644--- a/ui/demo/demo-core/package.json+++ b/ui/demo/demo-core/package.json@@ -15,9 +15,9 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {- "@openremote/core": "^1.1.0",- "@openremote/or-icon": "^1.1.0",- "@openremote/or-translate": "^1.1.0",+ "@openremote/core": "^1.0.3",+ "@openremote/or-icon": "^1.0.3",+ "@openremote/or-translate": "^1.0.3","i18next": "^15.0.9","lit-element": "^2.4.0"},diff --git a/ui/demo/demo-or-map/package.json b/ui/demo/demo-or-map/package.jsonindex 15692fc51..be8126172 100644--- a/ui/demo/demo-or-map/package.json+++ b/ui/demo/demo-or-map/package.json@@ -14,8 +14,8 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {- "@openremote/demo-core": "^1.1.0",- "@openremote/or-map": "^1.1.0"+ "@openremote/demo-core": "^1.0.3",+ "@openremote/or-map": "^1.0.3"},"devDependencies": {"@babel/core": "^7.2.2",diff --git a/ui/demo/demo-or-thermostat/package.json b/ui/demo/demo-or-thermostat/package.jsonindex 1b6a01612..7152c969d 100644--- a/ui/demo/demo-or-thermostat/package.json+++ b/ui/demo/demo-or-thermostat/package.json@@ -14,7 +14,7 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {- "@openremote/or-thermostat": "^1.1.0",+ "@openremote/or-thermostat": "^1.0.3","source-map-loader": "^0.2.4"},"devDependencies": {diff --git a/ui/demo/demo-rest/package.json b/ui/demo/demo-rest/package.jsonindex 6e602173c..f1fc4c706 100644--- a/ui/demo/demo-rest/package.json+++ b/ui/demo/demo-rest/package.json@@ -15,7 +15,7 @@"author": "OpenRemote","license": "AGPL-3.0-or-later","dependencies": {- "@openremote/rest": "^1.1.0",+ "@openremote/rest": "^1.0.3","lit-element": "^2.4.0"},"devDependencies": {