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
Bug fix for AssetQuery with meta name negated when attribute has no meta items
Rich Turner7a763202bffd
diff --git a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.javaindex 577f41694..faf3dcc62 100644--- a/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java+++ b/manager/src/main/java/org/openremote/manager/asset/AssetStorageService.java@@ -1623,7 +1623,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServic}isFirst = false;- selectInserter.accept(groupIndex > 0 ? ", jsonb_each(A.attributes) as AX" + groupIndex : "jsonb_each(A.attributes) as AX" + groupIndex);+ selectInserter.accept((groupIndex > 0 ? ", " : "") + "jsonb_each(A.attributes) as AX" + groupIndex);containsCalendarPredicate = !containsCalendarPredicate && addNameValuePredicates(group, sb, binders, "AX" + groupIndex, selectInserter, operator == LogicGroup.Operator.OR, timeProvider);groupIndex++;}@@ -1666,7 +1666,7 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicif (attributePredicate.meta != null && attributePredicate.meta.length > 0) {String metaJsonObjName = jsonObjName + "_AM" + metaIndex++;- selectInserter.accept(", jsonb_each(" + jsonObjName + ".VALUE #> '{meta}') as " + metaJsonObjName);+ selectInserter.accept(" LEFT JOIN jsonb_each(" + jsonObjName + ".VALUE #> '{meta}') as " + metaJsonObjName + " ON true");sb.append(" and (");addNameValuePredicates(Arrays.asList(attributePredicate.meta.clone()), sb, binders, metaJsonObjName, selectInserter, true, timeProvider);sb.append(")");@@ -1929,6 +1929,11 @@ public class AssetStorageService extends RouteBuilder implements ContainerServicif (nameValuePredicate.negated) {attributeBuilder.append(")");++ if (nameValuePredicate.value == null) {+ // We have to include `is null` in where clause also as technically name not equals X is satisfied by null - mostly useful for meta items+ attributeBuilder.append(" or ").append(jsonObjName).append(".key IS NULL");+ }}return attributeBuilder.toString();diff --git a/ui/app/manager/src/pages/page-map.ts b/ui/app/manager/src/pages/page-map.tsindex 549b6359b..d835808ef 100644--- a/ui/app/manager/src/pages/page-map.ts+++ b/ui/app/manager/src/pages/page-map.ts@@ -181,33 +181,24 @@ export class PageMap<S extends MapStateKeyed> extends Page<S> {name: {predicateType: "string",value: WellknownAttributes.LOCATION- }- }- ],- groups: [- {- operator: LogicGroupOperator.OR,- items: [+ },+ meta: [+ {+ name: {+ predicateType: "string",+ value: WellknownMetaItems.SHOWONDASHBOARD+ },+ negated: true+ },{- meta: [- {- name: {- predicateType: "string",- value: WellknownMetaItems.SHOWONDASHBOARD- },- negated: true- },- {- name: {- predicateType: "string",- value: WellknownMetaItems.SHOWONDASHBOARD- },- value: {- predicateType: "boolean",- value: true- }- }- ]+ name: {+ predicateType: "string",+ value: WellknownMetaItems.SHOWONDASHBOARD+ },+ value: {+ predicateType: "boolean",+ value: true+ }}]}