fix bugs in user list

compendium_v2/db/auth_model.py

@@ -6,6 +6,7 @@ from datetime import datetime
 from enum import Enum
 from uuid import UUID, uuid4
 
+from typing import List
 from typing_extensions import Annotated
 
 from sqlalchemy import Table, Column
@@ -62,7 +63,7 @@ class User(UserMixin, db.Model):
     created_at: Mapped[_datetime]
     last_login: Mapped[_datetime]
 
-    nrens: Mapped[NREN] = relationship(secondary=UserNrenMember, lazy='joined')
+    nrens: Mapped[List[NREN]] = relationship(secondary=UserNrenMember, lazy='joined')
 
     def __repr__(self):
         return '<User %r>' % self.email

compendium_v2/routes/user.py

@@ -66,12 +66,13 @@ def all_users_view() -> Any:
 
     def _extract_data(entry: User):
         return {
+            'id': entry.id,
             'email': entry.email,
             'roles': entry.roles.value,
             'active': entry.active,
-            'nrens': [nren.name for nren in entry.nrens] if entry.nrens else []
+            'nrens': [nren.name for nren in entry.nrens]
         }
 
     entries = [_extract_data(entry) for entry in db.session.scalars(
-        select(User).order_by(User.email))]
+        select(User).order_by(User.email)).unique()]
     return jsonify(entries)

survey-frontend/src/UserManagementComponent.tsx

@@ -13,8 +13,9 @@ async function fetchUsers(): Promise<User[]> {
 }
 
 interface User {
+    id: string,
     email: string,
-    role: string,
+    roles: string,
     active: boolean,
     nrens: string[]
 }
@@ -33,8 +34,8 @@ function UserManagementComponent() {
         <div>
             <table>
             {users.map(user => (
-                <tr key={user.email}>
-                    {user.email} - {user.active} - {user.role} - {user.nrens.join()}
+                <tr key={user.id}>
+                    {user.id} - {user.email} - {user.active ? 'active' : 'inactive'} - {user.roles} - {user.nrens.join()}
                 </tr>
             ))}
             </table>