Cherry-pick perses fixes from etmura-perses-fix

Brings navigation workarounds, dropdown assertion ordering,
step numbering fixes, and cancel button wait from etmura-perses-fix.

Made-with: Cursor

Author: etmurasaki

web/cypress/e2e/perses/99.coo_rbac_perses_user1.cy.ts

@@ -63,6 +63,7 @@ describe('RBAC User1: COO - Dashboards (Perses) - Administrator perspective', {
   });
 
   beforeEach(() => {
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
     nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
   });
 

web/cypress/e2e/perses/99.coo_rbac_perses_user2.cy.ts

@@ -63,6 +63,7 @@ describe('RBAC User2: COO - Dashboards (Perses) - Administrator perspective', {
   });
 
   beforeEach(() => {
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
     nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
     cy.changeNamespace('All Projects');
   });

web/cypress/e2e/perses/99.coo_rbac_perses_user3.cy.ts

@@ -63,6 +63,7 @@ describe('RBAC User3: COO - Dashboards (Perses) - Administrator perspective', {
   });
 
   beforeEach(() => {
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
     nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
   });
 

web/cypress/e2e/perses/99.coo_rbac_perses_user4.cy.ts

@@ -63,6 +63,7 @@ describe('RBAC User4: COO - Dashboards (Perses) - Administrator perspective', {
   });
 
   beforeEach(() => {
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
     nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
   });
 

web/cypress/e2e/perses/99.coo_rbac_perses_user5.cy.ts

@@ -63,6 +63,7 @@ describe('RBAC User5: COO - Dashboards (Perses) - Administrator perspective', {
   });
 
   beforeEach(() => {
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
     nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
   });
 

web/cypress/e2e/perses/99.coo_rbac_perses_user6.cy.ts

@@ -63,6 +63,7 @@ describe('RBAC User6: COO - Dashboards (Perses) - Administrator perspective', {
   });
 
   beforeEach(() => {
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards']);
     nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
   });
 

web/cypress/support/perses/01.coo_list_perses_admin_namespace.cy.ts

