alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Conditionals] addendum to #2967 (#2972)

Browse Source 
* use correct id for telemetry requests

* request and subscription data cache should be mutually exclusive

use latest timestamp for any/all requests

* do not add id prop

remove unnecessary if check
This commit is contained in:
David Tsay
2020-04-28 13:01:30 -07:00
committed by GitHub
parent c43d3fcfc9
commit 71a8b377bb
1 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,24 +131,22 @@ export default class AllTelemetryCriterion extends TelemetryCriterion {
let telemetryDataCache = {};
return Promise.all(telemetryRequests)
.then(telemetryRequestsResults => {
let latestDatum;
let latestTimestamp;
const timeSystems = this.openmct.time.getAllTimeSystems();
const timeSystem = this.openmct.time.timeSystem();
telemetryRequestsResults.forEach((results, index) => {
latestDatum = results.length ? results[results.length - 1] : {};
if (latestDatum) {
latestDatum.id = keys[index];
telemetryDataCache[latestDatum.id] = this.computeResult(latestDatum);
const latestDatum = results.length ? results[results.length - 1] : {};
const datumId = keys[index];
latestTimestamp = getLatestTimestamp(
latestTimestamp,
latestDatum,
timeSystems,
timeSystem
);
}
telemetryDataCache[datumId] = this.computeResult(latestDatum);
latestTimestamp = getLatestTimestamp(
latestTimestamp,
latestDatum,
timeSystems,
timeSystem
);
});
const datum = {