Conditional set output is wrong (#6244)

* Only use default if we've evaluated as default
* Add e2e test for conditional sets
---------

Co-authored-by: Shefali Joshi <simplyrender@gmail.com>
Co-authored-by: Andrew Henry <akhenry@gmail.com>

e2e/tests/functional/plugins/conditionSet/conditionSet.e2e.spec.js

@@ -52,10 +52,9 @@ test.describe.serial('Condition Set CRUD Operations on @localStorage', () => {
 
         //Set object identifier from url
         conditionSetUrl = page.url();
-        console.log('conditionSetUrl ' + conditionSetUrl);
 
         getConditionSetIdentifierFromUrl = conditionSetUrl.split('/').pop().split('?')[0];
-        console.debug('getConditionSetIdentifierFromUrl ' + getConditionSetIdentifierFromUrl);
+        console.debug(`getConditionSetIdentifierFromUrl: ${getConditionSetIdentifierFromUrl}`);
         await page.close();
     });
 
@@ -246,4 +245,81 @@ test.describe('Basic Condition Set Use', () => {
         await expect(page.getByRole('menuitem', { name: /Plot/ })).toBeVisible();
         await expect(page.getByRole('menuitem', { name: /Telemetry Table/ })).toBeVisible();
     });
+    test('ConditionSet should output blank instead of the default value', async ({ page }) => {
+        //Navigate to baseURL
+        await page.goto('./', { waitUntil: 'networkidle' });
+
+        //Click the Create button
+        await page.click('button:has-text("Create")');
+
+        // Click the object specified by 'type'
+        await page.click(`li[role='menuitem']:text("Sine Wave Generator")`);
+        await page.getByRole('spinbutton', { name: 'Loading Delay (ms)' }).fill('8000');
+        const nameInput = page.locator('form[name="mctForm"] .first input[type="text"]');
+        await nameInput.fill("Delayed Sine Wave Generator");
+
+        // Click OK button and wait for Navigate event
+        await Promise.all([
+            page.waitForLoadState(),
+            page.click('[aria-label="Save"]'),
+            // Wait for Save Banner to appear
+            page.waitForSelector('.c-message-banner__message')
+        ]);
+
+        // Create a new condition set
+        await createDomainObjectWithDefaults(page, {
+            type: 'Condition Set',
+            name: "Test Blank Output of Condition Set"
+        });
+        // Change the object to edit mode
+        await page.locator('[title="Edit"]').click();
+
+        // Click Add Condition button twice
+        await page.locator('#addCondition').click();
+        await page.locator('#addCondition').click();
+        await page.locator('#conditionCollection').getByRole('textbox').nth(0).fill('First Condition');
+        await page.locator('#conditionCollection').getByRole('textbox').nth(1).fill('Second Condition');
+
+        // Expand the 'My Items' folder in the left tree
+        await page.locator('.c-tree__item__view-control.c-disclosure-triangle').first().click();
+        // Add the Sine Wave Generator to the Condition Set and save changes
+        const treePane = page.getByRole('tree', {
+            name: 'Main Tree'
+        });
+        const sineWaveGeneratorTreeItem = treePane.getByRole('treeitem', { name: "Delayed Sine Wave Generator"});
+        const conditionCollection = await page.locator('#conditionCollection');
+
+        await sineWaveGeneratorTreeItem.dragTo(conditionCollection);
+
+        const firstCriterionTelemetry = await page.locator('[aria-label="Criterion Telemetry Selection"] >> nth=0');
+        firstCriterionTelemetry.selectOption({ label: 'Delayed Sine Wave Generator' });
+
+        const secondCriterionTelemetry = await page.locator('[aria-label="Criterion Telemetry Selection"] >> nth=1');
+        secondCriterionTelemetry.selectOption({ label: 'Delayed Sine Wave Generator' });
+
+        const firstCriterionMetadata = await page.locator('[aria-label="Criterion Metadata Selection"] >> nth=0');
+        firstCriterionMetadata.selectOption({ label: 'Sine' });
+
+        const secondCriterionMetadata = await page.locator('[aria-label="Criterion Metadata Selection"] >> nth=1');
+        secondCriterionMetadata.selectOption({ label: 'Sine' });
+
+        const firstCriterionComparison = await page.locator('[aria-label="Criterion Comparison Selection"] >> nth=0');
+        firstCriterionComparison.selectOption({ label: 'is greater than or equal to' });
+
+        const secondCriterionComparison = await page.locator('[aria-label="Criterion Comparison Selection"] >> nth=1');
+        secondCriterionComparison.selectOption({ label: 'is less than' });
+
+        const firstCriterionInput = await page.locator('[aria-label="Criterion Input"] >> nth=0');
+        await firstCriterionInput.fill("0");
+
+        const secondCriterionInput = await page.locator('[aria-label="Criterion Input"] >> nth=1');
+        await secondCriterionInput.fill("0");
+
+        const saveButtonLocator = page.locator('button[title="Save"]');
+        await saveButtonLocator.click();
+        await page.getByRole('listitem', { name: 'Save and Finish Editing' }).click();
+
+        const outputValue = await page.locator('[aria-label="Current Output Value"]');
+        await expect(outputValue).toHaveText('---');
+    });
 });

src/plugins/condition/ConditionManager.js

@@ -93,6 +93,11 @@ export default class ConditionManager extends EventEmitter {
         );
         this.updateConditionResults({id: id});
         this.updateCurrentCondition(latestTimestamp);
+
+        if (Object.keys(this.telemetryObjects).length === 0) {
+            // no telemetry objects
+            this.emit('noTelemetryObjects');
+        }
     }
 
     initialize() {
@@ -102,6 +107,11 @@ export default class ConditionManager extends EventEmitter {
                 this.initCondition(conditionConfiguration, index);
             });
         }
