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 dependency issue
Rich Turner373640329101
diff --git a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.javaindex ff4de5b50..8235b8412 100644--- a/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java+++ b/model/src/main/java/org/openremote/model/asset/impl/GroupAsset.java@@ -22,7 +22,10 @@ package org.openremote.model.asset.impl;import org.openremote.model.asset.Asset;import org.openremote.model.asset.AssetDescriptor;import org.openremote.model.attribute.Attribute;+import org.openremote.model.attribute.MetaItem;import org.openremote.model.value.AttributeDescriptor;+import org.openremote.model.value.MetaItemType;+import org.openremote.model.value.ValueConstraint;import org.openremote.model.value.ValueType;import javax.persistence.Entity;@@ -38,6 +41,11 @@ public class GroupAsset extends Asset<GroupAsset> {public static final AttributeDescriptor<String> CHILD_ASSET_TYPE = new AttributeDescriptor<>("childAssetType", ValueType.TEXT);public static final AssetDescriptor<GroupAsset> DESCRIPTOR = new AssetDescriptor<>("folder", "B3B3B3", GroupAsset.class);+// static {+// // How to get all asset types+// CHILD_ASSET_TYPE.withConstraints(new ValueConstraint.AllowedValues())+// }+/*** For use by hydrators (i.e. JPA/Jackson)*/diff --git a/ui/component/or-asset-viewer/package.json b/ui/component/or-asset-viewer/package.jsonindex 51dfa598a..de183007e 100644--- a/ui/component/or-asset-viewer/package.json+++ b/ui/component/or-asset-viewer/package.json@@ -19,7 +19,6 @@"@openremote/or-attribute-input": "^1.0.4","@openremote/or-chart": "^1.0.4","@openremote/or-icon": "^1.0.3",- "@openremote/or-mwc-components/or-mwc-input": "^1.0.3","@openremote/or-mwc-components": "^1.0.3","@openremote/or-panel": "^1.0.3","@openremote/or-survey": "^1.0.3",diff --git a/ui/component/or-attribute-card/package.json b/ui/component/or-attribute-card/package.jsonindex 913ac6824..6be6396b1 100644--- a/ui/component/or-attribute-card/package.json+++ b/ui/component/or-attribute-card/package.json@@ -15,7 +15,7 @@"dependencies": {"@openremote/core": "^1.0.3","@openremote/or-chart": "^1.0.4",- "@openremote/or-mwc-components/or-mwc-input": "^1.0.3",+ "@openremote/or-mwc-components": "^1.0.3","lit-element": "^2.4.0","moment": "^2.24.0"},diff --git a/ui/component/or-attribute-history/package.json b/ui/component/or-attribute-history/package.jsonindex c81931386..16fde90a3 100644--- a/ui/component/or-attribute-history/package.json+++ b/ui/component/or-attribute-history/package.json@@ -14,7 +14,7 @@"dependencies": {"@material/data-table": "^9.0.0","@openremote/core": "^1.0.3",- "@openremote/or-mwc-components/or-mwc-input": "^1.0.3",+ "@openremote/or-mwc-components": "^1.0.3","@openremote/or-panel": "^1.0.3","@openremote/or-translate": "^1.0.3","chart.js": "^2.8.0",diff --git a/ui/component/or-attribute-input/package.json b/ui/component/or-attribute-input/package.jsonindex 9acd312a8..37678a0d0 100644--- a/ui/component/or-attribute-input/package.json+++ b/ui/component/or-attribute-input/package.json@@ -13,7 +13,7 @@"license": "AGPL-3.0-or-later","dependencies": {"@openremote/core": "^1.0.3",- "@openremote/or-mwc-components/or-mwc-input": "^1.0.3",+ "@openremote/or-mwc-components": "^1.0.3","@openremote/or-map": "^1.0.4","@openremote/or-translate": "^1.0.3","lit-element": "^2.4.0"diff --git a/ui/component/or-chart/package.json b/ui/component/or-chart/package.jsonindex 1d8f18b3c..dd1d89366 100644--- a/ui/component/or-chart/package.json+++ b/ui/component/or-chart/package.json@@ -17,7 +17,6 @@"@openremote/core": "^1.0.3","@openremote/or-asset-tree": "^1.0.4","@openremote/or-icon": "^1.0.3",- "@openremote/or-mwc-components/or-mwc-input": "^1.0.3","@openremote/or-mwc-components": "^1.0.3","@openremote/or-panel": "^1.0.3","@openremote/or-translate": "^1.0.3",diff --git a/ui/component/or-data-viewer/package.json b/ui/component/or-data-viewer/package.jsonindex 6a654f922..6df738cc0 100644--- a/ui/component/or-data-viewer/package.json+++ b/ui/component/or-data-viewer/package.json@@ -19,7 +19,7 @@"@openremote/or-attribute-input": "^1.0.4","@openremote/or-chart": "^1.0.4","@openremote/or-icon": "^1.0.3",- "@openremote/or-mwc-components/or-mwc-input": "^1.0.3",+ "@openremote/or-mwc-components": "^1.0.3","@openremote/or-map": "^1.0.4","@openremote/or-panel": "^1.0.3","@openremote/or-translate": "^1.0.3",diff --git a/ui/component/or-map/package.json b/ui/component/or-map/package.jsonindex b78048932..2ac667fb2 100644--- a/ui/component/or-map/package.json+++ b/ui/component/or-map/package.json@@ -16,7 +16,6 @@"@openremote/core": "^1.0.3","@openremote/model": "^1.0.3","@openremote/or-icon": "^1.0.3",- "@openremote/or-mwc-components/or-mwc-input": "^1.0.3","@openremote/or-mwc-components": "^1.0.3","@openremote/or-translate": "^1.0.3","@openremote/rest": "^1.0.3",diff --git a/ui/component/or-rules/package.json b/ui/component/or-rules/package.jsonindex 598a6ce02..622de06eb 100644--- a/ui/component/or-rules/package.json+++ b/ui/component/or-rules/package.json@@ -16,7 +16,6 @@"@openremote/model": "^1.0.3","@openremote/or-attribute-input": "^1.0.4","@openremote/or-icon": "^1.0.3",- "@openremote/or-mwc-components/or-mwc-input": "^1.0.3","@openremote/or-mwc-components": "^1.0.3","@openremote/or-panel": "^1.0.3","@openremote/or-translate": "^1.0.3",