From cfa5dcb02e5b3398794229e2487838c7472e065d Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 23 Jan 2020 12:16:16 -0800
Subject: [PATCH 01/11] drag wip

---
 .../components/ConditionCollection.vue        | 40 +++++++++++--------
 .../condition/components/ConditionEdit.vue    |  7 ++--
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index e8ffa3438d..08e69280fe 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -28,23 +28,31 @@
                 <span class="c-cs-button__label">Add Condition</span>
             </button>
         </div>
-        <div class="condition-collection">
-            <div v-for="conditionIdentifier in conditionCollection"
-                 :key="conditionIdentifier.key"
-                 class="conditionArea"
-            >
-                <div v-if="isEditing">
-                    <ConditionEdit :condition-identifier="conditionIdentifier"
+        <div class="c-c condition-collection">
+            <div id="js-c-drag-ghost"
+                 class="c-c__drag-ghost"
+            ></div>
+            <div class="c-c__container-holder">
+                <div v-for="conditionIdentifier in conditionCollection"
+                     :key="conditionIdentifier.key"
+                >
+                    <div class="c-c__drop-hint">
+                        <div class="c-drop-hint c-drop-hint"></div>
+                    </div>
+
+                    <div v-if="isEditing">
+                        <ConditionEdit :condition-identifier="conditionIdentifier"
+                                       :current-condition-identifier="currentConditionIdentifier"
+                                       @update-current-condition="updateCurrentCondition"
+                                       @remove-condition="removeCondition"
+                                       @condition-result-updated="handleConditionResult"
+                        />
+                    </div>
+                    <div v-else>
+                        <Condition :condition-identifier="conditionIdentifier"
                                    :current-condition-identifier="currentConditionIdentifier"
-                                   @update-current-condition="updateCurrentCondition"
-                                   @remove-condition="removeCondition"
-                                   @condition-result-updated="handleConditionResult"
-                    />
-                </div>
-                <div v-else>
-                    <Condition :condition-identifier="conditionIdentifier"
-                               :current-condition-identifier="currentConditionIdentifier"
-                    />
+                        />
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 034a39a713..a157876ede 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -1,7 +1,8 @@
 <template>
 <div v-if="condition"
-     class="c-cs-editui__conditions"
+     class="c-c-editui__conditions c-c-container__container c-c__drag-wrapper"
      :class="['widget-condition', { 'widget-condition--current': currentConditionIdentifier && (currentConditionIdentifier.key === conditionIdentifier.key) }]"
+     draggable="true"
 >
     <div class="title-bar">
         <span
