From fa6dd84945c8c7cc416577b82d5b2a974f28d1a9 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 07:23:38 -0800
Subject: [PATCH 01/14] added controls for remove and duplicate criteria

---
 .../condition/components/Condition.vue        |  3 ++-
 .../condition/components/Criterion.vue        | 26 +++++++++++++++++++
 .../condition/components/condition.scss       |  9 +++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index e469cd588e..3633e85656 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -96,6 +96,7 @@
                                                :criterion="criterion"
                                                :index="index"
                                                :trigger="trigger"
+                                               :is-default="domainObject.configuration.criteria.length === 1"
                                                @persist="persist"
                                     />
                                 </ul>
@@ -214,7 +215,7 @@ export default {
             this.domainObject.configuration.criteria.push(criteriaObject);
         },
         dragStart(e) {
-            this.$emit('set-move-index', Number(e.target.getAttribute('data-condition-index')));
+            this.$emit('setMoveIndex', Number(e.target.getAttribute('data-condition-index')));
         },
         destroy() {
             if (this.conditionClass) {
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 0bd865f828..046ca4a19e 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -46,6 +46,15 @@
             >
         </span>
     </span>
+    <div class="temp">
+        <span class="is-enabled c-c__duplicate"
+              @click="cloneCriterion"
+        ></span>
+        <span v-if="!isDefault"
+              class="is-enabled c-c__trash"
+              @click="removeCriterion"
+        ></span>
+    </div>
 </li>
 
 </template>
@@ -72,6 +81,10 @@ export default {
         trigger: {
             type: String,
             required: true
+        },
+        isDefault: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
@@ -91,6 +104,7 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
+        console.log('this.isDefault', this.isDefault);
     },
     methods: {
         updateMetadataOptions() {
@@ -113,6 +127,18 @@ export default {
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },
+        removeCriterion(ev) {
+            console.log('removeCriterion', this.index);
+            // this.$emit('removeCondition', this.conditionIdentifier);
+        },
+        cloneCriterion(ev) {
+            console.log('cloneCriterion')
+            // this.$emit('cloneCondition', {
+            //     identifier: this.conditionIdentifier,
+            //     index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
+            // });
+        },
+
         persist() {
             this.$emit('persist', this.criterion);
         }
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index b6e4e47bd2..d5503456db 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -197,3 +197,12 @@
         border-radius: 2px;
     }
 }
+
+.temp {
+    width: 24px;
+
+    .c-c__duplicate,
+    .c-c__trash {
+        display: inline-block;
+    }
+}

From 386fc7504782b463af39240d4faac5cdef87b5c5 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 12:23:18 -0800
Subject: [PATCH 02/14] remove criterion working

---
 .../condition/components/Condition.vue        | 41 ++++++++++++++-----
 .../components/ConditionCollection.vue        |  1 -
 .../condition/components/Criterion.vue        | 27 +-----------
 .../condition/components/condition.scss       |  2 +-
 4 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index 3633e85656..c76e1db722 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -90,15 +90,27 @@
                                 <ul v-if="telemetry.length"
                                     class="t-widget-condition-config"
                                 >
-                                    <Criterion v-for="(criterion, index) in domainObject.configuration.criteria"
-                                               :key="index"
-                                               :telemetry="telemetry"
-                                               :criterion="criterion"
-                                               :index="index"
-                                               :trigger="trigger"
-                                               :is-default="domainObject.configuration.criteria.length === 1"
-                                               @persist="persist"
-                                    />
+                                    <li v-for="(criterion, index) in domainObject.configuration.criteria"
+                                        :key="index"
+                                        class="has-local-controls t-condition"
+                                    >
+                                        <Criterion :telemetry="telemetry"
+                                                   :criterion="criterion"
+                                                   :index="index"
+                                                   :trigger="trigger"
+                                                   :is-default="domainObject.configuration.criteria.length === 1"
+                                                   @persist="persist"
+                                        />
+                                        <div class="temp">
+                                            <span class="is-enabled c-c__duplicate"
+                                                  @click="cloneCriterion"
+                                            ></span>
+                                            <span v-if="!(domainObject.configuration.criteria.length === 1)"
+                                                  class="is-enabled c-c__trash"
+                                                  @click="removeCriterion(index)"
+                                            ></span>
+                                        </div>
+                                    </li>
                                 </ul>
                                 <div class="holder c-c-button-wrapper align-left">
                                     <span class="c-c-label-spacer"></span>
@@ -180,7 +192,8 @@ export default {
             trigger: 'all',
             selectedOutputKey: '',
             stringOutputField: false,
-            outputOptions: ['false', 'true', 'string']
+            outputOptions: ['false', 'true', 'string'],
+            criterionIndex: 0
         };
     },
     computed: {
@@ -241,6 +254,14 @@ export default {
                 index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
             });
         },
