[RFR] [JF] Fix selectfilter method

cypress/e2e/tests/migration/migration-waves/filter_applications.test.ts

@@ -44,7 +44,7 @@ const end = new Date(now.getTime());
 
 end.setFullYear(end.getFullYear() + 1);
 let applicationsList: Application[] = [];
-let businessservicesList: BusinessServices[] = [];
+let businessServicesList: BusinessServices[] = [];
 let tagList: Tag[] = [];
 let stakeholders: Stakeholders[] = [];
 
@@ -56,12 +56,12 @@ describe(
         before("Login and Create Test Data", function () {
             login();
 
-            businessservicesList = createMultipleBusinessServices(2);
+            businessServicesList = createMultipleBusinessServices(2);
             tagList = createMultipleTags(2);
             stakeholders = createMultipleStakeholders(2);
             applicationsList = createMultipleApplicationsWithBSandTags(
                 2,
-                businessservicesList,
+                businessServicesList,
                 tagList,
                 stakeholders
             );
@@ -153,7 +153,7 @@ describe(
 
         after("Perform test data clean up", function () {
             deleteByList(applicationsList);
-            deleteByList(businessservicesList);
+            deleteByList(businessServicesList);
             deleteByList(tagList);
             deleteByList(stakeholders);
         });

cypress/e2e/views/common.view.ts

@@ -35,7 +35,6 @@ export const alertTitle = "h4[class*='alert__title']";
 export const appTable = ".pf-v5-c-table";
 export const expandableRow = ".pf-c-expandable-row";
 export const helper = "span.pf-v5-c-helper-text__item-text";
-export const filterToggleButton = "div.pf-c-dropdown > button.pf-c-dropdown__toggle";
 export const filterInput = "input[type='search']";
 export const inputText = "input[type='text']";
 

cypress/utils/utils.ts

@@ -392,9 +392,18 @@ export function notExists(value: string, tableSelector = appTable): void {
     });
 }
 
-export function selectFilter(filterName: string): void {
-    cy.get("#filtered-by").click();
-    clickWithinByText('div[class="pf-v5-c-menu__content"]', "button", filterName);
+export function selectFilter(filterName: string, eq = 0): void {
+    if (eq === 0) {
+        cy.get("#filtered-by").click();
+        clickWithinByText('div[class="pf-v5-c-menu__content"]', "button", filterName);
+        return;
+    }
+    cy.get("div.pf-m-filter-group")
+        .eq(eq)
+        .within(() => {
+            cy.get("#filtered-by").click();
+            clickWithinByText('div[class="pf-v5-c-menu__content"]', "button", filterName);
+        });
 }
 
 export function filterInputText(searchTextValue: string, value: number): void {
@@ -462,7 +471,12 @@ export function validateSingleApplicationIssue(issue: AppIssue): void {
         });
 }
 
-export function applySelectFilter(filterId, filterName, filterText, isValid = true): void {
+export function applySelectFilter(
+    filterId: string,
+    filterName,
+    filterText: string,
+    isValid = true
+): void {
     selectFilter(filterName);
     click(".pf-v5-c-menu-toggle__button");
     inputText(".pf-v5-c-text-input-group__text-input", filterText);
@@ -478,9 +492,9 @@ export function applySearchFilter(
     filterName: string,
     searchText: string | string[],
     identifiedRisk = false,
-    value?: number
+    eq = 0
 ): void {
-    selectFilter(filterName, identifiedRisk, value);
+    selectFilter(filterName, eq);
     let filterValue = [];
     if (!Array.isArray(searchText)) {
         filterValue = [searchText];