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 <cloudbehl@gmail.com>
(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 4cad786c6fefe412aff8584105650d38cbfedca9..f3129a7ffd9e84e0c97a78c5d3fdc4133a9b8a29 100644 (file)
--- 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 fbd7d32633015ebe8342e63497ffce2ca729c516..ce348d208d8b63e8f33efe0325ddfef62b89ddaf 100644 (file)
--- 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">
   <ng-container ngbNavItem>
     <a ngbNavLink
-       i18n>Daemons List</a>
+       i18n>Gateways List</a>
     <ng-template ngbNavContent>
       <cd-table [data]="daemons"
                 [columns]="columns"

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts
index 3f333adb58306e414c6a2fe7d9ea869bc6179782..bdb4decd9dab36e7c8c350688211445ca018c8e1 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-daemon-list/rgw-daemon-list.component.spec.ts
@@ -84,10 +84,10 @@ describe('RgwDaemonListComponent', () => {
     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 e667b6d39888a3ae7e00c83d8eca525b7810c3d3..1bf131363ef64680ee672eef33acf3c7d23315b4 100644 (file)
--- 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 42b120510d69bb409603e871ed17650542f58b9d..aaa369a098eaa888e997e3e5a6e702b490eb7936 100644 (file)
--- 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 @@
           <li routerLinkActive="active"
               class="tc_submenuitem tc_submenuitem_rgw_daemons">
             <a i18n
-               routerLink="/rgw/daemon">Daemons</a>
+               routerLink="/rgw/daemon">Gateways</a>
           </li>
           <li routerLinkActive="active"
               class="tc_submenuitem tc_submenuitem_rgw_users">