+        removeCriterion(index) {
+            this.domainObject.configuration.criteria.splice(index, 1);
+            this.persist()
+        },
+        cloneCriterion(ev) {
+            // console.log('cloneCriterion')
+        },
+
         setOutput() {
             let conditionOutput = this.domainObject.configuration.output;
             if (conditionOutput) {
diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index fc52c2251a..ddc9483296 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -83,7 +83,6 @@
 import Condition from '../../condition/components/Condition.vue';
 import uuid from 'uuid';
 
-
 export default {
     inject: ['openmct', 'domainObject'],
     components: {
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 046ca4a19e..e04803faf0 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -1,5 +1,5 @@
 <template>
-<li class="has-local-controls t-condition">
+<div>
     <label>{{ setRowLabel }}</label>
     <span class="t-configuration">
         <span class="controls">
@@ -46,17 +46,7 @@
             >
         </span>
     </span>
-    <div class="temp">
-        <span class="is-enabled c-c__duplicate"
-              @click="cloneCriterion"
-        ></span>
-        <span v-if="!isDefault"
-              class="is-enabled c-c__trash"
-              @click="removeCriterion"
-        ></span>
-    </div>
-</li>
-
+</div>
 </template>
 
 <script>
@@ -104,7 +94,6 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
-        console.log('this.isDefault', this.isDefault);
     },
     methods: {
         updateMetadataOptions() {
@@ -127,18 +116,6 @@ export default {
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },
-        removeCriterion(ev) {
-            console.log('removeCriterion', this.index);
-            // this.$emit('removeCondition', this.conditionIdentifier);
-        },
-        cloneCriterion(ev) {
-            console.log('cloneCriterion')
-            // this.$emit('cloneCondition', {
-            //     identifier: this.conditionIdentifier,
-            //     index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
-            // });
-        },
-
         persist() {
             this.$emit('persist', this.criterion);
         }
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index d5503456db..76d8541cf4 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -199,7 +199,7 @@
 }
 
 .temp {
-    width: 24px;
+    width: 28px;
 
     .c-c__duplicate,
     .c-c__trash {

From 22161fce7ffa6d99cb16b3b47e78d657f7953ce7 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 12:44:50 -0800
Subject: [PATCH 03/14] implimented clone criterion

---
 src/plugins/condition/components/Condition.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index c76e1db722..c1bf624146 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -103,7 +103,7 @@
                                         />
                                         <div class="temp">
                                             <span class="is-enabled c-c__duplicate"
-                                                  @click="cloneCriterion"
+                                                  @click="cloneCriterion(index)"
                                             ></span>
                                             <span v-if="!(domainObject.configuration.criteria.length === 1)"
                                                   class="is-enabled c-c__trash"
@@ -258,8 +258,10 @@ export default {
             this.domainObject.configuration.criteria.splice(index, 1);
             this.persist()
         },
-        cloneCriterion(ev) {
-            // console.log('cloneCriterion')
+        cloneCriterion(index) {
+            const clonedCriterion = {...this.domainObject.configuration.criteria[index]};
+            this.domainObject.configuration.criteria.splice(index + 1, 0, clonedCriterion);
+            this.persist()
         },
 
         setOutput() {

From 2a9ccdcffd6acb406f7b0852169ad0753dcc4b7f Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 07:23:38 -0800
Subject: [PATCH 04/14] added controls for remove and duplicate criteria

---
 .../condition/components/Condition.vue        |  1 +
 .../condition/components/Criterion.vue        | 26 +++++++++++++++++++
 .../condition/components/condition.scss       |  9 +++++++
 3 files changed, 36 insertions(+)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index c930fee550..f3983ac912 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -117,6 +117,7 @@
                                                :criterion="criterion"
                                                :index="index"
                                                :trigger="trigger"
+                                               :is-default="domainObject.configuration.criteria.length === 1"
                                                @persist="persist"
                                     />
                                 </ul>
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 0bd865f828..046ca4a19e 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -46,6 +46,15 @@
             >
         </span>
     </span>
+    <div class="temp">
+        <span class="is-enabled c-c__duplicate"
+              @click="cloneCriterion"
+        ></span>
+        <span v-if="!isDefault"
+              class="is-enabled c-c__trash"
+              @click="removeCriterion"
+        ></span>
+    </div>
 </li>
 
 </template>
@@ -72,6 +81,10 @@ export default {
         trigger: {
             type: String,
             required: true
+        },
+        isDefault: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
@@ -91,6 +104,7 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
+        console.log('this.isDefault', this.isDefault);
     },
     methods: {
         updateMetadataOptions() {
@@ -113,6 +127,18 @@ export default {
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },
+        removeCriterion(ev) {
+            console.log('removeCriterion', this.index);
+            // this.$emit('removeCondition', this.conditionIdentifier);
+        },
+        cloneCriterion(ev) {
+            console.log('cloneCriterion')
+            // this.$emit('cloneCondition', {
+            //     identifier: this.conditionIdentifier,
+            //     index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
+            // });
+        },
+
         persist() {
             this.$emit('persist', this.criterion);
         }
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index b6e4e47bd2..d5503456db 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -197,3 +197,12 @@
         border-radius: 2px;
     }
 }
+
+.temp {
+    width: 24px;
+
+    .c-c__duplicate,
+    .c-c__trash {
+        display: inline-block;
+    }
+}

From 7fc825949cb42618ea6d5d0433d68ba1cf0d24da Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 12:23:18 -0800
Subject: [PATCH 05/14] remove criterion working

---
 .../condition/components/Condition.vue        | 41 ++++++++++++++-----
 .../components/ConditionCollection.vue        |  1 -
 .../condition/components/Criterion.vue        | 27 +-----------
 .../condition/components/condition.scss       |  2 +-
 4 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index f3983ac912..ea2818c8de 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -111,15 +111,27 @@
                                 <ul v-if="telemetry.length"
                                     class="t-widget-condition-config"
                                 >
-                                    <Criterion v-for="(criterion, index) in domainObject.configuration.criteria"
-                                               :key="index"
-                                               :telemetry="telemetry"
-                                               :criterion="criterion"
-                                               :index="index"
-                                               :trigger="trigger"
-                                               :is-default="domainObject.configuration.criteria.length === 1"
-                                               @persist="persist"
-                                    />
+                                    <li v-for="(criterion, index) in domainObject.configuration.criteria"
+                                        :key="index"
+                                        class="has-local-controls t-condition"
+                                    >
+                                        <Criterion :telemetry="telemetry"
+                                                   :criterion="criterion"
+                                                   :index="index"
+                                                   :trigger="trigger"
+                                                   :is-default="domainObject.configuration.criteria.length === 1"
+                                                   @persist="persist"
+                                        />
+                                        <div class="temp">
+                                            <span class="is-enabled c-c__duplicate"
+                                                  @click="cloneCriterion"
+                                            ></span>
+                                            <span v-if="!(domainObject.configuration.criteria.length === 1)"
+                                                  class="is-enabled c-c__trash"
+                                                  @click="removeCriterion(index)"
+                                            ></span>
+                                        </div>
+                                    </li>
                                 </ul>
                                 <div class="holder c-c-button-wrapper align-left">
                                     <span class="c-c-label-spacer"></span>
@@ -201,7 +213,8 @@ export default {
             trigger: 'all',
             selectedOutputKey: '',
             stringOutputField: false,
-            outputOptions: ['false', 'true', 'string']
+            outputOptions: ['false', 'true', 'string'],
+            criterionIndex: 0
         };
     },
     computed: {
@@ -264,6 +277,14 @@ export default {
                 index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
             });
         },
+        removeCriterion(index) {
+            this.domainObject.configuration.criteria.splice(index, 1);
+            this.persist()
+        },
+        cloneCriterion(ev) {
+            // console.log('cloneCriterion')
+        },
+
         setOutput() {
             let conditionOutput = this.domainObject.configuration.output;
             if (conditionOutput) {
diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index cde15c22f9..0e464e2bcd 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -84,7 +84,6 @@
 import Condition from '../../condition/components/Condition.vue';
 import uuid from 'uuid';
 
-
 export default {
     inject: ['openmct', 'domainObject'],
     components: {
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 046ca4a19e..e04803faf0 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -1,5 +1,5 @@
 <template>
-<li class="has-local-controls t-condition">
+<div>
     <label>{{ setRowLabel }}</label>
     <span class="t-configuration">
         <span class="controls">
@@ -46,17 +46,7 @@
             >
         </span>
     </span>
-    <div class="temp">
-        <span class="is-enabled c-c__duplicate"
-              @click="cloneCriterion"
-        ></span>
-        <span v-if="!isDefault"
-              class="is-enabled c-c__trash"
-              @click="removeCriterion"
-        ></span>
-    </div>
-</li>
-
+</div>
 </template>
 
 <script>
@@ -104,7 +94,6 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
-        console.log('this.isDefault', this.isDefault);
     },
     methods: {
         updateMetadataOptions() {
@@ -127,18 +116,6 @@ export default {
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },
-        removeCriterion(ev) {
-            console.log('removeCriterion', this.index);
-            // this.$emit('removeCondition', this.conditionIdentifier);
-        },
-        cloneCriterion(ev) {
-            console.log('cloneCriterion')
-            // this.$emit('cloneCondition', {
-            //     identifier: this.conditionIdentifier,
-            //     index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
-            // });
-        },
-
         persist() {
             this.$emit('persist', this.criterion);
         }
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index d5503456db..76d8541cf4 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -199,7 +199,7 @@
 }
 
 .temp {
-    width: 24px;
+    width: 28px;
 
     .c-c__duplicate,
     .c-c__trash {

From 0686e6d38f73de347354e5cf217b55b825b27bb9 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 12:44:50 -0800
Subject: [PATCH 06/14] implimented clone criterion

---
 src/plugins/condition/components/Condition.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index ea2818c8de..613c0d8591 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -124,7 +124,7 @@
                                         />
                                         <div class="temp">
                                             <span class="is-enabled c-c__duplicate"
-                                                  @click="cloneCriterion"
+                                                  @click="cloneCriterion(index)"
                                             ></span>
                                             <span v-if="!(domainObject.configuration.criteria.length === 1)"
                                                   class="is-enabled c-c__trash"
@@ -281,8 +281,10 @@ export default {
             this.domainObject.configuration.criteria.splice(index, 1);
             this.persist()
         },
-        cloneCriterion(ev) {
-            // console.log('cloneCriterion')
+        cloneCriterion(index) {
+            const clonedCriterion = {...this.domainObject.configuration.criteria[index]};
+            this.domainObject.configuration.criteria.splice(index + 1, 0, clonedCriterion);
+            this.persist()
         },
 
         setOutput() {

From 30a493d0386351f5b3493a23bbdb2ede80fdeba2 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Wed, 26 Feb 2020 11:40:52 -0800
Subject: [PATCH 07/14] resolved merge conflict

---
 .../condition/components/Condition.vue        |  1 +
 .../condition/components/Criterion.vue        | 26 +++++++++++++++++++
 .../condition/components/condition.scss       |  9 +++++++
 3 files changed, 36 insertions(+)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index c930fee550..f3983ac912 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -117,6 +117,7 @@
                                                :criterion="criterion"
                                                :index="index"
                                                :trigger="trigger"
+                                               :is-default="domainObject.configuration.criteria.length === 1"
                                                @persist="persist"
                                     />
                                 </ul>
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 0bd865f828..046ca4a19e 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -46,6 +46,15 @@
             >
         </span>
     </span>
+    <div class="temp">
+        <span class="is-enabled c-c__duplicate"
+              @click="cloneCriterion"
+        ></span>
+        <span v-if="!isDefault"
+              class="is-enabled c-c__trash"
+              @click="removeCriterion"
+        ></span>
+    </div>
 </li>
 
 </template>
@@ -72,6 +81,10 @@ export default {
         trigger: {
             type: String,
             required: true
+        },
+        isDefault: {
+            type: Boolean,
+            default: false
         }
     },
     data() {
@@ -91,6 +104,7 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
+        console.log('this.isDefault', this.isDefault);
     },
     methods: {
         updateMetadataOptions() {
@@ -113,6 +127,18 @@ export default {
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },
+        removeCriterion(ev) {
+            console.log('removeCriterion', this.index);
+            // this.$emit('removeCondition', this.conditionIdentifier);
+        },
+        cloneCriterion(ev) {
+            console.log('cloneCriterion')
+            // this.$emit('cloneCondition', {
+            //     identifier: this.conditionIdentifier,
+            //     index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
+            // });
+        },
+
         persist() {
             this.$emit('persist', this.criterion);
         }
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index b6e4e47bd2..d5503456db 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -197,3 +197,12 @@
         border-radius: 2px;
     }
 }
+
+.temp {
+    width: 24px;
+
+    .c-c__duplicate,
+    .c-c__trash {
+        display: inline-block;
+    }
+}

From 614206b10c030a4a78397e19e732eedd219bd143 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 12:23:18 -0800
Subject: [PATCH 08/14] remove criterion working

---
 .../condition/components/Condition.vue        | 41 ++++++++++++++-----
 .../components/ConditionCollection.vue        |  1 -
 .../condition/components/Criterion.vue        | 27 +-----------
 .../condition/components/condition.scss       |  2 +-
 4 files changed, 34 insertions(+), 37 deletions(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index f3983ac912..ea2818c8de 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -111,15 +111,27 @@
                                 <ul v-if="telemetry.length"
                                     class="t-widget-condition-config"
                                 >
-                                    <Criterion v-for="(criterion, index) in domainObject.configuration.criteria"
-                                               :key="index"
-                                               :telemetry="telemetry"
-                                               :criterion="criterion"
-                                               :index="index"
-                                               :trigger="trigger"
-                                               :is-default="domainObject.configuration.criteria.length === 1"
-                                               @persist="persist"
-                                    />
+                                    <li v-for="(criterion, index) in domainObject.configuration.criteria"
+                                        :key="index"
+                                        class="has-local-controls t-condition"
+                                    >
+                                        <Criterion :telemetry="telemetry"
+                                                   :criterion="criterion"
+                                                   :index="index"
+                                                   :trigger="trigger"
+                                                   :is-default="domainObject.configuration.criteria.length === 1"
+                                                   @persist="persist"
+                                        />
+                                        <div class="temp">
+                                            <span class="is-enabled c-c__duplicate"
+                                                  @click="cloneCriterion"
+                                            ></span>
+                                            <span v-if="!(domainObject.configuration.criteria.length === 1)"
+                                                  class="is-enabled c-c__trash"
+                                                  @click="removeCriterion(index)"
+                                            ></span>
+                                        </div>
+                                    </li>
                                 </ul>
                                 <div class="holder c-c-button-wrapper align-left">
                                     <span class="c-c-label-spacer"></span>
@@ -201,7 +213,8 @@ export default {
             trigger: 'all',
             selectedOutputKey: '',
             stringOutputField: false,
-            outputOptions: ['false', 'true', 'string']
+            outputOptions: ['false', 'true', 'string'],
+            criterionIndex: 0
         };
     },
     computed: {
@@ -264,6 +277,14 @@ export default {
                 index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
             });
         },
+        removeCriterion(index) {
+            this.domainObject.configuration.criteria.splice(index, 1);
+            this.persist()
+        },
+        cloneCriterion(ev) {
+            // console.log('cloneCriterion')
+        },
+
         setOutput() {
             let conditionOutput = this.domainObject.configuration.output;
             if (conditionOutput) {
diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index cde15c22f9..0e464e2bcd 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -84,7 +84,6 @@
 import Condition from '../../condition/components/Condition.vue';
 import uuid from 'uuid';
 
-
 export default {
     inject: ['openmct', 'domainObject'],
     components: {
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 046ca4a19e..e04803faf0 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -1,5 +1,5 @@
 <template>
-<li class="has-local-controls t-condition">
+<div>
     <label>{{ setRowLabel }}</label>
     <span class="t-configuration">
         <span class="controls">
@@ -46,17 +46,7 @@
             >
         </span>
     </span>
-    <div class="temp">
-        <span class="is-enabled c-c__duplicate"
-              @click="cloneCriterion"
-        ></span>
-        <span v-if="!isDefault"
-              class="is-enabled c-c__trash"
-              @click="removeCriterion"
-        ></span>
-    </div>
-</li>
-
+</div>
 </template>
 
 <script>
@@ -104,7 +94,6 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
-        console.log('this.isDefault', this.isDefault);
     },
     methods: {
         updateMetadataOptions() {
@@ -127,18 +116,6 @@ export default {
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },
-        removeCriterion(ev) {
-            console.log('removeCriterion', this.index);
-            // this.$emit('removeCondition', this.conditionIdentifier);
-        },
-        cloneCriterion(ev) {
-            console.log('cloneCriterion')
-            // this.$emit('cloneCondition', {
-            //     identifier: this.conditionIdentifier,
-            //     index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
-            // });
-        },
-
         persist() {
             this.$emit('persist', this.criterion);
         }
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index d5503456db..76d8541cf4 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -199,7 +199,7 @@
 }
 
 .temp {
-    width: 24px;
+    width: 28px;
 
     .c-c__duplicate,
     .c-c__trash {

From 43056c4068d2ff6787a7ee7da1f0c6afc80c9f2e Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 12:44:50 -0800
Subject: [PATCH 09/14] implimented clone criterion

---
 src/plugins/condition/components/Condition.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index ea2818c8de..613c0d8591 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -124,7 +124,7 @@
                                         />
                                         <div class="temp">
                                             <span class="is-enabled c-c__duplicate"
-                                                  @click="cloneCriterion"
+                                                  @click="cloneCriterion(index)"
                                             ></span>
                                             <span v-if="!(domainObject.configuration.criteria.length === 1)"
                                                   class="is-enabled c-c__trash"
@@ -281,8 +281,10 @@ export default {
             this.domainObject.configuration.criteria.splice(index, 1);
             this.persist()
         },
-        cloneCriterion(ev) {
-            // console.log('cloneCriterion')
+        cloneCriterion(index) {
+            const clonedCriterion = {...this.domainObject.configuration.criteria[index]};
+            this.domainObject.configuration.criteria.splice(index + 1, 0, clonedCriterion);
+            this.persist()
         },
 
         setOutput() {

From 25e28ab97c372a2625d6dfb371a2666743469d1c Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 07:23:38 -0800
Subject: [PATCH 10/14] added controls for remove and duplicate criteria

---
 src/plugins/condition/components/Criterion.vue | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index e04803faf0..1102a724e9 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -94,6 +94,7 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
+        console.log('this.isDefault', this.isDefault);
     },
     methods: {
         updateMetadataOptions() {
@@ -116,6 +117,18 @@ export default {
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },
+        removeCriterion(ev) {
+            console.log('removeCriterion', this.index);
+            // this.$emit('removeCondition', this.conditionIdentifier);
+        },
+        cloneCriterion(ev) {
+            console.log('cloneCriterion')
+            // this.$emit('cloneCondition', {
+            //     identifier: this.conditionIdentifier,
+            //     index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
+            // });
+        },
+
         persist() {
             this.$emit('persist', this.criterion);
         }

From 598d2b31e90ac23e75989053d87dfe8c36dc14a6 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 12:23:18 -0800
Subject: [PATCH 11/14] remove criterion working

---
 src/plugins/condition/components/Criterion.vue | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 1102a724e9..e04803faf0 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -94,7 +94,6 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
-        console.log('this.isDefault', this.isDefault);
     },
     methods: {
         updateMetadataOptions() {
@@ -117,18 +116,6 @@ export default {
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },
-        removeCriterion(ev) {
-            console.log('removeCriterion', this.index);
-            // this.$emit('removeCondition', this.conditionIdentifier);
-        },
-        cloneCriterion(ev) {
-            console.log('cloneCriterion')
-            // this.$emit('cloneCondition', {
-            //     identifier: this.conditionIdentifier,
-            //     index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
-            // });
-        },
-
         persist() {
             this.$emit('persist', this.criterion);
         }

From ec4d121a987ef98c228548e5687958e6ef4b2bb6 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Wed, 26 Feb 2020 11:59:04 -0800
Subject: [PATCH 12/14] changed classname of controls div

---
 src/plugins/condition/components/Condition.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index 613c0d8591..843119cab6 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -122,7 +122,7 @@
                                                    :is-default="domainObject.configuration.criteria.length === 1"
                                                    @persist="persist"
                                         />
-                                        <div class="temp">
+                                        <div>
                                             <span class="is-enabled c-c__duplicate"
                                                   @click="cloneCriterion(index)"
                                             ></span>

From 463ec47af67d10371f18dbd021093a36e57178e7 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Wed, 26 Feb 2020 12:21:53 -0800
Subject: [PATCH 13/14] changed classname of controls div

---
 src/plugins/condition/components/Condition.vue  | 2 +-
 src/plugins/condition/components/condition.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index 843119cab6..6fe07f352b 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -122,7 +122,7 @@
                                                    :is-default="domainObject.configuration.criteria.length === 1"
                                                    @persist="persist"
                                         />
-                                        <div>
+                                        <div class="c-c__criterion-controls">
                                             <span class="is-enabled c-c__duplicate"
                                                   @click="cloneCriterion(index)"
                                             ></span>
diff --git a/src/plugins/condition/components/condition.scss b/src/plugins/condition/components/condition.scss
index 76d8541cf4..bedcd9e785 100644
--- a/src/plugins/condition/components/condition.scss
+++ b/src/plugins/condition/components/condition.scss
@@ -198,7 +198,7 @@
     }
 }
 
-.temp {
+.c-c__criterion-controls {
     width: 28px;
 
     .c-c__duplicate,

From e57c18fd6985277074ef941221ab8a2e45f7131c Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 27 Feb 2020 14:55:52 -0800
Subject: [PATCH 14/14] removed unused isDefault prop

---
 src/plugins/condition/components/Criterion.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index e04803faf0..4425a22b28 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -71,10 +71,6 @@ export default {
         trigger: {
             type: String,
             required: true
-        },
-        isDefault: {
-            type: Boolean,
-            default: false
         }
     },
     data() {