@@ -2,6 +2,7 @@ import { persesDashboardsDashboardDropdownCOO, persesDashboardsDashboardDropdown
 import { commonPages } from '../../views/common';
 import { listPersesDashboardsPage } from "../../views/perses-dashboards-list-dashboards";
 import { persesDashboardsPage } from '../../views/perses-dashboards';
+import { nav } from '../../views/nav';
 
 export interface PerspectiveConfig {
   name: string;
@@ -69,10 +70,10 @@ export function testCOOListPersesNamespace(perspective: PerspectiveConfig) {
     listPersesDashboardsPage.emptyState();
     listPersesDashboardsPage.countDashboards('0');
 
-    cy.log(`1.11. Clear all filters`);
-    listPersesDashboardsPage.clearAllFilters();
+    nav.sidenav.clickNavLink(['Observe', 'Alerting']);
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
 
-    cy.log(`1.12. Click on a dashboard`);
+    cy.log(`1.11. Click on a dashboard`);
     listPersesDashboardsPage.clickDashboard(persesDashboardsDashboardDropdownCOO.APM_DASHBOARD[0]);
     //TODO: change back to shouldBeLoaded when customizable-dashboards gets merged
     persesDashboardsPage.shouldBeLoaded1();
@@ -121,8 +122,8 @@ export function testCOOListPersesNamespace(perspective: PerspectiveConfig) {
     listPersesDashboardsPage.countDashboards('0');
 
     cy.log(`2.7. Search for the renamed dashboard`);
-    listPersesDashboardsPage.clearAllFilters();
-    cy.changeNamespace('All Projects');
+    nav.sidenav.clickNavLink(['Observe', 'Alerting']);
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
     listPersesDashboardsPage.filter.byName(persesDashboardsDashboardDropdownPersesDev.PERSES_DASHBOARD_SAMPLE[0] + ' - Renamed');
     listPersesDashboardsPage.countDashboards('0');
     listPersesDashboardsPage.clearAllFilters();

web/cypress/support/perses/99.coo_rbac_perses_user1.cy.ts

@@ -476,11 +476,11 @@ export function testCOORBACPersesTestsDevUser1(perspective: PerspectiveConfig) {
     cy.log(`9.1. use sidebar nav to go to Observe > Dashboards (Perses)`);
     listPersesDashboardsPage.shouldBeLoaded();
 
-    cy.log(`9.3. Filter by Name`);
+    cy.log(`9.2. Filter by Name`);
     listPersesDashboardsPage.filter.byName('Testing Dashboard - UP');
     listPersesDashboardsPage.countDashboards('1');
 
-    cy.log(`9.4. Click on the Kebab icon - Delete`);
+    cy.log(`9.3. Click on the Kebab icon - Delete`);
     listPersesDashboardsPage.clickKebabIcon();
     listPersesDashboardsPage.clickDeleteOption();
     listPersesDashboardsPage.deleteDashboardDeleteButton();
@@ -489,7 +489,7 @@ export function testCOORBACPersesTestsDevUser1(perspective: PerspectiveConfig) {
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);
     nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
 
-    cy.log(`9.5. Filter by Name`);
+    cy.log(`9.4. Filter by Name`);
     listPersesDashboardsPage.filter.byName('Testing Dashboard - UP');
     listPersesDashboardsPage.countDashboards('0');
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);
@@ -511,7 +511,7 @@ export function testCOORBACPersesTestsDevUser1(perspective: PerspectiveConfig) {
     persesImportDashboardsPage.uploadFile('./cypress/fixtures/coo/coo141_perses/import/testing-perses-dashboard.json');
     persesImportDashboardsPage.assertPersesDashboardDetected();
 
-    cy.log(`10.4. Verify project dropdown options`); 
+    cy.log(`10.4. Verify project dropdown options`);
     persesImportDashboardsPage.assertProjectNotExistsInDropdown('observ-test');
     persesImportDashboardsPage.assertProjectNotExistsInDropdown('perses-dev');
     persesImportDashboardsPage.assertProjectNotExistsInDropdown('openshift-monitoring');

web/cypress/support/perses/99.coo_rbac_perses_user3.cy.ts

@@ -62,12 +62,13 @@ export function testCOORBACPersesTestsDevUser3(perspective: PerspectiveConfig) {
     listPersesDashboardsPage.assertCreateButtonIsEnabled();
     listPersesDashboardsPage.clickCreateButton();
     persesCreateDashboardsPage.createDashboardShouldBeLoaded();
-    persesCreateDashboardsPage.assertProjectDropdown('empty-namespace3');
     persesCreateDashboardsPage.assertProjectNotExistsInDropdown('openshift-cluster-observability-operator');
     persesCreateDashboardsPage.assertProjectNotExistsInDropdown('observ-test');
     persesCreateDashboardsPage.assertProjectNotExistsInDropdown('perses-dev');
     persesCreateDashboardsPage.assertProjectNotExistsInDropdown('openshift-monitoring');
     persesCreateDashboardsPage.assertProjectNotExistsInDropdown('empty-namespace4');
+    persesCreateDashboardsPage.assertProjectDropdown('empty-namespace3');
+
     persesCreateDashboardsPage.createDashboardDialogCancelButton();
 
     cy.log(`1.4. openshift-monitoring validation - Dashboard search - empty state`);

web/cypress/support/perses/99.coo_rbac_perses_user5.cy.ts

@@ -341,7 +341,7 @@ export function testCOORBACPersesTestsDevUser5(perspective: PerspectiveConfig) {
     persesImportDashboardsPage.uploadFile('./cypress/fixtures/coo/coo141_perses/import/testing-perses-dashboard.json');
     persesImportDashboardsPage.assertPersesDashboardDetected();
 
-    cy.log(`7.4. Verify project dropdown options`); 
+    cy.log(`7.4. Verify project dropdown options`);
     persesImportDashboardsPage.assertProjectNotExistsInDropdown('openshift-cluster-observability-operator');
     persesImportDashboardsPage.assertProjectNotExistsInDropdown('empty-namespace3');
     persesImportDashboardsPage.assertProjectNotExistsInDropdown('observ-test');