WIP receive criterion results and compute condition results

src/plugins/condition/Condition.js

@@ -59,6 +59,7 @@ export default class ConditionClass extends EventEmitter {
         this.criteria = [];
         this.criteriaResults = {};
         this.result = undefined;
+        this.latestTimestamp = {};
         if (conditionConfiguration.configuration.criteria) {
             this.createCriteria(conditionConfiguration.configuration.criteria);
         }
@@ -203,21 +204,18 @@ export default class ConditionClass extends EventEmitter {
     }
 
     requestLADConditionResult() {
-        const criteriaResults = [];
+        const criteriaResults = this.criteria.map(criterion =>
-
+            criterion.requestLAD()
-        this.criteria.forEach(criterion => {
+        );
-            criteriaResults.push(
-                criterion.requestLAD()
-            );
-        });
 
         return Promise.all(criteriaResults)
             .then(results => {
                 results.forEach(result => {
                     this.updateCriteriaResults(result);
+                    this.latestTimestamp = this.getLatestTimestamp(this.latestTimestamp, result)
                 });
-
+console.log(Object.assign({}, this.latestTimestamp, { result: this.result }));
-                return Object.assign({}, /*datum,*/ { result: this.result });
+                return Object.assign({}, this.latestTimestamp, { result: this.result });
             });
     }
 
@@ -253,6 +251,20 @@ export default class ConditionClass extends EventEmitter {
         this.result = computeCondition(this.criteriaResults, this.trigger === TRIGGER.ALL);
     }
 
+    getLatestTimestamp(current, compare) {
+        const timestamp = Object.assign({}, current);
+
+        this.openmct.time.getAllTimeSystems().forEach(timeSystem => {
+            if (!timestamp[timeSystem.key]
+                || compare[timeSystem.key] > timestamp[timeSystem.key]
+            ) {
+                timestamp[timeSystem.key] = compare[timeSystem.key];
+            }
+        });
+
+        return timestamp;
+    }
+
     emitEvent(eventName, data) {
         this.emit(eventName, {
             id: this.id,

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -128,8 +128,8 @@ export default class TelemetryCriterion extends EventEmitter {
                     obj,
                     options
                 ).then(results => {
-                    const datum = results.length ? results[results.length - 1] : {};
+                    const latestDatum = results.length ? results[results.length - 1] : {};
-                    return this.formatData(datum);
+                    return this.formatData(latestDatum);
                 });
             });
     }