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: build config and minor or-rules update
Rich Turner6056b82fcf1f
diff --git a/ui/component/model/build.gradle b/ui/component/model/build.gradleindex 00f7a2632..550962cf0 100644--- a/ui/component/model/build.gradle+++ b/ui/component/model/build.gradle@@ -16,7 +16,9 @@ buildscript {dependencies {compile resolveProject(":model")- compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"+ compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"+ compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"+ compile "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"compile "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"}@@ -45,6 +47,7 @@ generateTypeScript {]optionalProperties = "all" // TODO: cleanup model to be more explicit about optional paramsmapEnum = cz.habarta.typescript.generator.EnumMapping.asEnum+ mapDate = cz.habarta.typescript.generator.DateMapping.asNumberoutputFile = "src/index.ts"outputFileType = "implementationFile"outputKind = "module"@@ -57,6 +60,8 @@ generateTypeScript {]jackson2Modules = ["com.fasterxml.jackson.datatype.jdk8.Jdk8Module",+ "com.fasterxml.jackson.datatype.jsr310.JavaTimeModule",+ "com.fasterxml.jackson.module.paramnames.ParameterNamesModule","org.openremote.model.ModelModule"]extensionsWithConfiguration = [diff --git a/ui/component/model/package.json b/ui/component/model/package.jsonindex 9447143e7..4132591d7 100644--- a/ui/component/model/package.json+++ b/ui/component/model/package.json@@ -6,6 +6,7 @@"module": "dist/index.js","types": "dist/index.d.ts","scripts": {+ "build": "npx tsc -b","test": "echo \"No tests\" && exit 0","prepublishOnly": "npx tsc -b"},diff --git a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.tsindex 5a19cd2a6..d02d803a2 100644--- a/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts+++ b/ui/component/or-rules/src/json-viewer/or-rule-asset-query.ts@@ -205,7 +205,7 @@ export class OrRuleAssetQuery extends translate(i18next)(LitElement) {case "string":return getAttributeValueTemplate(assetType, { name: attributeName! }, this.readonly || false, false, (v: any) => this.setValuePredicateProperty(valuePredicate, "value", v), this.config ? this.config.inputProvider : undefined, undefined, i18next.t("string"))(value);case "boolean":- return html `<span>NOT IMPLEMENTED</span>`;+ return html ``; // Handled by the operator IS_TRUE or IS_FALSEcase "datetime":return html `<span>NOT IMPLEMENTED</span>`;case "number":diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradleindex 823447bc0..b99bc939a 100644--- a/ui/component/rest/build.gradle+++ b/ui/component/rest/build.gradle@@ -15,6 +15,8 @@ dependencies {compile resolveProject(":model")compile "cz.habarta.typescript-generator:typescript-generator-core:$typescriptGeneratorVersion"compile "com.fasterxml.jackson.datatype:jackson-datatype-jdk8:$jacksonVersion"+ compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion"+ compile "com.fasterxml.jackson.module:jackson-module-parameter-names:$jacksonVersion"}task generateTypescriptModelInfo(type: cz.habarta.typescript.generator.gradle.GenerateTask) {@@ -45,8 +47,11 @@ task generateTypescriptModelInfo(type: cz.habarta.typescript.generator.gradle.Ge]optionalProperties = "all" // TODO: cleanup model to be more explicit about optional paramsmapEnum = cz.habarta.typescript.generator.EnumMapping.asEnum+ mapDate = cz.habarta.typescript.generator.DateMapping.asNumberjackson2Modules = ["com.fasterxml.jackson.datatype.jdk8.Jdk8Module",+ "com.fasterxml.jackson.datatype.jsr310.JavaTimeModule",+ "com.fasterxml.jackson.module.paramnames.ParameterNamesModule","org.openremote.model.ModelModule"]}