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
separate promises
Vincent5f42834711a8
diff --git a/ui/component/or-attribute-card/src/index.ts b/ui/component/or-attribute-card/src/index.tsindex 824f299c9..4db0da1eb 100644--- a/ui/component/or-attribute-card/src/index.ts+++ b/ui/component/or-attribute-card/src/index.ts@@ -243,33 +243,38 @@ export class OrAttributeCard extends LitElement {return response.data;}- protected getData = () => {- this.getAssetById(this.assetId)- .then((data: Asset) => {- this.asset = data;-- const thisMoment = moment(this.now);- const currentPeriod = {- start: thisMoment.startOf(this.period).toDate().getTime(),- end: thisMoment.endOf(this.period).toDate().getTime()- };- const lastPeriod = {- start: thisMoment.clone().subtract(1, this.period).startOf(this.period).toDate().getTime(),- end: thisMoment.clone().subtract(1, this.period).endOf(this.period).toDate().getTime()- };-- this.getDatapointsByAttribute(data.id!, lastPeriod.start, lastPeriod.end)- .then((lastPeriodDatapoints: ValueDatapoint<any>[]) => {- const datapoints = lastPeriodDatapoints || [];- this.mainValueLastPeriod = this.getHighestValue(this.sanitizeDataPoints(datapoints));- });-- return this.getDatapointsByAttribute(data.id!, currentPeriod.start, currentPeriod.end);- })+ protected async getData() {+ const thisMoment = moment(this.now);++ this.asset = await this.getAssetById(this.assetId);++ const currentPeriod = {+ start: thisMoment.startOf(this.period).toDate().getTime(),+ end: thisMoment.endOf(this.period).toDate().getTime()+ };+ const lastPeriod = {+ start: thisMoment.clone().subtract(1, this.period).startOf(this.period).toDate().getTime(),+ end: thisMoment.clone().subtract(1, this.period).endOf(this.period).toDate().getTime()+ };++ const p1 = this.getDatapointsByAttribute(this.asset.id!, currentPeriod.start, currentPeriod.end).then((datapoints: ValueDatapoint<any>[]) => {this.data = datapoints || [];this.mainValue = this.getHighestValue(this.sanitizeDataPoints(this.data));+ return this.mainValue;});++ const p2 = this.getDatapointsByAttribute(this.asset.id!, lastPeriod.start, lastPeriod.end)+ .then((datapoints: ValueDatapoint<any>[]) => {+ this.mainValueLastPeriod = this.getHighestValue(this.sanitizeDataPoints(datapoints));+ return this.mainValueLastPeriod;+ });++ Promise.all([p1, p2])+ .then((returnvalues) => {+ this.delta = this.getFormattedDelta(returnvalues[0], returnvalues[1]);+ });+}protected sanitizeDataPoints(data: ValueDatapoint<any>[]): ValueDatapoint<any>[] {