Spaces:
Runtime error
Runtime error
Greg Claude Opus 4.7 (1M context) commited on
Commit ·
bee4db8
1
Parent(s): 05b0bc2
feat(ta-01): allow editing sex and role in user create/edit modal
Browse filesFrontend (UsersPage):
- Sex selector (Sin especificar / Masculino / Femenino) on create and edit.
- Role select no longer disabled while editing; changes are diffed and
sent in the PUT payload.
Backend (schemas/user.py):
- UserUpdate gains optional `role` so PUT /users/{id} can change it.
- sex was already supported; just wiring it on the client side.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
backend/app/schemas/user.py
CHANGED
|
@@ -28,6 +28,7 @@ class UserUpdate(BaseModel):
|
|
| 28 |
secondary_phone_number: Optional[str] = None
|
| 29 |
parent_id: Optional[int] = None
|
| 30 |
is_active: Optional[str] = None
|
|
|
|
| 31 |
|
| 32 |
|
| 33 |
class UserResponse(BaseModel):
|
|
|
|
| 28 |
secondary_phone_number: Optional[str] = None
|
| 29 |
parent_id: Optional[int] = None
|
| 30 |
is_active: Optional[str] = None
|
| 31 |
+
role: Optional[str] = None
|
| 32 |
|
| 33 |
|
| 34 |
class UserResponse(BaseModel):
|
frontend/src/pages/UsersPage.tsx
CHANGED
|
@@ -11,7 +11,7 @@ import CameraCapture from '../components/CameraCapture';
|
|
| 11 |
import AuthImage from '../components/AuthImage';
|
| 12 |
|
| 13 |
const DEFAULT_PASS = 'talos123';
|
| 14 |
-
const EMPTY_FORM = { name: '', lastname: '', email: '', role: 'student', card_id: '', phone_number: '', password: DEFAULT_PASS };
|
| 15 |
|
| 16 |
export default function UsersPage() {
|
| 17 |
const user = useAuthStore((s) => s.user);
|
|
@@ -66,7 +66,7 @@ export default function UsersPage() {
|
|
| 66 |
};
|
| 67 |
const openEdit = async (u: User) => {
|
| 68 |
setEditing(u);
|
| 69 |
-
setForm({ name: u.name, lastname: u.lastname, email: u.email || '', role: u.role, card_id: u.card_id || '', phone_number: u.phone_number || '', password: '' });
|
| 70 |
setCapturedImage(null); setCapturedBlob(null);
|
| 71 |
try {
|
| 72 |
const perms = await listUserPermissions(u.id);
|
|
@@ -86,11 +86,13 @@ export default function UsersPage() {
|
|
| 86 |
if (form.email !== (editing.email || '')) payload.email = form.email;
|
| 87 |
if (form.card_id !== (editing.card_id || '')) payload.card_id = form.card_id;
|
| 88 |
if (form.phone_number !== (editing.phone_number || '')) payload.phone_number = form.phone_number;
|
|
|
|
|
|
|
| 89 |
if (Object.keys(payload).length) await updateUser(editing.id, payload);
|
| 90 |
await setUserPerms(editing.id, userPermissions);
|
| 91 |
userId = editing.id;
|
| 92 |
} else {
|
| 93 |
-
const created = await createUser({ name: form.name, lastname: form.lastname, email: form.email || undefined, role: form.role, card_id: form.card_id || undefined, phone_number: form.phone_number || undefined, password: form.password || DEFAULT_PASS });
|
| 94 |
userId = created.id;
|
| 95 |
}
|
| 96 |
if (userId && (capturedBlob || capturedImage)) {
|
|
@@ -227,10 +229,22 @@ export default function UsersPage() {
|
|
| 227 |
<div><label className="block text-sm font-medium text-gray-700 mb-1">Apellido *</label><input value={form.lastname} onChange={(e) => setForm({ ...form, lastname: e.target.value })} required className="w-full border border-gray-300 rounded-lg px-3 py-2" /></div>
|
| 228 |
<div><label className="block text-sm font-medium text-gray-700 mb-1">Email</label><input type="email" value={form.email} onChange={(e) => setForm({ ...form, email: e.target.value })} className="w-full border border-gray-300 rounded-lg px-3 py-2" /></div>
|
| 229 |
<div><label className="block text-sm font-medium text-gray-700 mb-1">Rol</label>
|
| 230 |
-
<select value={form.role} onChange={(e) => setForm({ ...form, role: e.target.value })}
|
| 231 |
{ROLES.map((r) => <option key={r.value} value={r.value}>{r.label}</option>)}
|
| 232 |
</select>
|
| 233 |
</div>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 234 |
{editing && form.role !== 'admin' && availablePermissions.length > 0 && (
|
| 235 |
<div>
|
| 236 |
<label className="block text-sm font-medium text-gray-700 mb-1">Permisos</label>
|
|
|
|
| 11 |
import AuthImage from '../components/AuthImage';
|
| 12 |
|
| 13 |
const DEFAULT_PASS = 'talos123';
|
| 14 |
+
const EMPTY_FORM = { name: '', lastname: '', email: '', role: 'student', sex: '', card_id: '', phone_number: '', password: DEFAULT_PASS };
|
| 15 |
|
| 16 |
export default function UsersPage() {
|
| 17 |
const user = useAuthStore((s) => s.user);
|
|
|
|
| 66 |
};
|
| 67 |
const openEdit = async (u: User) => {
|
| 68 |
setEditing(u);
|
| 69 |
+
setForm({ name: u.name, lastname: u.lastname, email: u.email || '', role: u.role, sex: u.sex || '', card_id: u.card_id || '', phone_number: u.phone_number || '', password: '' });
|
| 70 |
setCapturedImage(null); setCapturedBlob(null);
|
| 71 |
try {
|
| 72 |
const perms = await listUserPermissions(u.id);
|
|
|
|
| 86 |
if (form.email !== (editing.email || '')) payload.email = form.email;
|
| 87 |
if (form.card_id !== (editing.card_id || '')) payload.card_id = form.card_id;
|
| 88 |
if (form.phone_number !== (editing.phone_number || '')) payload.phone_number = form.phone_number;
|
| 89 |
+
if (form.role !== editing.role) payload.role = form.role;
|
| 90 |
+
if (form.sex !== (editing.sex || '')) payload.sex = form.sex || null;
|
| 91 |
if (Object.keys(payload).length) await updateUser(editing.id, payload);
|
| 92 |
await setUserPerms(editing.id, userPermissions);
|
| 93 |
userId = editing.id;
|
| 94 |
} else {
|
| 95 |
+
const created = await createUser({ name: form.name, lastname: form.lastname, email: form.email || undefined, role: form.role, sex: form.sex || undefined, card_id: form.card_id || undefined, phone_number: form.phone_number || undefined, password: form.password || DEFAULT_PASS });
|
| 96 |
userId = created.id;
|
| 97 |
}
|
| 98 |
if (userId && (capturedBlob || capturedImage)) {
|
|
|
|
| 229 |
<div><label className="block text-sm font-medium text-gray-700 mb-1">Apellido *</label><input value={form.lastname} onChange={(e) => setForm({ ...form, lastname: e.target.value })} required className="w-full border border-gray-300 rounded-lg px-3 py-2" /></div>
|
| 230 |
<div><label className="block text-sm font-medium text-gray-700 mb-1">Email</label><input type="email" value={form.email} onChange={(e) => setForm({ ...form, email: e.target.value })} className="w-full border border-gray-300 rounded-lg px-3 py-2" /></div>
|
| 231 |
<div><label className="block text-sm font-medium text-gray-700 mb-1">Rol</label>
|
| 232 |
+
<select value={form.role} onChange={(e) => setForm({ ...form, role: e.target.value })} className="w-full border border-gray-300 rounded-lg px-3 py-2">
|
| 233 |
{ROLES.map((r) => <option key={r.value} value={r.value}>{r.label}</option>)}
|
| 234 |
</select>
|
| 235 |
</div>
|
| 236 |
+
<div>
|
| 237 |
+
<label className="block text-sm font-medium text-gray-700 mb-1">Sexo</label>
|
| 238 |
+
<select
|
| 239 |
+
value={form.sex}
|
| 240 |
+
onChange={(e) => setForm({ ...form, sex: e.target.value })}
|
| 241 |
+
className="w-full border border-gray-300 rounded-lg px-3 py-2"
|
| 242 |
+
>
|
| 243 |
+
<option value="">Sin especificar</option>
|
| 244 |
+
<option value="M">Masculino</option>
|
| 245 |
+
<option value="F">Femenino</option>
|
| 246 |
+
</select>
|
| 247 |
+
</div>
|
| 248 |
{editing && form.role !== 'admin' && availablePermissions.length > 0 && (
|
| 249 |
<div>
|
| 250 |
<label className="block text-sm font-medium text-gray-700 mb-1">Permisos</label>
|