From 1a409afb03d9df6da3810545a291b5a07f193c63 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 27 Feb 2020 16:32:38 -0800
Subject: [PATCH] wip: addressing review comments

---
 .../condition/components/Condition.vue        |  1 +
 .../condition/components/Criterion.vue        | 21 ++++++++-----------
 .../condition/criterion/TelemetryCriterion.js |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index 146cb566a5..198a32467c 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -277,6 +277,7 @@ export default {
             } else {
                 this.domainObject.configuration.output = this.selectedOutputKey;
             }
+            this.persist();
         },
         updateCurrentCondition() {
             this.$emit('updateCurrentCondition', this.currentConditionIdentifier);
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index db45adfb78..f33adcb931 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -44,19 +44,16 @@
                     {{ option.text }}
                 </option>
             </select>
-            <input v-if="inputCount > 0"
-                   v-model="criterion.input[0]"
-                   class="t-condition-name-input"
-                   type="text"
-                   @blur="persist"
-            >
-            <span v-if="inputCount === 2">and</span>
-            <input v-if="inputCount === 2"
-                   v-model="criterion.input[1]"
-                   class="t-condition-name-input"
-                   type="text"
-                   @blur="persist"
+            <span v-for="(item, inputIndex) in Array, inputCount"
+                  :key="inputIndex"
             >
+                <input v-model="criterion.input[inputIndex]"
+                       class="t-condition-name-input"
+                       type="text"
+                       @blur="persist"
+                >
+                <span v-if="inputIndex < inputCount-1">and</span>
+            </span>
         </span>
     </span>
 </li>
diff --git a/src/plugins/condition/criterion/TelemetryCriterion.js b/src/plugins/condition/criterion/TelemetryCriterion.js
index cbbd159e6a..39599b8f9f 100644
--- a/src/plugins/condition/criterion/TelemetryCriterion.js
+++ b/src/plugins/condition/criterion/TelemetryCriterion.js
@@ -76,8 +76,8 @@ export default class TelemetryCriterion extends EventEmitter {
         let params = [];
         let result = false;
         params.push(data[this.metadata]);
-        if (this.input.length) {
-            this.input.forEach(input => {params.push(this.input[0])});
+        if (this.input instanceof Array && this.input.length) {
+            this.input.forEach((input) => {params.push(input)});
         }
         if (typeof comparator === 'function') {
             result = comparator(params);