From 36baf6931a2a8c13ff19c70218043bf1d7a02c52 Mon Sep 17 00:00:00 2001
From: Shefali <simplyrender@gmail.com>
Date: Thu, 24 Oct 2024 12:48:17 -0700
Subject: [PATCH 1/5] Use the disabled attribute on a valid tag - the button.

---
 src/plugins/condition/components/ConditionItem.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/condition/components/ConditionItem.vue b/src/plugins/condition/components/ConditionItem.vue
index dd42a583163..19ca43bb0b8 100644
--- a/src/plugins/condition/components/ConditionItem.vue
+++ b/src/plugins/condition/components/ConditionItem.vue
@@ -160,8 +160,9 @@
             </div>
           </template>
           <div class="c-cdef__separator c-row-separator"></div>
-          <div class="c-cdef__controls" :disabled="!telemetry.length">
+          <div class="c-cdef__controls">
             <button
+              :disabled="!telemetry.length"
               class="c-cdef__add-criteria-button c-button c-button--labeled icon-plus"
               @click="addCriteria"
             >

From f7298c1b2e3b1bf8be23d5564eb22b62a64f6018 Mon Sep 17 00:00:00 2001
From: Shefali <simplyrender@gmail.com>
Date: Mon, 4 Nov 2024 15:41:48 -0800
Subject: [PATCH 2/5] Add e2e test to check for add criteria button being
 enabled

---
 .../conditionSetOperations.e2e.spec.js        | 32 +++++++++++++++++++
 .../condition/components/ConditionItem.vue    |  1 +
 2 files changed, 33 insertions(+)

diff --git a/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js b/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
index 5cd5d86d251..887c7634de6 100644
--- a/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
+++ b/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
@@ -287,6 +287,38 @@ test.describe('Basic Condition Set Use', () => {
       description: 'https://github.com/nasa/openmct/issues/7484'
     });
   });
+
+  test('ConditionSet has add criteria button enabled/disabled when composition is and is not available', async ({
+    page
+  }) => {
+    const exampleTelemetry = await createExampleTelemetryObject(page);
+
+    await page.getByLabel('Show selected item in tree').click();
+    await page.goto(conditionSet.url);
+    // Change the object to edit mode
+    await page.getByLabel('Edit Object').click();
+
+    // Create a condition
+    await page.locator('#addCondition').click();
+    await page.locator('#conditionCollection').getByRole('textbox').nth(0).fill('First Condition');
+
+    // Validate that the add criteria button is disabled
+    await expect(page.getByLabel('Add Criteria - Disabled')).toBeVisible();
+
+    // Add Telemetry to ConditionSet
+    const sineWaveGeneratorTreeItem = page
+      .getByRole('tree', {
+        name: 'Main Tree'
+      })
+      .getByRole('treeitem', {
+        name: exampleTelemetry.name
+      });
+    const conditionCollection = page.locator('#conditionCollection');
+    await sineWaveGeneratorTreeItem.dragTo(conditionCollection);
+
+    // Validate that the add criteria button is enabled
+    await expect(page.getByLabel('Add Criteria - Enabled')).toBeVisible();
+  });
 });
 
 test.describe('Condition Set Composition', () => {
diff --git a/src/plugins/condition/components/ConditionItem.vue b/src/plugins/condition/components/ConditionItem.vue
index 19ca43bb0b8..b24045c59a7 100644
--- a/src/plugins/condition/components/ConditionItem.vue
+++ b/src/plugins/condition/components/ConditionItem.vue
@@ -163,6 +163,7 @@
           <div class="c-cdef__controls">
             <button
               :disabled="!telemetry.length"
+              :aria-label="`Add Criteria - ${!telemetry.length ? 'Disabled' : 'Enabled'}`"
               class="c-cdef__add-criteria-button c-button c-button--labeled icon-plus"
               @click="addCriteria"
             >

From 9f6412c552186dff4922ff858f3b83d3cab7ce2c Mon Sep 17 00:00:00 2001
From: Shefali <simplyrender@gmail.com>
Date: Mon, 4 Nov 2024 15:54:58 -0800
Subject: [PATCH 3/5] Improve test

---
 .../plugins/conditionSet/conditionSetOperations.e2e.spec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js b/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
index 887c7634de6..ba349c5904a 100644
--- a/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
+++ b/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
@@ -316,8 +316,10 @@ test.describe('Basic Condition Set Use', () => {
     const conditionCollection = page.locator('#conditionCollection');
     await sineWaveGeneratorTreeItem.dragTo(conditionCollection);
 
-    // Validate that the add criteria button is enabled
-    await expect(page.getByLabel('Add Criteria - Enabled')).toBeVisible();
+    // Validate that the add criteria button is enabled and adds a new criterion
+    await page.getByLabel('Add Criteria - Enabled').click();
+    const numOfUnnamedCriteria = await page.getByLabel('Criterion Telemetry Selection').count();
+    expect(numOfUnnamedCriteria).toEqual(2);
   });
 });
 

