From eda2c573b285a61e365acb48384123f8854aa790 Mon Sep 17 00:00:00 2001 From: Ankush Behl Date: Thu, 18 May 2023 17:25:56 +0530 Subject: [PATCH] mgr/dashboard:Change Daemons > Object Gateway section to Gateways - Change the Daemons to Gateways - Changing the breadcrums to call it Gateways - In list page Calling Daemons List as Gateways List Fixes: https://tracker.ceph.com/issues/61245 Signed-off-by: Ankush Behl --- .../frontend/cypress/integration/rgw/daemons.e2e-spec.ts | 4 ++-- .../ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html | 2 +- .../rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts | 4 ++-- .../mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts | 2 +- .../app/core/navigation/navigation/navigation.component.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/rgw/daemons.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/rgw/daemons.e2e-spec.ts index 4cad786c6fefe..f3129a7ffd9e8 100644 --- a/src/pybind/mgr/dashboard/frontend/cypress/integration/rgw/daemons.e2e-spec.ts +++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/rgw/daemons.e2e-spec.ts @@ -11,7 +11,7 @@ describe('RGW daemons page', () => { describe('breadcrumb and tab tests', () => { it('should open and show breadcrumb', () => { - daemons.expectBreadcrumbText('Daemons'); + daemons.expectBreadcrumbText('Gateways'); }); it('should show two tabs', () => { @@ -19,7 +19,7 @@ describe('RGW daemons page', () => { }); it('should show daemons list tab at first', () => { - daemons.getTabText(0).should('eq', 'Daemons List'); + daemons.getTabText(0).should('eq', 'Gateways List'); }); it('should show overall performance as a second tab', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html index fbd7d32633015..ce348d208d8b6 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.html @@ -3,7 +3,7 @@ class="nav-tabs"> Daemons List + i18n>Gateways List { fixture.destroy(); })); - it('should only show Daemons List tab', () => { + it('should only show Gateways List tab', () => { fixture.detectChanges(); - expectTabsAndHeading(1, 'Daemons List'); + expectTabsAndHeading(1, 'Gateways List'); }); it('should show Overall Performance tab', () => { diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts index 696df2b639c64..c2f7cc60f93f9 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw.module.ts @@ -94,7 +94,7 @@ const routes: Routes = [ { path: '' // Required for a clean reload on daemon selection. }, - { path: 'daemon', component: RgwDaemonListComponent, data: { breadcrumbs: 'Daemons' } }, + { path: 'daemon', component: RgwDaemonListComponent, data: { breadcrumbs: 'Gateways' } }, { path: 'user', data: { breadcrumbs: 'Users' }, diff --git a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html index 0ea5e8dc3e388..2e7dc16b3d0ef 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html +++ b/src/pybind/mgr/dashboard/frontend/src/app/core/navigation/navigation/navigation.component.html @@ -266,7 +266,7 @@
  • Daemons + routerLink="/rgw/daemon">Gateways
  • -- 2.39.5