From 1c8e396d5835dceb961682df6ae20afeff8f9528 Mon Sep 17 00:00:00 2001
From: Nizamudeen A <nia@redhat.com>
Date: Thu, 18 May 2023 16:18:08 +0530
Subject: [PATCH] mgr/dashboard: fix rgw roles breadcrumbs

Fixes: https://tracker.ceph.com/issues/61241
Signed-off-by: Nizamudeen A <nia@redhat.com>
(cherry picked from commit 9518cd9d70020bcf5197dea6d61ea0bd2b21ae54)
---
 .../rgw-user-tabs.component.html              |  2 +-
 .../frontend/src/app/ceph/rgw/rgw.module.ts   | 54 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html
index 2130d3c2d2d..8ad1ac19309 100644
--- a/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html
+++ b/src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-user-tabs/rgw-user-tabs.component.html
@@ -9,7 +9,7 @@
   </li>
   <li class="nav-item">
     <a class="nav-link"
-       routerLink="/rgw/user/roles"
+       routerLink="/rgw/roles"
        routerLinkActive="active"
        ariaCurrentWhenActive="page"
        [routerLinkActiveOptions]="{exact: true}"
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 1bf131363ef..3a8ad6f6fc7 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
@@ -86,36 +86,36 @@ const routes: Routes = [
         path: `${URLVerbs.EDIT}/:uid`,
         component: RgwUserFormComponent,
         data: { breadcrumbs: ActionLabels.EDIT }
+      }
+    ]
+  },
+  {
+    path: 'roles',
+    data: {
+      breadcrumbs: 'Roles',
+      resource: 'api.rgw.user.roles@1.0',
+      tabs: [
+        {
+          name: 'Users',
+          url: '/rgw/user'
+        },
+        {
+          name: 'Roles',
+          url: '/rgw/roles'
+        }
+      ]
+    },
+    children: [
+      {
+        path: '',
+        component: CRUDTableComponent
       },
       {
-        path: 'roles',
+        path: URLVerbs.CREATE,
+        component: CrudFormComponent,
         data: {
-          breadcrumbs: 'Roles',
-          resource: 'api.rgw.user.roles@1.0',
-          tabs: [
-            {
-              name: 'Users',
-              url: '/rgw/user'
-            },
-            {
-              name: 'Roles',
-              url: '/rgw/user/roles'
-            }
-          ]
-        },
-        children: [
-          {
-            path: '',
-            component: CRUDTableComponent
-          },
-          {
-            path: URLVerbs.CREATE,
-            component: CrudFormComponent,
-            data: {
-              breadcrumbs: ActionLabels.CREATE
-            }
-          }
-        ]
+          breadcrumbs: ActionLabels.CREATE
+        }
       }
     ]
   },
-- 
2.39.5