From 413e507a21bec7e8142a614097b1239ca11d97a9 Mon Sep 17 00:00:00 2001
From: Shefali <simplyrender@gmail.com>
Date: Tue, 5 Nov 2024 10:13:24 -0800
Subject: [PATCH 4/5] Check for add criteria button to have attribute disabled

---
 .../plugins/conditionSet/conditionSetOperations.e2e.spec.js  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js b/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
index ba349c5904a..672f6c7a193 100644
--- a/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
+++ b/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
@@ -288,7 +288,7 @@ test.describe('Basic Condition Set Use', () => {
     });
   });
 
-  test('ConditionSet has add criteria button enabled/disabled when composition is and is not available', async ({
+  test.only('ConditionSet has add criteria button enabled/disabled when composition is and is not available', async ({
     page
   }) => {
     const exampleTelemetry = await createExampleTelemetryObject(page);
@@ -303,7 +303,7 @@ test.describe('Basic Condition Set Use', () => {
     await page.locator('#conditionCollection').getByRole('textbox').nth(0).fill('First Condition');
 
     // Validate that the add criteria button is disabled
-    await expect(page.getByLabel('Add Criteria - Disabled')).toBeVisible();
+    await expect(page.getByLabel('Add Criteria - Disabled')).toHaveAttribute('disabled');
 
     // Add Telemetry to ConditionSet
     const sineWaveGeneratorTreeItem = page
@@ -317,6 +317,7 @@ test.describe('Basic Condition Set Use', () => {
     await sineWaveGeneratorTreeItem.dragTo(conditionCollection);
 
     // Validate that the add criteria button is enabled and adds a new criterion
+    await expect(page.getByLabel('Add Criteria - Enabled')).not.toHaveAttribute('disabled');
     await page.getByLabel('Add Criteria - Enabled').click();
     const numOfUnnamedCriteria = await page.getByLabel('Criterion Telemetry Selection').count();
     expect(numOfUnnamedCriteria).toEqual(2);

From fd8422e9fe37650593dbbf34ec83089161ea69e1 Mon Sep 17 00:00:00 2001
From: Shefali <simplyrender@gmail.com>
Date: Tue, 5 Nov 2024 10:13:52 -0800
Subject: [PATCH 5/5] Remove focused test

---
 .../plugins/conditionSet/conditionSetOperations.e2e.spec.js     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js b/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
index 672f6c7a193..c3a65a20e77 100644
--- a/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
+++ b/e2e/tests/functional/plugins/conditionSet/conditionSetOperations.e2e.spec.js
@@ -288,7 +288,7 @@ test.describe('Basic Condition Set Use', () => {
     });
   });
 
-  test.only('ConditionSet has add criteria button enabled/disabled when composition is and is not available', async ({
+  test('ConditionSet has add criteria button enabled/disabled when composition is and is not available', async ({
     page
   }) => {
     const exampleTelemetry = await createExampleTelemetryObject(page);