From 9bd1c51a6eeea5d051d11e02fdc644980d9d7ef3 Mon Sep 17 00:00:00 2001
From: David Tsay <david.e.tsay@nasa.gov>
Date: Fri, 28 Feb 2020 13:06:57 -0800
Subject: [PATCH] always use timestamp from latest datum

---
 src/plugins/condition/ConditionManager.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/plugins/condition/ConditionManager.js b/src/plugins/condition/ConditionManager.js
index 6fafa5b681..c11788053a 100644
--- a/src/plugins/condition/ConditionManager.js
+++ b/src/plugins/condition/ConditionManager.js
@@ -208,29 +208,29 @@ export default class ConditionManager extends EventEmitter {
     handleConditionResult(resultObj) {
         let conditionCollection = this.domainObject.configuration.conditionCollection;
         let currentConditionIdentifier = conditionCollection[conditionCollection.length-1];
-        // This sets timestamps for the default condition
-        let currentConditionResult = resultObj ? resultObj.data : {};
 
         if (resultObj) {
             let idAsString = this.openmct.objects.makeKeyString(resultObj.id);
             if (this.findConditionById(idAsString)) {
-                this.conditionResults[idAsString] = resultObj.data;
+                this.conditionResults[idAsString] = resultObj.data.result;
             }
         }
 
         for (let i = 0; i < conditionCollection.length - 1; i++) {
             let conditionIdAsString = this.openmct.objects.makeKeyString(conditionCollection[i]);
-            if (this.conditionResults[conditionIdAsString] && this.conditionResults[conditionIdAsString].result) {
+            if (this.conditionResults[conditionIdAsString]) {
                 //first condition to be true wins
                 currentConditionIdentifier = conditionCollection[i];
-                currentConditionResult = this.conditionResults[conditionIdAsString];
                 break;
             }
         }
 
         this.openmct.objects.get(currentConditionIdentifier).then((obj) => {
             this.emit('conditionSetResultUpdated',
-                Object.assign(currentConditionResult, {output: obj.configuration.output})
+                Object.assign({},
+                    resultObj.data,
+                    { output: obj.configuration.output }
+                )
             )
         });
     }