From 47d4fc9103e03e8067dc22758702469f90265c65 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Fri, 28 Feb 2020 15:32:40 -0800
Subject: [PATCH 1/2] removed CurrentOutput component

---
 .../condition/components/ConditionSet.vue     | 14 +++-
 .../condition/components/CurrentOutput.vue    | 69 -------------------
 2 files changed, 11 insertions(+), 72 deletions(-)
 delete mode 100644 src/plugins/condition/components/CurrentOutput.vue

diff --git a/src/plugins/condition/components/ConditionSet.vue b/src/plugins/condition/components/ConditionSet.vue
index cc5af46072..aaa988e97e 100644
--- a/src/plugins/condition/components/ConditionSet.vue
+++ b/src/plugins/condition/components/ConditionSet.vue
@@ -23,7 +23,17 @@
 <template>
 <div class="c-cs-edit w-condition-set">
     <div class="c-sw-edit__ui holder">
-        <CurrentOutput :output="currentConditionOutput" />
+        <section id="current-output">
+            <div class="c-cs__ui__header">
+                <span class="c-cs__ui__header-label">Current Output</span>
+            </div>
+            <div class="c-cs__ui_content">
+                <div v-if="currentConditionOutput">
+                    <span class="current-output">{{ currentConditionOutput }}</span>
+                </div>
+                <div v-else>No output selected</div>
+            </div>
+        </section>
         <TestData :is-editing="isEditing" />
         <ConditionCollection :is-editing="isEditing"
                              @currentConditionSetOutputUpdated="updateCurrentOutput"
@@ -33,14 +43,12 @@
 </template>
 
 <script>
-import CurrentOutput from './CurrentOutput.vue';
 import TestData from './TestData.vue';
 import ConditionCollection from './ConditionCollection.vue';
 
 export default {
     inject: ["openmct", "domainObject"],
     components: {
-        CurrentOutput,
         TestData,
         ConditionCollection
     },
diff --git a/src/plugins/condition/components/CurrentOutput.vue b/src/plugins/condition/components/CurrentOutput.vue
deleted file mode 100644
index 76e3b919c0..0000000000
--- a/src/plugins/condition/components/CurrentOutput.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-<template>
-<section id="current-output">
-    <div v-if="output"
-         class="c-cs__ui__header"
-    >
-        <span class="c-cs__ui__header-label">Current Output</span>
-        <span
-            class="is-enabled flex-elem"
-            :class="['c-cs__disclosure-triangle', { 'c-cs__disclosure-triangle--expanded': expanded }]"
-            @click="expanded = !expanded"
-        ></span>
-    </div>
-    <div v-if="expanded && output"
-         class="c-cs__ui_content"
-    >
-        <div>
-            <span class="current-output">{{ output }}</span>
-        </div>
-    </div>
-</section>
-</template>
-
-<script>
-export default {
-    inject: ['openmct', 'domainObject'],
-    props: {
-        isEditing: Boolean,
-        output: {
-            default: () => {return null;},
-            type: String
-        }
-    },
-    data() {
-        return {
-            expanded: true
-        }
-    },
-    mounted() {
-    },
-    updated() {
-
-    },
-    methods: {
-
-    }
-}
-</script>

From fa83b4867c036159129ed1f42f754b4d8fdc1752 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Mon, 2 Mar 2020 06:17:27 -0800
Subject: [PATCH 2/2] removed extra div

---
 src/plugins/condition/components/ConditionSet.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/condition/components/ConditionSet.vue b/src/plugins/condition/components/ConditionSet.vue
index aaa988e97e..7447f5bb84 100644
--- a/src/plugins/condition/components/ConditionSet.vue
+++ b/src/plugins/condition/components/ConditionSet.vue
@@ -28,10 +28,10 @@
                 <span class="c-cs__ui__header-label">Current Output</span>
             </div>
             <div class="c-cs__ui_content">
-                <div v-if="currentConditionOutput">
-                    <span class="current-output">{{ currentConditionOutput }}</span>
-                </div>
-                <div v-else>No output selected</div>
+                <span v-if="currentConditionOutput"
+                      class="current-output">{{ currentConditionOutput }}
+                </span>
+                <span v-else>No output selected</span>
             </div>
         </section>
         <TestData :is-editing="isEditing" />