show user roles in Users table

pAI-OS · Nov 6, 2024 · 9f9fdf0 · 9f9fdf0
1 parent c2f840c
commit 9f9fdf0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 11 deletions.
diff --git a/backend/managers/UsersManager.py b/backend/managers/UsersManager.py
@@ -46,7 +46,7 @@ async def retrieve_user(self, id):
         async with db_session_context() as session:
             result = await session.execute(select(User).filter(User.id == id))
             user = result.scalar_one_or_none()
-            return UserSchema(id=user.id, name=user.name, email=user.email) if user else None
+            return UserSchema(id=user.id, name=user.name, email=user.email, role=user.role) if user else None
 
     async def retrieve_users(self, offset=0, limit=100, sort_by=None, sort_order='asc', filters=None):
         async with db_session_context() as session:
@@ -59,7 +59,7 @@ async def retrieve_users(self, offset=0, limit=100, sort_by=None, sort_order='as
                     else:
                         query = query.filter(getattr(User, key) == value)
 
-            if sort_by and sort_by in ['id', 'name', 'email']:
+            if sort_by and sort_by in ['id', 'name', 'email', 'role']:
                 order_column = getattr(User, sort_by)
                 query = query.order_by(order_column.desc() if sort_order.lower() == 'desc' else order_column)
 
@@ -69,7 +69,8 @@ async def retrieve_users(self, offset=0, limit=100, sort_by=None, sort_order='as
             users = [UserSchema(
                 id=user.id,
                 name=user.name,
-                email=user.email
+                email=user.email,
+                role=user.role
             ) for user in result.scalars().all()]
 
             # Get total count

diff --git a/backend/schemas.py b/backend/schemas.py
@@ -47,6 +47,9 @@ class UserCreateSchema(UserBaseSchema):
 
 class UserSchema(UserBaseSchema):
     id: str
+    name: str
+    email: str
+    role: str
 
 # Asset schemas
 class AssetBaseSchema(BaseModel):

diff --git a/frontend/src/users.tsx b/frontend/src/users.tsx
@@ -1,30 +1,31 @@
 import { useMediaQuery, Theme } from "@mui/material";
-import { Create, Edit, EditButton, DeleteButton, List, SimpleList, Show, ShowButton, SimpleForm, SimpleShowLayout, Datagrid, TextField, TextInput, EmailField, useRecordContext } from "react-admin";
+import { Create, Edit, EditButton, DeleteButton, List, SimpleList, Show, ShowButton, SimpleForm, SimpleShowLayout, Datagrid, TextField, TextInput, EmailField, SelectInput, useRecordContext } from "react-admin";
 
 const UserTitle = () => {
     const record = useRecordContext();
     return <span>Users {record ? `- ${record.name}` : ""}</span>;
 };
 
-interface UserRecord {
-    id: string;
-    name: string;
-    email: string;
-}
+const roleChoices = [
+    { id: 'user', name: 'User' },
+    { id: 'admin', name: 'Admin' },
+];
 
 export const UserList = () => {
     const isSmall = useMediaQuery<Theme>((theme) => theme.breakpoints.down("sm"));
     return (
         <List>
             {isSmall ? (
                 <SimpleList
-                    primaryText={(record: UserRecord) => record.name}
-                    secondaryText={(record: UserRecord) => record.email}
+                    primaryText={(record) => record.name}
+                    secondaryText={(record) => record.email}
+                    tertiaryText={(record) => record.role}
                 />
             ) : (
                 <Datagrid rowClick="edit">
                     <TextField source="name" />
                     <EmailField source="email" />
+                    <TextField source="role" />
                     <ShowButton />
                     <EditButton />
                     <DeleteButton />
@@ -40,6 +41,7 @@ export const UserShow = () => (
             <TextField source="id" />
             <TextField source="name" />
             <EmailField source="email" />
+            <TextField source="role" />
         </SimpleShowLayout>
     </Show>
 );
@@ -49,6 +51,7 @@ export const UserEdit = () => (
         <SimpleForm>
             <TextInput source="name" />
             <TextInput source="email" />
+            <SelectInput source="role" choices={roleChoices} />
         </SimpleForm>
     </Edit>
 );
@@ -58,6 +61,7 @@ export const UserCreate = () => (
         <SimpleForm>
             <TextInput source="name" />
             <TextInput source="email" />
+            <SelectInput source="role" choices={roleChoices} defaultValue="user" />
         </SimpleForm>
     </Create>
 );