+
+        if (Object.keys(this.telemetryObjects).length === 0) {
+            // no telemetry objects
+            this.emit('noTelemetryObjects');
+        }
     }
 
     updateConditionTelemetryObjects() {

src/plugins/condition/components/Condition.vue

@@ -132,6 +132,7 @@
                 <span class="c-cdef__controls">
                     <select
                         v-model="condition.configuration.trigger"
+                        aria-label="Condition Trigger"
                         @change="persist"
                     >
                         <option

src/plugins/condition/components/ConditionCollection.vue

@@ -114,15 +114,11 @@ export default {
             telemetryObjs: [],
             moveIndex: undefined,
             isDragging: false,
-            defaultOutput: undefined,
             dragCounter: 0,
             currentConditionId: ''
         };
     },
     watch: {
-        defaultOutput(newOutput, oldOutput) {
-            this.$emit('updateDefaultOutput', newOutput);
-        },
         testData: {
             handler() {
                 this.updateTestData();
@@ -158,7 +154,7 @@ export default {
         this.observeForChanges();
         this.conditionManager = new ConditionManager(this.domainObject, this.openmct);
         this.conditionManager.on('conditionSetResultUpdated', this.handleConditionSetResultUpdated);
-        this.updateDefaultCondition();
+        this.conditionManager.on('noTelemetryObjects', this.emitNoTelemetryObjectEvent);
         this.stalenessSubscription = {};
     },
     methods: {
@@ -166,18 +162,16 @@ export default {
             this.currentConditionId = data.conditionId;
             this.$emit('conditionSetResultUpdated', data);
         },
+        emitNoTelemetryObjectEvent(data) {
+            this.currentConditionId = '';
+            this.$emit('noTelemetryObjects');
+        },
         observeForChanges() {
             this.stopObservingForChanges = this.openmct.objects.observe(this.domainObject, 'configuration.conditionCollection', (newConditionCollection) => {
                 //this forces children to re-render
                 this.conditionCollection = newConditionCollection.map(condition => condition);
-                this.updateDefaultCondition();
             });
         },
-        updateDefaultCondition() {
-            const defaultCondition = this.domainObject.configuration.conditionCollection
-                .find(conditionConfiguration => conditionConfiguration.isDefault);
-            this.defaultOutput = defaultCondition.configuration.output;
-        },
         setMoveIndex(index) {
             this.moveIndex = index;
             this.isDragging = true;

src/plugins/condition/components/ConditionSet.vue

@@ -28,12 +28,15 @@
     <section class="c-cs__current-output c-section">
         <div class="c-cs__content c-cs__current-output-value">
             <span class="c-cs__current-output-value__label">Current Output</span>
-            <span class="c-cs__current-output-value__value">
+            <span
+                class="c-cs__current-output-value__value"
+                aria-label="Current Output Value"
+            >
                 <template v-if="currentConditionOutput">
                     {{ currentConditionOutput }}
                 </template>
                 <template v-else>
-                    {{ defaultConditionOutput }}
+                    ---
                 </template>
             </span>
         </div>
@@ -51,7 +54,7 @@
             :is-editing="isEditing"
             :test-data="testData"
             @conditionSetResultUpdated="updateCurrentOutput"
-            @updateDefaultOutput="updateDefaultOutput"
+            @noTelemetryObjects="updateCurrentOutput('---')"
             @telemetryUpdated="updateTelemetry"
             @telemetryStaleness="handleStaleness"
         />
@@ -75,7 +78,6 @@ export default {
     data() {
         return {
             currentConditionOutput: '',
-            defaultConditionOutput: '',
             telemetryObjs: [],
             testData: {},
             staleObjects: []

src/plugins/condition/components/Criterion.vue

@@ -29,6 +29,7 @@
             <select
                 ref="telemetrySelect"
                 v-model="criterion.telemetry"
+                aria-label="Criterion Telemetry Selection"
                 @change="updateMetadataOptions"
             >
                 <option value="">- Select Telemetry -</option>
@@ -50,6 +51,7 @@
             <select
                 ref="metadataSelect"
                 v-model="criterion.metadata"
+                aria-label="Criterion Metadata Selection"
                 @change="updateOperations"
             >
                 <option value="">- Select Field -</option>
@@ -69,6 +71,7 @@
         >
             <select
                 v-model="criterion.operation"
+                aria-label="Criterion Comparison Selection"
                 @change="updateInputVisibilityAndValues"
             >
                 <option value="">- Select Comparison -</option>
@@ -89,6 +92,7 @@
                     <input
                         v-model="criterion.input[inputIndex]"
                         class="c-cdef__control__input"
+                        aria-label="Criterion Input"
                         :type="setInputType"
                         @change="persist"
                     >
@@ -103,6 +107,7 @@
                 >
                     <select
                         v-model="criterion.input[0]"
+                        aria-label="Criterion Else Selection"
                         @change="persist"
                     >
                         <option

src/plugins/displayLayout/components/AlphanumericFormat.vue

@@ -72,7 +72,7 @@ export default {
             this.isEditing = isEditing;
         },
         formatTelemetry(event) {
-            let newFormat = event.currentTarget.value;
+            const newFormat = event.currentTarget.value;
             this.openmct.selection.get().forEach(selectionPath => {
                 selectionPath[0].context.updateTelemetryFormat(newFormat);
             });

src/plugins/displayLayout/components/TelemetryView.vue

@@ -193,7 +193,7 @@ export default {
         },
         telemetryValue() {
             if (!this.datum) {
-                return;
+                return '---';
             }
 
             return this.formatter && this.formatter.format(this.datum);