mgr/dashboard: Rename Cluster > Monitoring to Alerts and change Cluster>Users to...

Fixes: https://tracker.ceph.com/issues/61213
Signed-off-by: Aashish Sharma <aasharma@redhat.com>
(cherry picked from commit 31b692f4e38e94d3e690921418f8eeebc2b48212)

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/users.e2e-spec.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/users.e2e-spec.ts
index 8374e7c7500fd90209a3463bb410d6ec07d00f95..87acda97fd83cb7d75dd9d544e7fe79ec6544a94 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/users.e2e-spec.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/cluster/users.e2e-spec.ts
@@ -1,6 +1,6 @@
 import { UsersPageHelper } from './users.po';
 
-describe('Cluster Users', () => {
+describe('Cluster Ceph Users', () => {
   const users = new UsersPageHelper();
 
   beforeEach(() => {
@@ -11,7 +11,7 @@ describe('Cluster Users', () => {
 
   describe('breadcrumb and tab tests', () => {
     it('should open and show breadcrumb', () => {
-      users.expectBreadcrumbText('Users');
+      users.expectBreadcrumbText('Ceph Users');
     });
   });
 

diff --git a/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts b/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts
index 3713bd772c1a5f6596ad0faded44c8a74de5a289..3bad05559907f469c825e0d3f5839cc2d4b66169 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts
+++ b/src/pybind/mgr/dashboard/frontend/cypress/integration/ui/navigation.po.ts
@@ -27,9 +27,9 @@ export class NavigationPageHelper extends PageHelper {
         { menu: 'Configuration', component: 'cd-configuration' },
         { menu: 'CRUSH map', component: 'cd-crushmap' },
         { menu: 'Manager Modules', component: 'cd-mgr-module-list' },
-        { menu: 'Users', component: 'cd-crud-table' },
+        { menu: 'Ceph Users', component: 'cd-crud-table' },
         { menu: 'Logs', component: 'cd-logs' },
-        { menu: 'Monitoring', component: 'cd-prometheus-tabs' }
+        { menu: 'Alerts', component: 'cd-prometheus-tabs' }
       ]
     },
     { menu: 'Pools', component: 'cd-pool-list' },

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
index fed34a3d2459a283e13b41c1d861b90adc59861e..f15a6b2faf9014ddaa236f1d7f419e1525ab3405 100644 (file)
--- a/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
+++ b/src/pybind/mgr/dashboard/frontend/src/app/app-routing.module.ts
@@ -121,7 +121,7 @@ const routes: Routes = [
         path: 'ceph-users',
         component: CRUDTableComponent,
         data: {
-          breadcrumbs: 'Cluster/Users',
+          breadcrumbs: 'Cluster/Ceph Users',
           resource: 'api.cluster.user@1.0'
         }
       },
@@ -129,7 +129,7 @@ const routes: Routes = [
         path: 'cluster/user/create',
         component: CrudFormComponent,
         data: {
-          breadcrumbs: 'Cluster/Users',
+          breadcrumbs: 'Cluster/Ceph Users/Create',
           resource: 'api.cluster.user@1.0'
         }
       },
@@ -137,7 +137,7 @@ const routes: Routes = [
         path: 'cluster/user/import',
         component: CrudFormComponent,
         data: {
-          breadcrumbs: 'Cluster/Users',
+          breadcrumbs: 'Cluster/Ceph Users/Import',
           resource: 'api.cluster.user@1.0'
         }
       },
@@ -145,7 +145,7 @@ const routes: Routes = [
         path: 'cluster/user/edit',
         component: CrudFormComponent,
         data: {
-          breadcrumbs: 'Cluster/Users',
+          breadcrumbs: 'Cluster/Ceph Users/Edit',
           resource: 'api.cluster.user@1.0'
         }
       },
@@ -237,7 +237,7 @@ const routes: Routes = [
       },
       {
         path: 'monitoring',
-        data: { breadcrumbs: 'Cluster/Monitoring' },
+        data: { breadcrumbs: 'Cluster/Alerts' },
         children: [
           { path: '', redirectTo: 'active-alerts', pathMatch: 'full' },
           {

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 dd72a2493ce1ef167370db973cbd4769fb816a22..42b120510d69bb409603e871ed17650542f58b9d 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
@@ -155,7 +155,7 @@
               class="tc_submenuitem tc_submenuitem_users"
               *ngIf="permissions.configOpt.read">
             <a i18n
-               routerLink="/ceph-users">Users</a>
+               routerLink="/ceph-users">Ceph Users</a>
           </li>
           <li routerLinkActive="active"
               class="tc_submenuitem tc_submenuitem_log"
@@ -167,7 +167,7 @@
               class="tc_submenuitem tc_submenuitem_monitoring"
               *ngIf="permissions.prometheus.read">
             <a routerLink="/monitoring">
-              <ng-container i18n>Monitoring</ng-container>
+              <ng-container i18n>Alerts</ng-container>
               <small *ngIf="prometheusAlertService.activeCriticalAlerts > 0"
                      class="badge badge-danger ms-1">{{ prometheusAlertService.activeCriticalAlerts }}</small>
               <small *ngIf="prometheusAlertService.activeWarningAlerts > 0"