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
Minor
Rich Turner47cbc496bd2a
diff --git a/model/src/main/java/org/openremote/model/value/ValueType.java b/model/src/main/java/org/openremote/model/value/ValueType.javaindex 95d526b93..73e0bef93 100644--- a/model/src/main/java/org/openremote/model/value/ValueType.java+++ b/model/src/main/java/org/openremote/model/value/ValueType.java@@ -36,6 +36,7 @@ import org.openremote.model.auth.UsernamePassword;import org.openremote.model.calendar.CalendarEvent;import org.openremote.model.console.ConsoleProviders;import org.openremote.model.geo.GeoJSONPoint;+import org.openremote.model.query.AssetQuery;import org.openremote.model.util.CronExpressionParser;import org.openremote.model.util.TsIgnore;import org.openremote.model.value.impl.*;@@ -202,6 +203,8 @@ public final class ValueType {new ValueConstraint.Pattern(Constants.WS_URL_REGEXP));+ public static final ValueDescriptor<AssetQuery> ASSET_QUERY = new ValueDescriptor<>("assetQuery", AssetQuery.class);+protected ValueType() {}}diff --git a/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy b/test/src/test/groovy/org/openremote/test/rules/RulesExecutionFailureTest.groovysimilarity index 99%rename from test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovyrename to test/src/test/groovy/org/openremote/test/rules/RulesExecutionFailureTest.groovyindex 88f26fb49..ef924a573 100644--- a/test/src/test/groovy/org/openremote/test/failure/RulesExecutionFailureTest.groovy+++ b/test/src/test/groovy/org/openremote/test/rules/RulesExecutionFailureTest.groovy@@ -1,4 +1,4 @@-package org.openremote.test.failure+package org.openremote.test.rulesimport org.openremote.manager.rules.*import org.openremote.manager.setup.SetupServicediff --git a/ui/component/or-json-forms/src/util.ts b/ui/component/or-json-forms/src/util.tsindex 2c5024d63..6b60ab7b1 100644--- a/ui/component/or-json-forms/src/util.ts+++ b/ui/component/or-json-forms/src/util.ts@@ -112,7 +112,7 @@ export function getCombinatorInfos(schemas: JsonSchema[], rootSchema: JsonSchema}return {- title: i18next.t("schema.title." + titleAndDescription[0], {defaultValue: Util.camelCaseToSentenceCase(titleAndDescription[0])}),+ title: titleAndDescription[0],description: titleAndDescription[1],defaultValueCreator: creator,constProperty: constProperty,@@ -170,7 +170,7 @@ export function findSchemaTitleAndDescription(schema: JsonSchema, rootSchema: Js}}- return [title, undefined];+ return [i18next.t("schema.title." + title, {defaultValue: Util.camelCaseToSentenceCase(title)}), undefined];}function getLabelFromScopeOrRef(scopeOrRef: string) {