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
Fixes to get UI code compiling
Rich Turner339e0e6d2310
diff --git a/ui/component/core/build.gradle b/ui/component/core/build.gradleindex 086ece69d..2cef8b219 100644--- a/ui/component/core/build.gradle+++ b/ui/component/core/build.gradle@@ -1,6 +1,6 @@buildDir = "dist"-task generate(type: Exec){+task generate(type: Exec) {commandLine npmCommand("npm"), "run-script", "generate"}diff --git a/ui/component/core/src/event.ts b/ui/component/core/src/event.tsindex 6ad44c32d..9a87b65f9 100644--- a/ui/component/core/src/event.ts+++ b/ui/component/core/src/event.ts@@ -527,7 +527,7 @@ export class WebSocketEventProvider extends EventProviderImpl {}} else if (msg.startsWith(EVENT_MESSAGE_PREFIX)) {let str = msg.substring(EVENT_MESSAGE_PREFIX.length);- let triggered = JSON.parse(str) as TriggeredEventSubscription;+ let triggered = JSON.parse(str) as TriggeredEventSubscription<SharedEvent>;if (triggered.events) {triggered.events.forEach((event) => {this._onMessageReceived(triggered.subscriptionId!, event);diff --git a/ui/component/or-header/tsconfig.json b/ui/component/or-header/tsconfig.jsonindex ea36d473f..7fc0e6f3b 100644--- a/ui/component/or-header/tsconfig.json+++ b/ui/component/or-header/tsconfig.json@@ -10,6 +10,7 @@],"references": [{ "path": "../core" },+ { "path": "../or-input" },{ "path": "../or-mwc-components" }]}\ No newline at end of filediff --git a/ui/component/or-rules/src/index.ts b/ui/component/or-rules/src/index.tsindex 9c73bafb3..a9a0a6cae 100644--- a/ui/component/or-rules/src/index.ts+++ b/ui/component/or-rules/src/index.ts@@ -221,7 +221,6 @@ export const getAssetTypes = async () => {const response = await manager.rest.api.AssetResource.queryAssets({select: {excludeAttributes: true,- excludeRealm: true,excludeParentInfo: true,excludePath: true,excludeAttributeMeta: true,diff --git a/ui/component/rest/src/main/java/AggregatedApiClient.java b/ui/component/rest/src/main/java/AggregatedApiClient.javaindex 4fb1a4c05..d8c9ad696 100644--- a/ui/component/rest/src/main/java/AggregatedApiClient.java+++ b/ui/component/rest/src/main/java/AggregatedApiClient.java@@ -78,7 +78,7 @@ public class AggregatedApiClient extends EmitterExtension {}private FieldAndGetter getOutputs(TsBeanModel client) {- String getterName = client.getName().getSimpleName().replace("Client", "");+ String getterName = client.getName().getSimpleName().substring(0, client.getName().getSimpleName().length()-6);String fieldName = "_" + Character.toLowerCase(getterName.charAt(0)) + getterName.substring(1);return new FieldAndGetter(fieldName, getterName);}