mgr/dashboard: Fix overview a11y tests

Fixes https://tracker.ceph.com/issues/75696

Signed-off-by: Afreen Misbah <afreen@ibm.com>

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/a11y/dashboard.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/a11y/dashboard.e2e-spec.ts
deleted file mode 100644 (file)
index b6f6ad2..0000000
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/a11y/dashboard.e2e-spec.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { DashboardV3PageHelper } from '../ui/dashboard-v3.po';
-
-describe('Overview Page', { retries: 0 }, () => {
-  const overview = new DashboardV3PageHelper();
-
-  beforeEach(() => {
-    cy.intercept('GET', '**/api/prometheus/data*', {
-      statusCode: 200,
-      body: {
-        status: 'success',
-        data: {
-          resultType: 'matrix',
-          result: []
-        }
-      }
-    });
-    cy.intercept('GET', '**/api/prometheus/prometheus_query_data*', {
-      statusCode: 200,
-      body: {
-        status: 'success',
-        data: {
-          resultType: 'vector',
-          result: []
-        }
-      }
-    });
-    cy.login();
-    overview.navigateTo();
-  });
-
-  describe('Dashboard accessibility', () => {
-    it('should have no accessibility violations', () => {
-      cy.injectAxe();
-      cy.checkAccessibility(
-        {
-          exclude: [['.cd-navbar-main']]
-        },
-        {
-          rules: {
-            'page-has-heading-one': { enabled: false }
-          }
-        }
-      );
-    });
-  });
-});

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/a11y/overview.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/a11y/overview.e2e-spec.ts
new file mode 100644 (file)
index 0000000..720718f
--- /dev/null
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/a11y/overview.e2e-spec.ts
@@ -0,0 +1,46 @@
+import { OvevriewPagehelper } from '../ui/dashboard-v3.po';
+
+describe('Overview Page', { retries: 0 }, () => {
+  const overview = new OvevriewPagehelper();
+
+  beforeEach(() => {
+    cy.intercept('GET', '**/api/prometheus/data*', {
+      statusCode: 200,
+      body: {
+        status: 'success',
+        data: {
+          resultType: 'matrix',
+          result: []
+        }
+      }
+    });
+    cy.intercept('GET', '**/api/prometheus/prometheus_query_data*', {
+      statusCode: 200,
+      body: {
+        status: 'success',
+        data: {
+          resultType: 'vector',
+          result: []
+        }
+      }
+    });
+    cy.login();
+    overview.navigateTo();
+  });
+
+  describe('Overview accessibility', () => {
+    it('should have no accessibility violations', () => {
+      cy.injectAxe();
+      cy.checkAccessibility(
+        {
+          exclude: [['.cd-navbar-main']]
+        },
+        {
+          rules: {
+            'page-has-heading-one': { enabled: false }
+          }
+        }
+      );
+    });
+  });
+});

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/04-osds.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/04-osds.e2e-spec.ts
index fc3a3ca6a115706b25456b0c4fa254993ce5dbe2..e526fd6157437011c47e9c354b0b7b59a4f73f57 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/04-osds.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/04-osds.e2e-spec.ts
@@ -1,9 +1,9 @@
 import { OSDsPageHelper } from '../cluster/osds.po';
-import { DashboardV3PageHelper } from '../ui/dashboard-v3.po';
+import { OvevriewPagehelper } from '../ui/dashboard-v3.po';
 
 describe('OSDs page', () => {
   const osds = new OSDsPageHelper();
-  const overview = new DashboardV3PageHelper();
+  const overview = new OvevriewPagehelper();
 
   before(() => {
     cy.login();

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.e2e-spec.ts
index 74dc43eb67bc7fe95312a6ce999ff223aa2a3c17..0a4666d685e194d25148d1c347621a8ef821e4ae 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.e2e-spec.ts
@@ -1,7 +1,7 @@
-import { DashboardV3PageHelper } from './dashboard-v3.po';
+import { OvevriewPagehelper } from './dashboard-v3.po';
 
 describe('Dashboard-v3 Main Page', () => {
-  const overview = new DashboardV3PageHelper();
+  const overview = new OvevriewPagehelper();
 
   before(() => {
     cy.login();

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.po.ts
index 75f4c405f7bca766fa656ac96e46be4116f9b0eb..059938b86e9d81e8786aa9be161be9f2679e773f 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.po.ts
@@ -1,6 +1,6 @@
 import { PageHelper } from '../page-helper.po';
 
-export class DashboardV3PageHelper extends PageHelper {
+export class OvevriewPagehelper extends PageHelper {
   pages = { index: { url: '#/overview', id: 'cd-overview' } };
 
   cardTitle(index: number) {

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/overview/overview.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/overview/overview.component.html
index 796fbe7baf740fd615d61d96b96d1f2b46e3c6c5..84bfcfc9c908ae87646cf10e97fbd1087eacaef9 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/overview/overview.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/overview/overview.component.html
@@ -8,12 +8,11 @@
 
 @let storageCard = (storageCardVm$ | async);
 @let health = (healthCardVm$ | async);
-<div cdsGrid
-     [fullWidth]="true"
-     [narrow]="true"
-     class="cds-mt-6 cds-mb-6 overview">
-  <div cdsRow
-       class="cds-mb-5">
+<main cdsGrid
+      [fullWidth]="true"
+      [narrow]="true"
+      class="cds-mt-5 cds-mb-5 overview">
+  <div cdsRow>
     <div cdsCol
          [columnNumbers]="{lg: 11}">
       <cd-overview-health-card
@@ -53,7 +52,7 @@
       <cd-performance-card></cd-performance-card>
     </div>
   </div>
-</div>
+</main>
 @if (isHealthPanelOpen && health?.incidents > 0) {
   <cd-side-panel
     [headerText]="'Health incidents ('+ health?.incidents +')'"