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>

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 c8cddfdc8a9eb06469d02494709fe8d187ff022e..bba4da1f7b4f13f6b2c45051611d835cd4abd985 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
@@ -83,10 +83,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 696df2b639c643bf78bed59f3cf8f90048f3e785..c2f7cc60f93f926d1bd4cfbb2386e08b576814e2 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
@@ -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 0ea5e8dc3e38871957af8164b5d5c89cbe82b564..2e7dc16b3d0efb3c11865878033cc4a33ad0fe4d 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">