Revert ""PR 1326 Update Tag.edit()" (#1337)

Signed-off-by: Nandini Chandra <[email protected]>
konveyor · Feb 7, 2025 · 69383c5 · 69383c5
1 parent 3a660fb
commit 69383c5
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 17 deletions.
diff --git a/cypress/e2e/models/migration/archetypes/archetype.ts b/cypress/e2e/models/migration/archetypes/archetype.ts
@@ -17,7 +17,7 @@ import {
     cancelForm,
     click,
     clickByText,
-    clickKebabMenuOptionNoID,
+    clickKebabMenuOptionArchetype,
     confirm,
     inputText,
     performRowActionByIcon,
@@ -147,7 +147,7 @@ export class Archetype {
 
     delete(cancel = false): void {
         Archetype.open();
-        clickKebabMenuOptionNoID(this.name, "Delete");
+        clickKebabMenuOptionArchetype(this.name, "Delete");
         if (cancel) {
             cancelForm();
         } else click(commonView.confirmButton);
@@ -216,7 +216,7 @@ export class Archetype {
         saveAndReview = false
     ) {
         Archetype.open();
-        clickKebabMenuOptionNoID(this.name, "Assess");
+        clickKebabMenuOptionArchetype(this.name, "Assess");
         cy.wait(SEC);
         Assessment.perform_assessment(
             risk,
@@ -239,7 +239,7 @@ export class Archetype {
 
     validateReviewDonutChart(): void {
         Archetype.open();
-        clickKebabMenuOptionNoID(this.name, review);
+        clickKebabMenuOptionArchetype(this.name, review);
         Assessment.validateReviewDonutChart();
     }
 
@@ -252,7 +252,7 @@ export class Archetype {
 
     perform_review(risk): void {
         Archetype.open();
-        clickKebabMenuOptionNoID(this.name, "Review");
+        clickKebabMenuOptionArchetype(this.name, "Review");
         cy.wait(8 * SEC);
         Assessment.perform_review(risk);
     }
@@ -277,7 +277,7 @@ export class Archetype {
         comments?: string,
         cancel = false
     ) {
-        clickKebabMenuOptionNoID(this.name, "Duplicate");
+        clickKebabMenuOptionArchetype(this.name, "Duplicate");
 
         if (cancel) {
             cancelForm();
@@ -346,13 +346,13 @@ export class Archetype {
 
     discard(option: string) {
         Archetype.open();
-        clickKebabMenuOptionNoID(this.name, option);
+        clickKebabMenuOptionArchetype(this.name, option);
         confirm();
     }
 
     clickAssessButton() {
         Archetype.open();
-        clickKebabMenuOptionNoID(this.name, "Assess");
+        clickKebabMenuOptionArchetype(this.name, "Assess");
     }
 
     deleteAssessments(): void {

diff --git a/cypress/e2e/models/migration/controls/tags.ts b/cypress/e2e/models/migration/controls/tags.ts
@@ -17,7 +17,6 @@ import {
     button,
     controls,
     deleteAction,
-    editAction,
     migration,
     SEC,
     tags,
@@ -31,11 +30,11 @@ import {
     cancelForm,
     click,
     clickByText,
-    clickKebabMenuOptionNoID,
     closeRowDetails,
     confirm,
     expandRowDetails,
     inputText,
+    performRowActionByIcon,
     selectItemsPerPage,
     selectUserPerspective,
     submitForm,
@@ -115,7 +114,7 @@ export class Tag {
     edit(updatedValue: { name?: string; tagcategory?: string }, cancel = false): void {
         Tag.openList();
         expandRowDetails(this.tagCategory);
-        clickKebabMenuOptionNoID(this.name, editAction);
+        performRowActionByIcon(this.name, commonView.pencilIcon);
         if (cancel) {
             cancelForm();
         } else {

diff --git a/cypress/e2e/tests/migration/applicationinventory/assessment/review/filter.test.ts b/cypress/e2e/tests/migration/applicationinventory/assessment/review/filter.test.ts
@@ -19,7 +19,7 @@ import {
     applySelectFilter,
     clearAllFilters,
     clickItemInKebabMenu,
-    clickKebabMenuOptionNoID,
+    clickKebabMenuOptionArchetype,
     createMultipleApplications,
     createMultipleArchetypes,
     createMultipleStakeholders,
@@ -76,7 +76,7 @@ describe(["@tier3"], "Review Identified Risks filter validations for assessments
             clickItemInKebabMenu(application.name, review);
             commonActions();
             Archetype.open();
-            clickKebabMenuOptionNoID(archetype.name, review);
+            clickKebabMenuOptionArchetype(archetype.name, review);
             commonActions();
         });
     });

diff --git a/cypress/utils/utils.ts b/cypress/utils/utils.ts
@@ -833,10 +833,9 @@ export function clickItemInKebabMenu(rowItem, itemName: string): void {
     cy.get(actionMenuItem).contains(itemName).closest(button).first().click({ force: true });
 }
 
-export function clickKebabMenuOptionNoID(rowItem: string, itemName: string): void {
-    // The clickItemInKebabMenu() fn doesn't work in a few places. For eg: clickItemInKebabMenu()
-    // doesn't work on Tag kebab menu.So, try this function if clickItemInKebabMenu() doesn't work.
-    // Also, the kebab menu doesn't have an ID on these pages, hence the name.
+export function clickKebabMenuOptionArchetype(rowItem: string, itemName: string): void {
+    // The clickItemInKebabMenu() fn can't be used on the Archetype page just yet because the
+    // the individual archetypes don't have an id for their kebab menu.
     cy.contains(rowItem)
         .closest(trTag)
         .within(() => {