Merge pull request ceph#65246 from afreen23/remove-old-dash

Drop support for older version of dashboard

Reviewed-by: Nizamudeen A <[email protected]>

Author: afreen23

PendingReleaseNotes

@@ -194,6 +194,10 @@
   C `rbd_mirror_image_resync()`, and Python `Image.mirror_image_resync()` --
   will return EINVAL instead of ENOENT when mirroring is not enabled.
 
+* DASHBOARD: Removed the older landing page which was deprecated in quincy.
+  The admin can no longer enable the older, deprecated landing page layout by 
+  adjusting FEATURE_TOGGLE_DASHBOARD.
+
 >=19.2.1
 
 * CephFS: The `fs subvolume create` command now allows tagging subvolumes through option

doc/mgr/dashboard.rst

@@ -129,16 +129,6 @@ updates on any changes in the cluster and allows quick access to other sections
 
 .. image:: dashboard-landing-page.png
 
-
-.. note::
-  You can change the landing page to the previous version from:
-  ``Cluster >> Manager Modules >> Dashboard >> Edit``.
-  Editing the ``FEATURE_TOGGLE_DASHBOARD`` option will change the landing page, from one view to another.
-
-  Note that the previous version of the landing page will be disabled in future releases.
-
-.. _dashboard-landing-page-details:
-
 Details
 """""""
 Provides an overview of the cluster configuration, displaying various critical aspects of the cluster.

src/pybind/mgr/dashboard/controllers/health.py

@@ -157,6 +157,7 @@
         'up': (int, 'Count of iSCSI gateways running'),
         'down': (int, 'Count of iSCSI gateways not running')
     }, 'Iscsi gateways status'),
+    'num_hosts': (int, 'Count of hosts')
 })
 
 

src/pybind/mgr/dashboard/frontend/cypress/e2e/a11y/dashboard.e2e-spec.ts

@@ -1,7 +1,7 @@
-import { DashboardPageHelper } from '../ui/dashboard.po';
+import { DashboardV3PageHelper } from '../ui/dashboard-v3.po';
 
 describe('Dashboard Main Page', { retries: 0 }, () => {
-  const dashboard = new DashboardPageHelper();
+  const dashboard = new DashboardV3PageHelper();
 
   beforeEach(() => {
     cy.login();

src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/04-osds.e2e-spec.ts

@@ -1,18 +1,12 @@
 import { OSDsPageHelper } from '../cluster/osds.po';
-import { DashboardPageHelper } from '../ui/dashboard.po';
-import { ManagerModulesPageHelper } from '../cluster/mgr-modules.po';
+import { DashboardV3PageHelper } from '../ui/dashboard-v3.po';
 
 describe('OSDs page', () => {
   const osds = new OSDsPageHelper();
-  const dashboard = new DashboardPageHelper();
-  const mgrmodules = new ManagerModulesPageHelper();
+  const dashboard = new DashboardV3PageHelper();
 
   before(() => {
     cy.login();
-    mgrmodules.navigateTo();
-    mgrmodules.navigateEdit('dashboard');
-    cy.get('#FEATURE_TOGGLE_DASHBOARD').uncheck();
-    cy.contains('button', 'Update').click();
   });
 
   beforeEach(() => {
@@ -35,9 +29,7 @@ describe('OSDs page', () => {
 
           // landing page is easier to check OSD status
           dashboard.navigateTo();
-          dashboard.infoCardBody('OSDs').should('contain.text', `${expectedCount} total`);
-          dashboard.infoCardBody('OSDs').should('contain.text', `${expectedCount} up`);
-          dashboard.infoCardBody('OSDs').should('contain.text', `${expectedCount} in`);
+          dashboard.cardRow('OSD').should('contain.text', `${expectedCount} OSDs`);
 
           cy.wait(30000);
           expect(Number(newCount)).to.be.gte(2);

src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.e2e-spec.ts

@@ -1,16 +1,10 @@
-import { ManagerModulesPageHelper } from '../cluster/mgr-modules.po';
 import { DashboardV3PageHelper } from './dashboard-v3.po';
 
 describe('Dashboard-v3 Main Page', () => {
   const dashboard = new DashboardV3PageHelper();
-  const mgrmodules = new ManagerModulesPageHelper();
 
   before(() => {
     cy.login();
-    mgrmodules.navigateTo();
-    mgrmodules.navigateEdit('dashboard');
-    cy.get('#FEATURE_TOGGLE_DASHBOARD').check();
-    cy.contains('button', 'Update').click();
   });
 
   beforeEach(() => {

src/pybind/mgr/dashboard/frontend/cypress/e2e/ui/dashboard-v3.po.ts

@@ -17,4 +17,8 @@ export class DashboardV3PageHelper extends PageHelper {
 
     return cy.get('@cards').its(indexOrTitle);
   }
+
+  cardRow(rowName: string) {
+    return cy.get(`[data-testid=${rowName}]`);
+  }
 }