From 06a5207c6d2f4d68616aca92819c780fd36716f0 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Tue, 14 Jan 2020 17:07:32 -0800
Subject: [PATCH] deriving current output from current (blue) condition output
 and persisting

---
 .../condition/components/ConditionEdit.vue    |  4 ++-
 .../condition/components/ConditionSet.vue     | 28 ++---------------
 .../condition/components/CurrentOutput.vue    | 30 +++++++++++++------
 3 files changed, 26 insertions(+), 36 deletions(-)

diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 5f9f7443c6..0b3e1bc0df 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -47,8 +47,9 @@
                             <li>
                                 <label>Output</label>
                                 <span class="controls">
-                                    <select class="">
+                                    <select v-model="condition.output">
                                         <option value="false">false</option>
+                                        <option value="true">true</option>
                                     </select>
                                 </span>
                             </li>
@@ -82,6 +83,7 @@ export default {
     mounted() {
     },
     updated() {
+        console.log('updated conditionEdit');
         this.updateCurrentCondition();
         this.persist()
     },
diff --git a/src/plugins/condition/components/ConditionSet.vue b/src/plugins/condition/components/ConditionSet.vue
index c4c022bb1a..f027ec669a 100644
--- a/src/plugins/condition/components/ConditionSet.vue
+++ b/src/plugins/condition/components/ConditionSet.vue
@@ -2,7 +2,7 @@
 <div class="c-object-view u-contents">
     <div class="c-cs-edit w-condition-set">
         <div class="c-sw-edit__ui holder">
-            <CurrentOutput :current-output="currentOutput" />
+            <CurrentOutput :condition-collection="domainObject.conditionCollection" />
             <TestData :is-editing="isEditing" />
             <ConditionCollection :is-editing="isEditing"
                                  :condition-collection="domainObject.conditionCollection"
@@ -29,33 +29,9 @@ export default {
     },
     data() {
         let conditionCollection = this.domainObject.configuration.conditionCollection;
-        let currentConditionIndex = 0;
 
         return {
-            currentOutput: conditionCollection[currentConditionIndex].output,
-            conditionCollection,
-            currentConditionIndex
-        }
-    },
-    mounted() {
-        this.currentConditionIndex = this.getCurrentConditionIndex();
-    },
-    methods: {
-        persist(index) {
-            if (index) {
-                this.openmct.objects.mutate(this.domainObject, `configuration.conditionCollection[${index}]`, this.conditionCollection[index]);
-            } else {
-                this.openmct.objects.mutate(this.domainObject, 'configuration.conditionCollection', this.conditionCollection);
-            }
-        },
-        getCurrentConditionIndex() {
-            let currentConditionIndex;
-            this.conditionCollection.forEach((condition, index) => {
-                if (condition.isCurrent) {
-                    currentConditionIndex = index;
-                }
-            });
-            return currentConditionIndex;
+            conditionCollection
         }
     }
 };
diff --git a/src/plugins/condition/components/CurrentOutput.vue b/src/plugins/condition/components/CurrentOutput.vue
index 94cb947347..ae3153d278 100644
--- a/src/plugins/condition/components/CurrentOutput.vue
+++ b/src/plugins/condition/components/CurrentOutput.vue
@@ -12,7 +12,7 @@
          class="c-cs__ui_content"
     >
         <div>
-            <span class="current-output">{{ currentOutput }}</span>
+            <span class="current-output">{{ conditionCollection[currentConditionIndex].output }}</span>
         </div>
     </div>
 </section>
@@ -20,21 +20,33 @@
 
 <script>
 export default {
-    inject: ['openmct'],
+    inject: ['openmct', 'domainObject'],
     props: {
-        currentOutput: {
-            type: String,
-            default: ''
-        },
         isEditing: Boolean
     },
     data() {
+        let conditionCollection = this.domainObject.configuration.conditionCollection;
+        let currentConditionIndex = 0;
+
         return {
-            expanded: true
-        };
+            expanded: true,
+            conditionCollection,
+            currentConditionIndex
+        }
+    },
+    mounted() {
+        this.currentConditionIndex = this.getCurrentConditionIndex();
     },
     methods: {
-
+        getCurrentConditionIndex() {
+            let currentConditionIndex;
+            this.conditionCollection.forEach((condition, index) => {
+                if (condition.isCurrent) {
+                    currentConditionIndex = index;
+                }
+            });
+            return currentConditionIndex;
+        }
     }
 }
 </script>