From 007b14b5c970e5a8457ed20b49e195548743c4a2 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Thu, 20 Feb 2020 14:59:04 -0800
Subject: [PATCH 1/7] added hid/show selects

---
 .../condition/components/ConditionEdit.vue    | 389 ------------------
 .../condition/components/Criterion.vue        |   9 +-
 2 files changed, 7 insertions(+), 391 deletions(-)
 delete mode 100644 src/plugins/condition/components/ConditionEdit.vue

diff --git a/src/plugins/condition/components/ConditionEdit.vue b/src/plugins/condition/components/ConditionEdit.vue
deleted file mode 100644
index 60295d157f..0000000000
--- a/src/plugins/condition/components/ConditionEdit.vue
+++ /dev/null
@@ -1,389 +0,0 @@
-/*****************************************************************************
- * Open MCT, Copyright (c) 2014-2020, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-<template>
-<!-- TODO: current condition class should be set using openmct.objects.makeKeyString(<identifier>) -->
-<div v-if="condition"
-     class="c-c-editui__conditions c-c-container__container c-c__drag-wrapper"
-     :class="['widget-condition', { 'widget-condition--current': currentConditionIdentifier && (currentConditionIdentifier.key === conditionIdentifier.key) }]"
->
-    <div class="title-bar">
-        <span class="c-c__menu-hamburger"
-              :class="{ 'is-enabled': !condition.isDefault }"
-              :draggable="!condition.isDefault"
-              @dragstart="dragStart"
-              @dragover.stop
-        ></span>
-        <span
-            class="is-enabled flex-elem"
-            :class="['c-c__disclosure-triangle', { 'c-c__disclosure-triangle--expanded': expanded }]"
-            @click="expanded = !expanded"
-        ></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"
-              class="is-enabled c-c__duplicate"
-              @click="cloneCondition"
-        ></span>
-        <span v-if="!condition.isDefault"
-              class="is-enabled c-c__trash"
-              @click="removeCondition"
-        ></span>
-    </div>
-    <div v-if="expanded"
-         class="condition-config-edit widget-condition-content c-sw-editui__conditions-wrapper holder widget-conditions-wrapper flex-elem expanded"
-    >
-        <div id="conditionArea"
-             class="c-c-editui__condition widget-conditions"
-        >
-            <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-condition-config">
-                            <li>
-                                <label>Condition Name</label>
-                                <span class="controls">
-                                    <input v-model="condition.definition.name"
-                                           class="t-condition-name-input"
-                                           type="text"
-                                    >
-                                </span>
-                            </li>
-                            <li>
-                                <label>Output</label>
-                                <span class="controls">
-                                    <select v-model="selectedOutputKey"
-                                            @change="checkInputValue"
-                                    >
-                                        <option value="">- Select Output -</option>
-                                        <option v-for="option in outputOptions"
-                                                :key="option.key"
-                                                :value="option.key"
-                                        >
-                                            {{ option.text }}
-                                        </option>
-                                    </select>
-                                    <input v-if="selectedOutputKey === outputOptions[2].key"
-                                           v-model="condition.definition.output"
-                                           class="t-condition-name-input"
-                                           type="text"
-                                    >
-                                </span>
-                            </li>
-                        </ul>
-                        <div v-if="!condition.isDefault"
-                             class="widget-condition-content expanded"
-                        >
-                            <ul class="t-widget-condition-config">
-                                <li class="has-local-controls t-condition">
-                                    <label>Match when</label>
-                                    <span class="controls">
-                                        <select>
-                                            <option value="all">all criteria are met</option>
-                                            <option value="any">any criteria are met</option>
-                                        </select>
-                                    </span>
-                                </li>
-                            </ul>
-                            <ul class="t-widget-condition-config">
-                                <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"
-                                                    @change="updateTelemetryMetaData"
-                                            >
-                                                <option value="">- Select Telemetry -</option>
-                                                <option v-for="telemetryOption in telemetry"
-                                                        :key="telemetryOption.identifier.key"
-                                                        :value="telemetryOption.identifier"
-                                                >
-                                                    {{ telemetryOption.name }}
-                                                </option>
-                                            </select>
-                                        </span>
-                                        <span class="controls">
-                                            <select v-model="selectedMetaDataKey">
-                                                <option value="">- Select Field -</option>
-                                                <option v-for="option in telemetryMetadata"
-                                                        :key="option.key"
-                                                        :value="option.key"
-                                                >
-                                                    {{ option.name }}
-                                                </option>
-                                            </select>
-                                        </span>
-                                        <span class="controls">
-                                            <select v-model="selectOperationName"
-                                                    @change="setInputValueVisibility"
-                                            >
-                                                <option value="">- Select Comparison -</option>
-                                                <option v-for="option in operations"
-                                                        :key="option.name"
-                                                        :value="option.name"
-                                                >
-                                                    {{ option.text }}
-                                                </option>
-                                            </select>
-                                            <input v-if="comparisonValueField"
-                                                   class="t-condition-name-input"
-                                                   type="text"
-                                                   v-model="operationValue"
-                                            >
-                                        </span>
-                                    </span>
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-</template>
-
-<script>
-import { OPERATIONS } from '../utils/operations';
-import ConditionClass from "@/plugins/condition/Condition";
-
-export default {
-    inject: ['openmct', 'domainObject'],
-    props: {
-        conditionIdentifier: {
-            type: Object,
-            required: true
-        },
-        currentConditionIdentifier: {
-            type: Object,
-            required: true
-        },
-        telemetry: {
-            type: Array,
-            required: true,
-            default: () => []
-        },
-        conditionIndex: {
-            type: Number,
-            required: true
-        }
-    },
-    data() {
-        return {
-            condition: this.condition,
-            expanded: true,
-            telemetryObject: this.telemetryObject,
-            telemetryMetadata: this.telemetryMetadata,
-            operations: OPERATIONS,
-            selectedMetaDataKey: '',
-            selectedTelemetryKey: '',
-            selectOperationName: '',
-            selectedOutputKey: '',
-            stringOutputField: false,
-            comparisonValueField: false,
-            operationValue: this.operationValue,
-            outputOptions: [
-                {
-                    key: 'false',
-                    text: 'False'
-                },
-                {
-                    key: 'true',
-                    text: 'True'
-                },
-                {
-                    key: 'string',
-                    text: 'String'
-                }
-            ]
-
-        };
-    },
-    destroyed() {
-        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: {
-        dragStart(e) {
-            e.dataTransfer.effectAllowed = "copyMove";
-            e.dataTransfer.setDragImage(e.target.closest('.c-c-container__container'), 0, 0);
-            this.$emit('setMoveIndex', this.conditionIndex);
-        },
-        initialize() {
-            this.setOutput();
-            this.setOperation();
-            this.updateTelemetry();
-            this.conditionClass = new ConditionClass(this.condition, this.openmct);
-            this.conditionClass.on('conditionResultUpdated', this.handleConditionResult.bind(this));
-        },
-        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('conditionResultUpdated', {
-                id: this.conditionIdentifier,
-                result: args.data.result
-            })
-        },
-        removeCondition(ev) {
-            this.$emit('removeCondition', this.conditionIdentifier);
-        },
-        cloneCondition(ev) {
-            this.$emit('cloneCondition', {
-                identifier: this.conditionIdentifier,
-                index: Number(ev.target.closest('.widget-condition').getAttribute('data-condition-index'))
-            });
-        },
-        setOutput() {
-            let conditionOutput = this.condition.definition.output;
-            if (conditionOutput !== 'false' && conditionOutput !== 'true') {
-                this.selectedOutputKey = this.outputOptions[2].key;
-            } else {
-                if (conditionOutput === 'true') {
-                    this.selectedOutputKey = this.outputOptions[1].key;
-                } else {
-                    this.selectedOutputKey = this.outputOptions[0].key;
-                }
-            }
-        },
-        setOperation() {
-            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.selectOperationName = this.operations[i].name;
-                        this.comparisonValueField = this.operations[i].inputCount > 0;
-                        if (this.comparisonValueField) {
-                            this.operationValue = this.condition.definition.criteria[0].input[0];
-                        }
-                    }
-                }
-            }
-        },
-        updateTelemetry() {
-            if (this.hasTelemetry()) {
-                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.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() {
-            if (this.selectedOutputKey === this.outputOptions[2].key) {
-                this.condition.definition.output = '';
-            } else {
-                this.condition.definition.output = this.selectedOutputKey;
-            }
-        },
-        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;
-                }
-            }
-            //find the criterion being updated and set the operation property
-        },
-        updateTelemetryMetaData() {
-            this.selectedMetaDataKey = '';
-            this.updateConditionCriteria();
-            this.updateTelemetry();
-        },
-        updateCurrentCondition() {
-            this.$emit('updateCurrentCondition', this.conditionIdentifier);
-        }
-    }
-}
-</script>
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 0bd865f828..d483dfeaad 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -15,7 +15,9 @@
                 </option>
             </select>
         </span>
-        <span class="controls">
+        <span v-if="criterion.telemetry"
+              class="controls"
+        >
             <select v-model="criterion.metadata">
                 <option value="">- Select Field -</option>
                 <option v-for="option in telemetryMetadata"
@@ -26,7 +28,9 @@
                 </option>
             </select>
         </span>
-        <span class="controls">
+        <span v-if="criterion.telemetry && criterion.metadata"
+              class="controls"
+        >
             <select v-model="criterion.operation"
                     @change="updateOperationInputVisibility"
             >
@@ -91,6 +95,7 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
+        console.log('this.criterion.telemetry', this.criterion.telemetry);
     },
     methods: {
         updateMetadataOptions() {

From 53b785269b242e45d654e2adc58f82ba1e7fef2b Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Fri, 21 Feb 2020 06:43:16 -0800
Subject: [PATCH 2/7] wip: filtering select comparison

---
 src/plugins/condition/components/Criterion.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index d483dfeaad..61588efc90 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -20,7 +20,7 @@
         >
             <select v-model="criterion.metadata">
                 <option value="">- Select Field -</option>
-                <option v-for="option in telemetryMetadata"
+                <option v-for="option in telemetryMetadataOptions"
                         :key="option.key"
                         :value="option.key"
                 >
@@ -81,6 +81,7 @@ export default {
     data() {
         return {
             telemetryMetadata: {},
+            telemetryMetadataOptions: {},
             operations: OPERATIONS,
             isInputOperation: false,
             rowLabel: ''
@@ -95,13 +96,16 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
-        console.log('this.criterion.telemetry', this.criterion.telemetry);
+        console.log('this.criterion.metadata', this.criterion.metadata);
     },
     methods: {
         updateMetadataOptions() {
             if (this.criterion.telemetry) {
                 this.openmct.objects.get(this.criterion.telemetry).then((telemetryObject) => {
-                    this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject).values();
+                    this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
+                    this.telemetryMetadataOptions = this.openmct.telemetry.getMetadata(telemetryObject).values();
+                    // console.log('this.openmct.telemetry.getFormatMap(telemetryObject)', this.openmct.telemetry.getFormatMap(this.openmct.telemetry.getMetadata(telemetryObject)));
+                    console.log('this.telemetryMetadata', this.openmct.telemetry.getMetadata(telemetryObject));
                 });
             }
             this.persist();

From a7fc9b3caa15125695796430a13f7406a42ab4e1 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Sun, 23 Feb 2020 15:19:03 -0800
Subject: [PATCH 3/7] filter comparison list based on field selected

---
 .../condition/components/Criterion.vue        | 42 ++++++++++++++-----
 1 file changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 61588efc90..59627cac42 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -18,7 +18,9 @@
         <span v-if="criterion.telemetry"
               class="controls"
         >
-            <select v-model="criterion.metadata">
+            <select v-model="criterion.metadata"
+                    @change="updateOperations"
+            >
                 <option value="">- Select Field -</option>
                 <option v-for="option in telemetryMetadataOptions"
                         :key="option.key"
@@ -35,7 +37,7 @@
                     @change="updateOperationInputVisibility"
             >
                 <option value="">- Select Comparison -</option>
-                <option v-for="option in operations"
+                <option v-for="option in filteredOps"
                         :key="option.name"
                         :value="option.name"
                 >
@@ -83,6 +85,7 @@ export default {
             telemetryMetadata: {},
             telemetryMetadataOptions: {},
             operations: OPERATIONS,
+            filteredOps: [],
             isInputOperation: false,
             rowLabel: ''
         }
@@ -96,25 +99,44 @@ export default {
     mounted() {
         this.updateMetadataOptions();
         this.updateOperationInputVisibility();
-        console.log('this.criterion.metadata', this.criterion.metadata);
     },
     methods: {
         updateMetadataOptions() {
             if (this.criterion.telemetry) {
                 this.openmct.objects.get(this.criterion.telemetry).then((telemetryObject) => {
                     this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
-                    this.telemetryMetadataOptions = this.openmct.telemetry.getMetadata(telemetryObject).values();
-                    // console.log('this.openmct.telemetry.getFormatMap(telemetryObject)', this.openmct.telemetry.getFormatMap(this.openmct.telemetry.getMetadata(telemetryObject)));
-                    console.log('this.telemetryMetadata', this.openmct.telemetry.getMetadata(telemetryObject));
+                    this.telemetryMetadataOptions = this.telemetryMetadata.values();
                 });
             }
             this.persist();
         },
+        updateOperations(ev) {
+            let operationFormat = 'string';
+            this.telemetryMetadata.valueMetadatas.forEach((value, index) => {
+                if (value.key === ev.target.value) {
+                    let valueMetadata = this.telemetryMetadataOptions[index];
+                    if (valueMetadata.formatString) {
+                        operationFormat = 'number';
+                    } else if (valueMetadata.format) {
+                        if (valueMetadata.format === 'utc') {
+                            operationFormat = 'number';
+                        } else if (valueMetadata.format === 'enum') {
+                            operationFormat = 'enum';
+                        }
+                    }
+                }
+            });
+            this.filteredOps = [...this.operations.filter(op => op.appliesTo.indexOf(operationFormat) !== -1)];
+        },
         updateOperationInputVisibility() {
-            for (let i=0; i < this.operations.length; i++) {
-                if (this.criterion.operation === this.operations[i].name) {
-                    this.isInputOperation = this.operations[i].inputCount > 0;
-                    if (!this.isInputOperation) {this.criterion.input = ''}
+            if (this.criterion.operation === '') {
+                this.isInputOperation = false;
+            } else {
+                for (let i = 0; i < this.filteredOps.length; i++) {
+                    if (this.criterion.operation === this.filteredOps[i].name) {
+                        this.isInputOperation = this.filteredOps[i].inputCount > 0;
+                        if (!this.isInputOperation) {this.criterion.input = ''}
+                    }
                 }
             }
             this.persist();

From a1bf4a92e5376da1b9b95c659346b387a214261a Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Mon, 24 Feb 2020 15:50:01 -0800
Subject: [PATCH 4/7] changed default input to array and clear downstream
 selection lists on change

---
 src/plugins/condition/Condition.js            |  2 +-
 .../condition/components/Condition.vue        | 10 ++++----
 .../components/ConditionCollection.vue        |  2 +-
 .../condition/components/Criterion.vue        | 23 +++++++++++++++----
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/plugins/condition/Condition.js b/src/plugins/condition/Condition.js
index 9e0a26e041..36e72e7fed 100644
--- a/src/plugins/condition/Condition.js
+++ b/src/plugins/condition/Condition.js
@@ -37,7 +37,7 @@ import {computeCondition} from "@/plugins/condition/utils/evaluator";
 *       {
 *           telemetry: '',
 *           operation: '',
-*           input: '',
+*           input: [],
 *           metadata: ''
 *       }
 *   ]
diff --git a/src/plugins/condition/components/Condition.vue b/src/plugins/condition/components/Condition.vue
index 1833318e6a..fe466f3b7e 100644
--- a/src/plugins/condition/components/Condition.vue
+++ b/src/plugins/condition/components/Condition.vue
@@ -61,7 +61,7 @@
                                                     :key="option"
                                                     :value="option"
                                             >
-                                                {{ option.charAt(0).toUpperCase() + option.slice(1) }}
+                                                {{ initCap(option) }}
                                             </option>
                                         </select>
                                         <input v-if="selectedOutputKey === outputOptions[2]"
@@ -182,11 +182,6 @@ export default {
             outputOptions: ['false', 'true', 'string']
         };
     },
-    computed: {
-        initCap: function (string) {
-            return string.charAt(0).toUpperCase() + string.slice(1)
-        }
-    },
     destroyed() {
         this.destroy();
     },
@@ -266,6 +261,9 @@ export default {
         hasTelemetry(identifier) {
             // TODO: check parent domainObject.composition.hasTelemetry
             return this.currentCriteria && identifier;
+        },
+        initCap: function (string) {
+            return string.charAt(0).toUpperCase() + string.slice(1)
         }
     }
 }
diff --git a/src/plugins/condition/components/ConditionCollection.vue b/src/plugins/condition/components/ConditionCollection.vue
index cde15c22f9..ef752b1e13 100644
--- a/src/plugins/condition/components/ConditionCollection.vue
+++ b/src/plugins/condition/components/ConditionCollection.vue
@@ -242,7 +242,7 @@ export default {
                 criteria: isDefault ? [] : [{
                     telemetry: '',
                     operation: '',
-                    input: '',
+                    input: [],
                     metadata: '',
                     key: ''
                 }]
diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index 59627cac42..d63a0aec71 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -98,22 +98,34 @@ export default {
     },
     mounted() {
         this.updateMetadataOptions();
-        this.updateOperationInputVisibility();
     },
     methods: {
-        updateMetadataOptions() {
+        updateMetadataOptions(ev) {
+            if (ev) {
+                this.criterion.metadata = '';
+                this.criterion.operation = '';
+                this.criterion.input = [];
+            }
             if (this.criterion.telemetry) {
                 this.openmct.objects.get(this.criterion.telemetry).then((telemetryObject) => {
                     this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
                     this.telemetryMetadataOptions = this.telemetryMetadata.values();
+                    this.updateOperations();
+                    this.updateOperationInputVisibility();
                 });
+            } else {
+                this.criterion.metadata = '';
             }
             this.persist();
         },
         updateOperations(ev) {
+            if (ev) {
+                this.criterion.operation = '';
+                this.criterion.input = [];
+            }
             let operationFormat = 'string';
             this.telemetryMetadata.valueMetadatas.forEach((value, index) => {
-                if (value.key === ev.target.value) {
+                if (value.key === this.criterion.metadata) {
                     let valueMetadata = this.telemetryMetadataOptions[index];
                     if (valueMetadata.formatString) {
                         operationFormat = 'number';
@@ -128,7 +140,10 @@ export default {
             });
             this.filteredOps = [...this.operations.filter(op => op.appliesTo.indexOf(operationFormat) !== -1)];
         },
-        updateOperationInputVisibility() {
+        updateOperationInputVisibility(ev) {
+            if (ev) {
+                this.criterion.input = [];
+            }
             if (this.criterion.operation === '') {
                 this.isInputOperation = false;
             } else {

From f4f1d0387bd7bab246c1365d995c5fb44bace7bd Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Mon, 24 Feb 2020 16:31:59 -0800
Subject: [PATCH 5/7] rendering correct number of input fields depending on
 operation and persisting values

---
 .../condition/components/Criterion.vue        | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index d63a0aec71..cb2d751163 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -44,8 +44,15 @@
                     {{ option.text }}
                 </option>
             </select>
-            <input v-if="isInputOperation"
-                   v-model="criterion.input"
+            <input v-if="inputCount > 0"
+                   v-model="criterion.input[0]"
+                   class="t-condition-name-input"
+                   type="text"
+                   @blur="persist"
+            >
+            <span v-if="inputCount === 2">and</span>
+            <input v-if="inputCount === 2"
+                   v-model="criterion.input[1]"
                    class="t-condition-name-input"
                    type="text"
                    @blur="persist"
@@ -53,7 +60,6 @@
         </span>
     </span>
 </li>
-
 </template>
 
 <script>
@@ -86,7 +92,7 @@ export default {
             telemetryMetadataOptions: {},
             operations: OPERATIONS,
             filteredOps: [],
-            isInputOperation: false,
+            inputCount: 0,
             rowLabel: ''
         }
     },
@@ -101,11 +107,7 @@ export default {
     },
     methods: {
         updateMetadataOptions(ev) {
-            if (ev) {
-                this.criterion.metadata = '';
-                this.criterion.operation = '';
-                this.criterion.input = [];
-            }
+            if (ev) {this.clearInputs()}
             if (this.criterion.telemetry) {
                 this.openmct.objects.get(this.criterion.telemetry).then((telemetryObject) => {
                     this.telemetryMetadata = this.openmct.telemetry.getMetadata(telemetryObject);
@@ -116,13 +118,9 @@ export default {
             } else {
                 this.criterion.metadata = '';
             }
-            this.persist();
         },
         updateOperations(ev) {
-            if (ev) {
-                this.criterion.operation = '';
-                this.criterion.input = [];
-            }
+            if (ev) {this.clearInputs()}
             let operationFormat = 'string';
             this.telemetryMetadata.valueMetadatas.forEach((value, index) => {
                 if (value.key === this.criterion.metadata) {
@@ -139,23 +137,25 @@ export default {
                 }
             });
             this.filteredOps = [...this.operations.filter(op => op.appliesTo.indexOf(operationFormat) !== -1)];
+            this.persist();
         },
         updateOperationInputVisibility(ev) {
             if (ev) {
                 this.criterion.input = [];
             }
-            if (this.criterion.operation === '') {
-                this.isInputOperation = false;
-            } else {
-                for (let i = 0; i < this.filteredOps.length; i++) {
-                    if (this.criterion.operation === this.filteredOps[i].name) {
-                        this.isInputOperation = this.filteredOps[i].inputCount > 0;
-                        if (!this.isInputOperation) {this.criterion.input = ''}
-                    }
+            for (let i = 0; i < this.filteredOps.length; i++) {
+                if (this.criterion.operation === this.filteredOps[i].name) {
+                    this.inputCount = this.filteredOps[i].inputCount;
+                    if (!this.inputCount) {this.criterion.input = []}
                 }
             }
             this.persist();
         },
+        clearInputs() {
+            this.criterion.operation = '';
+            this.criterion.input = [];
+            this.inputCount = 0;
+        },
         updateMetadataSelection() {
             this.updateOperationInputVisibility();
         },

From 70b5c627ca8983b92d4f3fd8b737712edc4333fc Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Mon, 24 Feb 2020 16:48:27 -0800
Subject: [PATCH 6/7] handle multiple inputs in telemetryCriterion

---
 src/plugins/condition/criterion/TelemetryCriterion.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/condition/criterion/TelemetryCriterion.js b/src/plugins/condition/criterion/TelemetryCriterion.js
index 1ac7a2b150..1d35d6bf35 100644
--- a/src/plugins/condition/criterion/TelemetryCriterion.js
+++ b/src/plugins/condition/criterion/TelemetryCriterion.js
@@ -77,7 +77,7 @@ export default class TelemetryCriterion extends EventEmitter {
         let result = false;
         params.push(data[this.metadata]);
         if (this.input instanceof Array && this.input.length) {
-            params.push(this.input[0]);
+            this.input.forEach(input => {params.push(this.input[0])});
         } else if (this.input) {
             params.push(this.input);
         }

From fd0c19026d18d0ffc70be237b04c36607c3a5f08 Mon Sep 17 00:00:00 2001
From: Joel McKinnon <joel.g.mckinnon@nasa.gov>
Date: Tue, 25 Feb 2020 15:36:37 -0800
Subject: [PATCH 7/7] addressed review comments

---
 .../condition/components/Criterion.vue        | 41 +++++++++++--------
 .../condition/criterion/TelemetryCriterion.js |  4 +-
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/plugins/condition/components/Criterion.vue b/src/plugins/condition/components/Criterion.vue
index cb2d751163..db45adfb78 100644
--- a/src/plugins/condition/components/Criterion.vue
+++ b/src/plugins/condition/components/Criterion.vue
@@ -91,21 +91,40 @@ export default {
             telemetryMetadata: {},
             telemetryMetadataOptions: {},
             operations: OPERATIONS,
-            filteredOps: [],
             inputCount: 0,
-            rowLabel: ''
+            rowLabel: '',
+            operationFormat: ''
         }
     },
     computed: {
         setRowLabel: function () {
             let operator = this.trigger === 'all' ? 'and ': 'or ';
             return (this.index !== 0 ? operator : '') + 'when';
+        },
+        filteredOps: function () {
+            return [...this.operations.filter(op => op.appliesTo.indexOf(this.operationFormat) !== -1)];
         }
     },
     mounted() {
         this.updateMetadataOptions();
     },
     methods: {
+        getOperationFormat() {
+            this.telemetryMetadata.valueMetadatas.forEach((value, index) => {
+                let valueMetadata = this.telemetryMetadataOptions[index];
+                if (valueMetadata.formatString) {
+                    this.operationFormat = 'number';
+                } else if (valueMetadata.format) {
+                    if (valueMetadata.format === 'utc') {
+                        this.operationFormat = 'number';
+                    } else if (valueMetadata.format === 'enum') {
+                        this.operationFormat = 'enum';
+                    }
+                } else {
+                    this.operationFormat = 'string';
+                }
+            });
+        },
         updateMetadataOptions(ev) {
             if (ev) {this.clearInputs()}
             if (this.criterion.telemetry) {
@@ -121,27 +140,13 @@ export default {
         },
         updateOperations(ev) {
             if (ev) {this.clearInputs()}
-            let operationFormat = 'string';
-            this.telemetryMetadata.valueMetadatas.forEach((value, index) => {
-                if (value.key === this.criterion.metadata) {
-                    let valueMetadata = this.telemetryMetadataOptions[index];
-                    if (valueMetadata.formatString) {
-                        operationFormat = 'number';
-                    } else if (valueMetadata.format) {
-                        if (valueMetadata.format === 'utc') {
-                            operationFormat = 'number';
-                        } else if (valueMetadata.format === 'enum') {
-                            operationFormat = 'enum';
-                        }
-                    }
-                }
-            });
-            this.filteredOps = [...this.operations.filter(op => op.appliesTo.indexOf(operationFormat) !== -1)];
+            this.getOperationFormat();
             this.persist();
         },
         updateOperationInputVisibility(ev) {
             if (ev) {
                 this.criterion.input = [];
+                this.inputCount = 0;
             }
             for (let i = 0; i < this.filteredOps.length; i++) {
                 if (this.criterion.operation === this.filteredOps[i].name) {
diff --git a/src/plugins/condition/criterion/TelemetryCriterion.js b/src/plugins/condition/criterion/TelemetryCriterion.js
index 1d35d6bf35..cbbd159e6a 100644
--- a/src/plugins/condition/criterion/TelemetryCriterion.js
+++ b/src/plugins/condition/criterion/TelemetryCriterion.js
@@ -76,10 +76,8 @@ export default class TelemetryCriterion extends EventEmitter {
         let params = [];
         let result = false;
         params.push(data[this.metadata]);
-        if (this.input instanceof Array && this.input.length) {
+        if (this.input.length) {
             this.input.forEach(input => {params.push(this.input[0])});
-        } else if (this.input) {
-            params.push(this.input);
         }
         if (typeof comparator === 'function') {
             result = comparator(params);