Merge branch 'condition-ui' of https://github.com/nasa/openmct into condition-ui

src/plugins/condition/ConditionSpec.js

@@ -64,6 +64,7 @@ describe("The condition", function () {
         openmct.telemetry.getMetadata.and.returnValue(testTelemetryObject.telemetry.values);
 
         testConditionDefinition = {
+            definition: {
                 trigger: TRIGGER.ANY,
                 criteria: [
                     {
@@ -73,6 +74,7 @@ describe("The condition", function () {
                         key: testTelemetryObject.identifier
                     }
                 ]
+            }
         };
 
         conditionObj = new Condition(
@@ -85,7 +87,7 @@ describe("The condition", function () {
     });
 
     it("generates criteria with an id", function () {
-        const testCriterion = testConditionDefinition.criteria[0];
+        const testCriterion = testConditionDefinition.definition.criteria[0];
         let criterion = conditionObj.generateCriterion(testCriterion);
         expect(criterion.id).toBeDefined();
         expect(criterion.operation).toEqual(testCriterion.operation);
@@ -101,15 +103,15 @@ 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.operator);
+        expect(criterion.operator).toEqual(testConditionDefinition.definition.criteria[0].operator);
-        expect(criterion.input).toEqual(testConditionDefinition.input);
+        expect(criterion.input).toEqual(testConditionDefinition.definition.criteria[0].input);
-        expect(criterion.metaDataKey).toEqual(testConditionDefinition.metaDataKey);
+        expect(criterion.metaDataKey).toEqual(testConditionDefinition.definition.criteria[0].metaDataKey);
-        expect(criterion.key).toEqual(testConditionDefinition.key);
     });
 
     it("initializes with the trigger from the condition definition", function () {
-        expect(conditionObj.trigger).toEqual(testConditionDefinition.trigger);
+        expect(conditionObj.trigger).toEqual(testConditionDefinition.definition.trigger);
     });
 
     it("destroys all criteria for a condition", function () {

src/plugins/condition/components/Condition.vue

@@ -2,7 +2,7 @@
 <div v-if="condition"
      id="conditionArea"
      class="c-cs-ui__conditions"
-     :class="['widget-condition', { 'widget-condition--current': isCurrent && (isCurrent.key === conditionIdentifier.key) }]"
+     :class="['widget-condition', { 'widget-condition--current': currentConditionIdentifier && (currentConditionIdentifier.key === conditionIdentifier.key) }]"
 >
     <div class="title-bar">
         <span class="condition-name">
@@ -28,7 +28,7 @@ export default {
             type: Object,
             required: true
         },
-        isCurrent: {
+        currentConditionIdentifier: {
             type: Object,
             required: true
         }

src/plugins/condition/components/ConditionCollection.vue

@@ -35,7 +35,7 @@
             >
                 <div v-if="isEditing">
                     <ConditionEdit :condition-identifier="conditionIdentifier"
-                                   :is-current="currentConditionIdentifier"
+                                   :current-condition-identifier="currentConditionIdentifier"
                                    @update-current-condition="updateCurrentCondition"
                                    @remove-condition="removeCondition"
                                    @condition-result-updated="handleConditionResult"
@@ -43,7 +43,7 @@
                 </div>
                 <div v-else>
                     <Condition :condition-identifier="conditionIdentifier"
-                               :is-current="currentConditionIdentifier"
+                               :current-condition-identifier="currentConditionIdentifier"
                     />
                 </div>
             </div>
@@ -88,6 +88,8 @@ export default {
         this.conditionCollection = this.domainObject.configuration ? this.domainObject.configuration.conditionCollection : [];
         if (!this.conditionCollection.length) {
             this.addCondition(null, true);
+        } else {
+            this.updateCurrentCondition(this.conditionCollection[0]);
         }
     },
     methods: {
@@ -98,7 +100,6 @@ export default {
         },
         updateCurrentConditionId() {
             let currentConditionIdentifier = this.conditionCollection[this.conditionCollection.length-1];
-
             for (let i=0, ii = this.conditionCollection.length-1; i< ii; i++) {
                 let conditionIdAsString = this.openmct.objects.makeKeyString(this.conditionCollection[i]);
                 if (this.conditionResults[conditionIdAsString]) {

src/plugins/condition/components/ConditionEdit.vue

@@ -1,7 +1,7 @@
 <template>
 <div v-if="condition"
      class="c-cs-editui__conditions"
-     :class="['widget-condition', { 'widget-condition--current': isCurrent && (isCurrent.key === conditionIdentifier.key) }]"
+     :class="['widget-condition', { 'widget-condition--current': currentConditionIdentifier && (currentConditionIdentifier.key === conditionIdentifier.key) }]"
 >
     <div class="title-bar">
         <span
@@ -147,7 +147,7 @@ export default {
             type: Object,
             required: true
         },
-        isCurrent: {
+        currentConditionIdentifier: {
             type: Object,
             required: true
         }
@@ -160,8 +160,8 @@ export default {
             telemetryMetadata: this.telemetryMetadata,
             operations: OPERATIONS,
             selectedMetaDataKey: null,
-            selectedTelemetryKey: null,
+            selectedTelemetryKey: '',
-            selectedOperationKey: null,
+            selectedOperationKey: '',
             selectedOutputKey: null,
             stringOutputField: false,
             comparisonValueField: false,
@@ -239,7 +239,7 @@ 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.telemetryMetadata[0].key;
+                    this.selectedMetaDataKey = '';
                     this.selectedTelemetryKey = this.telemetryObject.identifier;
                 });
             } else {

src/plugins/condition/criterion/TelemetryCriterion.js

@@ -77,7 +77,9 @@ export default class TelemetryCriterion extends EventEmitter {
         let params = [];
         let result = false;
         params.push(data[this.metaDataKey]);
-        params.push(this.input);
+        if (this.input instanceof Array && this.input.length) {
+            params.push(this.input[0]);
+        }
         if (typeof comparator === 'function') {
             result = comparator(params);
         }

src/plugins/condition/criterion/TelemetryCriterionSpec.js

@@ -94,17 +94,6 @@ describe("The telemetry criterion", function () {
         expect(telemetryCriterion.subscription).toBeDefined();
     });
 
-    it("normalizes telemetry data", function () {
-        let result = telemetryCriterion.normalizeData({
-            key: 'some-key',
-            source: 'testSource',
-            testSource: 'Hello'
-        });
-        expect(result).toEqual({
-            'some-key': 'Hello'
-        })
-    });
-
     it("emits update event on new data from telemetry providers", function () {
         spyOn(telemetryCriterion, 'emitEvent').and.callThrough();
         telemetryCriterion.handleSubscription({