+ let historyContent: JSX.Element;
+ if (historyLoading) {
+ historyContent = (
+
);
- } else if (eventosInscritos.length === 0) {
- eventsSection = (
-
-
- );
+ } else if (historyError) {
+ historyContent =
{historyError}
;
} else {
- eventsSection = (
-
-
-
({
- from: parseDate(e.fecha_inicio),
- to: parseDate(e.fecha_fin),
- id: e.id_evento,
- }))}
- selectedRange={
- selectedEvento
- ? {
- from: parseDate(selectedEvento.fecha_inicio),
- to: parseDate(selectedEvento.fecha_fin),
- id: selectedEvento.id_evento,
- }
- : undefined
- }
- month={calendarMonth}
- onMonthChange={setCalendarMonth}
- />
-
-
-
- );
- }
-
- let inscriptionsContent: JSX.Element | null;
- if (loading) {
- inscriptionsContent = null;
- } else if (error) {
- inscriptionsContent = (
-
- );
- } else if (grouped.length === 0) {
- inscriptionsContent = (
-
- );
- } else {
- inscriptionsContent = (
-
- {grouped.map((item) => (
-
-
-
-
- {item.evento_nombre}
-
-
- Inscrito el {item.fecha_inscripcion}
-
-
-
- {item.estado}
-
-
-
- Fecha limite de pago: {item.fecha_limite_pago}
-
-
-
handleDownload(item.id_inscripcion)}>
- Descargar comprobante
-
-
handleView(item.id_inscripcion)}
+ historyContent = (
+
+
+
+ Fecha
+ Estado anterior
+ Estado nuevo
+ Tipo de cambio
+ Comentario / Retroalimentación
+
+
+
+ {historyItems.length === 0 ? (
+
+
- Ver comprobante
-
- loadHistory(item.id_inscripcion)}
+ No hay cambios para los filtros seleccionados.
+
+
+ ) : (
+ historyItems.map((item) => (
+
- Ver historial de cambios
-
-
-
- ))}
-
+ {item.fecha_cambio}
+
+ {item.estado_anterior || "-"}
+
+ {item.estado_nuevo}
+ {item.tipo_cambio || "-"}
+
+ {item.nota || item.actor || "-"}
+
+
+ ))
+ )}
+
+
);
}
return (
- {eventsSection}
+
Comprobantes
- {inscriptionsContent}
+
-
- {historyLoading ? (
-
-
- ) : historyError ? (
-
{historyError}
- ) : (
-
-
-
- Fecha
- Estado anterior
- Estado nuevo
- Tipo de cambio
- Comentario / Retroalimentación
-
-
-
- {historyItems.length === 0 ? (
-
-
- No hay cambios para los filtros seleccionados.
-
-
- ) : (
- historyItems.map((item) => (
-
- {item.fecha_cambio}
-
- {item.estado_anterior || "-"}
-
- {item.estado_nuevo}
- {item.tipo_cambio || "-"}
-
- {item.nota || item.actor || "-"}
-
-
- ))
- )}
-
-
- )}
+ {historyContent}
)}
@@ -824,59 +829,6 @@ export default function MyInscriptionsScreen(): JSX.Element {
-
-
-
-
- Historial de cambios de estado
-
-
-
- Revisa la trazabilidad de cambios por inscripción.
-
-
-
- {
- const nextValue = Array.isArray(value) ? (value[0] ?? "") : value;
- const parsed = Number(nextValue);
- setSelectedHistoryInscriptionId(Number.isFinite(parsed) && parsed > 0 ? parsed : null);
- }}
- options={historyInscriptionOptions}
- inputLabel="Inscripción"
- placeholder="Selecciona una inscripción"
- allowCustom={false}
- isClearable
- />
-
-
-
- {historyLoading ? (
-
Cargando historial...
- ) : historyItems.length === 0 ? (
-
Sin cambios registrados.
- ) : (
- historyItems.map((history) => (
-
-
- {history.estado_anterior?.trim() || "Sin estado"} -> {history.estado_nuevo}
-
-
{history.fecha_cambio}
- {history.nota ? (
-
{history.nota}
- ) : null}
- {history.actor ? (
-
Actor: {history.actor}
- ) : null}
-
- ))
- )}
-
-
);
}
diff --git a/frontend/src/screens/mensajes/ConversacionScreen.tsx b/frontend/src/screens/mensajes/ConversacionScreen.tsx
index 55e94c1c..cb4570bf 100644
--- a/frontend/src/screens/mensajes/ConversacionScreen.tsx
+++ b/frontend/src/screens/mensajes/ConversacionScreen.tsx
@@ -120,14 +120,18 @@ export default function ConversacionScreen(): JSX.Element {
return;
}
if (!user?.id || !conversacionId) return;
+
+ const cuerpoNormalizado = cuerpo.trim();
+ const cuerpoAEnviar = cuerpoNormalizado || (adjunto ? " " : "");
+
setSending(true);
setError("");
const res = await sendMensaje(
Number(conversacionId),
user.id,
- cuerpo.trim(),
+ cuerpoAEnviar,
adjunto?.url,
- adjunto?.nombre
+ adjunto?.nombre,
);
setSending(false);
if (res.status === 201) {
diff --git a/frontend/src/screens/roleManagement/RoleManagementListScreen.test.tsx b/frontend/src/screens/roleManagement/RoleManagementListScreen.test.tsx
new file mode 100644
index 00000000..e111b39a
--- /dev/null
+++ b/frontend/src/screens/roleManagement/RoleManagementListScreen.test.tsx
@@ -0,0 +1,170 @@
+import { fireEvent, render, screen, waitFor } from "@testing-library/react";
+import RoleManagementListScreen from "./RoleManagementListScreen";
+import {
+ createRole,
+ deleteRole,
+ getPermissions,
+ getRolePermissions,
+ getRoles,
+ getUsers,
+ updateRole,
+ updateRolePermissions,
+ updateUserRoles,
+} from "../../services/roleServices";
+
+jest.mock("../../services/roleServices", () => ({
+ getUsers: jest.fn(),
+ getRoles: jest.fn(),
+ getRolePermissions: jest.fn(),
+ getPermissions: jest.fn(),
+ updateUserRoles: jest.fn(),
+ createRole: jest.fn(),
+ updateRole: jest.fn(),
+ deleteRole: jest.fn(),
+ updateRolePermissions: jest.fn(),
+}));
+
+jest.mock("../../contexts/Toast/ToastContext", () => ({
+ useToast: () => ({ showToast: jest.fn() }),
+}));
+
+jest.mock("../../utils/notifications", () => ({
+ addUserNotification: jest.fn(),
+}));
+
+const mockedGetUsers = getUsers as jest.MockedFunction
;
+const mockedGetRoles = getRoles as jest.MockedFunction;
+const mockedGetRolePermissions = getRolePermissions as jest.MockedFunction<
+ typeof getRolePermissions
+>;
+
+const mockedGetPermissions = getPermissions as jest.MockedFunction;
+const mockedUpdateUserRoles = updateUserRoles as jest.MockedFunction;
+const mockedCreateRole = createRole as jest.MockedFunction;
+const mockedUpdateRole = updateRole as jest.MockedFunction;
+const mockedDeleteRole = deleteRole as jest.MockedFunction;
+const mockedUpdateRolePermissions =
+ updateRolePermissions as jest.MockedFunction;
+
+describe("RoleManagementListScreen", () => {
+ beforeEach(() => {
+ mockedGetUsers.mockResolvedValue({
+ status: 200,
+ data: {
+ total: 3,
+ users: [
+ {
+ id: 1,
+ name: "Juan Admin",
+ email: "juan@test.com",
+ roles: ["ADMIN"],
+ },
+ {
+ id: 2,
+ name: "Maria Revisora",
+ email: "maria@test.com",
+ roles: ["REVISOR"],
+ },
+ {
+ id: 3,
+ name: "Pedro",
+ email: "pedro@test.com",
+ roles: ["FANTASMA"],
+ },
+ ],
+ },
+ });
+
+ mockedGetRoles.mockResolvedValue({
+ status: 200,
+ data: {
+ roles: [
+ { id: 1, name: "ADMIN", description: "Administrador" },
+ { id: 2, name: "REVISOR", description: "Revisor" },
+ ],
+ },
+ });
+
+ mockedGetRolePermissions.mockImplementation(async (roleId: number) => {
+ if (roleId === 1) {
+ return {
+ status: 200,
+ data: {
+ permissions: [{ id: 11, name: "users.read", resource: "users" }],
+ },
+ };
+ }
+ return {
+ status: 200,
+ data: {
+ permissions: [],
+ },
+ };
+ });
+
+ mockedGetPermissions.mockResolvedValue({ status: 200, data: { permissions: [] } });
+ mockedUpdateUserRoles.mockResolvedValue({ status: 200, data: {} });
+ mockedCreateRole.mockResolvedValue({ status: 200, data: {} });
+ mockedUpdateRole.mockResolvedValue({ status: 200, data: {} });
+ mockedDeleteRole.mockResolvedValue({ status: 200, data: {} });
+ mockedUpdateRolePermissions.mockResolvedValue({ status: 200, data: {} });
+ });
+
+ afterEach(() => {
+ jest.clearAllMocks();
+ });
+
+ it("muestra detalles del usuario y estado de permisos por rol", async () => {
+ render(;
const rawRoles =
- (record.roles as unknown) ??
- record.role ??
- record.rol ??
- record.nombre_rol ??
- "";
- const rolesArray = Array.isArray(rawRoles)
- ? rawRoles.map((r) => String(r))
- : String(rawRoles)
- .split(",")
- .map((r) => r.trim())
- .filter(Boolean);
+ record.roles ?? record.role ?? record.rol ?? record.nombre_rol;
+ const rolesArray = toRoles(rawRoles);
return {
id: Number(record.id ?? record.id_usuario ?? index + 1),
- name: String(record.name ?? record.nombre ?? record.email ?? "Usuario"),
- email: String(record.email ?? record.correo ?? ""),
+ name: toText(record.name ?? record.nombre ?? record.email, "Usuario"),
+ email: toText(record.email ?? record.correo, ""),
roles: rolesArray,
};
});
}
+// normalizeRoles adapts backend payload shapes to role rows.
function normalizeRoles(payload: unknown): RoleRow[] {
const root = (payload as { payload?: unknown })?.payload ?? payload;
const list = Array.isArray(root)
@@ -82,12 +108,13 @@ function normalizeRoles(payload: unknown): RoleRow[] {
const record = item as Record;
return {
id: Number(record.id ?? record.id_rol ?? record.idRol ?? 0),
- name: String(record.name ?? record.nombre_rol ?? ""),
- description: String(record.description ?? record.descripcion ?? ""),
+ name: toText(record.name ?? record.nombre_rol),
+ description: toText(record.description ?? record.descripcion),
};
});
}
+// normalizePermissions adapts backend payload shapes to permission rows.
function normalizePermissions(payload: unknown): PermissionRow[] {
const root = (payload as { payload?: unknown })?.payload ?? payload;
const list = Array.isArray(root)
@@ -101,12 +128,13 @@ function normalizePermissions(payload: unknown): PermissionRow[] {
const record = item as Record;
return {
id: Number(record.id ?? record.id_permiso ?? index + 1),
- name: String(record.name ?? record.nombre_permiso ?? "Permiso"),
- resource: String(record.resource ?? record.recurso ?? ""),
+ name: toText(record.name ?? record.nombre_permiso, "Permiso"),
+ resource: toText(record.resource ?? record.recurso),
};
});
}
+// extractTotal gets total count from paginated responses with tolerant parsing.
function extractTotal(payload: unknown): number {
const root = (payload as { payload?: unknown })?.payload ?? payload;
const raw = (root as { total?: unknown })?.total ?? 0;
@@ -116,11 +144,14 @@ function extractTotal(payload: unknown): number {
const arrayEqual = (a: string[], b: string[]) => {
if (a.length !== b.length) return false;
- const sortedA = [...a].sort();
- const sortedB = [...b].sort();
+ const sortedA = [...a].sort((left, right) => left.localeCompare(right));
+ const sortedB = [...b].sort((left, right) => left.localeCompare(right));
return sortedA.every((value, index) => value === sortedB[index]);
};
+const normalizeRoleName = (value: string): string => value.trim().toUpperCase();
+
+// RoleManagementListScreen renders both user-role assignment and role-permission admin sections.
export default function RoleManagementListScreen(): JSX.Element {
const [rows, setRows] = useState([]);
const [isLoading, setIsLoading] = useState(true);
@@ -130,6 +161,7 @@ export default function RoleManagementListScreen(): JSX.Element {
const [isModalOpen, setIsModalOpen] = useState(false);
const [selectedUser, setSelectedUser] = useState(null);
+ const [detailsUser, setDetailsUser] = useState(null);
const [roleOptions, setRoleOptions] = useState([]);
const [selectedRoles, setSelectedRoles] = useState([]);
const [rolesLoading, setRolesLoading] = useState(false);
@@ -158,6 +190,8 @@ export default function RoleManagementListScreen(): JSX.Element {
[],
);
const [isSavingPermissions, setIsSavingPermissions] = useState(false);
+ const [userSearch, setUserSearch] = useState("");
+ const [userRoleFilter, setUserRoleFilter] = useState("");
const { showToast } = useToast();
@@ -167,6 +201,40 @@ export default function RoleManagementListScreen(): JSX.Element {
selectedUser && !arrayEqual(selectedRoles, selectedUser.roles),
);
+ const roleNameOptions = useMemo(
+ () => roleOptions.map((option) => String(option.value)),
+ [roleOptions],
+ );
+
+ const roleNameSet = useMemo(
+ () => new Set(roleNameOptions.map(normalizeRoleName)),
+ [roleNameOptions],
+ );
+
+ const roleByName = useMemo(() => {
+ const map = new Map();
+ roleRows.forEach((role) => map.set(normalizeRoleName(role.name), role));
+ return map;
+ }, [roleRows]);
+
+ const filteredRows = useMemo(() => {
+ const query = userSearch.trim().toLowerCase();
+ const roleFilter = normalizeRoleName(userRoleFilter);
+
+ return rows.filter((row) => {
+ const matchesQuery =
+ !query ||
+ row.name.toLowerCase().includes(query) ||
+ row.email.toLowerCase().includes(query);
+
+ const matchesRole =
+ !roleFilter ||
+ row.roles.some((role) => normalizeRoleName(role) === roleFilter);
+
+ return matchesQuery && matchesRole;
+ });
+ }, [rows, userRoleFilter, userSearch]);
+
const loadUsers = useCallback(async () => {
setIsLoading(true);
setError("");
@@ -268,6 +336,43 @@ export default function RoleManagementListScreen(): JSX.Element {
const handleUpdateRole = async () => {
if (!selectedUser) return;
+ if (selectedRoles.length === 0) {
+ showToast({
+ title: "Validación",
+ message: "Debes asignar al menos un rol al usuario.",
+ status: "error",
+ });
+ return;
+ }
+
+ const invalidRoles = selectedRoles.filter(
+ (role) => !roleNameSet.has(normalizeRoleName(role)),
+ );
+ if (invalidRoles.length > 0) {
+ showToast({
+ title: "Validación",
+ message: `Roles inválidos: ${invalidRoles.join(", ")}.`,
+ status: "error",
+ });
+ return;
+ }
+
+ const rolesWithoutPermissions = selectedRoles.filter((roleName) => {
+ const role = roleByName.get(normalizeRoleName(roleName));
+ if (!role) return false;
+ const permissions = rolePermissionsMap[role.id] ?? [];
+ return permissions.length === 0;
+ });
+
+ if (rolesWithoutPermissions.length > 0) {
+ showToast({
+ title: "Validación",
+ message: `Los roles ${rolesWithoutPermissions.join(", ")} no tienen permisos configurados.`,
+ status: "error",
+ });
+ return;
+ }
+
setIsUpdating(true);
const { status } = await updateUserRoles({
@@ -466,6 +571,185 @@ export default function RoleManagementListScreen(): JSX.Element {
: permission.name,
}));
+ const getUserValidation = (row: UserRoleRow): JSX.Element => {
+ const invalidRowRoles = row.roles.filter(
+ (role) => !roleNameSet.has(normalizeRoleName(role)),
+ );
+ if (invalidRowRoles.length > 0) {
+ return (
+
+ Roles inválidos: {invalidRowRoles.join(", ")}
+
+ );
+ }
+
+ const rowRolesWithoutPermissions = row.roles.filter((roleName) => {
+ const role = roleByName.get(normalizeRoleName(roleName));
+ if (!role) return false;
+ return (rolePermissionsMap[role.id] ?? []).length === 0;
+ });
+
+ if (rowRolesWithoutPermissions.length > 0) {
+ return (
+
+ Sin permisos: {rowRolesWithoutPermissions.join(", ")}
+
+ );
+ }
+
+ return OK ;
+ };
+
+ const renderUsersBody = (): JSX.Element[] => {
+ if (isLoading) {
+ return [
+
+
+ Cargando usuarios...
+
+ ,
+ ];
+ }
+
+ if (error) {
+ return [
+
+
+ {error}
+
+ ,
+ ];
+ }
+
+ if (filteredRows.length === 0) {
+ return [
+
+
+ Sin usuarios para los filtros aplicados.
+
+ ,
+ ];
+ }
+
+ return filteredRows.map((row) => (
+
+ {row.name}
+ {row.email || "-"}
+
+ openRoleModal(row)}
+ >
+ {row.roles.length > 0 ? row.roles.join(", ") : "Sin roles"}
+
+
+ {getUserValidation(row)}
+
+
+ setDetailsUser(row)}
+ >
+ Detalles
+
+ openRoleModal(row)}
+ >
+ Editar roles
+
+
+
+
+ ));
+ };
+
+ const renderRolePermissionsCell = (roleId: number): string => {
+ const rolePermissions = rolePermissionsMap[roleId] ?? [];
+ if (rolePermissions.length === 0) return "Sin permisos";
+ return rolePermissions
+ .map((permission) =>
+ permission.resource
+ ? `${permission.name} - ${permission.resource}`
+ : permission.name,
+ )
+ .join(", ");
+ };
+
+ const renderRolesBody = (): JSX.Element[] => {
+ if (rolesSectionLoading) {
+ return [
+
+
+ Cargando roles...
+
+ ,
+ ];
+ }
+
+ if (roleRows.length === 0) {
+ return [
+
+
+ Sin roles.
+
+ ,
+ ];
+ }
+
+ return roleRows.map((role) => (
+
+ {role.name}
+ {role.description || "-"}
+ {renderRolePermissionsCell(role.id)}
+
+
+ openEditRole(role)}
+ >
+ Editar
+
+ handleDeleteRole(role)}
+ >
+ Eliminar
+
+ void openPermissionsModal(role)}
+ >
+ Editar permisos
+
+
+
+
+ ));
+ };
+
+ const getRoleStatusBadge = (roleName: string): JSX.Element => {
+ const role = roleByName.get(normalizeRoleName(roleName));
+ const permissionsCount = role
+ ? (rolePermissionsMap[role.id] ?? []).length
+ : 0;
+ const invalid = !roleNameSet.has(normalizeRoleName(roleName));
+
+ if (invalid) {
+ return Inválido ;
+ }
+
+ if (permissionsCount === 0) {
+ return Sin permisos ;
+ }
+
+ return (
+
+ {permissionsCount} permisos
+
+ );
+ };
+
return (
@@ -479,6 +763,45 @@ export default function RoleManagementListScreen(): JSX.Element {
+
+
+
+ Buscar por nombre o correo
+
+
+
+
+ Filtrar por rol
+
+ setUserRoleFilter(event.target.value)}
+ className="w-full rounded border border-slate-600 bg-slate-800 text-slate-200 px-3 py-2"
+ >
+ Todos los roles
+ {roleNameOptions.map((roleName) => (
+
+ {roleName}
+
+ ))}
+
+
+
+
@@ -486,45 +809,12 @@ export default function RoleManagementListScreen(): JSX.Element {
Usuario
Correo
Roles
+ Validación
+ Acciones
- {isLoading ? (
-
-
- Cargando usuarios...
-
-
- ) : error ? (
-
-
- {error}
-
-
- ) : rows.length === 0 ? (
-
-
- Sin usuarios.
-
-
- ) : (
- rows.map((row) => (
-
- {row.name}
- {row.email || "-"}
-
- openRoleModal(row)}
- >
- {row.roles.length > 0
- ? row.roles.join(", ")
- : "Sin roles"}
-
-
-
- ))
- )}
+ {renderUsersBody()}
@@ -570,64 +860,55 @@ export default function RoleManagementListScreen(): JSX.Element {
- {rolesSectionLoading ? (
-
-
- Cargando roles...
-
-
- ) : roleRows.length === 0 ? (
-
-
- Sin roles.
-
-
- ) : (
- roleRows.map((role) => (
-
- {role.name}
- {role.description || "-"}
-
- {(rolePermissionsMap[role.id] ?? []).length > 0
- ? (rolePermissionsMap[role.id] ?? [])
- .map((permission) =>
- permission.resource
- ? `${permission.name} - ${permission.resource}`
- : permission.name,
- )
- .join(", ")
- : "Sin permisos"}
-
-
-
- openEditRole(role)}
- >
- Editar
-
- handleDeleteRole(role)}
- >
- Eliminar
-
- void openPermissionsModal(role)}
- >
- Editar permisos
-
-
-
-
- ))
- )}
+ {renderRolesBody()}
+