fix: userlist map crash issue

Athlonix · Jul 24, 2024 · 10804bc · 10804bc
1 parent d1f8ca2
commit 10804bc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/apps/admin/app/(dashboard)/dashboard/users/page.tsx b/apps/admin/app/(dashboard)/dashboard/users/page.tsx
@@ -107,7 +107,6 @@ function ShowContent() {
                 <TableHead>Prénom</TableHead>
                 <TableHead>Nom</TableHead>
                 <TableHead>Email</TableHead>
-                <TableHead>Référant</TableHead>
                 <TableHead>Rôle</TableHead>
                 <TableHead>Date d'éxpiration</TableHead>
                 <TableHead>Date de création</TableHead>

diff --git a/apps/admin/app/ui/dashboard/users/UserRow.tsx b/apps/admin/app/ui/dashboard/users/UserRow.tsx
@@ -152,10 +152,9 @@ function UserRow(user: UserProps) {
       <TableCell>{firstName}</TableCell>
       <TableCell>{lastName}</TableCell>
       <TableCell>{user.email}</TableCell>
-      <TableCell>TODO</TableCell>
       <TableCell>
         {roles && roles.length > 0 ? (
-          roles.map((role) => (
+          roles?.map((role) => (
             <Badge
               className="m-[2px]"
               key={role.id}
@@ -214,7 +213,7 @@ function UserRow(user: UserProps) {
                           username={username}
                           firstName={firstName}
                           lastName={lastName}
-                          roles={roles.map((role) => role.id)}
+                          roles={roles?.map((role) => role.id)}
                           closeDialog={() => setOpenEdit(false)}
                           setter={setter}
                         />
@@ -255,7 +254,7 @@ function UserRow(user: UserProps) {
                       <DialogDescription>
                         <div className="mb-4">Êtes-vous sûr de vouloir supprimer cet utilisateur ?</div>
                         <div className="flex w-full justify-end gap-4">
-                          <Button variant="destructive" onClick={deleteUser}>
+                          <Button variant="destructive" onClick={deleteUser} disabled={username === 'Supprimé'}>
                             Supprimer
                           </Button>
                           <Button variant="secondary" onClick={() => setOpenDelete(false)}>

diff --git a/apps/admin/app/ui/dashboard/users/UsersList.tsx b/apps/admin/app/ui/dashboard/users/UsersList.tsx
@@ -6,7 +6,7 @@ import UserRow from '@/app/ui/dashboard/users/UserRow';
 function UsersList({ users }: { users: User[] }) {
   return (
     <>
-      {users.map((user: User) => (
+      {users?.map((user: User) => (
         <UserRow key={user.id} {...user} />
       ))}
     </>