From fc03b3a79d613a01ba1a9a154296af94a732dc51 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Sun, 2 Feb 2020 08:22:23 -0800
Subject: [PATCH] updateTemetry failing to return object on line 328

---
 .../condition/components/ConditionCollection.vue      |  4 ++--
 src/plugins/condition/components/ConditionEdit.vue    | 11 +++++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index ee3fb67430..a49bf26b83 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -233,8 +233,8 @@ export default {
                     criteria: isDefault ? [] : [{
                         operation: '',
                         input: '',
-                        metaDataKey: '',
-                        key: ''
+                        metaDataKey: this.openmct.telemetry.getMetadata(this.telemetryObjs[0]).values()[0].key,
+                        key: this.telemetryObjs.length ? this.openmct.objects.makeKeyString(this.telemetryObjs[0].identifier) : null,
                     }]
                 },
                 summary: 'summary description'
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index dcd75e2746..ec9d278ac9 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -247,6 +247,7 @@ export default {
         },
         initialize() {
             if (this.condition.definition.criteria.length) {
+                console.log('initialize found criteria')
                 this.setCurrentCriterion(0);
                 this.setOutput();
                 this.setOperation();
@@ -290,7 +291,7 @@ export default {
             this.$emit('removeCondition', this.conditionIdentifier);
         },
         cloneCondition(ev) {
-            this.$emit('clone-condition', {
+            this.$emit('cloneCondition', {
                 identifier: this.conditionIdentifier,
                 index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
             });
@@ -321,9 +322,11 @@ export default {
             }
         },
         updateTelemetry() {
+            console.log('this.currentCriteria', this.currentCriteria);
             if (this.hasTelemetry()) {
+                console.log('this.currentCriteria.key', this.currentCriteria.key);
                 this.openmct.objects.get(this.currentCriteria.key).then((obj) => {
-                    console.log('this.openmct.telemetry.getMetadata(this.telemetryObject).values()', this.openmct.telemetry.getMetadata(this.telemetryObject).values());
+                    console.log('this.telemetryObject', this.telemetryObject);
                     this.telemetryObject = obj;
                     this.telemetryMetadata[this.currentCriteria.key] = this.openmct.telemetry.getMetadata(this.telemetryObject).values();
                     this.selectedMetaDataKey[this.currentCriteria.key] = this.getTelemetryMetadataKey();
@@ -355,6 +358,10 @@ export default {
             return this.telemetry.length && index > -1 ? this.telemetry[index].identifier : '';
         },
         hasTelemetry() {
+            if (this.currentCriteria && this.currentCriteria.key) {
+                console.log('hasTelemetry() returns true');
+            }
+            // console.log('this.currentCriteria', this.currentCriteria);
             return this.currentCriteria && this.currentCriteria.key;
         },
         updateConditionCriteria() {