ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-08 12:00:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix LAD requests for any/all telemetry

Browse Source
This commit is contained in:
Joshi 2020-03-31 16:48:59 -07:00
parent ee4a81bdfd
commit 72a3248123
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/condition/criterion/AllTelemetryCriterion.js
View File

@ -137,28 +137,28 @@ export default class TelemetryCriterion extends EventEmitter {
return this.formatData({}, options.telemetryObjects); return this.formatData({}, options.telemetryObjects);
} }
const telemetryRequests = options.telemetryObjects let keys = Object.keys(Object.assign({}, options.telemetryObjects));
.map(telemetryObject => this.telemetryAPI.request( const telemetryRequests = keys
telemetryObject, .map(key => this.telemetryAPI.request(
options.telemetryObjects[key],
options options
)); ));
return Promise.all(telemetryRequests) return Promise.all(telemetryRequests)
.then(telemetryRequestsResults => { .then(telemetryRequestsResults => {
let latestDatum;
telemetryRequestsResults.forEach((results, index) => { telemetryRequestsResults.forEach((results, index) => {
const latestDatum = results.length ? results[results.length - 1] : {}; latestDatum = results.length ? results[results.length - 1] : {};
if (index === telemetryRequestsResults.length-1) { if (index < telemetryRequestsResults.length-1) {
//when the last result is computed, we return the result
return {
id: this.id,
data: this.formatData(latestDatum, options.telemetryObjects)
};
} else {
if (latestDatum) { if (latestDatum) {
this.telemetryDataCache[latestDatum.id] = this.computeResult(latestDatum); this.telemetryDataCache[latestDatum.id] = this.computeResult(latestDatum);
} }
} }
}); });
return {
id: this.id,
data: this.formatData(latestDatum, options.telemetryObjects)
};
}); });
} }