From: Ankush Behl Date: Thu, 18 May 2023 11:55:56 +0000 (+0530) Subject: mgr/dashboard:Change Daemons > Object Gateway section to Gateways X-Git-Tag: v18.1.2~81^2~13 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=70c6367eb2352f2e5b0b68542f460502d2c349e0;p=ceph-ci.git 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 (cherry picked from commit eda2c573b285a61e365acb48384123f8854aa790) --- 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 4cad786c6fe..f3129a7ffd9 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 fbd7d326330..ce348d208d8 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 e667b6d3988..1bf131363ef 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 @@ -71,7 +71,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 42b120510d6..aaa369a098e 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