[RFR] Added all filters to issues except archetype, refactored mechanism to be more generic

cypress/e2e/models/migration/applicationinventory/application.ts

@@ -72,7 +72,7 @@ import {
 import { AppIssue, applicationData, RbacValidationRules } from "../../../types/types";
 import { kebabButton, rightSideMenu, sourceDropdown } from "../../../views/analysis.view";
 import { Issues } from "../issues/issues";
-import { singleAppLabels } from "../../../views/issue.view";
+import { singleApplicationColumns } from "../../../views/issue.view";
 import { liTag } from "../../../views/common.view";
 
 export class Application {
@@ -432,16 +432,19 @@ export class Application {
             cy.contains(currentIssue.name)
                 .closest(trTag)
                 .within(() => {
-                    validateTextPresence(singleAppLabels.issue, currentIssue.name);
-                    validateTextPresence(singleAppLabels.category, currentIssue.category);
-                    validateTextPresence(singleAppLabels.source, currentIssue.source);
-                    cy.get(singleAppLabels.target).within(() => {
+                    validateTextPresence(singleApplicationColumns.issue, currentIssue.name);
+                    validateTextPresence(singleApplicationColumns.category, currentIssue.category);
+                    validateTextPresence(singleApplicationColumns.source, currentIssue.source);
+                    cy.get(singleApplicationColumns.target).within(() => {
                         currentIssue.targets.forEach((currentTarget) => {
                             validateTextPresence(liTag, currentTarget);
                         });
                     });
-                    validateNumberPresence(singleAppLabels.effort, currentIssue.effort);
-                    validateNumberPresence(singleAppLabels.files, currentIssue.affectedFiles);
+                    validateNumberPresence(singleApplicationColumns.effort, currentIssue.effort);
+                    validateNumberPresence(
+                        singleApplicationColumns.files,
+                        currentIssue.affectedFiles
+                    );
                 });
         });
     }

cypress/e2e/models/migration/issues/issues.ts

@@ -6,6 +6,7 @@ import {
     selectFilter,
     selectItemsPerPage,
     selectUserPerspective,
+    validateTextPresence,
 } from "../../../../utils/utils";
 import { button, filterIssue, migration, SEC, singleApplication } from "../../../types/constants";
 import { navMenu } from "../../../views/menu.view";
@@ -14,8 +15,10 @@ import {
     bsFilterName,
     searchInput,
     singleAppDropList,
+    singleApplicationColumns,
     tagFilterName,
 } from "../../../views/issue.view";
+import { AppIssue } from "../../../types/types";
 
 export class Issues {
     /** Contains URL of issues web page */
@@ -40,7 +43,7 @@ export class Issues {
         clickByText(button, applicationName);
     }
 
-    public static filterBy(filterType: filterIssue, item: string | string[]): void {
+    public static filterBy(filterType: filterIssue, filterValue: string | string[]): void {
         let selector = "";
         Issues.openList();
         selectFilter(filterType);
@@ -51,23 +54,52 @@ export class Issues {
             filterType === filterIssue.target;
 
         if (isApplicableFilter) {
-            inputText(searchInput, item);
-            click(searchButton);
+            if (Array.isArray(filterValue)) {
+                filterValue.forEach((current) => {
+                    inputText(searchInput, current);
+                    click(searchButton);
+                });
+            } else {
+                inputText(searchInput, filterValue);
+                click(searchButton);
+            }
         } else {
             if (filterType == filterIssue.bs) {
                 selector = bsFilterName;
             } else if (filterType == filterIssue.tags) {
                 selector = tagFilterName;
             }
             click(selector);
-            if (Array.isArray(item)) {
-                item.forEach((name) => {
+            if (Array.isArray(filterValue)) {
+                filterValue.forEach((name) => {
                     clickByText(span, name);
                 });
             } else {
-                clickByText(span, item);
+                clickByText(span, filterValue);
             }
             click(selector);
         }
     }
+
+    public static validateFilter(
+        issues: AppIssue[],
+        filterType: filterIssue,
+        filterValue: string
+    ): void {
+        issues.forEach((issue: AppIssue) => {
+            const isApplicableFilter =
+                filterType === filterIssue.tags ||
+                filterType === filterIssue.category ||
+                filterType === filterIssue.source ||
+                filterType === filterIssue.target;
+
+            if (isApplicableFilter) {
+                Issues.filterBy(filterType, issue[filterValue]);
+            } else {
+                Issues.filterBy(filterType, filterValue);
+            }
+            cy.get("tr").should("not.contain", "No data available");
+            validateTextPresence(singleApplicationColumns.issue, issue["name"]);
+        });
+    }
 }

cypress/e2e/tests/migration/issues/all-issues/filter.test.ts

@@ -21,22 +21,20 @@ import {
     getRandomAnalysisData,
     deleteByList,
     clearAllFilters,
-    validateTextPresence,
 } from "../../../../../utils/utils";
 import { Analysis } from "../../../../models/migration/applicationinventory/analysis";
 import { SEC, filterIssue } from "../../../../types/constants";
 import { Issues } from "../../../../models/migration/issues/issues";
 import { BusinessServices } from "../../../../models/migration/controls/businessservices";
 import * as data from "../../../../../utils/data_utils";
-import { singleAppLabels } from "../../../../views/issue.view";
 let applicationsList: Array<Analysis> = [];
-let appBusinessService: BusinessServices;
+let businessService: BusinessServices;
 
 describe(["@tier2"], "Issues filtering", () => {
     before("Login", function () {
         login();
-        appBusinessService = new BusinessServices(data.getCompanyName(), data.getDescription());
-        appBusinessService.create();
+        businessService = new BusinessServices(data.getCompanyName(), data.getDescription());
+        businessService.create();
     });
 
     beforeEach("Load data", function () {
@@ -55,48 +53,68 @@ describe(["@tier2"], "Issues filtering", () => {
             }),
             getRandomAnalysisData(this.analysisData["source_analysis_on_bookserverapp"])
         );
-        application.business = appBusinessService.name;
+        application.business = businessService.name;
         application.create();
         applicationsList.push(application);
         cy.wait(2 * SEC);
         application.analyze();
         application.verifyAnalysisStatus("Completed");
 
-        Issues.filterBy(filterIssue.appName, application.name);
-        cy.get("tr").should("not.contain", "No data available");
-        this.analysisData["source_analysis_on_bookserverapp"]["issues"].forEach(
-            (issue: string[]) => {
-                validateTextPresence(singleAppLabels.issue, issue["name"]);
-            }
+        Issues.validateFilter(
+            this.analysisData["source_analysis_on_bookserverapp"]["issues"],
+            filterIssue.appName,
+            application.name
         );
         clearAllFilters();
     });
 
     it("Filtering issues by BS", function () {
-        Issues.filterBy(filterIssue.bs, appBusinessService.name);
-        cy.get("tr").should("not.contain", "No data available");
-        this.analysisData["source_analysis_on_bookserverapp"]["issues"].forEach(
-            (issue: string[]) => {
-                validateTextPresence(singleAppLabels.issue, issue["name"]);
-            }
+        Issues.validateFilter(
+            this.analysisData["source_analysis_on_bookserverapp"]["issues"],
+            filterIssue.bs,
+            businessService.name
         );
         clearAllFilters();
     });
 
     it("Filtering issues by tags", function () {
-        let issue = this.analysisData["source_analysis_on_bookserverapp"]["issues"][0];
-        Issues.filterBy(filterIssue.tags, issue["tags"]);
-        cy.get("tr").should("not.contain", "No data available");
-        this.analysisData["source_analysis_on_bookserverapp"]["issues"].forEach(
-            (issue: string[]) => {
-                validateTextPresence(singleAppLabels.issue, issue["name"]);
-            }
+        Issues.validateFilter(
+            this.analysisData["source_analysis_on_bookserverapp"]["issues"],
+            filterIssue.tags,
+            "tags"
+        );
+        clearAllFilters();
+    });
+
+    it("Filtering issues by category", function () {
+        Issues.validateFilter(
+            this.analysisData["source_analysis_on_bookserverapp"]["issues"],
+            filterIssue.category,
+            "category"
+        );
+        clearAllFilters();
+    });
+
+    it("Filtering issues by source", function () {
+        Issues.validateFilter(
+            this.analysisData["source_analysis_on_bookserverapp"]["issues"],
+            filterIssue.source,
+            "source"
+        );
+        clearAllFilters();
+    });
+
+    it("Filtering issues by target", function () {
+        Issues.validateFilter(
+            this.analysisData["source_analysis_on_bookserverapp"]["issues"],
+            filterIssue.target,
+            "targets"
         );
         clearAllFilters();
     });
 
     after("Perform test data clean up", function () {
         deleteByList(applicationsList);
-        appBusinessService.delete();
+        businessService.delete();
     });
 });

cypress/e2e/views/issue.view.ts

@@ -3,7 +3,7 @@ export const bsFilterName = "#businessService\\.name-filter-value-select";
 export const tagFilterName = "#tag\\.id-filter-value-select";
 export const singleAppDropList = "#application-select";
 
-export enum singleAppLabels {
+export enum singleApplicationColumns {
     issue = 'td[data-label="Issue"]',
     category = 'td[data-label="Category"]',
     source = 'td[data-label="Source"]',