@@ -150,8 +151,8 @@ export default {
         currentConditionIdentifier: {
             type: Object,
             required: true
-        }
-    },
+        },
+     },
     data() {
         return {
             condition: this.condition,

From 7e0f475c63b17c9450c67694f1b40094f9b34bfb Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 23 Jan 2020 16:13:28 -0800
Subject: [PATCH 02/11] style changes for dnd

---
 .../components/ConditionCollection.vue        |  7 +-
 .../condition/components/ConditionEdit.vue    | 48 ++++++++---
 src/plugins/condition/components/DropHint.vue | 83 +++++++++++++++++++
 .../condition/components/condition.scss       |  8 +-
 4 files changed, 123 insertions(+), 23 deletions(-)
 create mode 100644 src/plugins/condition/components/DropHint.vue

diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index 08e69280fe..8a5abe63df 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -33,13 +33,9 @@
                  class="c-c__drag-ghost"
             ></div>
             <div class="c-c__container-holder">
-                <div v-for="conditionIdentifier in conditionCollection"
+                <div v-for="(conditionIdentifier, index) in conditionCollection"
                      :key="conditionIdentifier.key"
                 >
-                    <div class="c-c__drop-hint">
-                        <div class="c-drop-hint c-drop-hint"></div>
-                    </div>
-
                     <div v-if="isEditing">
                         <ConditionEdit :condition-identifier="conditionIdentifier"
                                        :current-condition-identifier="currentConditionIdentifier"
@@ -65,6 +61,7 @@ import Condition from '../../condition/components/Condition.vue';
 import ConditionEdit from '../../condition/components/ConditionEdit.vue';
 import uuid from 'uuid';
 
+
 export default {
     inject: ['openmct', 'domainObject'],
     components: {
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index a157876ede..3787ae2097 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -3,6 +3,7 @@
      class="c-c-editui__conditions c-c-container__container c-c__drag-wrapper"
      :class="['widget-condition', { 'widget-condition--current': currentConditionIdentifier && (currentConditionIdentifier.key === conditionIdentifier.key) }]"
      draggable="true"
+     @dragstart="initDrag"
 >
     <div class="title-bar">
         <span
@@ -28,20 +29,20 @@
         ></span>
     </div>
     <div v-if="expanded"
-         class="condition-config-edit widget-rule-content c-sw-editui__rules-wrapper holder widget-rules-wrapper flex-elem expanded"
+         class="condition-config-edit widget-condition-content c-sw-editui__conditions-wrapper holder widget-conditions-wrapper flex-elem expanded"
     >
-        <div id="ruleArea"
-             class="c-sw-editui__rules widget-rules"
+        <div id="conditionArea"
+             class="c-c-editui__condition widget-conditions"
         >
-            <div class="c-sw-rule">
-                <div class="c-sw-rule__ui l-compact-form l-widget-rule has-local-controls">
+            <div class="c-c-condition">
+                <div class="c-c-condition__ui l-compact-form l-widget-condition has-local-controls">
                     <div>
-                        <ul class="t-widget-rule-config">
+                        <ul class="t-widget-condition-config">
                             <li>
                                 <label>Condition Name</label>
                                 <span class="controls">
                                     <input v-model="condition.definition.name"
-                                           class="t-rule-name-input"
+                                           class="t-condition-name-input"
                                            type="text"
                                     >
                                 </span>
@@ -62,16 +63,16 @@
                                     </select>
                                     <input v-if="selectedOutputKey === outputOptions[2].key"
                                            v-model="condition.definition.output"
-                                           class="t-rule-name-input"
+                                           class="t-condition-name-input"
                                            type="text"
                                     >
                                 </span>
                             </li>
                         </ul>
                         <div v-if="!condition.isDefault"
-                             class="widget-rule-content expanded"
+                             class="widget-condition-content expanded"
                         >
-                            <ul class="t-widget-rule-config">
+                            <ul class="t-widget-condition-config">
                                 <li class="has-local-controls t-condition">
                                     <label>Match when</label>
                                     <span class="controls">
@@ -82,7 +83,7 @@
                                     </span>
                                 </li>
                             </ul>
-                            <ul class="t-widget-rule-config">
+                            <ul class="t-widget-condition-config">
                                 <li v-if="telemetryObject && telemetryMetadata"
                                     class="has-local-controls t-condition"
                                 >
@@ -120,7 +121,7 @@
                                                 </option>
                                             </select>
                                             <input v-if="comparisonValueField"
-                                                   class="t-rule-name-input"
+                                                   class="t-condition-name-input"
                                                    type="text"
                                                    @keyup="getOperationValue"
                                             >
@@ -152,7 +153,7 @@ export default {
             type: Object,
             required: true
         },
-     },
+    },
     data() {
         return {
             condition: this.condition,
@@ -198,6 +199,8 @@ export default {
             this.conditionClass = new ConditionClass(this.condition, this.openmct);
             this.conditionClass.on('conditionResultUpdated', this.handleConditionResult.bind(this));
         }));
+
+        this.dragGhost = document.getElementById('js-c-drag-ghost');
     },
     updated() {
         if (this.isCurrent && this.isCurrent.key === this.condition.key) {
@@ -206,6 +209,25 @@ export default {
         this.persist();
     },
     methods: {
+        initDrag() {
+            // let type = this.openmct.types.get(this.domainObject.type),
+            //     iconClass = type.definition ? type.definition.cssClass : 'icon-object-unknown';
+
+            // if (this.dragGhost) {
+            //     let originalClassName = this.dragGhost.classList[0];
+            //     this.dragGhost.className = '';
+            //     this.dragGhost.classList.add(originalClassName, iconClass);
+
+            //     this.dragGhost.innerHTML = `<span>${this.domainObject.name}</span>`;
+            //     event.dataTransfer.setDragImage(this.dragGhost, 0, 0);
+            // }
+
+            console.log('conditionId', this.condition.id);
+            console.log('containerIndex', this.containerIndex);
+
+            event.dataTransfer.setData('conditionId', this.condition.id);
+            event.dataTransfer.setData('containerIndex', this.containerIndex);
+        },
         handleConditionResult(args) {
             // console.log('ConditionEdit::Result', args);
             this.$emit('condition-result-updated', {
diff --git a/src/plugins/condition/components/DropHint.vue b/src/plugins/condition/components/DropHint.vue
new file mode 100644
index 0000000000..d2a6dc61b0
--- /dev/null
+++ b/src/plugins/condition/components/DropHint.vue
@@ -0,0 +1,83 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2014-2018, 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 v-show="isValidTarget">
+    <div
+        class="c-drop-hint c-drop-hint--always-show"
+        :class="{'is-mouse-over': isMouseOver}"
+        @dragover.prevent
+        @dragenter="dragenter"
+        @dragleave="dragleave"
+        @drop="dropHandler"
+    ></div>
+</div>
+</template>
+
+<script>
+export default {
+    props:{
+        index: {
+            type: Number,
+            required: true
+        },
+        allowDrop: {
+            type: Function,
+            required: true
+        }
+    },
+    data() {
+        return {
+            isMouseOver: false,
+            isValidTarget: false
+        }
+    },
+    mounted() {
+        document.addEventListener('dragstart', this.dragstart);
+        document.addEventListener('dragend', this.dragend);
+        document.addEventListener('drop', this.dragend);
+    },
+    destroyed() {
+        document.removeEventListener('dragstart', this.dragstart);
+        document.removeEventListener('dragend', this.dragend);
+        document.removeEventListener('drop', this.dragend);
+    },
+    methods: {
+        dragenter() {
+            this.isMouseOver = true;
+        },
+        dragleave() {
+            this.isMouseOver = false;
+        },
+        dropHandler(event) {
+            this.$emit('object-drop-to', this.index, event);
+            this.isValidTarget = false;
+        },
+        dragstart(event) {
+            this.isValidTarget = this.allowDrop(event, this.index);
+        },
+        dragend() {
+            this.isValidTarget = false;
+        }
+    }
+}
+</script>
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index 160ab59286..4e7b573658 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -1,5 +1,3 @@
-
-
 .widget-condition {
     background-color: #eee;
     margin: 0 0 0.6em;
@@ -53,7 +51,7 @@
     margin-left: 0;
 }
 
-.l-widget-rule {
+.l-widget-condition {
     padding: 0;
 }
 
@@ -61,11 +59,11 @@
     padding: 0;
 }
 
-.widget-rule-content.expanded {
+.widget-condition-content.expanded {
     margin: 0 3px;
 }
 
-.widget-rule-content.expanded ul {
+.widget-condition-content.expanded ul {
     border-top: solid 1px #ccc;
     padding: 2px;
 }

From 96746f40425d3a13191a85e542afe6ac6fe9def7 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Fri, 24 Jan 2020 13:23:02 -0800
Subject: [PATCH 03/11] drag to reorder conditions

---
 .../components/ConditionCollection.vue        | 31 +++++++++++++++++--
 .../condition/components/ConditionEdit.vue    | 30 ++++++------------
 .../condition/components/condition.scss       | 11 ++++++-
 3 files changed, 48 insertions(+), 24 deletions(-)

diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index 8a5abe63df..b990122e63 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -29,16 +29,19 @@
             </button>
         </div>
         <div class="c-c condition-collection">
-            <div id="js-c-drag-ghost"
-                 class="c-c__drag-ghost"
-            ></div>
             <div class="c-c__container-holder">
                 <div v-for="(conditionIdentifier, index) in conditionCollection"
                      :key="conditionIdentifier.key"
                 >
                     <div v-if="isEditing">
+                        <div :id="'drop' + index"
+                             class="c-c__drag-ghost"
+                             @drop.prevent="dropCondition"
+                             @dragover.prevent
+                        ></div>
                         <ConditionEdit :condition-identifier="conditionIdentifier"
                                        :current-condition-identifier="currentConditionIdentifier"
+                                       :condition-index="index"
                                        @update-current-condition="updateCurrentCondition"
                                        @remove-condition="removeCondition"
                                        @condition-result-updated="handleConditionResult"
@@ -98,6 +101,27 @@ export default {
         }
     },
     methods: {
+        dropCondition(e) {
+            const newCondIndex = Number(e.dataTransfer.getData('conditionIndex'));
+            const oldCondIndex = Number(e.target.id.slice(4));
+
+            let reorderPlan = [];
+
+            this.conditionCollection.forEach((condition, index) => {
+                const reorderObj = {};
+                reorderObj.oldIndex = index;
+                if (index === oldCondIndex) {
+                    reorderObj.newIndex = newCondIndex;
+                } else if (index === newCondIndex) {
+                    reorderObj.newIndex = oldCondIndex;
+                } else {
+                    reorderObj.newIndex = index;
+                }
+                reorderPlan.push(reorderObj);
+            });
+
+            this.reorder(reorderPlan);
+        },
         handleConditionResult(args) {
             let idAsString = this.openmct.objects.makeKeyString(args.id);
             this.conditionResults[idAsString] = args.result;
@@ -173,6 +197,7 @@ export default {
             reorderPlan.forEach((reorderEvent) => {
                 this.$set(this.conditionCollection, reorderEvent.newIndex, oldConditions[reorderEvent.oldIndex]);
             });
+            this.persist();
         },
         persist() {
             this.openmct.objects.mutate(this.domainObject, 'configuration.conditionCollection', this.conditionCollection);
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 3787ae2097..4e41596f92 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -1,9 +1,11 @@
 <template>
 <div v-if="condition"
+     :data-condition-index="conditionIndex"
      class="c-c-editui__conditions c-c-container__container c-c__drag-wrapper"
      :class="['widget-condition', { 'widget-condition--current': currentConditionIdentifier && (currentConditionIdentifier.key === conditionIdentifier.key) }]"
-     draggable="true"
-     @dragstart="initDrag"
+     :draggable="!condition.isDefault"
+     @dragstart="dragStart"
+     @dragover.stop
 >
     <div class="title-bar">
         <span
@@ -153,6 +155,10 @@ export default {
             type: Object,
             required: true
         },
+        conditionIndex: {
+            type: Number,
+            required: true
+        }
     },
     data() {
         return {
@@ -209,24 +215,8 @@ export default {
         this.persist();
     },
     methods: {
-        initDrag() {
-            // let type = this.openmct.types.get(this.domainObject.type),
-            //     iconClass = type.definition ? type.definition.cssClass : 'icon-object-unknown';
-
-            // if (this.dragGhost) {
-            //     let originalClassName = this.dragGhost.classList[0];
-            //     this.dragGhost.className = '';
-            //     this.dragGhost.classList.add(originalClassName, iconClass);
-
-            //     this.dragGhost.innerHTML = `<span>${this.domainObject.name}</span>`;
-            //     event.dataTransfer.setDragImage(this.dragGhost, 0, 0);
-            // }
-
-            console.log('conditionId', this.condition.id);
-            console.log('containerIndex', this.containerIndex);
-
-            event.dataTransfer.setData('conditionId', this.condition.id);
-            event.dataTransfer.setData('containerIndex', this.containerIndex);
+        dragStart: e => {
+            e.dataTransfer.setData('conditionIndex', e.target.getAttribute('data-condition-index'));
         },
         handleConditionResult(args) {
             // console.log('ConditionEdit::Result', args);
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index 4e7b573658..298e4817f6 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -1,6 +1,6 @@
 .widget-condition {
     background-color: #eee;
-    margin: 0 0 0.6em;
+    margin: 0 0 5px;
     border-radius: 3px;
 
     &--current {
@@ -9,6 +9,10 @@
 
 }
 
+.c-c-editui__conditions.widget-condition {
+    margin: 0;
+}
+
 .title-bar {
     display: flex;
     align-items: center;
@@ -150,3 +154,8 @@
         content: $glyph-icon-trash;
     }
 }
+
+.c-c__drag-ghost {
+    width: 100%;
+    min-height: 10px;
+}
\ No newline at end of file

From 5055a18ca1c1cd820ab60b59fa46787ac881a9ed Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Sat, 25 Jan 2020 12:46:15 -0800
Subject: [PATCH 04/11] reorder wip

---
 .../components/ConditionCollection.vue        | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index b990122e63..f19ec6cad1 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -29,16 +29,21 @@
             </button>
         </div>
         <div class="c-c condition-collection">
-            <div class="c-c__container-holder">
-                <div v-for="(conditionIdentifier, index) in conditionCollection"
-                     :key="conditionIdentifier.key"
+            <ul class="c-c__container-holder">
+                <li v-for="(conditionIdentifier, index) in conditionCollection"
+                    :key="conditionIdentifier.key"
                 >
                     <div v-if="isEditing">
-                        <div :id="'drop' + index"
+                        <div v-if="index !== conditionCollection.length - 1"
+                             :id="'drop' + index"
                              class="c-c__drag-ghost"
                              @drop.prevent="dropCondition"
                              @dragover.prevent
                         ></div>
+                        <div v-else
+                             class="c-c__drag-ghost"
+                        >
+                        </div>
                         <ConditionEdit :condition-identifier="conditionIdentifier"
                                        :current-condition-identifier="currentConditionIdentifier"
                                        :condition-index="index"
@@ -52,8 +57,8 @@
                                    :current-condition-identifier="currentConditionIdentifier"
                         />
                     </div>
-                </div>
-            </div>
+                </li>
+            </ul>
         </div>
     </div>
 </section>
@@ -102,24 +107,21 @@ export default {
     },
     methods: {
         dropCondition(e) {
-            const newCondIndex = Number(e.dataTransfer.getData('conditionIndex'));
-            const oldCondIndex = Number(e.target.id.slice(4));
+            const moveIndex = Number(e.dataTransfer.getData('conditionIndex'));
+            const targetIndex = Number(e.target.id.slice(4));
 
-            let reorderPlan = [];
+            function moveArrIndex(arr, from, to) {
+                arr.splice(to, 0, arr.splice(from,  1)[0]);
+                return arr;
+            }
 
-            this.conditionCollection.forEach((condition, index) => {
-                const reorderObj = {};
-                reorderObj.oldIndex = index;
-                if (index === oldCondIndex) {
-                    reorderObj.newIndex = newCondIndex;
-                } else if (index === newCondIndex) {
-                    reorderObj.newIndex = oldCondIndex;
-                } else {
-                    reorderObj.newIndex = index;
-                }
-                reorderPlan.push(reorderObj);
-            });
+            const oldIndexArr = Object.keys(this.conditionCollection);
+            const newIndexArr = moveArrIndex(Object.keys(this.conditionCollection), moveIndex, targetIndex);
 
+            const reorderPlan = [];
+            for (let i = 0; i < oldIndexArr.length; i++) {
+                reorderPlan.push({oldIndex: i, newIndex: newIndexArr[i]});
+            }
             this.reorder(reorderPlan);
         },
         handleConditionResult(args) {

From bc9cadaa77d95a906ed41eb5a6f96fd78dd2cbc1 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Mon, 27 Jan 2020 09:34:50 -0800
Subject: [PATCH 05/11] fixed reorder bugs

---
 .../components/ConditionCollection.vue        | 60 +++++++++++++------
 .../condition/components/ConditionEdit.vue    |  7 +--
 .../condition/components/condition.scss       |  9 ++-
 3 files changed, 53 insertions(+), 23 deletions(-)

diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index f19ec6cad1..6363426cf6 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -34,22 +34,19 @@
                     :key="conditionIdentifier.key"
                 >
                     <div v-if="isEditing">
-                        <div v-if="index !== conditionCollection.length - 1"
-                             :id="'drop' + index"
-                             class="c-c__drag-ghost"
+                        <div class="c-c__drag-ghost"
                              @drop.prevent="dropCondition"
+                             @dragenter="dragEnter"
+                             @dragleave="dragLeave"
                              @dragover.prevent
                         ></div>
-                        <div v-else
-                             class="c-c__drag-ghost"
-                        >
-                        </div>
                         <ConditionEdit :condition-identifier="conditionIdentifier"
                                        :current-condition-identifier="currentConditionIdentifier"
                                        :condition-index="index"
                                        @update-current-condition="updateCurrentCondition"
                                        @remove-condition="removeCondition"
                                        @condition-result-updated="handleConditionResult"
+                                       @set-move-index="setMoveIndex"
                         />
                     </div>
                     <div v-else>
@@ -85,7 +82,8 @@ export default {
             parentKeyString: this.openmct.objects.makeKeyString(this.domainObject.identifier),
             conditionCollection: [],
             conditions: [],
-            currentConditionIdentifier: this.currentConditionIdentifier || {}
+            currentConditionIdentifier: this.currentConditionIdentifier || {},
+            moveIndex: null
         };
     },
     destroyed() {
@@ -106,23 +104,49 @@ export default {
         }
     },
     methods: {
+        setMoveIndex(index) {
+            this.moveIndex = index;
+        },
         dropCondition(e) {
-            const moveIndex = Number(e.dataTransfer.getData('conditionIndex'));
-            const targetIndex = Number(e.target.id.slice(4));
-
-            function moveArrIndex(arr, from, to) {
-                arr.splice(to, 0, arr.splice(from,  1)[0]);
+            let targetIndex = Array.from(document.querySelectorAll('.c-c__drag-ghost')).indexOf(e.target);
+            if (targetIndex > this.moveIndex) { targetIndex-- }
+            const oldIndexArr = Object.keys(this.conditionCollection);
+            const move = function (arr, old_index, new_index) {
+                while (old_index < 0) {
+                    old_index += arr.length;
+                }
+                while (new_index < 0) {
+                    new_index += arr.length;
+                }
+                if (new_index >= arr.length) {
+                    var k = new_index - arr.length;
+                    while ((k--) + 1) {
+                        arr.push(undefined);
+                    }
+                }
+                arr.splice(new_index, 0, arr.splice(old_index, 1)[0]);
                 return arr;
             }
-
-            const oldIndexArr = Object.keys(this.conditionCollection);
-            const newIndexArr = moveArrIndex(Object.keys(this.conditionCollection), moveIndex, targetIndex);
-
+            const newIndexArr = move(oldIndexArr, this.moveIndex, targetIndex);
             const reorderPlan = [];
+
             for (let i = 0; i < oldIndexArr.length; i++) {
-                reorderPlan.push({oldIndex: i, newIndex: newIndexArr[i]});
+                reorderPlan.push({oldIndex: Number(newIndexArr[i]), newIndex: i});
             }
+
             this.reorder(reorderPlan);
+
+            e.target.classList.remove("dragging");
+        },
+        dragEnter(e) {
+            let targetIndex = Array.from(document.querySelectorAll('.c-c__drag-ghost')).indexOf(e.target);
+
+            if (targetIndex > this.moveIndex) { targetIndex-- }
+            if (this.moveIndex === targetIndex) { return }
+            e.target.classList.add("dragging");
+        },
+        dragLeave(e) {
+            e.target.classList.remove("dragging");
         },
         handleConditionResult(args) {
             let idAsString = this.openmct.objects.makeKeyString(args.id);
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 4e41596f92..883fd135b7 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -11,12 +11,11 @@
         <span
             class="c-c__menu-hamburger"
             :class="{ 'is-enabled': !condition.isDefault }"
-            @click="expanded = !condition.expanded"
         ></span>
         <span
             class="is-enabled flex-elem"
             :class="['c-c__disclosure-triangle', { 'c-c__disclosure-triangle--expanded': expanded }]"
-            @click="expanded = !condition.expanded"
+            @click="expanded = !expanded"
         ></span>
         <div class="condition-summary">
             <span class="condition-name">{{ condition.definition.name }}</span>
@@ -215,8 +214,8 @@ export default {
         this.persist();
     },
     methods: {
-        dragStart: e => {
-            e.dataTransfer.setData('conditionIndex', e.target.getAttribute('data-condition-index'));
+        dragStart(e) {
+            this.$emit('set-move-index', Number(e.target.getAttribute('data-condition-index')));
         },
         handleConditionResult(args) {
             // console.log('ConditionEdit::Result', args);
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index 298e4817f6..939ac627e1 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -157,5 +157,12 @@
 
 .c-c__drag-ghost {
     width: 100%;
-    min-height: 10px;
+    min-height: 5px;
+    &.dragging {
+        min-height: 20px;
+        border: solid 1px blue;
+        background-color: lightblue;
+        border-radius: 2px;
+    }
+
 }
\ No newline at end of file

From c977c64139f4e83fd262e91e9a6be66984007d5b Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Tue, 28 Jan 2020 16:31:01 -0800
Subject: [PATCH 06/11] added drag image and grab cursor

---
 .../condition/components/ConditionEdit.vue      | 17 ++++++++---------
 src/plugins/condition/components/condition.scss |  7 +++++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 883fd135b7..9feba6455f 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -1,16 +1,15 @@
 <template>
 <div v-if="condition"
-     :data-condition-index="conditionIndex"
      class="c-c-editui__conditions c-c-container__container c-c__drag-wrapper"
      :class="['widget-condition', { 'widget-condition--current': currentConditionIdentifier && (currentConditionIdentifier.key === conditionIdentifier.key) }]"
-     :draggable="!condition.isDefault"
-     @dragstart="dragStart"
-     @dragover.stop
 >
     <div class="title-bar">
-        <span
-            class="c-c__menu-hamburger"
-            :class="{ 'is-enabled': !condition.isDefault }"
+        <span class="c-c__menu-hamburger"
+              :class="{ 'is-enabled': !condition.isDefault }"
+              :data-condition-index="conditionIndex"
+              :draggable="!condition.isDefault"
+              @dragstart="dragStart"
+              @dragover.stop
         ></span>
         <span
             class="is-enabled flex-elem"
@@ -204,8 +203,6 @@ export default {
             this.conditionClass = new ConditionClass(this.condition, this.openmct);
             this.conditionClass.on('conditionResultUpdated', this.handleConditionResult.bind(this));
         }));
-
-        this.dragGhost = document.getElementById('js-c-drag-ghost');
     },
     updated() {
         if (this.isCurrent && this.isCurrent.key === this.condition.key) {
@@ -215,6 +212,8 @@ export default {
     },
     methods: {
         dragStart(e) {
+            e.dataTransfer.effectAllowed = "copyMove";
+            e.dataTransfer.setDragImage(e.target.closest('.c-c-container__container'), 0, 0);
             this.$emit('set-move-index', Number(e.target.getAttribute('data-condition-index')));
         },
         handleConditionResult(args) {
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index 939ac627e1..dcfeea42a1 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -137,7 +137,14 @@
     }
 }
 
+
 .c-c__menu-hamburger {
+    &:active {
+        cursor: grabbing;
+        cursor: -moz-grabbing;
+        cursor: -webkit-grabbing;
+    }
+
     &:before {
         content: $glyph-icon-menu-hamburger;
     }

From 04da88e3b40af4e974788bd064c33dae4eba216f Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 30 Jan 2020 14:53:19 -0800
Subject: [PATCH 07/11] addressed review comments

---
 .../components/ConditionCollection.vue        | 25 +++++-
 .../condition/components/ConditionEdit.vue    | 25 +++++-
 .../condition/components/ConditionSet.vue     | 22 +++++
 .../condition/components/CurrentOutput.vue    | 22 +++++
 src/plugins/condition/components/DropHint.vue | 83 -------------------
 src/plugins/condition/components/TestData.vue | 22 +++++
 .../condition/components/condition.scss       |  6 +-
 7 files changed, 115 insertions(+), 90 deletions(-)
 delete mode 100644 src/plugins/condition/components/DropHint.vue

diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index 6363426cf6..65a6de60d6 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.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="conditionCollection"
          class="c-cs__ui_section"
@@ -109,7 +131,7 @@ export default {
         },
         dropCondition(e) {
             let targetIndex = Array.from(document.querySelectorAll('.c-c__drag-ghost')).indexOf(e.target);
-            if (targetIndex > this.moveIndex) { targetIndex-- }
+            if (targetIndex > this.moveIndex) { targetIndex-- } // for 'downward' move
             const oldIndexArr = Object.keys(this.conditionCollection);
             const move = function (arr, old_index, new_index) {
                 while (old_index < 0) {
@@ -140,7 +162,6 @@ export default {
         },
         dragEnter(e) {
             let targetIndex = Array.from(document.querySelectorAll('.c-c__drag-ghost')).indexOf(e.target);
-
             if (targetIndex > this.moveIndex) { targetIndex-- }
             if (this.moveIndex === targetIndex) { return }
             e.target.classList.add("dragging");
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index bb1bb63442..a6023bf931 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.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>
 <div v-if="condition"
      class="c-c-editui__conditions c-c-container__container c-c__drag-wrapper"
@@ -6,7 +28,6 @@
     <div class="title-bar">
         <span class="c-c__menu-hamburger"
               :class="{ 'is-enabled': !condition.isDefault }"
-              :data-condition-index="conditionIndex"
               :draggable="!condition.isDefault"
               @dragstart="dragStart"
               @dragover.stop
@@ -214,7 +235,7 @@ export default {
         dragStart(e) {
             e.dataTransfer.effectAllowed = "copyMove";
             e.dataTransfer.setDragImage(e.target.closest('.c-c-container__container'), 0, 0);
-            this.$emit('set-move-index', Number(e.target.getAttribute('data-condition-index')));
+            this.$emit('set-move-index', this.conditionIndex);
         },
         handleConditionResult(args) {
             this.$emit('condition-result-updated', {
diff --git a/src/plugins/condition/components/ConditionSet.vue b/src/plugins/condition/components/ConditionSet.vue
index a09bf2085c..1c0c5d7f6a 100644
--- a/src/plugins/condition/components/ConditionSet.vue
+++ b/src/plugins/condition/components/ConditionSet.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>
 <div class="c-object-view u-contents">
     <div class="c-cs-edit w-condition-set">
diff --git a/src/plugins/condition/components/CurrentOutput.vue b/src/plugins/condition/components/CurrentOutput.vue
index 9df85ab7a2..557483861a 100644
--- a/src/plugins/condition/components/CurrentOutput.vue
+++ b/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"
diff --git a/src/plugins/condition/components/DropHint.vue b/src/plugins/condition/components/DropHint.vue
deleted file mode 100644
index d2a6dc61b0..0000000000
--- a/src/plugins/condition/components/DropHint.vue
+++ /dev/null
@@ -1,83 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2018, 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 v-show="isValidTarget">
-    <div
-        class="c-drop-hint c-drop-hint--always-show"
-        :class="{'is-mouse-over': isMouseOver}"
-        @dragover.prevent
-        @dragenter="dragenter"
-        @dragleave="dragleave"
-        @drop="dropHandler"
-    ></div>
-</div>
-</template>
-
-<script>
-export default {
-    props:{
-        index: {
-            type: Number,
-            required: true
-        },
-        allowDrop: {
-            type: Function,
-            required: true
-        }
-    },
-    data() {
-        return {
-            isMouseOver: false,
-            isValidTarget: false
-        }
-    },
-    mounted() {
-        document.addEventListener('dragstart', this.dragstart);
-        document.addEventListener('dragend', this.dragend);
-        document.addEventListener('drop', this.dragend);
-    },
-    destroyed() {
-        document.removeEventListener('dragstart', this.dragstart);
-        document.removeEventListener('dragend', this.dragend);
-        document.removeEventListener('drop', this.dragend);
-    },
-    methods: {
-        dragenter() {
-            this.isMouseOver = true;
-        },
-        dragleave() {
-            this.isMouseOver = false;
-        },
-        dropHandler(event) {
-            this.$emit('object-drop-to', this.index, event);
-            this.isValidTarget = false;
-        },
-        dragstart(event) {
-            this.isValidTarget = this.allowDrop(event, this.index);
-        },
-        dragend() {
-            this.isValidTarget = false;
-        }
-    }
-}
-</script>
diff --git a/src/plugins/condition/components/TestData.vue b/src/plugins/condition/components/TestData.vue
index 79e0c5ac9a..f2678d5168 100644
--- a/src/plugins/condition/components/TestData.vue
+++ b/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"
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index dcfeea42a1..2e57ab44e6 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/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 {
@@ -164,9 +164,9 @@
 
 .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;

From dd0e360709f578f0fcad8b25e9b0ad70b38a031d Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 30 Jan 2020 15:11:47 -0800
Subject: [PATCH 08/11] addressed review comments

---
 .../condition/ConditionSetViewProvider.js        |  2 +-
 src/plugins/condition/components/Condition.vue   |  1 +
 .../condition/components/ConditionEdit.vue       |  2 ++
 .../condition/components/ConditionSet.vue        | 16 +++++++---------
 src/plugins/condition/utils/eventbus.js          |  2 --
 5 files changed, 11 insertions(+), 12 deletions(-)
 delete mode 100644 src/plugins/condition/utils/eventbus.js

diff --git a/src/plugins/condition/ConditionSetViewProvider.js b/src/plugins/condition/ConditionSetViewProvider.js
index 38a3d65726..267f10718c 100644
--- a/src/plugins/condition/ConditionSetViewProvider.js
+++ b/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) => {
diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index ae041c6ed2..57001c8347 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -1,4 +1,5 @@
 <template>
+<!-- TODO: current condition class should be set using openmct.objects.makeKeyString(<identifier>) -->
 <div v-if="condition"
      id="conditionArea"
      class="c-cs-ui__conditions"
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index 034a39a713..b4ea0b149a 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -1,4 +1,5 @@
 <template>
+<!-- TODO: current condition class should be set using openmct.objects.makeKeyString(<identifier>) -->
 <div v-if="condition"
      class="c-cs-editui__conditions"
      :class="['widget-condition', { 'widget-condition--current': currentConditionIdentifier && (currentConditionIdentifier.key === conditionIdentifier.key) }]"
@@ -16,6 +17,7 @@
         ></span>
         <div class="condition-summary">
             <span class="condition-name">{{ condition.definition.name }}</span>
+            <!-- TODO: description should be derived from criteria -->
             <span class="condition-description">{{ condition.definition.name }}</span>
         </div>
         <span v-if="!condition.isDefault"
diff --git a/src/plugins/condition/components/ConditionSet.vue b/src/plugins/condition/components/ConditionSet.vue
index a09bf2085c..2f871d3d55 100644
--- a/src/plugins/condition/components/ConditionSet.vue
+++ b/src/plugins/condition/components/ConditionSet.vue
@@ -1,13 +1,11 @@
 <template>
-<div class="c-object-view u-contents">
-    <div class="c-cs-edit w-condition-set">
-        <div class="c-sw-edit__ui holder">
-            <CurrentOutput :condition="currentCondition" />
-            <TestData :is-editing="isEditing" />
-            <ConditionCollection :is-editing="isEditing"
-                                 @current-condition-updated="updateCurrentCondition"
-            />
-        </div>
+<div class="c-cs-edit w-condition-set">
+    <div class="c-sw-edit__ui holder">
+        <CurrentOutput :condition="currentCondition" />
+        <TestData :is-editing="isEditing" />
+        <ConditionCollection :is-editing="isEditing"
+                             @current-condition-updated="updateCurrentCondition"
+        />
     </div>
 </div>
 </template>
diff --git a/src/plugins/condition/utils/eventbus.js b/src/plugins/condition/utils/eventbus.js
deleted file mode 100644
index 50e9f894c8..0000000000
--- a/src/plugins/condition/utils/eventbus.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import Vue from 'vue';
-export const EventBus = new Vue();

From dc85063467177d65ad63c3565911b248cd665851 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Fri, 31 Jan 2020 08:08:39 -0800
Subject: [PATCH 09/11] added isDragging prop to prevent other drag actions

---
 src/plugins/condition/components/ConditionCollection.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index 65a6de60d6..6821297e08 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -105,7 +105,8 @@ export default {
             conditionCollection: [],
             conditions: [],
             currentConditionIdentifier: this.currentConditionIdentifier || {},
-            moveIndex: null
+            moveIndex: Number,
+            isDragging: false
         };
     },
     destroyed() {
@@ -128,6 +129,7 @@ export default {
     methods: {
         setMoveIndex(index) {
             this.moveIndex = index;
+            this.isDragging = true;
         },
         dropCondition(e) {
             let targetIndex = Array.from(document.querySelectorAll('.c-c__drag-ghost')).indexOf(e.target);
@@ -159,10 +161,12 @@ export default {
             this.reorder(reorderPlan);
 
             e.target.classList.remove("dragging");
+            this.isDragging = false;
         },
         dragEnter(e) {
+            if (!this.isDragging) { return }
             let targetIndex = Array.from(document.querySelectorAll('.c-c__drag-ghost')).indexOf(e.target);
-            if (targetIndex > this.moveIndex) { targetIndex-- }
+            if (targetIndex > this.moveIndex) { targetIndex-- } // for 'downward' move
             if (this.moveIndex === targetIndex) { return }
             e.target.classList.add("dragging");
         },

From 2690156a9d19300f02e5d3ec379d22b362d97930 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Fri, 31 Jan 2020 13:44:07 -0800
Subject: [PATCH 10/11] changed kebab-case event names to camelCase

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

diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index 6821297e08..94471d003d 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -65,10 +65,10 @@
                         <ConditionEdit :condition-identifier="conditionIdentifier"
                                        :current-condition-identifier="currentConditionIdentifier"
                                        :condition-index="index"
-                                       @update-current-condition="updateCurrentCondition"
-                                       @remove-condition="removeCondition"
-                                       @condition-result-updated="handleConditionResult"
-                                       @set-move-index="setMoveIndex"
+                                       @updateCurrentCondition="updateCurrentCondition"
+                                       @removeCondition="removeCondition"
+                                       @conditionResultUpdated="handleConditionResult"
+                                       @setMoveIndex="setMoveIndex"
                         />
                     </div>
                     <div v-else>
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index a6023bf931..09b6686846 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -235,16 +235,16 @@ export default {
         dragStart(e) {
             e.dataTransfer.effectAllowed = "copyMove";
             e.dataTransfer.setDragImage(e.target.closest('.c-c-container__container'), 0, 0);
-            this.$emit('set-move-index', this.conditionIndex);
+            this.$emit('setMoveIndex', this.conditionIndex);
         },
         handleConditionResult(args) {
-            this.$emit('condition-result-updated', {
+            this.$emit('conditionResultUpdated', {
                 id: this.conditionIdentifier,
                 result: args.data.result
             })
         },
         removeCondition(ev) { //move this to conditionCollection
-            this.$emit('remove-condition', this.conditionIdentifier);
+            this.$emit('removeCondition', this.conditionIdentifier);
         },
         setOutput() {
             if (this.condition.definition.output !== 'false' && this.condition.definition.output !== 'true') {
@@ -307,7 +307,7 @@ export default {
             //find the criterion being updated and set the input property
         },
         updateCurrentCondition() {
-            this.$emit('update-current-condition', this.conditionIdentifier);
+            this.$emit('updateCurrentCondition', this.conditionIdentifier);
         }
     }
 }

From e580734c9593ab863f397b52ec9662f045fc7b61 Mon Sep 17 00:00:00 2001
From: Shefali Joshi <simplyrender@gmail.com>
Date: Fri, 31 Jan 2020 14:44:28 -0800
Subject: [PATCH 11/11] Set criteria options (#2630)

* Set criteria options on condition edit

* Persists telemetry options correctly and loads them on mount

* Fixes saving the input value for criteria

* Display active condition's output in read only view

* Destroy classes and unsubscribe when condition set view is destroyed

* Fixes saving the input value for a criteria

* Handle telemetry removal

* Fixes tests

* Addresses comments - change function names, consolidate compute function

* Addresses review comments
- Use camelCase for events (did not change properties as eslint complains)
- Reduce repeated property access by assigning to a variable
- Use descriptive variable name

* Addressing comments - improves input value field visibility logic

* Change variable name to reflect intent
---
 src/plugins/condition/Condition.js            |   8 +-
 src/plugins/condition/ConditionSpec.js        |   1 -
 .../condition/components/Condition.vue        |  18 +++
 .../components/ConditionCollection.vue        |  42 +++--
 .../condition/components/ConditionEdit.vue    | 150 +++++++++++++-----
 .../condition/components/ConditionSet.vue     |   2 +-
 src/plugins/condition/utils/evaluator.js      |  27 +---
 7 files changed, 163 insertions(+), 85 deletions(-)

diff --git a/src/plugins/condition/Condition.js b/src/plugins/condition/Condition.js
index 6ff4a41b56..ab3bc0858d 100644
--- a/src/plugins/condition/Condition.js
+++ b/src/plugins/condition/Condition.js
@@ -24,7 +24,7 @@ import * as EventEmitter from 'eventemitter3';
 import uuid from 'uuid';
 import TelemetryCriterion from "@/plugins/condition/criterion/TelemetryCriterion";
 import { TRIGGER } from "@/plugins/condition/utils/constants";
-import {computeConditionForAll, computeConditionForAny} from "@/plugins/condition/utils/evaluator";
+import {computeCondition} from "@/plugins/condition/utils/evaluator";
 
 /*
 * conditionDefinition = {
@@ -228,11 +228,7 @@ export default class ConditionClass extends EventEmitter {
 
     //TODO: implement as part of the evaluator class task.
     evaluate() {
-        if (this.trigger === TRIGGER.ANY) {
-            this.result = computeConditionForAny(this.criteriaResults);
-        } else if (this.trigger === TRIGGER.ALL) {
-            this.result = computeConditionForAll(this.criteriaResults);
-        }
+        this.result = computeCondition(this.criteriaResults, this.trigger === TRIGGER.ALL);
     }
 
     emitEvent(eventName, data) {
diff --git a/src/plugins/condition/ConditionSpec.js b/src/plugins/condition/ConditionSpec.js
index 2f58676cef..18334bcada 100644
--- a/src/plugins/condition/ConditionSpec.js
+++ b/src/plugins/condition/ConditionSpec.js
@@ -103,7 +103,6 @@ describe("The condition", function () {
     it("initializes with criteria from the condition definition", function () {
         expect(conditionObj.criteria.length).toEqual(1);
         let criterion = conditionObj.criteria[0];
-        console.log(criterion);
         expect(criterion instanceof TelemetryCriterion).toBeTrue();
         expect(criterion.operator).toEqual(testConditionDefinition.definition.criteria[0].operator);
         expect(criterion.input).toEqual(testConditionDefinition.definition.criteria[0].input);
diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index 57001c8347..1e37bc6479 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -22,6 +22,8 @@
 </template>
 
 <script>
+import ConditionClass from "@/plugins/condition/Condition";
+
 export default {
     inject: ['openmct'],
     props: {
@@ -39,10 +41,26 @@ export default {
             condition: this.condition
         };
     },
+    destroyed() {
+        this.conditionClass.off('conditionResultUpdated', this.handleConditionResult.bind(this));
+        if (this.conditionClass && typeof this.conditionClass.destroy === 'function') {
+            this.conditionClass.destroy();
+        }
+    },
     mounted() {
         this.openmct.objects.get(this.conditionIdentifier).then((obj => {
             this.condition = obj;
+            this.conditionClass = new ConditionClass(this.condition, this.openmct);
+            this.conditionClass.on('conditionResultUpdated', this.handleConditionResult.bind(this));
         }));
+    },
+    methods: {
+        handleConditionResult(args) {
+            this.$emit('conditionResultUpdated', {
+                id: this.conditionIdentifier,
+                result: args.data.result
+            })
+        }
     }
 }
 </script>
diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index e8ffa3438d..1044506d9b 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -35,15 +35,17 @@
             >
                 <div v-if="isEditing">
                     <ConditionEdit :condition-identifier="conditionIdentifier"
+                                   :telemetry="telemetryObjs"
                                    :current-condition-identifier="currentConditionIdentifier"
-                                   @update-current-condition="updateCurrentCondition"
-                                   @remove-condition="removeCondition"
-                                   @condition-result-updated="handleConditionResult"
+                                   @updateCurrentCondition="updateCurrentCondition"
+                                   @removeCondition="removeCondition"
+                                   @conditionResultUpdated="handleConditionResult"
                     />
                 </div>
                 <div v-else>
                     <Condition :condition-identifier="conditionIdentifier"
                                :current-condition-identifier="currentConditionIdentifier"
+                               @conditionResultUpdated="handleConditionResult"
                     />
                 </div>
             </div>
@@ -72,7 +74,8 @@ export default {
             parentKeyString: this.openmct.objects.makeKeyString(this.domainObject.identifier),
             conditionCollection: [],
             conditions: [],
-            currentConditionIdentifier: this.currentConditionIdentifier || {}
+            currentConditionIdentifier: this.currentConditionIdentifier || {},
+            telemetryObjs: this.telemetryObjs
         };
     },
     destroyed() {
@@ -84,6 +87,7 @@ export default {
         this.instantiate = this.openmct.$injector.get('instantiate');
         this.composition = this.openmct.composition.get(this.domainObject);
         this.composition.on('add', this.addTelemetry);
+        this.composition.on('remove', this.removeTelemetry);
         this.composition.load();
         this.conditionCollection = this.domainObject.configuration ? this.domainObject.configuration.conditionCollection : [];
         if (!this.conditionCollection.length) {
@@ -108,16 +112,26 @@ export default {
                     break;
                 }
             }
-            this.$emit('current-condition-updated', currentConditionIdentifier);
+            this.$emit('currentConditionUpdated', currentConditionIdentifier);
         },
         addTelemetry(telemetryDomainObject) {
             this.telemetryObjs.push(telemetryDomainObject);
         },
+        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 conditionDO = this.getConditionDomainObject(!!isDefault);
-            //persist the condition DO so that we can do an openmct.objects.get on it and only persist the identifier in the conditionCollection of conditionSet
-            this.openmct.objects.mutate(conditionDO, 'created', new Date());
-            this.conditionCollection.unshift(conditionDO.identifier);
+            let conditionDomainObject = this.getConditionDomainObject(!!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
+            this.openmct.objects.mutate(conditionDomainObject, 'created', new Date());
+            this.conditionCollection.unshift(conditionDomainObject.identifier);
             this.persist();
         },
         updateCurrentCondition(identifier) {
@@ -137,16 +151,16 @@ export default {
                     criteria: isDefault ? [] : [{
                         operation: '',
                         input: '',
-                        metaDataKey: this.openmct.telemetry.getMetadata(this.telemetryObjs[0]).values()[0].key,
-                        key: this.telemetryObjs.length ? this.openmct.objects.makeKeyString(this.telemetryObjs[0].identifier) : null
+                        metaDataKey: '',
+                        key: ''
                     }]
                 },
                 summary: 'summary description'
             };
-            let conditionDOKeyString = this.openmct.objects.makeKeyString(conditionObj.identifier);
-            let newDO = this.instantiate(conditionObj, conditionDOKeyString);
+            let conditionDomainObjectKeyString = this.openmct.objects.makeKeyString(conditionObj.identifier);
+            let newDomainObject = this.instantiate(conditionObj, conditionDomainObjectKeyString);
 
-            return newDO.useCapability('adapter');
+            return newDomainObject.useCapability('adapter');
         },
         updateCondition(updatedCondition) {
             //TODO: this should only happen for reordering
diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
index d549d166f8..56ab70f5c1 100644
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ b/src/plugins/condition/components/ConditionEdit.vue
@@ -84,17 +84,22 @@
                                 </li>
                             </ul>
                             <ul class="t-widget-rule-config">
-                                <li v-if="telemetryObject && telemetryMetadata"
+                                <li v-if="telemetry.length"
                                     class="has-local-controls t-condition"
                                 >
                                     <label>when</label>
                                     <span class="t-configuration">
                                         <span class="controls">
                                             <select v-model="selectedTelemetryKey"
-                                                    class=""
+                                                    @change="updateTelemetryMetaData"
                                             >
                                                 <option value="">- Select Telemetry -</option>
-                                                <option :value="telemetryObject.identifier">{{ telemetryObject.name }}</option>
+                                                <option v-for="telemetryOption in telemetry"
+                                                        :key="telemetryOption.identifier.key"
+                                                        :value="telemetryOption.identifier"
+                                                >
+                                                    {{ telemetryOption.name }}
+                                                </option>
                                             </select>
                                         </span>
                                         <span class="controls">
@@ -109,8 +114,8 @@
                                             </select>
                                         </span>
                                         <span class="controls">
-                                            <select v-model="selectedOperationKey"
-                                                    @change="operationKeyChange"
+                                            <select v-model="selectOperationName"
+                                                    @change="setInputValueVisibility"
                                             >
                                                 <option value="">- Select Comparison -</option>
                                                 <option v-for="option in operations"
@@ -123,7 +128,7 @@
                                             <input v-if="comparisonValueField"
                                                    class="t-rule-name-input"
                                                    type="text"
-                                                   @keyup="getOperationValue"
+                                                   v-model="operationValue"
                                             >
                                         </span>
                                     </span>
@@ -152,6 +157,11 @@ export default {
         currentConditionIdentifier: {
             type: Object,
             required: true
+        },
+        telemetry: {
+            type: Array,
+            required: true,
+            default: () => []
         }
     },
     data() {
@@ -161,12 +171,13 @@ export default {
             telemetryObject: this.telemetryObject,
             telemetryMetadata: this.telemetryMetadata,
             operations: OPERATIONS,
-            selectedMetaDataKey: null,
+            selectedMetaDataKey: '',
             selectedTelemetryKey: '',
-            selectedOperationKey: '',
-            selectedOutputKey: null,
+            selectOperationName: '',
+            selectedOutputKey: '',
             stringOutputField: false,
             comparisonValueField: false,
+            operationValue: this.operationValue,
             outputOptions: [
                 {
                     key: 'false',
@@ -185,42 +196,64 @@ export default {
         };
     },
     destroyed() {
-        this.conditionClass.off('conditionResultUpdated', this.handleConditionResult.bind(this));
-        if (this.conditionClass && typeof this.conditionClass.destroy === 'function') {
-            this.conditionClass.destroy();
-        }
+        this.destroy();
     },
     mounted() {
         this.openmct.objects.get(this.conditionIdentifier).then((obj => {
             this.condition = obj;
+            this.initialize();
+        }));
+    },
+    updated() {
+        //validate telemetry exists, update criteria as needed
+        this.validate();
+        this.persist();
+    },
+    methods: {
+        initialize() {
             this.setOutput();
             this.setOperation();
             this.updateTelemetry();
             this.conditionClass = new ConditionClass(this.condition, this.openmct);
             this.conditionClass.on('conditionResultUpdated', this.handleConditionResult.bind(this));
-        }));
-    },
-    updated() {
-        if (this.isCurrent && this.isCurrent.key === this.condition.key) {
-            this.updateCurrentCondition();
-        }
-        this.persist();
-    },
-    methods: {
+        },
+        destroy() {
+            this.conditionClass.off('conditionResultUpdated', this.handleConditionResult.bind(this));
+            if (this.conditionClass && typeof this.conditionClass.destroy === 'function') {
+                this.conditionClass.destroy();
+                delete this.conditionClass;
+            }
+        },
+        reset() {
+            this.selectedMetaDataKey = '';
+            this.selectedTelemetryKey = '';
+            this.selectOperationName = '';
+            this.operationValue = '';
+        },
+        validate() {
+            if (this.hasTelemetry() && !this.getTelemetryKey()) {
+                this.reset();
+            } else {
+                if (!this.conditionClass) {
+                    this.initialize();
+                }
+            }
+        },
         handleConditionResult(args) {
-            this.$emit('condition-result-updated', {
+            this.$emit('conditionResultUpdated', {
                 id: this.conditionIdentifier,
                 result: args.data.result
             })
         },
-        removeCondition(ev) { //move this to conditionCollection
-            this.$emit('remove-condition', this.conditionIdentifier);
+        removeCondition(ev) {
+            this.$emit('removeCondition', this.conditionIdentifier);
         },
         setOutput() {
-            if (this.condition.definition.output !== 'false' && this.condition.definition.output !== 'true') {
+            let conditionOutput = this.condition.definition.output;
+            if (conditionOutput !== 'false' && conditionOutput !== 'true') {
                 this.selectedOutputKey = this.outputOptions[2].key;
             } else {
-                if (this.condition.definition.output === 'true') {
+                if (conditionOutput === 'true') {
                     this.selectedOutputKey = this.outputOptions[1].key;
                 } else {
                     this.selectedOutputKey = this.outputOptions[0].key;
@@ -231,7 +264,11 @@ export default {
             if (this.condition.definition.criteria.length && this.condition.definition.criteria[0].operation) {
                 for (let i=0, ii=this.operations.length; i < ii; i++) {
                     if (this.condition.definition.criteria[0].operation === this.operations[i].name) {
-                        this.selectedOperationKey = this.operations[i].name;
+                        this.selectOperationName = this.operations[i].name;
+                        this.comparisonValueField = this.operations[i].inputCount > 0;
+                        if (this.comparisonValueField) {
+                            this.operationValue = this.condition.definition.criteria[0].input[0];
+                        }
                     }
                 }
             }
@@ -241,17 +278,47 @@ export default {
                 this.openmct.objects.get(this.condition.definition.criteria[0].key).then((obj) => {
                     this.telemetryObject = obj;
                     this.telemetryMetadata = this.openmct.telemetry.getMetadata(this.telemetryObject).values();
-                    this.selectedMetaDataKey = '';
-                    this.selectedTelemetryKey = this.telemetryObject.identifier;
+                    this.selectedMetaDataKey = this.getTelemetryMetadataKey();
+                    this.selectedTelemetryKey = this.getTelemetryKey();
                 });
             } else {
                 this.telemetryObject = null;
             }
         },
+        getTelemetryMetadataKey() {
+            let index = -1;
+            if (this.condition.definition.criteria[0].metaDataKey) {
+                index = _.findIndex(this.telemetryMetadata, (metadata) => {
+                    return metadata.key === this.condition.definition.criteria[0].metaDataKey;
+                });
+            }
+            return this.telemetryMetadata.length && index > -1 ? this.telemetryMetadata[index].key : '';
+        },
+        getTelemetryKey() {
+            let index = -1;
+            if (this.condition.definition.criteria[0].key) {
+                index = _.findIndex(this.telemetry, (obj) => {
+                    let key = this.openmct.objects.makeKeyString(obj.identifier);
+                    let conditionKey = this.openmct.objects.makeKeyString(this.condition.definition.criteria[0].key);
+                    return key === conditionKey;
+                });
+            }
+            return this.telemetry.length && index > -1 ? this.telemetry[index].identifier : '';
+        },
         hasTelemetry() {
             return this.condition.definition.criteria.length && this.condition.definition.criteria[0].key;
         },
+        updateConditionCriteria() {
+            if (this.condition.definition.criteria.length) {
+                let criterion = this.condition.definition.criteria[0];
+                criterion.key = this.selectedTelemetryKey;
+                criterion.metaDataKey = this.selectedMetaDataKey;
+                criterion.operation = this.selectOperationName;
+                criterion.input = [this.operationValue];
+            }
+        },
         persist() {
+            this.updateConditionCriteria();
             this.openmct.objects.mutate(this.condition, 'definition', this.condition.definition);
         },
         checkInputValue() {
@@ -261,23 +328,22 @@ export default {
                 this.condition.definition.output = this.selectedOutputKey;
             }
         },
-        operationKeyChange(ev) {
-            if (ev.target.value !== 'isUndefined' && ev.target.value !== 'isDefined') {
-                this.comparisonValueField = true;
-            } else {
-                this.comparisonValueField = false;
+        setInputValueVisibility(ev) {
+            for (let i=0, ii=this.operations.length; i < ii; i++) {
+                if (this.selectOperationName === this.operations[i].name) {
+                    this.comparisonValueField = this.operations[i].inputCount > 0;
+                    break;
+                }
             }
-            this.condition.definition.criteria[0].operation = this.selectedOperationKey;
-            this.persist();
             //find the criterion being updated and set the operation property
         },
-        getOperationValue(ev) {
-            this.condition.definition.criteria[0].input = [ev.target.value];
-            this.persist();
-            //find the criterion being updated and set the input property
+        updateTelemetryMetaData() {
+            this.selectedMetaDataKey = '';
+            this.updateConditionCriteria();
+            this.updateTelemetry();
         },
         updateCurrentCondition() {
-            this.$emit('update-current-condition', this.conditionIdentifier);
+            this.$emit('updateCurrentCondition', this.conditionIdentifier);
         }
     }
 }
diff --git a/src/plugins/condition/components/ConditionSet.vue b/src/plugins/condition/components/ConditionSet.vue
index 2f871d3d55..c918d1d221 100644
--- a/src/plugins/condition/components/ConditionSet.vue
+++ b/src/plugins/condition/components/ConditionSet.vue
@@ -4,7 +4,7 @@
         <CurrentOutput :condition="currentCondition" />
         <TestData :is-editing="isEditing" />
         <ConditionCollection :is-editing="isEditing"
-                             @current-condition-updated="updateCurrentCondition"
+                             @currentConditionUpdated="updateCurrentCondition"
         />
     </div>
 </div>
diff --git a/src/plugins/condition/utils/evaluator.js b/src/plugins/condition/utils/evaluator.js
index f74bb1e5d4..2f0a325f0e 100644
--- a/src/plugins/condition/utils/evaluator.js
+++ b/src/plugins/condition/utils/evaluator.js
@@ -1,28 +1,13 @@
-/**
- * Returns true only if at least one of the results is true
- **/
-export const computeConditionForAny = (resultMap) => {
+export const computeCondition = (resultMap, allMustBeTrue) => {
     let result = false;
     for (let key in resultMap) {
         if (resultMap.hasOwnProperty(key)) {
             result = resultMap[key];
-            if (result) {
-                break;
-            }
-        }
-    }
-    return result;
-};
-
-/**
- * Returns true only if all the results are true
- **/
-export const computeConditionForAll = (resultMap) => {
-    let result = false;
-    for (let key in resultMap) {
-        if (resultMap.hasOwnProperty(key)) {
-            result = resultMap[key];
-            if (!result) {
+            if (allMustBeTrue && !result) {
+                //If we want all conditions to be true, then even one negative result should break.
+                break;
+            } else if (!allMustBeTrue && result) {
+                //If we want at least one condition to be true, then even one positive result should break.
                 break;
             }
         }