resolved conflicts

src/plugins/condition/ConditionSetViewProvider.js

@@ -58,7 +58,7 @@ export default class ConditionSetViewProvider {
                             isEditing
                         }
                     },
-                    template: '<condition-set ref="conditionSet" :isEditing="isEditing"></condition-set>'
+                    template: '<condition-set :isEditing="isEditing"></condition-set>'
                 });
             },
             onEditModeChange: (isEditing) => {

src/plugins/condition/components/ConditionCollection.vue

@@ -95,12 +95,12 @@ export default {
     data() {
         return {
             expanded: true,
-            telemetryObjs: [],
             parentKeyString: this.openmct.objects.makeKeyString(this.domainObject.identifier),
             conditionCollection: [],
             conditionResults: {},
             conditions: [],
             currentConditionIdentifier: this.currentConditionIdentifier || {},
+            telemetryObjs: [],
             moveIndex: Number,
             isDragging: false
         };
@@ -198,6 +198,16 @@ export default {
                 this.telemetryObjs.splice(index, 1);
             }
         },
+        removeTelemetry(telemetryDomainObjectIdentifier) {
+            let index = _.findIndex(this.telemetryObjs, (obj) => {
+                let objId = this.openmct.objects.makeKeyString(obj.identifier);
+                let id = this.openmct.objects.makeKeyString(telemetryDomainObjectIdentifier);
+                return objId === id;
+            });
+            if (index > -1) {
+                this.telemetryObjs.splice(index, 1);
+            }
+        },
         addCondition(event, isDefault) {
             let conditionDomainObject = this.createConditionDomainObject(!!isDefault);
             //persist the condition domain object so that we can do an openmct.objects.get on it and only persist the identifier in the conditionCollection of conditionSet

src/plugins/condition/components/ConditionSet.vue

@@ -1,13 +1,33 @@
+/*****************************************************************************
+ * 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>
-<div class="c-object-view u-contents">
+<div class="c-cs-edit w-condition-set">
-    <div class="c-cs-edit w-condition-set">
+    <div class="c-sw-edit__ui holder">
-        <div class="c-sw-edit__ui holder">
+        <CurrentOutput :condition="currentCondition" />
-            <CurrentOutput :condition="currentCondition" />
+        <TestData :is-editing="isEditing" />
-            <TestData :is-editing="isEditing" />
+        <ConditionCollection :is-editing="isEditing"
-            <ConditionCollection :is-editing="isEditing"
+                             @currentConditionUpdated="updateCurrentCondition"
-                                 @currentConditionUpdated="updateCurrentCondition"
+        />
-            />
-        </div>
     </div>
 </div>
 </template>

src/plugins/condition/components/CurrentOutput.vue

@@ -1,3 +1,25 @@
+/*****************************************************************************
+ * 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="condition"

src/plugins/condition/components/TestData.vue

@@ -1,3 +1,25 @@
+/*****************************************************************************
+ * 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 v-show="isEditing"
          id="test-data"

src/plugins/condition/components/condition.scss

@@ -1,6 +1,6 @@
 .widget-condition {
     background-color: #eee;
-    margin: 0 0 5px;
+    margin: 0 0 0.33em;
     border-radius: 3px;
 
     &--current {
@@ -162,7 +162,14 @@
     }
 }
 
+
 .c-c__menu-hamburger {
+    &:active {
+        cursor: grabbing;
+        cursor: -moz-grabbing;
+        cursor: -webkit-grabbing;
+    }
+
     &:before {
         content: $glyph-icon-menu-hamburger;
     }
@@ -182,12 +189,11 @@
 
 .c-c__drag-ghost {
     width: 100%;
-    min-height: 5px;
+    min-height: 0.33em;
     &.dragging {
-        min-height: 20px;
+        min-height: 2em;
         border: solid 1px blue;
         background-color: lightblue;
         border-radius: 2px;
     }
-
 }

src/plugins/condition/utils/eventbus.js

@@ -1,2 +0,0 @@
-import Vue from 'vue';
-export const EventBus = new Vue();