Merge pull request #602 from Tria-plc/freight/feature/user_management_UI

Freight/feature/user management UI

apps/edr-freight-web/backoffice/src/App.tsx

@@ -132,6 +132,7 @@ import WarehouseListPage from "./pages/warehouses/WarehouseListPage";
 import WarehouseRulesPage from "./pages/warehouses/WarehouseRulesPage";
 import { HealthCheck } from "./features/health/HealthCheck";
 import FaydaCallbackPage from "./pages/FaydaCallbackPage";
+import { UserManagementRoutes } from "./user-management/route";
 
 const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
   {
@@ -144,7 +145,7 @@ const buildSidebarSections = (demoItems: SidebarItem[]): SidebarSection[] => [
       },
       {
         label: "Staff",
-        href: "/um",
+        href: "/user-management",
         icon: <Users />,
       },
       {
@@ -667,6 +668,7 @@ const App = () => {
 
   return (
     <Routes>
+      {UserManagementRoutes()}
       <Route path="/um/*" element={<UserManagementHostPage />} />
       <Route path="/health" element={<HealthCheck />} />
       <Route path="/callback" element={<FaydaCallbackPage />} />
@@ -1232,18 +1234,18 @@ const App = () => {
         />
 
         {/* Legacy embedded user management routes */}
-        <Route path="user-management" element={<UserManagementPage />} />
+        {/* <Route path="user-management" element={<UserManagementPage />} />
         <Route path="user-management/users" element={<UsersPage />} />
         <Route
           path="user-management/position-types"
           element={<PositionTypesPage />}
-        />
+        /> */}
         {/* <Route path="user-management/employees" element={<EmployeesPage />} /> */}
-        <Route
+        {/* <Route
           path="user-management/permissions"
           element={<PermissionsPage />}
         />
-        <Route path="user-management/roles" element={<RolesPage />} />
+        <Route path="user-management/roles" element={<RolesPage />} /> */}
 
         <Route
           path="file-settings"