feature/rbac y perfiles implementados

Reviewed-on: #25

src/App.jsx

@@ -14,6 +14,9 @@ import LandingAnimated from './pages/LandingAnimated';
 import Expedientes from './pages/Expedientes';
 import Organization from './pages/Organization';
 import Users from './pages/Users';
+import UserForm from './pages/UserForm';
+import Profiles from './pages/Profiles';
+import ProfileForm from './pages/ProfileForm';
 import Reports from './pages/Reports';
 import Settings from './pages/Settings';
 import Importers from './pages/Importers';
@@ -76,6 +79,31 @@ function AppContent() {
             <Users />
           </RequireAuth>
         } />
+        <Route path="/users/new" element={
+          <RequireAuth>
+            <UserForm />
+          </RequireAuth>
+        } />
+        <Route path="/users/:id/edit" element={
+          <RequireAuth>
+            <UserForm />
+          </RequireAuth>
+        } />
+        <Route path="/profiles" element={
+          <RequireAuth>
+            <Profiles />
+          </RequireAuth>
+        } />
+        <Route path="/profiles/new" element={
+          <RequireAuth>
+            <ProfileForm />
+          </RequireAuth>
+        } />
+        <Route path="/profiles/:id/edit" element={
+          <RequireAuth>
+            <ProfileForm />
+          </RequireAuth>
+        } />
         <Route path="/reports" element={
           <RequireAuth>
             <Reports />

src/api/apiError.js

@@ -0,0 +1,19 @@
+/**
+ * Extrae el mensaje de error de una respuesta HTTP fallida.
+ * Lee el JSON del body y devuelve `detail`, `message` o `error` del backend.
+ * Si no hay JSON, devuelve el texto o un fallback genérico con el status.
+ */
+export async function extractApiError(response) {
+  const status = response.status;
+  try {
+    const contentType = response.headers.get('content-type') || '';
+    if (contentType.includes('application/json')) {
+      const body = await response.json();
+      return body.detail || body.message || body.error || `Error ${status}`;
+    }
+    const text = await response.text();
+    return text || `Error ${status}`;
+  } catch {
+    return `Error ${status}`;
+  }
+}

src/api/coves.js

@@ -1,58 +1,31 @@
 import { fetchWithAuth } from '../fetchWithAuth';
+import { extractApiError } from './apiError';
 
 const API_BASE_URL = import.meta.env.VITE_EFC_API_URL;
 
 export const fetchPedimentoCoves = async (pedimentoId, page = 1, pageSize = 10, filters = {}) => {
-  try {
   const params = new URLSearchParams({
     pedimento: pedimentoId,
     page: page.toString(),
     page_size: pageSize.toString(),
   });
 
-    // Agregar filtros si existen
+  if (filters.numero_cove) params.append('numero_cove__icontains', filters.numero_cove);
-    if (filters.numero_cove) {
+  if (filters.cove_descargado !== undefined && filters.cove_descargado !== '') params.append('cove_descargado', filters.cove_descargado);
-      params.append('numero_cove__icontains', filters.numero_cove);
+  if (filters.acuse_cove_descargado !== undefined && filters.acuse_cove_descargado !== '') params.append('acuse_cove_descargado', filters.acuse_cove_descargado);
-    }
+  if (filters.date_from) params.append('created_at__gte', filters.date_from);
-    if (filters.cove_descargado !== undefined && filters.cove_descargado !== '') {
+  if (filters.date_to) params.append('created_at__lte', filters.date_to);
-      params.append('cove_descargado', filters.cove_descargado);
-    }
-    if (filters.acuse_cove_descargado !== undefined && filters.acuse_cove_descargado !== '') {
-      params.append('acuse_cove_descargado', filters.acuse_cove_descargado);
-    }
-    if (filters.date_from) {
-      params.append('created_at__gte', filters.date_from);
-    }
-    if (filters.date_to) {
-      params.append('created_at__lte', filters.date_to);
-    }
 
   const response = await fetchWithAuth(`${API_BASE_URL}/customs/coves/?${params}`);
-    
+  if (!response.ok) throw new Error(await extractApiError(response));
-    if (!response.ok) {
-      throw new Error(`Error ${response.status}: ${response.statusText}`);
-    }
 
   const data = await response.json();
-    return {
+  return { results: data.results, count: data.count, next: data.next, previous: data.previous };
-      results: data.results,
-      count: data.count,
-      next: data.next,
-      previous: data.previous
-    };
-  } catch (error) {
-    console.error('Error fetching COVEs:', error);
-    throw error;
-  }
 };
 
 export const downloadCove = async (coveId) => {
-  try {
   const response = await fetchWithAuth(`${API_BASE_URL}/customs/coves/${coveId}/download/`);
-    
+  if (!response.ok) throw new Error(await extractApiError(response));
-    if (!response.ok) {
-      throw new Error(`Error ${response.status}: ${response.statusText}`);
-    }
 
   const blob = await response.blob();
   const url = window.URL.createObjectURL(blob);
@@ -64,19 +37,11 @@ export const downloadCove = async (coveId) => {
   a.click();
   window.URL.revokeObjectURL(url);
   document.body.removeChild(a);
-  } catch (error) {
-    console.error('Error downloading COVE:', error);
-    throw error;
-  }
 };
 
 export const downloadAcuseCove = async (coveId) => {
-  try {
   const response = await fetchWithAuth(`${API_BASE_URL}/customs/coves/${coveId}/download-acuse/`);
-    
+  if (!response.ok) throw new Error(await extractApiError(response));
-    if (!response.ok) {
-      throw new Error(`Error ${response.status}: ${response.statusText}`);
-    }
 
   const blob = await response.blob();
   const url = window.URL.createObjectURL(blob);
@@ -88,8 +53,4 @@ export const downloadAcuseCove = async (coveId) => {
   a.click();
   window.URL.revokeObjectURL(url);
   document.body.removeChild(a);
-  } catch (error) {
-    console.error('Error downloading COVE acuse:', error);
-    throw error;
-  }
 };

src/api/datastage.js

@@ -1,44 +1,42 @@
-// Consultar el estado de un task por task_id
+import { getWithAuth, postWithAuth, patchWithAuth, deleteWithAuth } from '../fetchWithAuth';
+import { extractApiError } from './apiError';
+
+const API_BASE = `${import.meta.env.VITE_EFC_API_URL}/datastage/datastages/`;
+
 export async function fetchTaskStatus(task_id) {
   const url = `${import.meta.env.VITE_EFC_API_URL}/datastage/datastages/task-status/?task_id=${encodeURIComponent(task_id)}`;
   const res = await getWithAuth(url);
-  if (!res.ok) throw new Error('Error al consultar el estado del task');
+  if (!res.ok) throw new Error(await extractApiError(res));
   return res.json();
 }
 
-import.meta.env;
-import { getWithAuth, postWithAuth, patchWithAuth, deleteWithAuth } from '../fetchWithAuth';
-const API_BASE = `${import.meta.env.VITE_EFC_API_URL}/datastage/datastages/`;
-
 export async function fetchDatastages(page = 1, page_size = 10) {
   const url = `${API_BASE}?page=${page}&page_size=${page_size}`;
   const res = await getWithAuth(url);
-  if (!res.ok) throw new Error('Error al obtener datastages');
+  if (!res.ok) throw new Error(await extractApiError(res));
-  const data = await res.json();
+  return res.json();
-  // Si la respuesta es paginada, devolver el objeto completo
-  return data;
 }
 
 export async function fetchDatastageDetail(id) {
   const res = await getWithAuth(`${API_BASE}${id}/`);
-  if (!res.ok) throw new Error('Error al obtener detalle');
+  if (!res.ok) throw new Error(await extractApiError(res));
   return res.json();
 }
 
 export async function createDatastage(data) {
   const res = await postWithAuth(API_BASE, data);
-  if (!res.ok) throw new Error('Error al crear datastage');
+  if (!res.ok) throw new Error(await extractApiError(res));
   return res.json();
 }
 
 export async function updateDatastage(id, data) {
   const res = await patchWithAuth(`${API_BASE}${id}/`, data);
-  if (!res.ok) throw new Error('Error al actualizar datastage');
+  if (!res.ok) throw new Error(await extractApiError(res));
   return res.json();
 }
 
 export async function deleteDatastage(id) {
   const res = await deleteWithAuth(`${API_BASE}${id}/`);
-  if (!res.ok) throw new Error('Error al eliminar datastage');
+  if (!res.ok) throw new Error(await extractApiError(res));
   return true;
 }

src/api/documentos.ts

@@ -1,5 +1,6 @@
 // src/api/pedimentoDocuments.ts
 import { fetchWithAuth } from '../fetchWithAuth';
+import { extractApiError } from './apiError';
 
 export interface PedimentoDocument {
   id: string;
@@ -47,6 +48,6 @@ export async function fetchPedimentoDocuments(
     `${API_URL}/record/documents/?${params.toString()}`
   );
   
-  if (!res.ok) throw new Error('No autorizado o error en la petición');
+  if (!res.ok) throw new Error(await extractApiError(res));
   return res.json();
 }

src/api/documents.js

@@ -1,74 +1,43 @@
-
-/**
- * @typedef {Object} Document
- * @property {string} id
- * @property {string} organizacion
- * @property {string} pedimento
- * @property {string} archivo
- * @property {number} document_type
- * @property {number} size
- * @property {string} extension
- * @property {string} created_at
- * @property {string} updated_at
- */
-
-/**
- * @typedef {Object} DocumentsResponse
- * @property {number} count
- * @property {string|null} next
- * @property {string|null} previous
- * @property {Document[]} results
- */
-
 import { refreshToken } from './auth';
+import { extractApiError } from './apiError';
 
 const API_URL = import.meta.env.VITE_EFC_API_URL;
-/**
+
- * Obtiene la lista de documentos (pedimentos)
- * @param {string} token
- * @returns {Promise<DocumentsResponse>}
- */
 export async function fetchDocuments(token, queryString = '') {
   let url = `${API_URL}/customs/pedimentos/`;
-  if (queryString) {
+  if (queryString) url += `?${queryString}`;
-    url += `?${queryString}`;
+
-  }
   let res = await fetch(url, {
     headers: {
       'Authorization': `Bearer ${token}`,
       'Content-Type': 'application/json',
     },
   });
+
   if (res.status === 401) {
-    // Intentar refrescar el token
     const refresh = localStorage.getItem('refresh');
     if (refresh) {
       try {
         const data = await refreshToken(refresh);
         localStorage.setItem('access', data.access);
-        // Reintenta la petición con el nuevo access token
         res = await fetch(`${API_URL}/customs/pedimentos/`, {
           headers: {
             'Authorization': `Bearer ${data.access}`,
             'Content-Type': 'application/json',
           },
         });
-      } catch (err) {
+      } catch {
         throw new Error('SESSION_EXPIRED');
       }
     } else {
       throw new Error('SESSION_EXPIRED');
     }
   }
-  if (!res.ok) throw new Error('No autorizado o error en la petición');
+
-  return res.json(); // Tipado por JSDoc: Promise<DocumentsResponse>
+  if (!res.ok) throw new Error(await extractApiError(res));
+  return res.json();
 }
-/**
+
- * Obtiene los documentos por id de pedimento
- * @param {string} token
- * @param {string} id
- * @returns {Promise<DocumentsResponse>}
- */
 export async function fetchDocumentById(token, id) {
   let res = await fetch(`${API_URL}/record/documents/?page=1&page_size=10&pedimento=${id}/`, {
     headers: {
@@ -76,27 +45,27 @@ export async function fetchDocumentById(token, id) {
       'Content-Type': 'application/json',
     },
   });
+
   if (res.status === 401) {
-    // Intentar refrescar el token
     const refresh = localStorage.getItem('refresh');
     if (refresh) {
       try {
         const data = await refreshToken(refresh);
         localStorage.setItem('access', data.access);
-        // Reintenta la petición con el nuevo access token
         res = await fetch(`${API_URL}/record/documents/?page=1&page_size=10&pedimento=${id}/`, {
           headers: {
             'Authorization': `Bearer ${data.access}`,
             'Content-Type': 'application/json',
           },
         });
-      } catch (err) {
+      } catch {
         throw new Error('SESSION_EXPIRED');
       }
     } else {
       throw new Error('SESSION_EXPIRED');
     }
   }
-  if (!res.ok) throw new Error('No autorizado o error en la petición');
+
-  return res.json(); // Tipado por JSDoc: Promise<DocumentsResponse>
+  if (!res.ok) throw new Error(await extractApiError(res));
+  return res.json();
 }

src/api/edocuments.js

@@ -1,64 +1,33 @@
 import { fetchWithAuth } from '../fetchWithAuth';
+import { extractApiError } from './apiError';
 
 const API_BASE_URL = import.meta.env.VITE_EFC_API_URL;
 
 export const fetchPedimentoEdocuments = async (pedimentoId, page = 1, pageSize = 10, filters = {}) => {
-  try {
   const params = new URLSearchParams({
     pedimento: pedimentoId,
     page: page.toString(),
     page_size: pageSize.toString(),
   });
 
-    // Agregar filtros si existen
+  if (filters.numero_edocument) params.append('numero_edocument__icontains', filters.numero_edocument);
-    if (filters.numero_edocument) {
+  if (filters.clave) params.append('clave__icontains', filters.clave);
-      params.append('numero_edocument__icontains', filters.numero_edocument);
+  if (filters.descripcion) params.append('descripcion__icontains', filters.descripcion);
-    }
+  if (filters.edocument_descargado !== undefined && filters.edocument_descargado !== '') params.append('edocument_descargado', filters.edocument_descargado);
-    if (filters.clave) {
+  if (filters.acuse_descargado !== undefined && filters.acuse_descargado !== '') params.append('acuse_descargado', filters.acuse_descargado);
-      params.append('clave__icontains', filters.clave);
+  if (filters.date_from) params.append('created_at__gte', filters.date_from);
-    }
+  if (filters.date_to) params.append('created_at__lte', filters.date_to);
-    if (filters.descripcion) {
-      params.append('descripcion__icontains', filters.descripcion);
-    }
-    if (filters.edocument_descargado !== undefined && filters.edocument_descargado !== '') {
-      params.append('edocument_descargado', filters.edocument_descargado);
-    }
-    if (filters.acuse_descargado !== undefined && filters.acuse_descargado !== '') {
-      params.append('acuse_descargado', filters.acuse_descargado);
-    }
-    if (filters.date_from) {
-      params.append('created_at__gte', filters.date_from);
-    }
-    if (filters.date_to) {
-      params.append('created_at__lte', filters.date_to);
-    }
 
   const response = await fetchWithAuth(`${API_BASE_URL}/customs/edocuments/?${params}`);
-    
+  if (!response.ok) throw new Error(await extractApiError(response));
-    if (!response.ok) {
-      throw new Error(`Error ${response.status}: ${response.statusText}`);
-    }
 
   const data = await response.json();
-    return {
+  return { results: data.results, count: data.count, next: data.next, previous: data.previous };
-      results: data.results,
-      count: data.count,
-      next: data.next,
-      previous: data.previous
-    };
-  } catch (error) {
-    console.error('Error fetching EDocs:', error);
-    throw error;
-  }
 };
 
 export const downloadEdocument = async (edocId) => {
-  try {
   const response = await fetchWithAuth(`${API_BASE_URL}/customs/edocuments/${edocId}/download/`);
-    
+  if (!response.ok) throw new Error(await extractApiError(response));
-    if (!response.ok) {
-      throw new Error(`Error ${response.status}: ${response.statusText}`);
-    }
 
   const blob = await response.blob();
   const url = window.URL.createObjectURL(blob);
@@ -70,19 +39,11 @@ export const downloadEdocument = async (edocId) => {
   a.click();
   window.URL.revokeObjectURL(url);
   document.body.removeChild(a);
-  } catch (error) {
-    console.error('Error downloading EDocs:', error);
-    throw error;
-  }
 };
 
 export const downloadAcuseEdocument = async (edocId) => {
-  try {
   const response = await fetchWithAuth(`${API_BASE_URL}/customs/edocuments/${edocId}/download-acuse/`);
-    
+  if (!response.ok) throw new Error(await extractApiError(response));
-    if (!response.ok) {
-      throw new Error(`Error ${response.status}: ${response.statusText}`);
-    }
 
   const blob = await response.blob();
   const url = window.URL.createObjectURL(blob);
@@ -94,8 +55,4 @@ export const downloadAcuseEdocument = async (edocId) => {
   a.click();
   window.URL.revokeObjectURL(url);
   document.body.removeChild(a);
-  } catch (error) {
-    console.error('Error downloading EDocs acuse:', error);
-    throw error;
-  }
 };

src/api/expedientes.ts

@@ -33,9 +33,9 @@ export interface PedimentosFilters {
   aduana?: string;
   regimen?: string;
   clave_pedimento?: string;
-  fecha_inicio?: string;
-  fecha_fin?: string;
   fecha_pago?: string;
+  fecha_pago_desde?: string;
+  fecha_pago_hasta?: string;
   alerta?: string | boolean;
   agente_aduanal?: string;
   curp_apoderado?: string;
@@ -53,6 +53,7 @@ export interface PedimentosFilters {
   contribuyente?: string;
   numero_edocs?: number;
   numero_coves?: number;
+  ordering?: string;
 }
 
 export async function fetchDocuments(

src/api/organizacion.js

@@ -1,4 +1,5 @@
 import { refreshToken } from './auth';
+import { extractApiError } from './apiError';
 
 const API_URL = import.meta.env.VITE_EFC_API_URL;
 
@@ -9,14 +10,13 @@ export async function fetchOrganizationUsage(token) {
       'Content-Type': 'application/json',
     },
   });
+
   if (res.status === 401) {
-    // Intentar refrescar el token
     const refresh = localStorage.getItem('refresh');
     if (refresh) {
       try {
         const data = await refreshToken(refresh);
         localStorage.setItem('access', data.access);
-        // Reintenta la petición con el nuevo access token
         res = await fetch(`${API_URL}/organization/uso-almacenamiento/mi_organizacion/`, {
           headers: {
             'Authorization': `Bearer ${data.access}`,
@@ -24,13 +24,14 @@ export async function fetchOrganizationUsage(token) {
           },
         });
         if (res.status === 401) throw new Error('SESSION_EXPIRED');
-      } catch (err) {
+      } catch {
         throw new Error('SESSION_EXPIRED');
       }
     } else {
       throw new Error('SESSION_EXPIRED');
     }
   }
-  if (!res.ok) throw new Error('No autorizado o error en la petición');
+
+  if (!res.ok) throw new Error(await extractApiError(res));
   return res.json();
 }

src/api/procesos.js

@@ -1,66 +1,32 @@
 import { fetchWithAuth } from '../fetchWithAuth';
+import { extractApiError } from './apiError';
 
 const API_BASE_URL = import.meta.env.VITE_EFC_API_URL;
 
 export const fetchPedimentoProcesos = async (pedimentoId, page = 1, pageSize = 10, filters = {}) => {
-  try {
   const params = new URLSearchParams({
     pedimento: pedimentoId,
     page: page.toString(),
     page_size: pageSize.toString(),
   });
 
-    // Agregar filtros si existen
+  if (filters.estado !== undefined && filters.estado !== '') params.append('estado', filters.estado);
-    if (filters.estado !== undefined && filters.estado !== '') {
+  if (filters.servicio !== undefined && filters.servicio !== '') params.append('servicio', filters.servicio);
-      params.append('estado', filters.estado);
+  if (filters.organizacion_name) params.append('organizacion_name__icontains', filters.organizacion_name);
-    }
+  if (filters.date_from) params.append('created_at__gte', filters.date_from);
-    if (filters.servicio !== undefined && filters.servicio !== '') {
+  if (filters.date_to) params.append('created_at__lte', filters.date_to);
-      params.append('servicio', filters.servicio);
+  if (filters.updated_from) params.append('updated_at__gte', filters.updated_from);
-    }
+  if (filters.updated_to) params.append('updated_at__lte', filters.updated_to);
-    if (filters.organizacion_name) {
-      params.append('organizacion_name__icontains', filters.organizacion_name);
-    }
-    if (filters.date_from) {
-      params.append('created_at__gte', filters.date_from);
-    }
-    if (filters.date_to) {
-      params.append('created_at__lte', filters.date_to);
-    }
-    if (filters.updated_from) {
-      params.append('updated_at__gte', filters.updated_from);
-    }
-    if (filters.updated_to) {
-      params.append('updated_at__lte', filters.updated_to);
-    }
 
   const response = await fetchWithAuth(`${API_BASE_URL}/customs/procesamientopedimentos/?${params}`);
-    
+  if (!response.ok) throw new Error(await extractApiError(response));
-    if (!response.ok) {
-      throw new Error(`Error ${response.status}: ${response.statusText}`);
-    }
 
   const data = await response.json();
-    return {
+  return { results: data.results, count: data.count, next: data.next, previous: data.previous };
-      results: data.results,
-      count: data.count,
-      next: data.next,
-      previous: data.previous
-    };
-  } catch (error) {
-    console.error('Error fetching Procesos:', error);
-    throw error;
-  }
 };
 
-// Mapeo de estados
 export const getEstadoLabel = (estado) => {
-  const estados = {
+  const estados = { 1: 'Pendiente', 2: 'En Proceso', 3: 'Completado', 4: 'Error', 5: 'Cancelado' };
-    1: 'Pendiente',
-    2: 'En Proceso',
-    3: 'Completado',
-    4: 'Error',
-    5: 'Cancelado'
-  };
   return estados[estado] || `Estado ${estado}`;
 };
 
@@ -70,38 +36,27 @@ export const getEstadoColor = (estado) => {
     2: 'bg-blue-100 text-blue-800',
     3: 'bg-green-100 text-green-800',
     4: 'bg-red-100 text-red-800',
-    5: 'bg-gray-100 text-gray-800'
+    5: 'bg-gray-100 text-gray-800',
   };
   return colores[estado] || 'bg-gray-100 text-gray-800';
 };
 
-// Mapeo de servicios
 export const getServicioLabel = (servicio) => {
   const servicios = {
-    1: 'Digitalización',
+    1: 'Digitalización', 2: 'Validación', 3: 'Procesamiento SAT',
-    2: 'Validación',
+    4: 'Generación COVEs', 5: 'Generación EDocs', 6: 'Envío VUCEM',
-    3: 'Procesamiento SAT',
+    7: 'Clasificación', 8: 'Archivo Digital', 9: 'Notificaciones',
-    4: 'Generación COVEs',
-    5: 'Generación EDocs',
-    6: 'Envío VUCEM',
-    7: 'Clasificación',
-    8: 'Archivo Digital',
-    9: 'Notificaciones'
   };
   return servicios[servicio] || `Servicio ${servicio}`;
 };
 
 export const getServicioColor = (servicio) => {
   const colores = {
-    1: 'bg-purple-100 text-purple-800',
+    1: 'bg-purple-100 text-purple-800', 2: 'bg-indigo-100 text-indigo-800',
-    2: 'bg-indigo-100 text-indigo-800',
+    3: 'bg-blue-100 text-blue-800',     4: 'bg-cyan-100 text-cyan-800',
-    3: 'bg-blue-100 text-blue-800',
+    5: 'bg-teal-100 text-teal-800',     6: 'bg-green-100 text-green-800',
-    4: 'bg-cyan-100 text-cyan-800',
+    7: 'bg-yellow-100 text-yellow-800', 8: 'bg-orange-100 text-orange-800',
-    5: 'bg-teal-100 text-teal-800',
+    9: 'bg-pink-100 text-pink-800',
-    6: 'bg-green-100 text-green-800',
-    7: 'bg-yellow-100 text-yellow-800',
-    8: 'bg-orange-100 text-orange-800',
-    9: 'bg-pink-100 text-pink-800'
   };
   return colores[servicio] || 'bg-gray-100 text-gray-800';
 };

src/api/procesos.ts

@@ -39,6 +39,7 @@ export async function fetchTasks(
       }
     });
     
+    console.log('Params:', params.toString());
     const res = await fetchWithAuth(`${API_URL}/tasks/tasks/?${params.toString()}`);
     
     if (!res.ok) {
@@ -61,6 +62,7 @@ export interface ComandoResponse {
 // Interfaz para los parámetros de ejecución
 export interface EjecutarComandoParams {
   procesamiento?: string;
+  organizacionid?: string;  
   todos?: boolean;
 }
 
@@ -79,6 +81,10 @@ export async function ejecutarComando(
       requestData.procesamiento = params.procesamiento;
     }
 
+    if (params.organizacionid !== undefined) {
+      requestData.organizacionid = params.organizacionid;
+    }
+    
     if (params.todos !== undefined) {
       requestData.todos = params.todos;
     }

src/api/rbac.js

@@ -0,0 +1,153 @@
+const API_URL = import.meta.env.VITE_EFC_API_URL || 'http://localhost:8000';
+import { fetchWithAuth, postWithAuth, patchWithAuth, deleteWithAuth } from '../fetchWithAuth';
+
+async function handleResponse(response, operation = 'operación') {
+  if (response.status === 401) throw new Error('SESSION_EXPIRED');
+  if (!response.ok) {
+    let detail = `Error ${response.status}`;
+    try {
+      const body = await response.json();
+      detail = body.detail || body.message || JSON.stringify(body);
+    } catch {
+      detail = await response.text().catch(() => detail);
+    }
+    throw new Error(detail);
+  }
+  const contentType = response.headers.get('content-type');
+  if (!contentType?.includes('application/json')) return null;
+  return response.json();
+}
+
+// ── Catálogo de permisos ─────────────────────────────────────────────────────
+
+/** Array plano: [{ id, codename, descripcion, modulo }] */
+export async function fetchPermissions() {
+  const res = await fetchWithAuth(`${API_URL}/rbac/permissions/`);
+  return handleResponse(res, 'Fetch Permissions');
+}
+
+/** Agrupado por módulo: { cards: [...], coves: [...], ... } */
+export async function fetchPermissionsByModule() {
+  const res = await fetchWithAuth(`${API_URL}/rbac/permissions/by-module/`);
+  return handleResponse(res, 'Fetch Permissions By Module');
+}
+
+// ── Permisos efectivos del usuario actual ────────────────────────────────────
+
+/** { permissions: ["cards.view", ...], roles: ["admin"] } */
+export async function fetchMyPermissions() {
+  const res = await fetchWithAuth(`${API_URL}/rbac/my-permissions/`);
+  return handleResponse(res, 'Fetch My Permissions');
+}
+
+// ── Roles (OrganizationRole) ─────────────────────────────────────────────────
+
+export async function fetchRoles() {
+  const res = await fetchWithAuth(`${API_URL}/rbac/roles/`);
+  return handleResponse(res, 'Fetch Roles');
+}
+
+/**
+ * data: { nombre, descripcion?, permission_ids: number[] }
+ * permission_ids son IDs numéricos de RolePermission.
+ */
+export async function createRole(data) {
+  const res = await postWithAuth(`${API_URL}/rbac/roles/`, data);
+  return handleResponse(res, 'Create Role');
+}
+
+export async function getRole(id) {
+  const res = await fetchWithAuth(`${API_URL}/rbac/roles/${id}/`);
+  return handleResponse(res, 'Get Role');
+}
+
+/**
+ * PATCH — reemplaza el rol completo.
+ * data: { nombre?, descripcion?, permission_ids?: number[] }
+ */
+export async function updateRole(id, data) {
+  const res = await patchWithAuth(`${API_URL}/rbac/roles/${id}/`, data);
+  return handleResponse(res, 'Update Role');
+}
+
+export async function deleteRole(id) {
+  const res = await deleteWithAuth(`${API_URL}/rbac/roles/${id}/`);
+  if (res.status === 401) throw new Error('SESSION_EXPIRED');
+  if (!res.ok) {
+    let detail = `Error ${res.status}`;
+    try { detail = (await res.json()).detail || detail; } catch {}
+    throw new Error(detail);
+  }
+  return true;
+}
+
+// ── Asignación de roles a usuarios (UserRole) ────────────────────────────────
+
+/**
+ * userId: filtra por usuario. Usa ?user_id= según spec.
+ * Respuesta: [{ id, user: {...}, role: {...}, created_at }]
+ */
+export async function fetchUserRoles(userId) {
+  const url = userId
+    ? `${API_URL}/rbac/user-roles/?user_id=${userId}`
+    : `${API_URL}/rbac/user-roles/`;
+  const res = await fetchWithAuth(url);
+  return handleResponse(res, 'Fetch User Roles');
+}
+
+/**
+ * body: { user_id, role_id } — UUIDs según spec del backend.
+ */
+export async function assignUserRole(userId, roleId) {
+  const res = await postWithAuth(`${API_URL}/rbac/user-roles/`, {
+    user_id: userId,
+    role_id: roleId,
+  });
+  return handleResponse(res, 'Assign Role');
+}
+
+export async function revokeUserRole(userRoleId) {
+  const res = await deleteWithAuth(`${API_URL}/rbac/user-roles/${userRoleId}/`);
+  if (res.status === 401) throw new Error('SESSION_EXPIRED');
+  if (!res.ok) {
+    let detail = `Error ${res.status}`;
+    try { detail = (await res.json()).detail || detail; } catch {}
+    throw new Error(detail);
+  }
+  return true;
+}
+
+// ── Switch de organización (solo SuperUser) ───────────────────────────────────
+
+/**
+ * Establece la organización activa del superuser.
+ * body: { organization_id: "uuid" }
+ */
+export async function switchOrganization(organizationId) {
+  const res = await postWithAuth(`${API_URL}/rbac/switch-organization/`, {
+    organization_id: organizationId,
+  });
+  return handleResponse(res, 'Switch Organization');
+}
+
+/** Limpia la organización activa del superuser. */
+export async function clearOrganization() {
+  const res = await deleteWithAuth(`${API_URL}/rbac/switch-organization/`);
+  if (res.status === 401) throw new Error('SESSION_EXPIRED');
+  if (!res.ok) {
+    let detail = `Error ${res.status}`;
+    try { detail = (await res.json()).detail || detail; } catch {}
+    throw new Error(detail);
+  }
+  return true;
+}
+
+// ── Permisos singulares por usuario (UserPermission) ─────────────────────────
+
+export async function fetchUserPermissions(userId) {
+  const url = userId
+    ? `${API_URL}/rbac/user-permissions/?user_id=${userId}`
+    : `${API_URL}/rbac/user-permissions/`;
+  const res = await fetchWithAuth(url);
+  return handleResponse(res, 'Fetch User Permissions');
+}

src/api/users.js

@@ -1,56 +1,42 @@
 const API_URL = import.meta.env.VITE_EFC_API_URL || 'http://localhost:8000';
 import { fetchWithAuth, postWithAuth, putWithAuth, deleteWithAuth } from '../fetchWithAuth';
+import { extractApiError } from './apiError';
 
-// Función helper para manejar respuestas
+async function handleResponse(response) {
-
+  if (response.status === 401) throw new Error('SESSION_EXPIRED');
-async function handleResponse(response, operation = 'operación') {
+  if (!response.ok) throw new Error(await extractApiError(response));
-  if (response.status === 401) {
-    throw new Error('SESSION_EXPIRED');
-  }
-  if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`Error ${response.status}: ${response.statusText}`);
-  }
   const contentType = response.headers.get('content-type');
-  if (!contentType || !contentType.includes('application/json')) {
+  if (!contentType || !contentType.includes('application/json')) return null;
-    throw new Error('El servidor no devolvió JSON válido');
-  }
   return response.json();
 }
 
 export async function fetchUsers() {
-  const url = `${API_URL}/user/users/`;
+  const res = await fetchWithAuth(`${API_URL}/user/users/`);
-  const res = await fetchWithAuth(url);
+  return handleResponse(res);
-  return handleResponse(res, 'Fetch Users');
 }
 
 export async function createUser(userData) {
-  const url = `${API_URL}/user/users/`;
+  const res = await postWithAuth(`${API_URL}/user/users/`, userData);
-  const res = await postWithAuth(url, userData);
+  return handleResponse(res);
-  return handleResponse(res, 'Create User');
 }
 
 export async function updateUser(id, userData) {
-  const url = `${API_URL}/user/users/${id}/`;
+  const res = await putWithAuth(`${API_URL}/user/users/${id}/`, userData);
-  const res = await putWithAuth(url, userData);
+  return handleResponse(res);
-  return handleResponse(res, 'Update User');
 }
 
 export async function deleteUser(id) {
-  const url = `${API_URL}/user/users/${id}/`;
+  const res = await deleteWithAuth(`${API_URL}/user/users/${id}/`);
-  const res = await deleteWithAuth(url);
+  return handleResponse(res);
-  if (!res.ok) throw new Error(`Error ${res.status}: ${res.statusText}`);
-  return true;
 }
 
 export async function getCurrentUser(token) {
-  const url = `${API_URL}/user/users/me/`;
+  const res = await fetch(`${API_URL}/user/users/me/`, {
-  const res = await fetch(url, {
     headers: {
       'Authorization': `Bearer ${token}`,
       'Content-Type': 'application/json',
       'Accept': 'application/json',
     },
   });
-  return handleResponse(res, 'Get Current User');
+  return handleResponse(res);
 }

src/api/users.ts

@@ -1,138 +1,39 @@
+/// <reference types="vite/client" />
 const API_URL = import.meta.env.VITE_EFC_API_URL || 'http://localhost:8000';
 import { fetchWithAuth, postWithAuth, putWithAuth, deleteWithAuth } from '../fetchWithAuth';
+import { extractApiError } from './apiError';
 
-// Función helper para manejar respuestas
+async function handleResponse(response: Response) {
-async function handleResponse(response, operation = 'operación') {
+  if (response.status === 401) throw new Error('SESSION_EXPIRED');
-  console.log(`📡 ${operation} response:`, response.status, response.statusText);
+  if (!response.ok) throw new Error(await extractApiError(response));
-  
-  if (response.status === 401) {
-    console.error('❌ Unauthorized - session expired');
-    throw new Error('SESSION_EXPIRED');
-  }
-  
-  if (!response.ok) {
-    const errorText = await response.text();
-    console.error(`❌ ${operation} error:`, response.status, errorText);
-    throw new Error(`Error ${response.status}: ${response.statusText}`);
-  }
-  
-  // Verificar que la respuesta es JSON
   const contentType = response.headers.get('content-type');
-  if (!contentType || !contentType.includes('application/json')) {
+  if (!contentType?.includes('application/json')) return null;
-    const text = await response.text();
-    console.error('❌ Response is not JSON:', text.substring(0, 200));
-    throw new Error('El servidor no devolvió JSON válido');
-  }
-  
   return response.json();
 }
 
 export async function fetchUsers() {
-  try {
+  const res = await fetchWithAuth(`${API_URL}/user/users/`);
-    const url = `${API_URL}/user/users/`;
+  return handleResponse(res);
-    console.log('👥 Fetching users from:', url);
-    
-    const res = await fetchWithAuth(url);
-    
-    const data = await handleResponse(res, 'Fetch Users');
-    console.log('✅ Users data received');
-    return data;
-    
-  } catch (error) {
-    console.error('❌ Error in fetchUsers:', error);
-    if (error.name === 'TypeError' && error.message.includes('fetch')) {
-      throw new Error('Error de conexión al servidor');
-    }
-    throw error;
-  }
 }
 
-export async function createUser(userData) {
+export async function createUser(userData: object) {
-  try {
+  const res = await postWithAuth(`${API_URL}/user/users/`, userData);
-    const url = `${API_URL}/user/users/`;
+  return handleResponse(res);
-    console.log('➕ Creating user at:', url);
-    
-    const res = await postWithAuth(url, userData);
-    
-    const data = await handleResponse(res, 'Create User');
-    console.log('✅ User created successfully');
-    return data;
-    
-  } catch (error) {
-    console.error('❌ Error in createUser:', error);
-    if (error.name === 'TypeError' && error.message.includes('fetch')) {
-      throw new Error('Error de conexión al servidor');
-    }
-    throw error;
-  }
 }
 
-export async function updateUser(id, userData) {
+export async function updateUser(id: string | number, userData: object) {
-  try {
+  const res = await putWithAuth(`${API_URL}/user/users/${id}/`, userData);
-    const url = `${API_URL}/user/users/${id}/`;
+  return handleResponse(res);
-    console.log('✏️ Updating user at:', url);
-    
-    const res = await putWithAuth(url, userData);
-    
-    const data = await handleResponse(res, 'Update User');
-    console.log('✅ User updated successfully');
-    return data;
-    
-  } catch (error) {
-    console.error('❌ Error in updateUser:', error);
-    if (error.name === 'TypeError' && error.message.includes('fetch')) {
-      throw new Error('Error de conexión al servidor');
-    }
-    throw error;
-  }
 }
 
-export async function deleteUser(id) {
+export async function deleteUser(id: string | number) {
-  try {
+  const res = await deleteWithAuth(`${API_URL}/user/users/${id}/`);
-    const url = `${API_URL}/user/users/${id}/`;
+  if (res.status === 401) throw new Error('SESSION_EXPIRED');
-    console.log('🗑️ Deleting user at:', url);
+  if (!res.ok) throw new Error(await extractApiError(res));
-    
+  return true;
-    const res = await deleteWithAuth(url);
-    
-    if (res.status === 401) {
-      console.error('❌ Unauthorized - session expired');
-      throw new Error('SESSION_EXPIRED');
-    }
-    
-    if (!res.ok) {
-      const errorText = await res.text();
-      console.error('❌ Delete User error:', res.status, errorText);
-      throw new Error(`Error ${res.status}: ${res.statusText}`);
-    }
-    
-    console.log('✅ User deleted successfully');
-    return true; // DELETE suele no devolver contenido
-    
-  } catch (error) {
-    console.error('❌ Error in deleteUser:', error);
-    if (error.name === 'TypeError' && error.message.includes('fetch')) {
-      throw new Error('Error de conexión al servidor');
-    }
-    throw error;
-  }
 }
 
 export async function getCurrentUser() {
-  try {
+  const res = await fetchWithAuth(`${API_URL}/user/users/me/`);
-    const url = `${API_URL}/user/users/me/`;
+  return handleResponse(res);
-    console.log('👤 Fetching current user from:', url);
-    
-    const res = await fetchWithAuth(url);
-    
-    const data = await handleResponse(res, 'Get Current User');
-    console.log('✅ Current user data received:', data);
-    return data;
-    
-  } catch (error) {
-    console.error('❌ Error in getCurrentUser:', error);
-    if (error.name === 'TypeError' && error.message.includes('fetch')) {
-      throw new Error('Error de conexión al servidor');
-    }
-    throw error;
-  }
 }

src/components/Sidebar.jsx

@@ -1,24 +1,22 @@
 import React, { useState, useEffect } from 'react';
 import { Link, useLocation, useNavigate } from 'react-router-dom';
 import { useUser } from '../context/UserContext';
+import { fetchWithAuth } from '../fetchWithAuth';
 
 export default function Sidebar({ isMobileOpen, onMobileClose }) {
-  // Leer si el usuario es importador desde localStorage
-  const isImportador = typeof window !== 'undefined' && localStorage.getItem('user_is_importador') === 'true';
-  // Leer grupos del usuario desde localStorage
-  let userGroups = [];
-  if (typeof window !== 'undefined') {
-    try {
-      userGroups = JSON.parse(localStorage.getItem('user_groups') || '[]');
-    } catch {
-      userGroups = [];
-    }
-  }
-  // Si los grupos son exactamente [3,5]
-  const isGroup35 = Array.isArray(userGroups) && userGroups.length === 2 && userGroups.includes(3) && userGroups.includes(5);
-  // Leer DEBUG_MODE desde variables de entorno
   const isDebugMode = import.meta.env.VITE_DEBUG_MODE === 'true';
 
+  // Permisos RBAC — cargados desde /rbac/my-permissions/ al hacer login
+  const [userPermissions, setUserPermissions] = useState(() => {
+    try {
+      return JSON.parse(localStorage.getItem('user_permissions') || '[]');
+    } catch {
+      return [];
+    }
+  });
+
+  const hasPermission = (codename) => userPermissions.includes(codename);
+  
   // Estados para responsividad
   const [isCollapsed, setIsCollapsed] = useState(false);
   const [internalMobileOpen, setInternalMobileOpen] = useState(false);
@@ -34,6 +32,14 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
   const handleLogout = () => {
     localStorage.removeItem('access');
     localStorage.removeItem('refresh');
+    localStorage.removeItem('user_id');
+    localStorage.removeItem('user_is_importador');
+    localStorage.removeItem('user_groups');
+    localStorage.removeItem('user_permissions');
+    localStorage.removeItem('username');
+    localStorage.removeItem('user_email');
+    localStorage.removeItem('user_first_name');
+    localStorage.removeItem('user_last_name');
     window.dispatchEvent(new CustomEvent('authStateChanged'));
     navigate('/login');
   };
@@ -55,6 +61,22 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
     handleMobileClose();
   }, [location.pathname]);
 
+  // Si no hay permisos en localStorage (sesión previa al RBAC), los carga del servidor
+  useEffect(() => {
+    if (userPermissions.length === 0 && localStorage.getItem('access')) {
+      const apiUrl = import.meta.env.VITE_EFC_API_URL || '';
+      fetchWithAuth(`${apiUrl}/rbac/my-permissions/`)
+        .then(res => res.ok ? res.json() : null)
+        .then(data => {
+          if (data && Array.isArray(data.permissions)) {
+            localStorage.setItem('user_permissions', JSON.stringify(data.permissions));
+            setUserPermissions(data.permissions);
+          }
+        })
+        .catch(() => {});
+    }
+  }, []);
+
   // El usuario y loading ahora vienen del contexto global
 
   // Definir todas las secciones
@@ -71,9 +93,8 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
             </svg>
           )
         },
-        // Ocultar 'Mi Organización' si es importador o si esGroup35
         ...(
-          (!isImportador && !isGroup35)
+          hasPermission('organizacion.view')
             ? [
                 {
                   name: 'Mi Organización',
@@ -101,7 +122,9 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
             </svg>
           )
         },
-        {
+        ...(
+          hasPermission('auditoria.view')
+            ? [{
                 name: 'Auditor',
                 path: '/auditor',
                 icon: (
@@ -109,7 +132,9 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 5H7a2 2 0 00-2 2v12a2 2 0 002 2h10a2 2 0 002-2V7a2 2 0 00-2-2h-2M9 5a2 2 0 002 2h2a2 2 0 002-2M9 5a2 2 0 012-2h2a2 2 0 012 2m-3 7h3m-3 4h3m-6-4h.01M9 16h.01" />
                   </svg>
                 )
-        }
+              }]
+            : []
+        )
       ]
     },
     {
@@ -158,9 +183,9 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
         }
       ]
     },
-    // Nueva sección Tableros - Solo mostrar si DEBUG_MODE es true
+    // Nueva sección Tableros - Solo mostrar si DEBUG_MODE es true y tiene cards.view
     ...(
-      (isDebugMode && !isGroup35)
+      (isDebugMode && hasPermission('cards.view'))
         ? [
             {
               title: 'Tableros',
@@ -179,15 +204,12 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
           ]
         : []
     ),
-    ...(
-      isGroup35
-        ? []
-        : [
     {
       title: 'Acceso a Usuarios',
       items: [
-                // Botón Importadores como primer elemento
+        ...(
-                {
+          hasPermission('importadores.view')
+            ? [{
                 name: 'Importadores',
                 path: '/importers',
                 icon: (
@@ -195,12 +217,12 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M16 7a4 4 0 01-8 0M12 11v10m-6 0h12a2 2 0 002-2v-5a2 2 0 00-2-2H6a2 2 0 00-2 2v5a2 2 0 002 2z" />
                   </svg>
                 )
-                },
+              }]
+            : []
+        ),
         ...(
-                  isImportador
+          hasPermission('usuarios.view')
-                    ? []
+            ? [{
-                    : [
-                        {
                 name: 'Usuarios',
                 path: '/users',
                 icon: (
@@ -208,10 +230,25 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 4.354a4 4 0 110 5.292M15 21H3v-1a6 6 0 0112 0v1zm0 0h6v-1a6 6 0 00-9-5.197m13.5-9a2.5 2.5 0 11-5 0 2.5 2.5 0 015 0z" />
                   </svg>
                 )
-                        }
+              }]
-                      ]
+            : []
         ),
-                {
+        ...(
+          hasPermission('usuarios.manage_roles')
+            ? [{
+                name: 'Perfiles',
+                path: '/profiles',
+                icon: (
+                  <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" />
+                  </svg>
+                )
+              }]
+            : []
+        ),
+        ...(
+          hasPermission('vucem.view')
+            ? [{
                 name: 'Ventanilla Única',
                 path: '/vucem',
                 icon: (
@@ -220,30 +257,17 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M8 12h8M12 8v8" />
                   </svg>
                 )
-                }
+              }]
+            : []
+        ),
       ]
     }
-          ]
-    )
   ];
 
-  // Filtrar secciones según si es importador y modo debug
+  // Ocultar secciones que no tienen ningún item visible
-  // Modificar items según si es importador
+  const menuSections = allMenuSections.filter(
-  const menuSections = allMenuSections
+    section => section && section.items && section.items.length > 0
-    .map(section => {
+  );
-      if (section.title === 'Organización') {
-        return {
-          ...section,
-          items: section.items.filter(item => !(isImportador && item.name === 'Mi Organización'))
-        };
-      }
-      // Para Tableros, filtrar la sección si es importador o si no está en modo debug
-      if (section.title === 'Tableros' && (isImportador || !isDebugMode)) {
-        return null;
-      }
-      return section;
-    })
-    .filter(Boolean);
 
   return (
     <>

src/fetchWithAuth.js

@@ -74,6 +74,7 @@ const refreshToken = async () => {
     localStorage.removeItem('refresh');
     localStorage.removeItem('user_id');
     localStorage.removeItem('user_is_importador');
+    localStorage.removeItem('user_permissions');
     
     // Redirigir al login después de un pequeño delay
     setTimeout(() => {

src/hooks/usePollTaskStatus.js

@@ -0,0 +1,99 @@
+import { useState, useRef, useCallback } from 'react';
+import { fetchWithAuth } from '../fetchWithAuth';
+
+const API_BASE_URL = import.meta.env.VITE_EFC_API_URL;
+
+// Estados que indican que la tarea ya terminó (no hay más que esperar)
+const FINAL_STATES = new Set(['SUCCESS', 'FAILURE', 'completed', 'failed', 'cancelled']);
+
+/**
+ * Polling acotado de estado de tarea.
+ *
+ * Uso:
+ *   const { taskState, polling, poll, reset } = usePollTaskStatus({ maxAttempts: 3, intervalMs: 2500 });
+ *
+ *   // Después de enviar la tarea al microservicio:
+ *   poll(taskId);
+ *
+ *   // taskState: null | { status, message, error, attempts }
+ *   // polling: true mientras hay intentos pendientes
+ */
+export function usePollTaskStatus({ maxAttempts = 3, intervalMs = 2500 } = {}) {
+  const [taskState, setTaskState] = useState(null);
+  const [polling, setPolling]     = useState(false);
+
+  const timeoutRef  = useRef(null);
+  const abortedRef  = useRef(false);
+  const attemptsRef = useRef(0);
+
+  const stop = useCallback(() => {
+    abortedRef.current = true;
+    if (timeoutRef.current) {
+      clearTimeout(timeoutRef.current);
+      timeoutRef.current = null;
+    }
+    setPolling(false);
+  }, []);
+
+  const reset = useCallback(() => {
+    stop();
+    setTaskState(null);
+    attemptsRef.current = 0;
+  }, [stop]);
+
+  const poll = useCallback((taskId) => {
+    if (!taskId) return;
+
+    // Reiniciar estado previo
+    abortedRef.current  = false;
+    attemptsRef.current = 0;
+    setPolling(true);
+    setTaskState({ status: 'PENDING', message: null, error: null, attempts: 0 });
+
+    const attempt = async () => {
+      if (abortedRef.current) return;
+
+      attemptsRef.current += 1;
+      const n = attemptsRef.current;
+
+      try {
+        const res = await fetchWithAuth(`${API_BASE_URL}/tasks/status/${taskId}/`);
+        if (abortedRef.current) return;
+
+        if (!res.ok) {
+          setTaskState({ status: 'FAILURE', message: `Error HTTP ${res.status}`, error: true, attempts: n });
+          setPolling(false);
+          return;
+        }
+
+        const data = await res.json();
+        if (abortedRef.current) return;
+
+        const newState = {
+          status:   data.status,
+          message:  data.message || data.error || null,
+          error:    data.error   || null,
+          result:   data.result  || null,
+          attempts: n,
+        };
+        setTaskState(newState);
+
+        if (FINAL_STATES.has(data.status) || n >= maxAttempts) {
+          setPolling(false);
+          return;
+        }
+
+        timeoutRef.current = setTimeout(attempt, intervalMs);
+
+      } catch (err) {
+        if (abortedRef.current) return;
+        setTaskState({ status: 'FAILURE', message: err.message, error: true, attempts: n });
+        setPolling(false);
+      }
+    };
+
+    attempt();
+  }, [maxAttempts, intervalMs]);
+
+  return { taskState, polling, poll, stop, reset };
+}

src/pages/Datastage.jsx

@@ -22,6 +22,8 @@ async function patchProcesadoTrue(item) {
     });
 }
 import { fetchWithAuth } from '../fetchWithAuth';
+import { useNotification } from '../context/NotificationContext';
+import { extractApiError } from '../api/apiError';
 
 // Modal para mostrar registros cargados
 function RegistrosCargadosModal({ open, onClose, registros }) {
@@ -59,7 +61,7 @@ function RegistrosCargadosModal({ open, onClose, registros }) {
 }
 
 // Procesar datastage (adaptado para mostrar registros cargados)
-async function procesarDatastage(item, setDatastages, setSuccess, setError, setRegistrosCargados, setShowRegistrosModal) {
+async function procesarDatastage(item, setDatastages, setSuccess, showMessage, setRegistrosCargados, setShowRegistrosModal) {
     try {
         const url = `${import.meta.env.VITE_EFC_API_URL}/datastage/datastages/${item.id}/procesar/`;
         const body = {
@@ -72,9 +74,11 @@ async function procesarDatastage(item, setDatastages, setSuccess, setError, setR
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify(body)
         });
+        if (!res.ok) {
+            showMessage(await extractApiError(res), 'error');
+            return;
+        }
         const data = await res.json();
-        if (res.status === 200) {
-            // PATCH para marcar como procesado en backend
         await patchProcesadoTrue(item);
         setDatastages(prev => ({
             ...prev,
@@ -82,31 +86,28 @@ async function procesarDatastage(item, setDatastages, setSuccess, setError, setR
                 ? prev.results.map(d => d.id === item.id ? { ...d, procesado: true } : d)
                 : []
         }));
-            // Mostrar el mensaje con task_id y detail si existen
         if (data && data.task_id && data.detail) {
             setSuccess(`Procesamiento iniciado.\nTask ID: ${data.task_id}\n${data.detail}`);
         } else {
             setSuccess('Procesado correctamente');
         }
-            // El modal de éxito se debe mostrar en el componente principal después de setSuccess
-            // No se llama aquí
         if (data && data.registros_cargados) {
             setRegistrosCargados(data.registros_cargados);
             setShowRegistrosModal(true);
         }
-        } else {
-            setError(data && data.detail ? data.detail : 'No se pudo procesar el datastage');
-        }
     } catch (e) {
-        setError('No se pudo procesar el datastage');
+        showMessage(e.message || 'No se pudo procesar el datastage', 'error');
     }
 }
 // Descarga autenticada de archivos datastage
-function downloadDatastageFile(id, filename) {
+async function downloadDatastageFile(id, filename, showMessage) {
     const url = `${import.meta.env.VITE_EFC_API_URL}/datastage/datastages/${id}/download-datastage/`;
-    fetchWithAuth(url, { method: 'GET' })
+    try {
-        .then(async res => {
+        const res = await fetchWithAuth(url, { method: 'GET' });
-            if (!res.ok) throw new Error('Error al descargar archivo');
+        if (!res.ok) {
+            const errMsg = await extractApiError(res);
+            throw new Error(errMsg);
+        }
         const blob = await res.blob();
         const link = document.createElement('a');
         link.href = window.URL.createObjectURL(blob);
@@ -114,11 +115,13 @@ function downloadDatastageFile(id, filename) {
         document.body.appendChild(link);
         link.click();
         link.remove();
-        })
+    } catch (err) {
-        .catch(() => alert('No se pudo descargar el archivo.'));
+        showMessage(err.message || 'No se pudo descargar el archivo', 'error');
+    }
 }
 
 export default function Datastage() {
+    const { showMessage } = useNotification();
     const focusKeeperRef = useRef(null);
     // datastages will hold the full API response object (with .results and .count)
     const [datastages, setDatastages] = useState({ results: [], count: 0 });
@@ -165,6 +168,7 @@ export default function Datastage() {
             }
         } catch (e) {
             setError(e.message);
+            showMessage(e.message, 'error');
             setDatastages({ results: [], count: 0 });
         }
         setLoading(false);
@@ -183,7 +187,7 @@ export default function Datastage() {
             setSelected(detail);
             setShowDetailModal(true);
         } catch (e) {
-            setError(e.message);
+            showMessage(e.message, 'error');
         }
         setLoading(false);
     };
@@ -197,14 +201,16 @@ export default function Datastage() {
             const fd = new FormData();
             fd.append('contribuyente', form.contribuyente);
             if (form.archivo) fd.append('archivo', form.archivo);
-            await postFormDataWithAuth(`${import.meta.env.VITE_EFC_API_URL}/datastage/datastages/`, fd);
+            const res = await postFormDataWithAuth(`${import.meta.env.VITE_EFC_API_URL}/datastage/datastages/`, fd);
+            if (!res.ok) throw new Error(await extractApiError(res));
             setForm({ archivo: null, contribuyente: '' });
             setShowCreateModal(false);
             setSuccess('Datastage creado exitosamente');
             setShowSuccessModal(true);
             load();
         } catch (e) {
-            setError(e.message);
+            setShowCreateModal(false);
+            showMessage(e.message || 'Error al crear el datastage', 'error');
         }
         setLoading(false);
     };
@@ -218,7 +224,8 @@ export default function Datastage() {
             const fd = new FormData();
             fd.append('contribuyente', form.contribuyente);
             if (form.archivo) fd.append('archivo', form.archivo);
-            await patchFormDataWithAuth(`${import.meta.env.VITE_EFC_API_URL}/datastage/datastages/${editingId}/`, fd);
+            const res = await patchFormDataWithAuth(`${import.meta.env.VITE_EFC_API_URL}/datastage/datastages/${editingId}/`, fd);
+            if (!res.ok) throw new Error(await extractApiError(res));
             setForm({ archivo: null, contribuyente: '' });
             setEditingId(null);
             setShowEditModal(false);
@@ -226,7 +233,8 @@ export default function Datastage() {
             setShowSuccessModal(true);
             load();
         } catch (e) {
-            setError(e.message);
+            setShowEditModal(false);
+            showMessage(e.message || 'Error al actualizar el datastage', 'error');
         }
         setLoading(false);
     };
@@ -244,7 +252,8 @@ export default function Datastage() {
             setShowSuccessModal(true);
             load();
         } catch (e) {
-            setError(e.message);
+            setShowDeleteModal(false);
+            showMessage(e.message || 'Error al eliminar el datastage', 'error');
         }
         setLoading(false);
     };
@@ -269,8 +278,9 @@ export default function Datastage() {
             } else {
                 setImportadores([]);
             }
-        } catch {
+        } catch (e) {
             setImportadores([]);
+            showMessage(e.message || 'Error al cargar importadores', 'error');
         }
         setShowCreateModal(true);
     };
@@ -381,11 +391,11 @@ export default function Datastage() {
                                     <tr key={item.id} className="hover:bg-slate-50 transition-colors">
                                         <td className="border px-2 py-2 text-center">{item.id}</td>
                                         <td className="border px-2 py-2 max-w-xs truncate">
-                                            {item.archivo ? (
+                                            {item.download_url ? (
                                                 <span className="flex items-center gap-1 text-xs text-gray-700 truncate font-mono">
                                                     {(() => {
                                                         try {
-                                                            const url = new URL(item.archivo);
+                                                            const url = new URL(item.download_url);
                                                             return decodeURIComponent(url.pathname.split('/').pop() || '');
                                                         } catch {
                                                             return '';
@@ -399,12 +409,13 @@ export default function Datastage() {
                                                             item.id,
                                                             (() => {
                                                                 try {
-                                                                    const url = new URL(item.archivo);
+                                                                    const url = new URL(item.download_url);
                                                                     return decodeURIComponent(url.pathname.split('/').pop() || '');
                                                                 } catch {
                                                                     return '';
                                                                 }
-                                                            })()
+                                                            })(),
+                                                            showMessage
                                                         )}
                                                     >
                                                         <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -444,7 +455,7 @@ export default function Datastage() {
                                                 <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" /></svg>
                                             </button>
                                             <button
-                                                onClick={() => procesarDatastage(item, setDatastages, setSuccess, setError, setRegistrosCargados, setShowRegistrosModal)}
+                                                onClick={() => procesarDatastage(item, setDatastages, setSuccess, showMessage, setRegistrosCargados, setShowRegistrosModal)}
                                                 className={`inline-flex items-center justify-center w-9 h-9 rounded-lg border transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-offset-1 ${item.procesado ? 'bg-gray-100 border-gray-200 cursor-not-allowed opacity-50' : 'bg-green-50 border-green-200 hover:bg-green-100 hover:border-green-300 focus:ring-green-500 cursor-pointer'}`}
                                                 title={item.procesado ? 'Ya procesado' : 'Procesar'}
                                                 disabled={item.procesado}
@@ -507,16 +518,17 @@ export default function Datastage() {
                                         </span>
                                     </div>
                                     <div className="flex items-center gap-1 text-xs text-gray-700 break-all font-mono mb-1">
-                                        {item.archivo ? (
+                                        {item.download_url ? (
                                             <span className="flex items-center gap-1">
-                                                {(() => { try { const url = new URL(item.archivo); return decodeURIComponent(url.pathname.split('/').pop() || ''); } catch { return ''; } })()}
+                                                {(() => { try { const url = new URL(item.download_url); return decodeURIComponent(url.pathname.split('/').pop() || ''); } catch { return ''; } })()}
                                                 <button
                                                     type="button"
                                                     className="inline-flex items-center justify-center w-6 h-6 rounded bg-blue-100 border border-blue-200 text-blue-700 hover:bg-blue-200 hover:border-blue-300 transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-blue-400 ml-1"
                                                     title="Descargar archivo"
                                                     onClick={() => downloadDatastageFile(
                                                         item.id,
-                                                        (() => { try { const url = new URL(item.archivo); return decodeURIComponent(url.pathname.split('/').pop() || ''); } catch { return ''; } })()
+                                                        (() => { try { const url = new URL(item.download_url); return decodeURIComponent(url.pathname.split('/').pop() || ''); } catch { return ''; } })(),
+                                                        showMessage
                                                     )}
                                                 >
                                                     <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -555,7 +567,7 @@ export default function Datastage() {
                                             <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24"><path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" /></svg>
                                         </button>
                                         <button
-                                            onClick={() => procesarDatastage(item, setDatastages, setSuccess, setError, setRegistrosCargados, setShowRegistrosModal)}
+                                            onClick={() => procesarDatastage(item, setDatastages, setSuccess, showMessage, setRegistrosCargados, setShowRegistrosModal)}
                                             className={`inline-flex items-center justify-center w-9 h-9 rounded-lg border transition-all duration-200 focus:outline-none focus:ring-2 focus:ring-offset-1 ${item.procesado ? 'bg-gray-100 border-gray-200 cursor-not-allowed opacity-50' : 'bg-green-50 border-green-200 hover:bg-green-100 hover:border-green-300 focus:ring-green-500 cursor-pointer'}`}
                                             title={item.procesado ? 'Ya procesado' : 'Procesar'}
                                             disabled={item.procesado}
@@ -803,7 +815,7 @@ export default function Datastage() {
                     <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-40">
                         <div className="bg-white rounded-xl shadow-2xl border border-blue-200 p-8 max-w-sm w-full flex flex-col animate-fade-in">
                             <h3 className="text-lg font-bold mb-2 text-blue-900">Detalle de Datastage #{selected.id}</h3>
-                            <div className="mb-1"><b>Archivo:</b> {selected.archivo ? <a href={selected.archivo} target="_blank" rel="noopener noreferrer" className="text-blue-600 underline break-all">Descargar</a> : <span className="text-gray-400">Sin archivo</span>}</div>
+                            {/* <div className="mb-1"><b>Archivo:</b> {selected.download_url ? <a href={selected.download_url} target="_blank" rel="noopener noreferrer" className="text-blue-600 underline break-all">Descargar</a> : <span className="text-gray-400">Sin archivo</span>}</div> */}
                             <div className="mb-1"><b>Contribuyente:</b> {selected.contribuyente}</div>
                             <div className="mb-1"><b>Procesado:</b> <span className={selected.procesado ? 'bg-green-100 text-green-700 px-2 py-0.5 rounded-full text-xs' : 'bg-yellow-100 text-yellow-700 px-2 py-0.5 rounded-full text-xs'}>{selected.procesado ? 'Sí' : 'No'}</span></div>
                             <div className="mb-1"><b>Organización:</b> {selected.organizacion}</div>

src/pages/Expedientes.jsx

@@ -55,7 +55,8 @@ export default function Documents() {
   const [expedienteFilter, setExpedienteFilter] = useState('all'); // all, true, false
   const [contribuyenteFilter, setContribuyenteFilter] = useState('');
   const [contribuyenteInput, setContribuyenteInput] = useState('');
-  const [fechaPagoFilter, setFechaPagoFilter] = useState('');
+  const [fechaInicioFilter, setFechaInicioFilter] = useState('');
+  const [fechaFinFilter, setFechaFinFilter] = useState('');
   const [pedimentoFilter, setPedimentoFilter] = useState('');
   const [searchFilter, setSearchFilter] = useState('');
   const [curpApoderadoFilter, setCurpApoderadoFilter] = useState('');
@@ -63,6 +64,8 @@ export default function Documents() {
   const [aduanaFilter, setAduanaFilter] = useState('');
   const [tipoOperacionFilter, setTipoOperacionFilter] = useState('');
   const [clavePedimentoFilter, setClavePedimentoFilter] = useState('');
+  const [sortField, setSortField] = useState('created_at');
+  const [sortDir, setSortDir] = useState('desc');
   const { showMessage } = useNotification();
   
   // Estados para selección múltiple
@@ -105,18 +108,20 @@ export default function Documents() {
 
   // Fetching usando la función tipada de TypeScript
   const fetchPedimentosData = async (page = currentPage, pageSize = itemsPerPage) => {
-    // Construir objeto de filtros
+    const ordering = sortDir === 'desc' ? `-${sortField}` : sortField;
     const filters = {
       search: searchFilter || undefined,
       pedimento_app: pedimentoFilter || undefined,
       existe_expediente: expedienteFilter === 'all' ? undefined : expedienteFilter,
       contribuyente: contribuyenteFilter || undefined,
       curp_apoderado: curpApoderadoFilter || undefined,
-      fecha_pago: fechaPagoFilter || undefined,
+      fecha_pago_desde: fechaInicioFilter || undefined,
+      fecha_pago_hasta: fechaFinFilter || undefined,
       patente: patenteFilter || undefined,
       aduana: aduanaFilter || undefined,
       tipo_operacion: tipoOperacionFilter || undefined,
       clave_pedimento: clavePedimentoFilter || undefined,
+      ordering,
     };
     return await fetchDocuments(page, pageSize, filters);
   };
@@ -125,7 +130,7 @@ export default function Documents() {
   const { data: pedimentos, loading, error, refetch } = usePolling(
     () => fetchPedimentosData(currentPage, itemsPerPage),
     30000, // 30 segundos
-    [currentPage, itemsPerPage, searchFilter, pedimentoFilter, expedienteFilter, alertaFilter, contribuyenteFilter, curpApoderadoFilter, fechaPagoFilter, patenteFilter, aduanaFilter, tipoOperacionFilter, clavePedimentoFilter]
+    [currentPage, itemsPerPage, searchFilter, pedimentoFilter, expedienteFilter, alertaFilter, contribuyenteFilter, curpApoderadoFilter, fechaInicioFilter, fechaFinFilter, patenteFilter, aduanaFilter, tipoOperacionFilter, clavePedimentoFilter, sortField, sortDir]
   );
 
   // Manejo de errores de sesión
@@ -230,6 +235,125 @@ export default function Documents() {
   //    }
   //   // showMessage('Error durante la descarga masiva', 'error');
   // };
+
+  // accionar pedimento completo si no se proceso
+  const handleEjecutarServicio = async (pedimentoId, org) => {
+    try {
+      showMessage(`Procesando pedimento ${pedimentoId}...`, 'info');
+      
+      // Construir el body de la petición
+      const body = {
+        organizacion: org, // Ajusta según tu organización, puede ser string o número
+        pedimento: pedimentoId.toString() // Convertir a string si es necesario
+      };
+      
+      // Endpoint para pedimento completo
+      const MICROSERVICE_URL = import.meta.env.VITE_EFC_MICROSERVICE_URL;
+      const endpoint = `${MICROSERVICE_URL}/services/pedimento_completo`;
+      
+      const response = await postWithAuth(endpoint, body);
+      
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}));
+        throw new Error(errorData.message || errorData.detail || `Error ${response.status}: ${response.statusText}`);
+      }
+      
+      const result = await response.json();
+      console.log('Resultado del servicio:', result);
+      
+      showMessage(`Pedimento ${pedimentoId} procesado correctamente`, 'success');
+      
+      // Opcional: Refrescar la lista después de procesar
+      setTimeout(() => {
+        refetch();
+      }, 2000);
+      
+    } catch (error) {
+      console.error('Error ejecutando servicio:', error);
+      showMessage(`Error al procesar pedimento ${pedimentoId}: ${error.message}`, 'error');
+    }
+  };
+
+  // Agrega esta función después de handleEjecutarServicio
+  const handleProcesarMultiplesPedimentos = async () => {
+    const pedimentosNoProcesados = currentDocuments.filter(ped => selectedDocuments.includes(ped.id) && !ped.existe_expediente);
+
+    if (pedimentosNoProcesados.length === 0) {
+      showMessage('No hay pedimentos seleccionados que estén sin procesar', 'warning');
+      return;
+    }
+
+    if (pedimentosNoProcesados.length > 200) {
+      showMessage(`Máximo 200 pedimentos por solicitud. Seleccionados: ${pedimentosNoProcesados.length}`, 'warning');
+      return;
+    }
+
+    try {
+      showMessage(`Iniciando procesamiento de ${pedimentosNoProcesados.length} pedimentos...`, 'info');
+      
+      const pedimentosData = pedimentosNoProcesados.map(ped => ({
+        id: ped.id,
+        pedimento_app: ped.pedimento_app,
+        aduana: ped.aduana,
+        patente: ped.patente,
+        pedimento: ped.pedimento,
+        organizacion: ped.organizacion
+      }));
+
+      const MICROSERVICE_URL = import.meta.env.VITE_EFC_MICROSERVICE_URL;
+      const response = await postWithAuth(`${MICROSERVICE_URL}/async/services/pedimento_completo/multiple`, {
+        organizacion: pedimentosNoProcesados[0].organizacion.toString(),
+        pedimentos: pedimentosNoProcesados.map(p => p.id.toString())
+      });
+
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}));
+        throw new Error(errorData.message || errorData.detail || `Error ${response.status}: ${response.statusText}`);
+      }
+
+      const result = await response.json();
+      
+      showMessage(
+        `Tarea iniciada: ${result.total_pedimentos} pedimentos encolados. Task ID: ${result.task_id}`,
+        'success'
+      );
+
+      setSelectedDocuments([]);
+      setIsSelectAll(false);
+
+      // Opcional: Iniciar polling para monitorear el progreso
+      // const intervalId = setInterval(async () => {
+      //   const statusResponse = await fetchWithAuth(`${MICROSERVICE_URL}/async/task-status/${result.task_id}`);
+        
+      //   if (statusResponse.ok) {
+      //     const status = await statusResponse.json();
+          
+      //     if (status.status === 'SUCCESS') {
+      //       clearInterval(intervalId);
+      //       const { success_count, failed_count, elapsed_seconds } = status.result;
+      //       showMessage(
+      //         `Procesamiento completado: ${success_count} exitosos, ${failed_count} fallidos. Tiempo: ${elapsed_seconds}s`,
+      //         failed_count > 0 ? 'warning' : 'success'
+      //       );
+      //       refetch(); // Refrescar la lista
+      //     } else if (status.status === 'FAILURE') {
+      //       clearInterval(intervalId);
+      //       showMessage(`Error en el procesamiento: ${status.message}`, 'error');
+      //     } else if (status.status === 'PROGRESS' && status.progress) {
+      //       const { current, total, current_pedimento, percentage } = status.progress;
+      //       console.log(`Progreso: ${percentage}% - ${current}/${total}: ${current_pedimento}`);
+      //     }
+      //   }
+      // }, 5000);
+
+      setTimeout(() => clearInterval(intervalId), 600000);
+
+    } catch (error) {
+      console.error('Error procesando múltiples pedimentos:', error);
+      showMessage(`Error: ${error.message}`, 'error');
+    }
+  };
+
   // Función para descargar documentos seleccionados
   const handleDownloadSelected = async () => {
      if (selectedDocuments.length === 0) {
@@ -691,13 +815,80 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
   expedienteFilter !== 'all',
   contribuyenteFilter,
   curpApoderadoFilter,
-  fechaPagoFilter,
+  fechaInicioFilter,
+  fechaFinFilter,
   patenteFilter,
   aduanaFilter,
   tipoOperacionFilter,
   clavePedimentoFilter,
 ].some(Boolean);
 
+  const handleDescargarFiltroExcel = async () => {
+    const params = new URLSearchParams();
+    if (searchFilter)         params.append('search',          searchFilter);
+    if (pedimentoFilter)      params.append('pedimento_app',   pedimentoFilter);
+    if (expedienteFilter !== 'all') params.append('existe_expediente', expedienteFilter);
+    if (contribuyenteFilter)  params.append('contribuyente',   contribuyenteFilter);
+    if (curpApoderadoFilter)  params.append('curp_apoderado',  curpApoderadoFilter);
+    if (fechaInicioFilter)    params.append('fecha_pago_desde', fechaInicioFilter);
+    if (fechaFinFilter)       params.append('fecha_pago_hasta', fechaFinFilter);
+    if (patenteFilter)        params.append('patente',         patenteFilter);
+    if (aduanaFilter)         params.append('aduana',          aduanaFilter);
+    if (tipoOperacionFilter)  params.append('tipo_operacion',  tipoOperacionFilter);
+    if (clavePedimentoFilter) params.append('clave_pedimento', clavePedimentoFilter);
+
+    try {
+      showMessage('Generando Excel, por favor espera...', 'info');
+      const res = await fetchWithAuth(`${API_URL}/customs/pedimentos/export-excel/?${params.toString()}`);
+      if (!res.ok) {
+        showMessage('Error al generar el archivo Excel', 'error');
+        return;
+      }
+      const blob = await res.blob();
+      const url = window.URL.createObjectURL(blob);
+      const a = document.createElement('a');
+      a.href = url;
+      const hdr = res.headers.get('Content-Disposition') || '';
+      const match = hdr.match(/filename="([^"]+)"/);
+      a.download = match ? match[1] : 'pedimentos.xlsx';
+      a.click();
+      a.remove();
+      window.URL.revokeObjectURL(url);
+      showMessage('Excel descargado correctamente', 'success');
+    } catch (err) {
+      showMessage(err.message || 'Error al descargar el Excel', 'error');
+    }
+  };
+
+  const handleSort = (field) => {
+    if (sortField === field) {
+      setSortDir(prev => prev === 'asc' ? 'desc' : 'asc');
+    } else {
+      setSortField(field);
+      setSortDir('asc');
+    }
+    setCurrentPage(1);
+  };
+
+  const SortIcon = ({ field }) => {
+    if (sortField !== field) {
+      return (
+        <svg className="inline ml-1 w-3 h-3 text-gray-400 opacity-50" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M7 16V4m0 0L3 8m4-4l4 4M17 8v12m0 0l4-4m-4 4l-4-4" />
+        </svg>
+      );
+    }
+    return sortDir === 'asc' ? (
+      <svg className="inline ml-1 w-3 h-3 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M5 15l7-7 7 7" />
+      </svg>
+    ) : (
+      <svg className="inline ml-1 w-3 h-3 text-blue-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 9l-7 7-7-7" />
+      </svg>
+    );
+  };
+
   // El layout principal y la tabla siempre se renderizan, loader/error/empty solo dentro del área de la tabla
 
   return (
@@ -856,11 +1047,33 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                     className="w-full border border-gray-300 rounded-xl px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 bg-white shadow-sm transition-all duration-200 hover:shadow-md"
                   />
                 </div>
-                {/* Fecha de pago */}
+                {/* Fecha de inicio */}
                 <div className="flex flex-col">
-                  <label className="text-xs font-semibold text-gray-700 mb-1.5">Fecha de pago</label>
+                  <label className="text-xs font-semibold text-gray-700 mb-1.5">Fecha de inicio</label>
-                  <input type="date" value={fechaPagoFilter} onChange={e => setFechaPagoFilter(e.target.value)}
+                  <input
-                    className="w-full border border-gray-300 rounded-xl px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 bg-white shadow-sm transition-all duration-200 hover:shadow-md" />
+                    type="date"
+                    value={fechaInicioFilter}
+                    onChange={e => {
+                      setFechaInicioFilter(e.target.value);
+                      setCurrentPage(1);
+                    }}
+                    max={fechaFinFilter || undefined}
+                    className="w-full border border-gray-300 rounded-xl px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 bg-white shadow-sm transition-all duration-200 hover:shadow-md"
+                  />
+                </div>
+                {/* Fecha de fin */}
+                <div className="flex flex-col">
+                  <label className="text-xs font-semibold text-gray-700 mb-1.5">Fecha de fin</label>
+                  <input
+                    type="date"
+                    value={fechaFinFilter}
+                    onChange={e => {
+                      setFechaFinFilter(e.target.value);
+                      setCurrentPage(1);
+                    }}
+                    min={fechaInicioFilter || undefined}
+                    className="w-full border border-gray-300 rounded-xl px-3 py-2.5 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 bg-white shadow-sm transition-all duration-200 hover:shadow-md"
+                  />
                 </div>
                 {/* Patente */}
                 <div className="flex flex-col">
@@ -945,6 +1158,21 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                 </div>
                 <div className="px-6 py-4">
                   <div className="flex flex-wrap gap-3">
+                    {/* NUEVO BOTÓN PARA PROCESAR MÚLTIPLES */}
+                    <button
+                      onClick={handleProcesarMultiplesPedimentos}
+                      className="inline-flex items-center px-4 py-2 font-medium text-white transition-colors duration-200 bg-green-600 rounded-lg shadow-sm hover:bg-green-700 hover:shadow-md"
+                    >
+                      <svg className="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 10V3L4 14h7v7l9-11h-7z" />
+                      </svg>
+                      Procesar seleccionados ({selectedDocuments.filter(id => {
+                        const ped = currentDocuments.find(p => p.id === id);
+                        return ped && !ped.existe_expediente;
+                      }).length} pendientes)
+                    </button>
+                    
+                    {/* Botón existente de eliminar */}
                     <button
                       onClick={handleDeleteSelected}
                       className="inline-flex items-center px-4 py-2 font-medium text-white transition-colors duration-200 bg-red-600 rounded-lg shadow-sm hover:bg-red-700 hover:shadow-md"
@@ -1001,13 +1229,22 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                   Actualizar Ahora
                 </button>
                 <button
-                  onClick={() => {handleDownloadSelected()}}
+                  onClick={() => handleDownloadSelected()}
                   className="inline-flex items-center px-4 py-2.5 border border-transparent text-sm font-medium rounded-xl text-white bg-gradient-to-r from-purple-600 to-purple-700 hover:from-purple-700 hover:to-purple-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-purple-500 transition-all duration-200 transform hover:scale-105 shadow-lg"
                 >
                   <svg className="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-4l-4 4m0 0l-4-4m4 4V4" />
                   </svg>
-                  {hasActiveFilters ? 'Descargar por Filtro' : 'Descargar Todos'}
+                  Descargar Expedientes
+                </button>
+                <button
+                  onClick={handleDescargarFiltroExcel}
+                  className="inline-flex items-center px-4 py-2.5 border border-transparent text-sm font-medium rounded-xl text-white bg-gradient-to-r from-green-600 to-green-700 hover:from-green-700 hover:to-green-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500 transition-all duration-200 transform hover:scale-105 shadow-lg"
+                >
+                  <svg className="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 17v-2m3 2v-4m3 4v-6m2 10H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
+                  </svg>
+                  {hasActiveFilters ? 'Descargar por Filtro' : 'Descargar Todos (Excel)'}
                 </button>
               </div>
             </div>
@@ -1042,12 +1279,49 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                           className="w-4 h-4 text-blue-600 border-gray-300 rounded focus:ring-blue-500"
                         />
                       </th>
-                      <th scope="col" className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase">Pedimento</th>
+                      <th
-                      <th scope="col" className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase">Fecha Pago</th>
+                        scope="col"
+                        className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase cursor-pointer select-none hover:bg-gray-100 transition-colors"
+                        onClick={() => handleSort('pedimento')}
+                        title="Ordenar por pedimento"
+                      >
+                        Pedimento<SortIcon field="pedimento" />
+                      </th>
+                      <th
+                        scope="col"
+                        className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase cursor-pointer select-none hover:bg-gray-100 transition-colors"
+                        onClick={() => handleSort('fecha_pago')}
+                        title="Ordenar por fecha de pago"
+                      >
+                        Fecha Pago<SortIcon field="fecha_pago" />
+                      </th>
+                      <th
+                        scope="col"
+                        className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase cursor-pointer select-none hover:bg-gray-100 transition-colors"
+                        onClick={() => handleSort('aduana')}
+                        title="Ordenar por aduana"
+                      >
+                        Aduana<SortIcon field="aduana" />
+                      </th>
+                      <th
+                        scope="col"
+                        className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase cursor-pointer select-none hover:bg-gray-100 transition-colors"
+                        onClick={() => handleSort('patente')}
+                        title="Ordenar por patente"
+                      >
+                        Patente<SortIcon field="patente" />
+                      </th>
                       <th scope="col" className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase">Contribuyente</th>
                       <th scope="col" className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase">CURP Apod.</th>
                       <th scope="col" className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase">Partidas</th>
-                      <th scope="col" className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase">F. Carga</th>
+                      <th
+                        scope="col"
+                        className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase cursor-pointer select-none hover:bg-gray-100 transition-colors"
+                        onClick={() => handleSort('created_at')}
+                        title="Ordenar por fecha de carga"
+                      >
+                        F. Carga<SortIcon field="created_at" />
+                      </th>
                       <th scope="col" className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase">Tipo Op.</th>
                       <th scope="col" className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase">Clave</th>
                       <th scope="col" className="px-4 py-2 text-xs font-medium tracking-wider text-left text-gray-500 uppercase">Archivos</th>
@@ -1099,6 +1373,8 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                             </Link>
                           </td>
                           <td className="px-4 py-3 text-xs text-gray-900 whitespace-nowrap">{ped.fecha_pago}</td>
+                          <td className="px-4 py-3 text-xs text-gray-900 whitespace-nowrap">{ped.aduana ?? '—'}</td>
+                          <td className="px-4 py-3 text-xs text-gray-900 whitespace-nowrap">{ped.patente ?? '—'}</td>
                           <td className="max-w-xs px-4 py-3 text-xs text-gray-900 truncate" title={ped.contribuyente}>{ped.contribuyente}</td>
                           <td className="px-4 py-3 text-xs text-gray-900 whitespace-nowrap">{ped.curp_apoderado}</td>
                           <td className="px-4 py-3 text-xs text-gray-900 whitespace-nowrap">{ped.numero_partidas}</td>
@@ -1145,6 +1421,21 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                             </span>
                           </td>
                           <td className="px-4 py-3 text-center whitespace-nowrap">
+                            {ped.existe_expediente ? (
+                              <>
+                              </>
+                            ) : (
+                              <button
+                                className="p-2 text-green-600 transition-colors duration-200 rounded-full hover:text-green-800 hover:bg-green-50 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2"
+                                onClick={() => handleEjecutarServicio(ped.id, ped.organizacion)}
+                                title="Procesar"
+                              >
+                                <svg className="w-4 h-4 text-green-600" fill="currentColor" viewBox="0 0 24 24">
+                                  <path d="M8 5v14l11-7z" />
+                                </svg>
+                              </button>
+                            )}
+                            {/* handleEjecutarServicio */}
                             <button
                               className="p-2 text-blue-600 transition-colors duration-200 rounded-full hover:text-blue-800 hover:bg-blue-50 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2"
                               onClick={() => handleDownloadTodoElExpediente(ped.id, ped.pedimento_app)}

src/pages/Login.jsx

@@ -23,11 +23,12 @@ export default function Login() {
       const apiUrl = import.meta.env.VITE_EFC_API_URL || '';
       const token = data.access;
       try {
-        const res = await fetch(`${apiUrl}/user/users/me/`, {
+        const [resUser, resPerms] = await Promise.all([
-          headers: { 'Authorization': `Bearer ${token}` }
+          fetch(`${apiUrl}/user/users/me/`, { headers: { 'Authorization': `Bearer ${token}` } }),
-        });
+          fetch(`${apiUrl}/rbac/my-permissions/`, { headers: { 'Authorization': `Bearer ${token}` } }),
-        if (res.ok) {
+        ]);
-          const user = await res.json();
+        if (resUser.ok) {
+          const user = await resUser.json();
           if (user && user.username) {
             localStorage.setItem('username', user.username);
             if (user.email) localStorage.setItem('user_email', user.email);
@@ -38,6 +39,12 @@ export default function Login() {
             if (typeof user.is_importador !== 'undefined') localStorage.setItem('user_is_importador', String(user.is_importador));
           }
         }
+        if (resPerms.ok) {
+          const permsData = await resPerms.json();
+          if (permsData && permsData.permissions) {
+            localStorage.setItem('user_permissions', JSON.stringify(permsData.permissions));
+          }
+        }
       } catch (e) {
         // Si falla, continuar igual
         console.error('No se pudo guardar info de usuario en localStorage', e);

src/pages/PedimentoDetail.jsx

@@ -136,6 +136,8 @@ export default function PedimentoDetail() {
   const [isSelectAllDocs, setIsSelectAllDocs] = useState(false);
   const [showDeleteModal, setShowDeleteModal] = useState(false);
   const [showUploadModal, setShowUploadModal] = useState(false);
+  const [headerUploadTypeId, setHeaderUploadTypeId] = useState(null);
+  const [headerUploadNumero, setHeaderUploadNumero] = useState('');
 
   // Estados para subir documentos
   const [selectedFiles, setSelectedFiles] = useState([]);
@@ -334,6 +336,8 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
   const [processingAcuseCove, setProcessingAcuseCove] = useState(null);
   const [processingEdoc, setProcessingEdoc] = useState(null);
   const [processingAcuseEdoc, setProcessingAcuseEdoc] = useState(null);
+  // Modal de advertencia por documentos con errores en EDocs
+  const [edocErrorModal, setEdocErrorModal] = useState({ open: false, edoc: null, tipo: null });
 
   // Agregar estado para el modal de documentos
   const [showDocumentsModal, setShowDocumentsModal] = useState(false);
@@ -412,6 +416,7 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
         // La API devuelve un array directamente, no un objeto con results
         const credenciales = Array.isArray(data) ? data : (data.results || []);
         
+        console.log('credenciales >>>> ', credenciales);
         return credenciales;
       }
       return [];
@@ -459,8 +464,10 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
           password: credencial.password,
           efirma: credencial.efirma,
           // Convertir URLs completas a rutas relativas
-          key: credencial.key ? credencial.key.split('/').slice(-2).join('/') : '',
+          key: credencial.key_download_url,
-          cer: credencial.cer ? credencial.cer.split('/').slice(-2).join('/') : '',
+          cer: credencial.cer_download_url,
+          // key: credencial.key ? credencial.key.split('/').slice(-2).join('/') : '',
+          // cer: credencial.cer ? credencial.cer.split('/').slice(-2).join('/') : '',
           is_active: credencial.is_active,
           organizacion: credencial.organizacion
         }
@@ -565,6 +572,7 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
   const [previewDoc, setPreviewDoc] = useState(null);
   const [previewContent, setPreviewContent] = useState('');
   const [imageZoom, setImageZoom] = useState(1);
+  const [previewIframeLoaded, setPreviewIframeLoaded] = useState(false);
   
   // Refs
   const focusKeeperRef = useRef(null);
@@ -647,6 +655,7 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
     setPreviewDoc(doc);
     setImageZoom(1);
     setPreviewContent('');
+    setPreviewIframeLoaded(false);
     setPreviewOpen(true);
     try {
       const res = await fetchWithAuth(`${API_URL}/record/documents/descargar/${doc.id}/`);
@@ -686,12 +695,17 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
         setPreviewLoading(false);
       } else {
         const blob = await res.blob();
+        if (blob.size === 0) {
+          setPreviewError('El archivo está vacío o no está disponible en el servidor.');
+          setPreviewLoading(false);
+          return;
+        }
         const url = window.URL.createObjectURL(blob);
         setPreviewUrl(url);
         setPreviewLoading(false);
       }
     } catch (err) {
-      console.error('Error in preview:', err);
+      console.error('Error en vista previa (VU):', err);
       if (err.message === 'SESSION_EXPIRED') {
         setPreviewError('Tu sesión ha expirado, por favor inicia sesión de nuevo.');
       } else {
@@ -711,6 +725,7 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
     setPreviewDoc(doc);
     setImageZoom(1);
     setPreviewContent('');
+    setPreviewIframeLoaded(false);
     setPreviewOpen(true);
     try {
       const res = await fetchWithAuth(`${API_URL}/record/documents/descargar/${doc.id}/`);
@@ -750,12 +765,17 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
         setPreviewLoading(false);
       } else {
         const blob = await res.blob();
+        if (blob.size === 0) {
+          setPreviewError('El archivo está vacío o no está disponible en el servidor.');
+          setPreviewLoading(false);
+          return;
+        }
         const url = window.URL.createObjectURL(blob);
         setPreviewUrl(url);
         setPreviewLoading(false);
       }
     } catch (err) {
-      console.error('Error in preview:', err);
+      console.error('Error en vista previa:', err);
       if (err.message === 'SESSION_EXPIRED') {
         setPreviewError('Tu sesión ha expirado, por favor inicia sesión de nuevo.');
       } else {
@@ -777,6 +797,7 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
     setPreviewDoc(null);
     setPreviewContent('');
     setImageZoom(1);
+    setPreviewIframeLoaded(false);
   };
 
   // Funciones para el nuevo diseño de documentos
@@ -965,6 +986,11 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
       // Agregar el ID del pedimento
       formData.append('pedimento_id', id);
 
+      // Tipo de documento específico si la subida viene del header de una sección
+      if (headerUploadTypeId) {
+        formData.append('document_type_id', headerUploadTypeId);
+      }
+
       // Agregar archivos al FormData
       selectedFiles.forEach((file) => {
         formData.append('files', file);
@@ -982,6 +1008,7 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
       // Limpiar archivos seleccionados y cerrar modal
       setSelectedFiles([]);
       setShowUploadModal(false);
+      setHeaderUploadTypeId(null);
 
       // Forzar recarga de documentos
       const currentPage = page;
@@ -2005,8 +2032,10 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
           user: credencial.usuario,
           password: credencial.password,
           efirma: credencial.efirma,
-          key: credencial.key,
+          key: credencial.key_download_url,
-          cer: credencial.cer,
+          cer: credencial.cer_download_url,
+          // key: credencial.key,
+          // cer: credencial.cer,
           is_active: credencial.is_active,
           organizacion: credencial.organizacion
         }
@@ -2078,8 +2107,10 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
           user: credencial.usuario,
           password: credencial.password,
           efirma: credencial.efirma,
-          key: credencial.key,
+          key: credencial.key_download_url,
-          cer: credencial.cer,
+          cer: credencial.cer_download_url,
+          // key: credencial.key,
+          // cer: credencial.cer,
           is_active: credencial.is_active,
           organizacion: credencial.organizacion
         }
@@ -2152,8 +2183,10 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
           user: credencial.usuario,
           password: credencial.password,
           efirma: credencial.efirma,
-          key: credencial.key,
+          key: credencial.key_download_url,
-          cer: credencial.cer,
+          cer: credencial.cer_download_url,
+          // key: credencial.key,
+          // cer: credencial.cer,
           is_active: credencial.is_active,
           organizacion: credencial.organizacion
         }
@@ -2226,8 +2259,10 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
           user: credencial.usuario,
           password: credencial.password,
           efirma: credencial.efirma,
-          key: credencial.key,
+          key: credencial.key_download_url,
-          cer: credencial.cer,
+          cer: credencial.cer_download_url,
+          // key: credencial.key,
+          // cer: credencial.cer,
           is_active: credencial.is_active,
           organizacion: credencial.organizacion
         }
@@ -2788,7 +2823,7 @@ const handleDeleteSelectedPedimentoDocuments = async () => {
         return;
       }
      
-      const result = await postFormDataWithAuth(`${API_URL}/record/documents/bulk-upload-vu/`, formData);
+      const result = await postFormDataWithAuth(`${API_URL}/record/documents/bulk-upload/`, formData);
 
       if(!result.ok){
         const errorData = await result.json();
@@ -2828,6 +2863,62 @@ const isPartida = selectedDocumentForUpload?.tab === 'partida';
 const isCove = selectedDocumentForUpload?.tab === 'cove';
 const isEdoc = selectedDocumentForUpload?.tab === 'edoc';
 
+  // Función para crear un registro VU nuevo (partida/cove/edoc) y subir sus archivos
+  const handleCreateVuRecord = async () => {
+    const tab = selectedDocumentForUpload?.tab;
+    if (!tab || !headerUploadNumero.trim() || uploadFiles.length === 0) {
+      showMessage('Por favor completa el número y selecciona al menos un archivo', 'warning');
+      return;
+    }
+
+    setUploadingToDocumento('header-upload');
+
+    try {
+      const formData = new FormData();
+      formData.append('pedimento_id', id);
+      formData.append('tab_seccion', tab);
+      formData.append('numero', headerUploadNumero.trim());
+
+      uploadFiles.forEach((fileObj, index) => {
+        formData.append('files', fileObj.file);
+        formData.append(`secciones[${index}]`, fileObj.seccion);
+      });
+
+      const result = await postFormDataWithAuth(`${API_URL}/record/documents/create-vu-record/`, formData);
+
+      if (!result.ok) {
+        const errorData = await result.json();
+        throw new Error(errorData.error || 'Error desconocido');
+      }
+
+      const data = await result.json();
+      showMessage(data.message || 'Registro creado exitosamente', 'success');
+
+      // Recargar la tabla correspondiente
+      if (tab === 'partida') {
+        fetchPedimentoPartidas(partidasPage, partidasPageSize, partidasFilters)
+          .then((d) => { setPartidas(d.results || []); setPartidasCount(d.count || 0); })
+          .catch(err => console.error('Error recargando partidas:', err));
+      } else if (tab === 'cove') {
+        fetchPedimentoCoves && fetchPedimentoCoves(covesPage, covesPageSize, covesFilters)
+          .then((d) => { setCoves(d.results || []); setCovesCount(d.count || 0); })
+          .catch(err => console.error('Error recargando coves:', err));
+      } else if (tab === 'edoc') {
+        fetchPedimentoEdocs && fetchPedimentoEdocs(edocsPage, edocsPageSize, edocsFilters)
+          .then((d) => { setEdocs(d.results || []); setEdocsCount(d.count || 0); })
+          .catch(err => console.error('Error recargando edocs:', err));
+      }
+    } catch (error) {
+      showMessage(`Error: ${error.message}`, 'error');
+    } finally {
+      setSelectedDocumentForUpload(null);
+      setUploadFiles([]);
+      setUploadModalOpen(false);
+      setHeaderUploadNumero('');
+      setUploadingToDocumento(null);
+    }
+  };
+
  // Estados para documentos de errores VU
 const [errorDocuments, setErrorDocuments] = useState([]);
 const [errorDocsCount, setErrorDocsCount] = useState(0);
@@ -4298,6 +4389,23 @@ useEffect(() => {
                     </span>
                   </div>
 
+                  <div className="flex items-center gap-2">
+                    <button
+                      onClick={() => {
+                        setSelectedDocumentForUpload({ tab: 'partida', numero: '', pedimento: id, id: 'header-upload', isHeaderUpload: true });
+                        setUploadFiles([]);
+                        setHeaderUploadNumero('');
+                        setUploadModalOpen(true);
+                      }}
+                      className="inline-flex items-center justify-center px-3 py-2 text-sm font-medium leading-4 text-white bg-green-600 border border-transparent rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500"
+                    >
+                      <svg className="w-4 h-4 mr-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-8l-4-4m0 0L8 8m4-4v12" />
+                      </svg>
+                      Subir Documentos
+                    </button>
+                  </div>
+
                   {/* Botones de acción masiva */}
                   {/* <div className="flex items-center space-x-3">
                     {selectedPartidas.length > 0 && (
@@ -4784,6 +4892,23 @@ useEffect(() => {
                       {covesCount} COVEs
                     </span>
                   </div>
+
+                  <div className="flex items-center gap-2">
+                    <button
+                      onClick={() => {
+                        setSelectedDocumentForUpload({ tab: 'cove', numero: '', pedimento: id, id: 'header-upload', isHeaderUpload: true });
+                        setUploadFiles([]);
+                        setHeaderUploadNumero('');
+                        setUploadModalOpen(true);
+                      }}
+                      className="inline-flex items-center justify-center px-3 py-2 text-sm font-medium leading-4 text-white bg-green-600 border border-transparent rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500"
+                    >
+                      <svg className="w-4 h-4 mr-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-8l-4-4m0 0L8 8m4-4v12" />
+                      </svg>
+                      Subir Documentos
+                    </button>
+                  </div>
                 </div>
 
                 {/* Botones para descargar todos los AcuseCoves y COVEs */}
@@ -5238,6 +5363,21 @@ useEffect(() => {
                       {edocsCount} EDocs
                     </span>
                   </div>
+
+                  <button
+                    onClick={() => {
+                      setSelectedDocumentForUpload({ tab: 'edoc', numero: '', pedimento: id, id: 'header-upload', isHeaderUpload: true });
+                      setUploadFiles([]);
+                      setHeaderUploadNumero('');
+                      setUploadModalOpen(true);
+                    }}
+                    className="inline-flex items-center justify-center px-3 py-2 text-sm font-medium leading-4 text-white bg-green-600 border border-transparent rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500"
+                  >
+                    <svg className="w-4 h-4 mr-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 16v1a3 3 0 003 3h10a3 3 0 003-3v-1m-4-8l-4-4m0 0L8 8m4-4v12" />
+                    </svg>
+                    Subir Documentos
+                  </button>
                 </div>
 
                 {/* Filtros */}
@@ -5411,7 +5551,7 @@ useEffect(() => {
               ) : (
                 <div className="space-y-4">
                   {/* Tabla de EDocs */}
-                  <div className="overflow-hidden rounded-lg shadow ring-1 ring-black ring-opacity-5">
+                  <div className="overflow-x-auto rounded-lg shadow ring-1 ring-black ring-opacity-5">
                     <table className="min-w-full divide-y divide-gray-300">
                       <thead className="bg-gray-50">
                         <tr>
@@ -5502,20 +5642,29 @@ useEffect(() => {
                                 {edoc.acuse_descargado ? 'Descargado' : 'Pendiente'}
                               </span>
                             </td>
-                            <td className="px-6 py-4 text-sm font-medium text-right whitespace-nowrap">
+                            <td className="px-6 py-4 text-sm font-medium text-right whitespace-nowrap" style={{minWidth: '140px'}}>
-                              <div className="flex items-center justify-end space-x-2">
+                              <div className="flex items-center justify-end space-x-2 flex-nowrap">
                                 {/* Botón EDoc */}
                                 <button
-                                  onClick={() => handleEdocProcess(edoc)}
+                                  onClick={() => {
+                                    const tieneError = !edoc.edocument_descargado && edoc.documentos?.some(d => d.document_type === 22);
+                                    if (tieneError) {
+                                      setEdocErrorModal({ open: true, edoc, tipo: 'edoc' });
+                                    } else {
+                                      handleEdocProcess(edoc);
+                                    }
+                                  }}
                                   disabled={edoc.edocument_descargado || processingEdoc === edoc.id}
                                   className={`p-1 rounded transition-colors ${
                                     edoc.edocument_descargado
                                       ? 'text-gray-400 cursor-not-allowed'
                                       : processingEdoc === edoc.id
                                       ? 'text-blue-400 cursor-not-allowed'
+                                      : !edoc.edocument_descargado && edoc.documentos?.some(d => d.document_type === 22)
+                                      ? 'text-yellow-500 hover:text-yellow-700 opacity-60'
                                       : 'text-blue-600 hover:text-blue-900'
                                   }`}
-                                  title={edoc.edocument_descargado ? 'EDoc ya descargado' : processingEdoc === edoc.id ? 'Procesando EDoc...' : 'Procesar EDoc'}
+                                  title={edoc.edocument_descargado ? 'EDoc ya descargado' : processingEdoc === edoc.id ? 'Procesando EDoc...' : !edoc.edocument_descargado && edoc.documentos?.some(d => d.document_type === 22) ? 'EDoc con errores — haz clic para más información' : 'Procesar EDoc'}
                                 >
                                   {processingEdoc === edoc.id ? (
                                     <svg className="w-4 h-4 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -5530,16 +5679,25 @@ useEffect(() => {
                                 
                                 {/* Botón Acuse de EDoc */}
                                 <button
-                                  onClick={() => handleAcuseEdocProcess(edoc)}
+                                  onClick={() => {
+                                    const tieneError = !edoc.acuse_descargado && edoc.documentos?.some(d => d.document_type === 26);
+                                    if (tieneError) {
+                                      setEdocErrorModal({ open: true, edoc, tipo: 'acuse' });
+                                    } else {
+                                      handleAcuseEdocProcess(edoc);
+                                    }
+                                  }}
                                   disabled={edoc.acuse_descargado || processingAcuseEdoc === edoc.id}
                                   className={`p-1 rounded transition-colors ${
                                     edoc.acuse_descargado
                                       ? 'text-gray-400 cursor-not-allowed'
                                       : processingAcuseEdoc === edoc.id
                                       ? 'text-green-400 cursor-not-allowed'
+                                      : !edoc.acuse_descargado && edoc.documentos?.some(d => d.document_type === 26)
+                                      ? 'text-yellow-500 hover:text-yellow-700 opacity-60'
                                       : 'text-green-600 hover:text-green-900'
                                   }`}
-                                  title={edoc.acuse_descargado ? 'Acuse de EDoc ya descargado' : processingAcuseEdoc === edoc.id ? 'Procesando Acuse de EDoc...' : 'Procesar Acuse de EDoc'}
+                                  title={edoc.acuse_descargado ? 'Acuse de EDoc ya descargado' : processingAcuseEdoc === edoc.id ? 'Procesando Acuse de EDoc...' : !edoc.acuse_descargado && edoc.documentos?.some(d => d.document_type === 26) ? 'Acuse con errores — haz clic para más información' : 'Procesar Acuse de EDoc'}
                                 >
                                   {processingAcuseEdoc === edoc.id ? (
                                     <svg className="w-4 h-4 animate-spin" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -6683,20 +6841,42 @@ useEffect(() => {
                     <h4 className="mb-2 text-lg font-semibold">Error al cargar documento</h4>
                     <p className="text-sm text-gray-600">{previewError}</p>
                     <button
-                      onClick={() => setPreviewError(null)}
+                      onClick={() => { setPreviewError(null); if (previewDoc) handlePreview(previewDoc); }}
                       className="px-4 py-2 mt-4 text-red-800 transition-colors bg-red-100 rounded-lg hover:bg-red-200"
                     >
-                      Reintentar
+                      Volver a cargar
                     </button>
                   </div>
                 </div>
               ) : previewType === 'pdf' ? (
-                <div className="flex-1 bg-white">
+                <div className="relative flex-1 bg-white">
+                  {/* Spinner hasta que el iframe confirme carga */}
+                  {!previewIframeLoaded && (
+                    <div className="absolute inset-0 z-10 flex items-center justify-center bg-white">
+                      <div className="text-center">
+                        <div className="inline-flex items-center space-x-3 text-blue-600">
+                          <svg className="w-10 h-10 animate-spin" fill="none" viewBox="0 0 24 24">
+                            <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
+                            <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>
+                          </svg>
+                          <span className="text-lg font-medium">Cargando documento...</span>
+                        </div>
+                      </div>
+                    </div>
+                  )}
                   <iframe
                     src={previewUrl}
                     title="PDF Preview"
                     className="w-full h-full border-0"
                     style={{ minHeight: '500px' }}
+                    onLoad={() => {
+                      setPreviewIframeLoaded(true);
+                      setPreviewLoading(false);
+                    }}
+                    onError={() => {
+                      setPreviewError('No se pudo cargar el documento PDF.');
+                      setPreviewLoading(false);
+                    }}
                   />
                 </div>
               ) : previewType === 'img' ? (
@@ -6880,6 +7060,7 @@ useEffect(() => {
                 onClick={() => {
                   setShowUploadModal(false);
                   setSelectedFiles([]);
+                  setHeaderUploadTypeId(null);
                 }}
                 className="px-4 py-2 text-sm font-medium text-gray-700 transition-colors duration-200 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
               >
@@ -7091,15 +7272,34 @@ useEffect(() => {
             <div className="relative w-full max-w-md p-6 bg-white rounded-lg shadow-xl">
               <div className="mb-4">
                 <h3 className="text-lg font-medium leading-6 text-gray-900">
-                  Subir documentos a {selectedDocumentForUpload.tab}: {selectedDocumentForUpload.numero}
+                  {selectedDocumentForUpload.isHeaderUpload
+                    ? `Nuevo ${selectedDocumentForUpload.tab === 'partida' ? 'Partida' : selectedDocumentForUpload.tab === 'cove' ? 'COVE' : 'EDoc'}`
+                    : `Subir documentos a ${selectedDocumentForUpload.tab}: ${selectedDocumentForUpload.numero}`}
                 </h3>
                 <p className="mt-1 text-sm text-gray-500">
-                  Selecciona los archivos que deseas subir
+                  {selectedDocumentForUpload.isHeaderUpload
+                    ? 'Se creará el registro y se subirán los archivos'
+                    : 'Selecciona los archivos que deseas subir'}
                 </p>
               </div>
 
               {/* Selectores específicos por tipo de archivo */}
               <div className="space-y-4">
+                {/* Input de número para header upload */}
+                {selectedDocumentForUpload.isHeaderUpload && (
+                  <div>
+                    <label className="block mb-2 text-sm font-medium text-gray-700">
+                      {isPartida ? 'Número de partida' : isCove ? 'Número de COVE' : 'Número de EDoc'}
+                    </label>
+                    <input
+                      type="text"
+                      value={headerUploadNumero}
+                      onChange={(e) => setHeaderUploadNumero(e.target.value)}
+                      placeholder={isPartida ? 'Ej. 1' : isCove ? 'Ej. CV-2024-001' : 'Ej. ED-2024-001'}
+                      className="block w-full px-3 py-2 text-sm text-gray-700 bg-white border border-gray-300 rounded-md shadow-sm focus:outline-none focus:ring-blue-500 focus:border-blue-500"
+                    />
+                  </div>
+                )}
                 {/* Primer selector para COVE (XML solo para partida y cove) */}
                 {(isPartida || isCove) && (
                 <div>
@@ -7189,14 +7389,23 @@ useEffect(() => {
                     setUploadModalOpen(false);
                     setShowUploadModal(false);
                     setSelectedFiles([]);
+                    setHeaderUploadNumero('');
                   }}
                   className="px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md shadow-sm hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
                 >
                   Cancelar
                 </button>
                 <button
-                  onClick={() => {handleUploadFilesToDocumento(selectedDocumentForUpload.tab)}}
+                  onClick={() => {
-                  disabled={uploadFiles.length === 0 || uploadingToDocumento === selectedDocumentForUpload.id}
+                    selectedDocumentForUpload.isHeaderUpload
+                      ? handleCreateVuRecord()
+                      : handleUploadFilesToDocumento(selectedDocumentForUpload.tab);
+                  }}
+                  disabled={
+                    uploadFiles.length === 0 ||
+                    uploadingToDocumento === selectedDocumentForUpload.id ||
+                    (selectedDocumentForUpload.isHeaderUpload && !headerUploadNumero.trim())
+                  }
                   className="inline-flex justify-center px-4 py-2 text-sm font-medium text-white bg-blue-600 border border-transparent rounded-md shadow-sm hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 disabled:opacity-50 disabled:cursor-not-allowed"
                 >
                   {uploadingToDocumento === selectedDocumentForUpload.id ? (
@@ -7217,6 +7426,91 @@ useEffect(() => {
         </div>
         )}
 
+      {/* Modal de advertencia: EDoc/Acuse con documentos de error */}
+      {edocErrorModal.open && edocErrorModal.edoc && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50 animate-fade-in">
+          <div className="w-full max-w-lg p-6 bg-white rounded-lg shadow-xl animate-modal-slide-up">
+            <div className="flex items-center mb-4 space-x-3">
+              <div className="flex items-center justify-center w-10 h-10 bg-yellow-100 rounded-full shrink-0">
+                <svg className="w-5 h-5 text-yellow-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 9v2m0 4h.01M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z" />
+                </svg>
+              </div>
+              <h3 className="text-lg font-semibold text-gray-900">
+                {edocErrorModal.tipo === 'acuse' ? 'Acuse de EDoc con errores' : 'EDoc con errores'}
+              </h3>
+            </div>
+
+            <p className="mb-1 text-sm text-gray-700">
+              Este EDocument (<span className="font-medium">{edocErrorModal.edoc.numero_edocument}</span>) cuenta con errores en la respuesta recibida.
+              Revisa el documento de error antes de volver a intentarlo.
+            </p>
+            <p className="mb-4 text-sm text-gray-500">
+              Puedes continuar con el flujo de trabajo, pero se recomienda corregir el error primero.
+            </p>
+
+            {/* Lista de documentos de error */}
+            {(() => {
+              const tipoFiltro = edocErrorModal.tipo === 'acuse' ? 26 : 22;
+              const docsError = edocErrorModal.edoc.documentos?.filter(d => d.document_type === tipoFiltro) || [];
+              return docsError.length > 0 ? (
+                <div className="mb-4">
+                  <p className="mb-2 text-xs font-medium tracking-wide text-gray-500 uppercase">Documentos de error</p>
+                  <ul className="space-y-2">
+                    {docsError.map(doc => {
+                      const nombreArchivo = (doc.archivo || '').split('/').pop() || 'Documento';
+                      return (
+                        <li key={doc.id} className="flex items-center justify-between p-2 rounded-md bg-gray-50">
+                          <span className="text-sm text-gray-700 truncate max-w-xs" title={nombreArchivo}>
+                            {nombreArchivo}
+                          </span>
+                          <button
+                            onClick={() => {
+                              setEdocErrorModal({ open: false, edoc: null, tipo: null });
+                              handlePreviewVU(doc);
+                            }}
+                            className="p-1 ml-2 text-blue-600 rounded shrink-0 hover:text-blue-900 hover:bg-blue-50"
+                            title="Ver documento"
+                          >
+                            <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+                              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.477 0 8.268 2.943 9.542 7-1.274 4.057-5.065 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
+                            </svg>
+                          </button>
+                        </li>
+                      );
+                    })}
+                  </ul>
+                </div>
+              ) : null;
+            })()}
+
+            <div className="flex justify-end space-x-2">
+              <button
+                onClick={() => setEdocErrorModal({ open: false, edoc: null, tipo: null })}
+                className="px-4 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-md hover:bg-gray-50"
+              >
+                Cancelar
+              </button>
+              <button
+                onClick={() => {
+                  const { edoc, tipo } = edocErrorModal;
+                  setEdocErrorModal({ open: false, edoc: null, tipo: null });
+                  if (tipo === 'acuse') {
+                    handleAcuseEdocProcess(edoc);
+                  } else {
+                    handleEdocProcess(edoc);
+                  }
+                }}
+                className="px-4 py-2 text-sm font-medium text-white bg-yellow-600 rounded-md hover:bg-yellow-700"
+              >
+                Continuar de todas formas
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+
     </div>
   );
 }

src/pages/Procesos.jsx

@@ -4,6 +4,7 @@ import { Link } from 'react-router-dom';
 import { fetchTasks, ejecutarComando } from '../api/procesos.ts';
 import { fetchWithAuth } from '../fetchWithAuth';
 import { useNotification } from '../context/NotificationContext';
+const API_URL = import.meta.env.VITE_EFC_API_URL;
 
 // Modal para mostrar detalles del task
 const TaskDetailsModal = ({ task, onClose }) => {
@@ -352,6 +353,10 @@ export default function Procesos() {
   const [servicioFilter, setServicioFilter] = useState('');
   const [statusFilter, setStatusFilter] = useState('');
 
+  const [organizacionFilter, setOrganizacionFilter] = useState('');
+  const [organizaciones, setOrganizaciones] = useState([]);
+  const [loadingOrganizaciones, setLoadingOrganizaciones] = useState(false);
+  
   // Sorting
   const [sortField, setSortField] = useState('');
   const [sortOrder, setSortOrder] = useState('asc'); // 'asc' | 'desc'
@@ -361,6 +366,7 @@ export default function Procesos() {
     pedimentoPedimentoFilter: '',
     statusFilter: '',
     servicioFilter: '',
+    organizacionFilter: '',  // Añadir esta línea
     sortField: '',
     sortOrder: 'asc'
   });
@@ -374,6 +380,7 @@ export default function Procesos() {
         pedimentoPedimentoFilter,
         servicioFilter,
         statusFilter,
+        organizacionFilter,  // Añadir esta línea
         sortField,
         sortOrder
       };
@@ -401,6 +408,7 @@ export default function Procesos() {
         if (pedimentoPedimentoFilter) filters['pedimento_app'] = pedimentoPedimentoFilter;
         if (servicioFilter) filters['servicio'] = servicioFilter;
         if (statusFilter) filters['status'] = statusFilter;
+        if (organizacionFilter) filters['organizacion'] = organizacionFilter;  // Añadir esta línea
         if (sortField) {
           // Mapear campos antiguos a nuevos si es necesario
           const fieldMapping = {
@@ -426,17 +434,31 @@ export default function Procesos() {
       }
     }
     fetchData();
-  }, [page, itemsPerPage, pedimentoPedimentoFilter, servicioFilter, statusFilter, sortField, sortOrder]);
+  }, [page, itemsPerPage, pedimentoPedimentoFilter, servicioFilter, statusFilter, organizacionFilter, sortField, sortOrder]);
 
   const [showProcesosDropdown, setShowProcesosDropdown] = useState(false);
   const [ejecutandoProceso, setEjecutandoProceso] = useState(false);
 
   const handleEjecutarProcesamiento = async (params) => {
+    // Verificar si se ha seleccionado una organización
+    if (!organizacionFilter) {
+      showMessage('Debes seleccionar una organización antes de ejecutar el proceso', 'warning');
+      return; // Detener la ejecución
+    }
+    
     try {
       setEjecutandoProceso(true);
       setShowProcesosDropdown(false);
 
-      const resultado = await ejecutarComando(params);
+      // Agregar el ID de la organización a los parámetros
+      const paramsConOrganizacion = {
+        ...params,
+        organizacionid: organizacionFilter // Solo necesitamos el ID
+      };
+      
+       console.log('Ejecutando proceso con parámetros:', paramsConOrganizacion);
+      
+      const resultado = await ejecutarComando(paramsConOrganizacion);
     
       if (resultado.message) {
         // Mostrar mensaje de éxito
@@ -481,6 +503,27 @@ useEffect(() => {
   };
 }, [showProcesosDropdown]);
 
+useEffect(() => {
+  async function fetchOrganizaciones() {
+    try {
+      setLoadingOrganizaciones(true);
+      const response = await fetchWithAuth(`${API_URL}/organization/organizaciones/`);
+      if (response.ok) {
+        const data = await response.json();
+        setOrganizaciones(data.results || []);
+      }
+    } catch (error) {
+      console.error('Error al cargar organizaciones:', error);
+    } finally {
+      setLoadingOrganizaciones(false);
+    }
+  }
+  
+  fetchOrganizaciones();
+}, []);
+
+
+
   return (
     <div className="min-h-screen p-4 bg-gradient-to-br from-slate-50 via-blue-50 to-indigo-100 sm:p-6 lg:p-8">
       {/* Modal de detalles del task */}
@@ -589,7 +632,7 @@ useEffect(() => {
               </svg>
               Filtros de búsqueda
             </h3>
-            <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-3">
+            <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
               <div className="space-y-2">
                 <label className="flex items-center gap-2 text-sm font-semibold text-gray-700">
                   <div className="w-2 h-2 bg-blue-500 rounded-full"></div>
@@ -653,6 +696,33 @@ useEffect(() => {
                   <option value="9">Acuse Cove</option>
                 </select>
               </div>
+              <div className="space-y-2">
+                <label className="flex items-center gap-2 text-sm font-semibold text-gray-700">
+                  <div className="w-2 h-2 bg-teal-500 rounded-full"></div>
+                    Organización
+                </label>
+                <select
+                className="w-full px-4 py-3 text-sm transition-all duration-200 bg-white border border-gray-300 shadow-sm rounded-xl focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 hover:shadow-md"
+                disabled={loadingOrganizaciones}
+                value={organizacionFilter}
+                onChange={e => {
+                setOrganizacionFilter(e.target.value);
+                setPage(1);
+                }}
+                >
+                  <option value="">Todas las organizaciones</option>
+                  {loadingOrganizaciones ? (
+                    <option value="" disabled>Cargando organizaciones...</option>
+                  ) : (
+                      organizaciones.map((org) => (
+                      <option key={org.id} value={org.id}>
+                        {org.nombre}
+                      </option>
+                      ))
+                  )}
+
+                </select>
+              </div>
           </div>
         </div>
         {/* BOTÓN PARA EJECUTAR PROCESAMIENTOS - AGREGAR AQUÍ */}

src/pages/ProfileForm.jsx

@@ -0,0 +1,416 @@
+import React, { useEffect, useState } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import {
+  getRole,
+  createRole,
+  updateRole,
+  fetchPermissionsByModule,
+} from '../api/rbac';
+import { useNotification } from '../context/NotificationContext';
+
+// Nombres legibles de módulos para la UI
+const MODULE_LABELS = {
+  usuarios:       'Usuarios',
+  pedimentos:     'Pedimentos',
+  partidas:       'Partidas',
+  remesas:        'Remesas',
+  coves:          'COVEs',
+  edocuments:     'E-Documents',
+  acuses:         'Acuses',
+  documentos:     'Documentos',
+  vucem:          'Ventanilla Única (VUCEM)',
+  reportes:       'Reportes',
+  datastage:      'DataStage',
+  organizacion:   'Organización',
+  notificaciones: 'Notificaciones',
+  cards:          'Dashboard / Cards',
+};
+
+export default function ProfileForm() {
+  const { id } = useParams();
+  const isEditing = Boolean(id);
+  const navigate = useNavigate();
+  const { showMessage } = useNotification();
+
+  const [name, setName] = useState('');
+  const [description, setDescription] = useState('');
+  const [isAdminRole, setIsAdminRole] = useState(false);
+
+  // Permisos de la API: { modulo: [{ id, codename, descripcion, modulo }] }
+  const [permsByModule, setPermsByModule] = useState({});
+  const [loadingPerms, setLoadingPerms] = useState(true);
+
+  // IDs numéricos de permisos seleccionados
+  const [selectedPermIds, setSelectedPermIds] = useState(new Set());
+
+  const [loadingRole, setLoadingRole] = useState(isEditing);
+  const [submitting, setSubmitting] = useState(false);
+
+  useEffect(() => {
+    if (typeof window !== 'undefined' && !document.getElementById('profiles-animations')) {
+      const style = document.createElement('style');
+      style.id = 'profiles-animations';
+      style.innerHTML = `
+        @keyframes fadeInUpProfiles {
+          0% { opacity: 0; transform: translateY(24px); }
+          100% { opacity: 1; transform: translateY(0); }
+        }
+        .fade-in-up-profiles { animation: fadeInUpProfiles 0.6s cubic-bezier(0.22, 1, 0.36, 1) both; }
+        @keyframes bounce-slow {
+          0%, 100% { transform: translateY(0); }
+          50% { transform: translateY(-8px); }
+        }
+        .animate-bounce-slow { animation: bounce-slow 2.2s infinite; }
+      `;
+      document.head.appendChild(style);
+    }
+  }, []);
+
+  // Cargar catálogo de permisos desde API
+  useEffect(() => {
+    fetchPermissionsByModule()
+      .then(data => {
+        setPermsByModule(data && typeof data === 'object' ? data : {});
+      })
+      .catch(() => showMessage('Error al cargar catálogo de permisos', 'error'))
+      .finally(() => setLoadingPerms(false));
+  }, []);
+
+  // Cargar datos del rol si es edición
+  useEffect(() => {
+    if (!isEditing) return;
+    getRole(id)
+      .then(role => {
+        setName(role.nombre || '');
+        setDescription(role.descripcion || '');
+        setIsAdminRole(role.is_admin_role || false);
+
+        // Permisos vienen como [{ id, codename, descripcion, modulo }]
+        const permList = Array.isArray(role.permissions) ? role.permissions : [];
+        setSelectedPermIds(new Set(permList.map(p => p.id)));
+        setLoadingRole(false);
+      })
+      .catch(err => {
+        showMessage(err.message || 'Error al cargar perfil', 'error');
+        setLoadingRole(false);
+      });
+  }, [id, isEditing]);
+
+  // Módulos en el orden en que llegan de la API
+  const modules = Object.keys(permsByModule);
+
+  const togglePerm = (permId) => {
+    setSelectedPermIds(prev => {
+      const next = new Set(prev);
+      if (next.has(permId)) next.delete(permId);
+      else next.add(permId);
+      return next;
+    });
+  };
+
+  const toggleModule = (module) => {
+    const moduleIds = (permsByModule[module] || []).map(p => p.id);
+    const allSelected = moduleIds.every(id => selectedPermIds.has(id));
+    setSelectedPermIds(prev => {
+      const next = new Set(prev);
+      if (allSelected) {
+        moduleIds.forEach(id => next.delete(id));
+      } else {
+        moduleIds.forEach(id => next.add(id));
+      }
+      return next;
+    });
+  };
+
+  const totalPerms = modules.reduce((acc, m) => acc + (permsByModule[m]?.length ?? 0), 0);
+
+  const selectAll = () => {
+    const all = modules.flatMap(m => (permsByModule[m] || []).map(p => p.id));
+    setSelectedPermIds(new Set(all));
+  };
+
+  const clearAll = () => setSelectedPermIds(new Set());
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    if (!name.trim()) {
+      showMessage('El nombre del perfil es obligatorio', 'error');
+      return;
+    }
+    setSubmitting(true);
+    try {
+      const payload = {
+        nombre: name.trim(),
+        descripcion: description.trim(),
+        permission_ids: [...selectedPermIds],
+      };
+
+      if (isEditing) {
+        await updateRole(id, payload);
+        showMessage('Perfil actualizado correctamente', 'success');
+      } else {
+        await createRole(payload);
+        showMessage('Perfil creado correctamente', 'success');
+      }
+      navigate('/profiles');
+    } catch (err) {
+      showMessage(err.message || 'Error al guardar perfil', 'error');
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  if (loadingRole) {
+    return (
+      <div className="min-h-screen p-4 sm:p-6 bg-gradient-to-br from-gray-50 to-blue-50 flex items-center justify-center">
+        <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-indigo-600" />
+      </div>
+    );
+  }
+
+  return (
+    <div className="min-h-screen p-4 sm:p-6 bg-gradient-to-br from-gray-50 to-blue-50">
+      <div className="max-w-4xl mx-auto">
+
+        {/* Header */}
+        <div className="mb-8 relative overflow-hidden rounded-2xl shadow bg-gradient-to-r from-indigo-600 via-indigo-700 to-indigo-800 border border-indigo-200 p-6 sm:p-8 flex flex-col sm:flex-row items-start sm:items-center gap-4 sm:gap-6 fade-in-up-profiles">
+          <div className="flex-shrink-0 bg-white/20 backdrop-blur-sm rounded-full p-3 sm:p-4 shadow-lg animate-bounce-slow">
+            <svg className="h-8 w-8 sm:h-10 sm:w-10 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" />
+            </svg>
+          </div>
+          <div className="flex-1">
+            <h1 className="text-2xl sm:text-3xl font-extrabold text-white tracking-tight mb-1">
+              {isEditing ? 'Editar Perfil' : 'Nuevo Perfil'}
+            </h1>
+            <p className="text-sm sm:text-base text-white/80 font-medium">
+              {isEditing ? `Editando: ${name}` : 'Define nombre y permisos del nuevo perfil'}
+            </p>
+          </div>
+          <button
+            type="button"
+            onClick={() => navigate('/profiles')}
+            className="flex-shrink-0 inline-flex items-center gap-2 px-4 py-2 bg-white/20 hover:bg-white/30 text-white text-sm font-medium rounded-lg border border-white/30 transition-all duration-200"
+          >
+            <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M10 19l-7-7m0 0l7-7m-7 7h18" />
+            </svg>
+            Regresar
+          </button>
+          <div className="absolute -top-10 -right-10 opacity-20 pointer-events-none select-none">
+            <svg width="120" height="120" viewBox="0 0 120 120" fill="none">
+              <circle cx="60" cy="60" r="50" fill="white" fillOpacity="0.15" />
+            </svg>
+          </div>
+        </div>
+
+        <form onSubmit={handleSubmit} className="space-y-6">
+
+          {/* Datos del perfil */}
+          <div className="bg-white rounded-2xl shadow-lg border border-gray-100 p-6 fade-in-up-profiles" style={{ animationDelay: '0.05s' }}>
+            <div className="flex items-center mb-4 pb-3 border-b border-gray-200">
+              <div className="bg-indigo-600 rounded-lg p-2 mr-3 shadow-sm">
+                <svg className="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M7 7h.01M7 3h5c.512 0 1.024.195 1.414.586l7 7a2 2 0 010 2.828l-7 7a2 2 0 01-2.828 0l-7-7A1.994 1.994 0 013 12V7a4 4 0 014-4z" />
+                </svg>
+              </div>
+              <div>
+                <h4 className="text-sm font-semibold text-slate-800">Datos del perfil</h4>
+                <p className="text-xs text-slate-500">Identifica el perfil dentro de la organización</p>
+              </div>
+            </div>
+            <div className="grid grid-cols-1 sm:grid-cols-2 gap-4 max-w-2xl">
+              <div className="space-y-1">
+                <label className="block text-xs font-semibold text-slate-700">
+                  Nombre <span className="text-red-600">*</span>
+                </label>
+                <input
+                  type="text"
+                  value={name}
+                  onChange={e => setName(e.target.value)}
+                  required
+                  disabled={isAdminRole}
+                  placeholder="Ej. Operador de VUCEM"
+                  className="w-full px-3 py-2 border border-slate-300 rounded-md shadow-sm focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 transition-all bg-white text-slate-900 placeholder-slate-400 text-sm disabled:bg-slate-100 disabled:text-slate-500"
+                />
+                {isAdminRole && (
+                  <p className="text-xs text-amber-600 flex items-center gap-1 mt-1">
+                    <svg className="w-3 h-3" fill="currentColor" viewBox="0 0 24 24">
+                      <path d="M12 2l2.09 6.26L20 10l-5 4.87L16.18 22 12 18.77 7.82 22 9 14.87 4 10l5.91-1.74z" />
+                    </svg>
+                    Perfil de administrador — el nombre es fijo
+                  </p>
+                )}
+              </div>
+              <div className="space-y-1">
+                <label className="block text-xs font-semibold text-slate-700">Descripción</label>
+                <input
+                  type="text"
+                  value={description}
+                  onChange={e => setDescription(e.target.value)}
+                  placeholder="Descripción opcional del perfil"
+                  className="w-full px-3 py-2 border border-slate-300 rounded-md shadow-sm focus:ring-2 focus:ring-indigo-500 focus:border-indigo-500 transition-all bg-white text-slate-900 placeholder-slate-400 text-sm"
+                />
+              </div>
+            </div>
+          </div>
+
+          {/* Permisos */}
+          <div className="bg-white rounded-2xl shadow-lg border border-gray-100 p-6 fade-in-up-profiles" style={{ animationDelay: '0.1s' }}>
+            <div className="flex items-center justify-between mb-4 pb-3 border-b border-gray-200">
+              <div className="flex items-center">
+                <div className="bg-indigo-600 rounded-lg p-2 mr-3 shadow-sm">
+                  <svg className="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                  </svg>
+                </div>
+                <div>
+                  <h4 className="text-sm font-semibold text-slate-800">Permisos</h4>
+                  <p className="text-xs text-slate-500">
+                    {loadingPerms
+                      ? 'Cargando catálogo…'
+                      : `${selectedPermIds.size} de ${totalPerms} permisos seleccionados`}
+                  </p>
+                </div>
+              </div>
+              {!loadingPerms && (
+                <div className="flex gap-2">
+                  <button
+                    type="button"
+                    onClick={selectAll}
+                    className="px-2.5 py-1 text-xs font-medium text-indigo-700 bg-indigo-50 hover:bg-indigo-100 rounded-md border border-indigo-200 transition-colors"
+                  >
+                    Todos
+                  </button>
+                  <button
+                    type="button"
+                    onClick={clearAll}
+                    className="px-2.5 py-1 text-xs font-medium text-slate-600 bg-slate-50 hover:bg-slate-100 rounded-md border border-slate-200 transition-colors"
+                  >
+                    Ninguno
+                  </button>
+                </div>
+              )}
+            </div>
+
+            {loadingPerms ? (
+              <div className="flex items-center justify-center py-10">
+                <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-indigo-600" />
+              </div>
+            ) : modules.length === 0 ? (
+              <div className="text-center py-10 text-slate-400 text-sm">
+                No se pudo cargar el catálogo de permisos
+              </div>
+            ) : (
+              <div className="space-y-5">
+                {modules.map(module => {
+                  const modulePerms = permsByModule[module] || [];
+                  const selectedCount = modulePerms.filter(p => selectedPermIds.has(p.id)).length;
+                  const allSelected = selectedCount === modulePerms.length && modulePerms.length > 0;
+                  const someSelected = selectedCount > 0 && !allSelected;
+
+                  return (
+                    <div key={module} className="border border-slate-100 rounded-xl overflow-hidden">
+                      {/* Cabecera módulo */}
+                      <div
+                        className={`flex items-center justify-between px-4 py-2.5 cursor-pointer select-none transition-colors ${
+                          allSelected ? 'bg-indigo-50' : someSelected ? 'bg-slate-50' : 'bg-slate-50/50'
+                        }`}
+                        onClick={() => toggleModule(module)}
+                      >
+                        <div className="flex items-center gap-2">
+                          <div className={`w-4 h-4 rounded border-2 flex items-center justify-center flex-shrink-0 transition-colors ${
+                            allSelected
+                              ? 'bg-indigo-600 border-indigo-600'
+                              : someSelected
+                                ? 'bg-indigo-200 border-indigo-400'
+                                : 'bg-white border-slate-300'
+                          }`}>
+                            {allSelected && (
+                              <svg className="w-2.5 h-2.5 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="3" d="M5 13l4 4L19 7" />
+                              </svg>
+                            )}
+                            {someSelected && (
+                              <div className="w-1.5 h-0.5 bg-indigo-600 rounded" />
+                            )}
+                          </div>
+                          <span className="text-sm font-semibold text-slate-700">
+                            {MODULE_LABELS[module] ?? module}
+                          </span>
+                        </div>
+                        <span className="text-xs text-slate-400 font-mono">
+                          {selectedCount}/{modulePerms.length}
+                        </span>
+                      </div>
+
+                      {/* Permisos del módulo */}
+                      <div className="grid grid-cols-2 sm:grid-cols-3 gap-px bg-slate-100">
+                        {modulePerms.map(perm => {
+                          const active = selectedPermIds.has(perm.id);
+                          return (
+                            <button
+                              key={perm.id}
+                              type="button"
+                              onClick={() => togglePerm(perm.id)}
+                              className={`flex items-center gap-2 px-3 py-2 text-left transition-colors duration-100 ${
+                                active ? 'bg-indigo-50' : 'bg-white hover:bg-slate-50'
+                              }`}
+                            >
+                              <div className={`w-3.5 h-3.5 rounded border flex items-center justify-center flex-shrink-0 transition-colors ${
+                                active ? 'bg-indigo-600 border-indigo-600' : 'bg-white border-slate-300'
+                              }`}>
+                                {active && (
+                                  <svg className="w-2 h-2 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="3" d="M5 13l4 4L19 7" />
+                                  </svg>
+                                )}
+                              </div>
+                              <span
+                                className={`text-xs truncate ${active ? 'text-indigo-800 font-medium' : 'text-slate-600'}`}
+                                title={perm.descripcion}
+                              >
+                                {perm.descripcion}
+                              </span>
+                            </button>
+                          );
+                        })}
+                      </div>
+                    </div>
+                  );
+                })}
+              </div>
+            )}
+          </div>
+
+          {/* Botones */}
+          <div className="flex flex-col sm:flex-row justify-end gap-3 pb-8 fade-in-up-profiles" style={{ animationDelay: '0.15s' }}>
+            <button
+              type="button"
+              onClick={() => navigate('/profiles')}
+              disabled={submitting}
+              className="w-full sm:w-auto px-6 py-2.5 border border-slate-300 rounded-lg shadow-sm text-sm font-semibold text-slate-700 bg-white hover:bg-slate-50 transition-all duration-200 disabled:opacity-50"
+            >
+              Cancelar
+            </button>
+            <button
+              type="submit"
+              disabled={submitting || loadingPerms}
+              className="w-full sm:w-auto px-6 py-2.5 rounded-lg shadow-lg text-sm font-semibold text-white bg-gradient-to-r from-indigo-600 to-indigo-800 hover:from-indigo-700 hover:to-indigo-900 transition-all duration-200 flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed"
+            >
+              {submitting && <div className="animate-spin rounded-full h-4 w-4 border-b-2 border-white" />}
+              <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d={isEditing ? 'M5 13l4 4L19 7' : 'M12 6v6m0 0v6m0-6h6m-6 0H6'} />
+              </svg>
+              <span>
+                {submitting
+                  ? (isEditing ? 'Guardando...' : 'Creando...')
+                  : (isEditing ? 'Guardar cambios' : 'Crear perfil')}
+              </span>
+            </button>
+          </div>
+        </form>
+      </div>
+    </div>
+  );
+}

src/pages/Profiles.jsx

@@ -0,0 +1,275 @@
+import React, { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { fetchRoles, deleteRole } from '../api/rbac';
+import { useNotification } from '../context/NotificationContext';
+
+export default function Profiles() {
+  const [roles, setRoles] = useState([]);
+  const [loading, setLoading] = useState(true);
+  const [searchTerm, setSearchTerm] = useState('');
+  const [showDeleteModal, setShowDeleteModal] = useState(false);
+  const [roleToDelete, setRoleToDelete] = useState(null);
+  const [deleting, setDeleting] = useState(false);
+  const navigate = useNavigate();
+  const { showMessage } = useNotification();
+
+  useEffect(() => {
+    if (typeof window !== 'undefined' && !document.getElementById('profiles-animations')) {
+      const style = document.createElement('style');
+      style.id = 'profiles-animations';
+      style.innerHTML = `
+        @keyframes fadeInUpProfiles {
+          0% { opacity: 0; transform: translateY(24px); }
+          100% { opacity: 1; transform: translateY(0); }
+        }
+        .fade-in-up-profiles { animation: fadeInUpProfiles 0.6s cubic-bezier(0.22, 1, 0.36, 1) both; }
+      `;
+      document.head.appendChild(style);
+    }
+  }, []);
+
+  const loadRoles = () => {
+    setLoading(true);
+    fetchRoles()
+      .then(data => {
+        setRoles(Array.isArray(data) ? data : (data?.results ?? []));
+        setLoading(false);
+      })
+      .catch(err => {
+        showMessage(err.message || 'Error al cargar perfiles', 'error');
+        setLoading(false);
+      });
+  };
+
+  useEffect(() => { loadRoles(); }, []);
+
+  const handleDeleteClick = (role) => {
+    setRoleToDelete(role);
+    setShowDeleteModal(true);
+  };
+
+  const handleDeleteConfirm = async () => {
+    if (!roleToDelete) return;
+    setDeleting(true);
+    try {
+      await deleteRole(roleToDelete.id);
+      showMessage('Perfil eliminado correctamente', 'success');
+      setShowDeleteModal(false);
+      setRoleToDelete(null);
+      loadRoles();
+    } catch (err) {
+      showMessage(err.message || 'Error al eliminar perfil', 'error');
+    } finally {
+      setDeleting(false);
+    }
+  };
+
+  const filtered = roles.filter(r =>
+    r.nombre?.toLowerCase().includes(searchTerm.toLowerCase())
+  );
+
+  const permCount = (role) => {
+    if (Array.isArray(role.permissions)) return role.permissions.length;
+    return '—';
+  };
+
+  return (
+    <div className="min-h-screen p-4 sm:p-6 bg-gradient-to-br from-gray-50 to-blue-50">
+      <div className="max-w-5xl mx-auto">
+
+        {/* Header */}
+        <div className="mb-8 relative overflow-hidden rounded-2xl shadow bg-gradient-to-r from-blue-600 via-blue-700 to-blue-800 border border-blue-200 p-6 sm:p-8 flex flex-col sm:flex-row items-start sm:items-center gap-4 sm:gap-6 fade-in-up-profiles">
+          <div className="flex-shrink-0 bg-white/20 backdrop-blur-sm rounded-full p-3 sm:p-4 shadow-lg">
+            <svg className="h-8 w-8 sm:h-10 sm:w-10 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" />
+            </svg>
+          </div>
+          <div className="flex-1">
+            <h1 className="text-2xl sm:text-3xl font-extrabold text-white tracking-tight mb-1">
+              Perfiles y Permisos
+            </h1>
+            <p className="text-sm sm:text-base text-white/80 font-medium">
+              Gestión de roles y accesos de la organización
+            </p>
+          </div>
+          <button
+            onClick={() => navigate('/profiles/new')}
+            className="flex-shrink-0 inline-flex items-center gap-2 px-4 py-2 bg-white/20 hover:bg-white/30 text-white text-sm font-medium rounded-lg border border-white/30 transition-all duration-200"
+          >
+            <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" />
+            </svg>
+            Nuevo perfil
+          </button>
+          <div className="absolute -top-10 -right-10 opacity-20 pointer-events-none select-none">
+            <svg width="120" height="120" viewBox="0 0 120 120" fill="none">
+              <circle cx="60" cy="60" r="50" fill="white" fillOpacity="0.15" />
+            </svg>
+          </div>
+        </div>
+
+        {/* Buscador */}
+        <div className="mb-4 fade-in-up-profiles" style={{ animationDelay: '0.05s' }}>
+          <div className="relative">
+            <svg className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-slate-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+            </svg>
+            <input
+              type="text"
+              value={searchTerm}
+              onChange={e => setSearchTerm(e.target.value)}
+              placeholder="Buscar perfil..."
+              className="w-full pl-9 pr-4 py-2 border border-slate-200 rounded-lg shadow-sm bg-white text-sm text-slate-800 placeholder-slate-400 focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-all"
+            />
+          </div>
+        </div>
+
+        {/* Tabla */}
+        <div className="bg-white rounded-2xl shadow-lg border border-gray-100 overflow-hidden fade-in-up-profiles" style={{ animationDelay: '0.1s' }}>
+          {loading ? (
+            <div className="flex items-center justify-center py-20">
+              <div className="animate-spin rounded-full h-10 w-10 border-b-2 border-blue-600" />
+            </div>
+          ) : filtered.length === 0 ? (
+            <div className="flex flex-col items-center justify-center py-20 text-slate-400">
+              <svg className="w-12 h-12 mb-3 opacity-40" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" />
+              </svg>
+              <p className="text-sm font-medium">
+                {searchTerm ? 'Sin resultados para la búsqueda' : 'No hay perfiles registrados'}
+              </p>
+            </div>
+          ) : (
+            <div className="overflow-x-auto">
+              <table className="min-w-full divide-y divide-gray-100">
+                <thead className="bg-slate-50">
+                  <tr>
+                    <th className="px-5 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Perfil</th>
+                    <th className="px-5 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Tipo</th>
+                    <th className="px-5 py-3 text-left text-xs font-semibold text-slate-500 uppercase tracking-wider">Permisos</th>
+                    <th className="px-5 py-3 text-right text-xs font-semibold text-slate-500 uppercase tracking-wider">Acciones</th>
+                  </tr>
+                </thead>
+                <tbody className="divide-y divide-gray-50">
+                  {filtered.map(role => (
+                    <tr key={role.id} className="hover:bg-slate-50/60 transition-colors duration-100">
+                      <td className="px-5 py-4">
+                        <div className="flex items-center gap-3">
+                          <div className={`w-8 h-8 rounded-lg flex items-center justify-center flex-shrink-0 ${role.is_admin_role ? 'bg-amber-100' : 'bg-blue-100'}`}>
+                            {role.is_admin_role ? (
+                              <svg className="w-4 h-4 text-amber-600" fill="currentColor" viewBox="0 0 24 24">
+                                <path d="M12 2l2.09 6.26L20 10l-5 4.87L16.18 22 12 18.77 7.82 22 9 14.87 4 10l5.91-1.74z" />
+                              </svg>
+                            ) : (
+                              <svg className="w-4 h-4 text-blue-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
+                              </svg>
+                            )}
+                          </div>
+                          <span className="text-sm font-semibold text-slate-800">{role.nombre}</span>
+                        </div>
+                      </td>
+                      <td className="px-5 py-4">
+                        {role.is_admin_role ? (
+                          <span className="inline-flex items-center gap-1 px-2 py-0.5 rounded-full text-xs font-semibold bg-amber-100 text-amber-700">
+                            <svg className="w-3 h-3" fill="currentColor" viewBox="0 0 24 24">
+                              <path d="M12 2l2.09 6.26L20 10l-5 4.87L16.18 22 12 18.77 7.82 22 9 14.87 4 10l5.91-1.74z" />
+                            </svg>
+                            Administrador
+                          </span>
+                        ) : (
+                          <span className="inline-flex items-center px-2 py-0.5 rounded-full text-xs font-medium bg-slate-100 text-slate-600">
+                            Estándar
+                          </span>
+                        )}
+                      </td>
+                      <td className="px-5 py-4">
+                        <span className="inline-flex items-center gap-1 text-sm text-slate-600">
+                          <svg className="w-3.5 h-3.5 text-blue-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                          </svg>
+                          {permCount(role)}
+                        </span>
+                      </td>
+                      <td className="px-5 py-4 text-right">
+                        <div className="flex items-center justify-end gap-2">
+                          <button
+                            onClick={() => navigate(`/profiles/${role.id}/edit`)}
+                            className="inline-flex items-center gap-1 px-3 py-1.5 text-xs font-medium text-blue-700 bg-blue-50 hover:bg-blue-100 rounded-lg border border-blue-200 transition-colors duration-150"
+                          >
+                            <svg className="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+                            </svg>
+                            Editar
+                          </button>
+                          <button
+                            onClick={() => handleDeleteClick(role)}
+                            disabled={role.is_admin_role}
+                            title={role.is_admin_role ? 'El perfil de administrador no puede eliminarse' : 'Eliminar perfil'}
+                            className="inline-flex items-center gap-1 px-3 py-1.5 text-xs font-medium text-red-600 bg-red-50 hover:bg-red-100 rounded-lg border border-red-200 transition-colors duration-150 disabled:opacity-40 disabled:cursor-not-allowed"
+                          >
+                            <svg className="w-3.5 h-3.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" />
+                            </svg>
+                            Eliminar
+                          </button>
+                        </div>
+                      </td>
+                    </tr>
+                  ))}
+                </tbody>
+              </table>
+            </div>
+          )}
+        </div>
+
+        {/* Contador */}
+        {!loading && filtered.length > 0 && (
+          <p className="mt-3 text-xs text-slate-400 text-right">
+            {filtered.length} perfil{filtered.length !== 1 ? 'es' : ''}
+          </p>
+        )}
+      </div>
+
+      {/* Modal confirmar eliminación */}
+      {showDeleteModal && roleToDelete && (
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black/40 backdrop-blur-sm p-4">
+          <div className="bg-white rounded-2xl shadow-2xl max-w-md w-full p-6">
+            <div className="flex items-center gap-3 mb-4">
+              <div className="w-10 h-10 rounded-full bg-red-100 flex items-center justify-center flex-shrink-0">
+                <svg className="w-5 h-5 text-red-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L3.07 16.5c-.77.833.192 2.5 1.732 2.5z" />
+                </svg>
+              </div>
+              <div>
+                <h3 className="text-base font-semibold text-slate-800">Eliminar perfil</h3>
+                <p className="text-xs text-slate-500">Esta acción no se puede deshacer</p>
+              </div>
+            </div>
+            <p className="text-sm text-slate-600 mb-6">
+              ¿Confirmas eliminar el perfil <span className="font-semibold text-slate-800">"{roleToDelete.nombre}"</span>?
+              Los usuarios con este perfil perderán los permisos asociados.
+            </p>
+            <div className="flex gap-3 justify-end">
+              <button
+                onClick={() => { setShowDeleteModal(false); setRoleToDelete(null); }}
+                disabled={deleting}
+                className="px-4 py-2 text-sm font-medium text-slate-700 bg-white border border-slate-300 rounded-lg hover:bg-slate-50 transition-colors disabled:opacity-50"
+              >
+                Cancelar
+              </button>
+              <button
+                onClick={handleDeleteConfirm}
+                disabled={deleting}
+                className="px-4 py-2 text-sm font-medium text-white bg-red-600 hover:bg-red-700 rounded-lg transition-colors disabled:opacity-50 flex items-center gap-2"
+              >
+                {deleting && <div className="animate-spin rounded-full h-3.5 w-3.5 border-b-2 border-white" />}
+                Eliminar
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+    </div>
+  );
+}

src/pages/Reports.jsx

@@ -9,6 +9,7 @@ const fetchCurrentUserWithAuth = async () => {
 };
 import { fetchWithAuth } from '../fetchWithAuth';
 import { useNotification } from '../context/NotificationContext';
+import { extractApiError } from '../api/apiError';
 import datastageModelsData from '../data/datastageModels.json';
 import pedimentosModelsData from '../data/pedimentosModels.json';
 
@@ -42,27 +43,6 @@ if (typeof document !== 'undefined' && !document.getElementById('reports-animati
   document.head.appendChild(style);
 }
 
-const handleDownloadReport = async (reportId) => {
-  try {
-    const url = `${import.meta.env.VITE_EFC_API_URL}/reports/report-document-download/${reportId}/`;
-    const res = await fetchWithAuth(url);
-    if (!res.ok) throw new Error('Error al descargar el reporte');
-    const blob = await res.blob();
-    let filename = `reporte_${reportId}.csv`;
-    const disposition = res.headers.get('Content-Disposition');
-    if (disposition && disposition.includes('filename=')) {
-      filename = disposition.split('filename=')[1].replace(/"/g, '').trim();
-    }
-    const link = document.createElement('a');
-    link.href = window.URL.createObjectURL(blob);
-    link.download = filename;
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
-  } catch (err) {
-    alert('No se pudo descargar el reporte.');
-  }
-};
 
 export default function Reports() {
   // Estado para organizacion_id
@@ -85,7 +65,7 @@ export default function Reports() {
   // Handler for Generar Reporte in Cumplimiento tab
   const handleGenerarReporteCumplimiento = async () => {
     if (!organizacionId) {
-      alert('No se pudo obtener el organizacion_id. Intenta de nuevo más tarde.');
+      showMessage('No se pudo obtener el ID de organización. Intenta de nuevo más tarde.', 'warning');
       return;
     }
     // Build query params from filtersCumplimiento and add organizacion_id
@@ -97,11 +77,13 @@ export default function Reports() {
     const url = `${import.meta.env.VITE_EFC_API_URL}/reports/table-summary/${params ? `?${params}` : ''}`;
     try {
       const res = await fetchWithAuth(url);
-      const data = await res.json();
+      if (!res.ok) {
-      if (!res.ok) throw new Error('Error al generar el reporte');
+        const errMsg = await extractApiError(res);
-      alert('Reporte solicitado correctamente. Aparecerá en el historial cuando esté listo.');
+        throw new Error(errMsg);
+      }
+      showMessage('Reporte solicitado correctamente. Aparecerá en el historial cuando esté listo.', 'success');
     } catch (err) {
-      alert('No se pudo generar el reporte.');
+      showMessage(err.message || 'No se pudo generar el reporte', 'error');
     }
   };
   // Filtros replicados de TableroAlmacenamiento
@@ -143,8 +125,8 @@ export default function Reports() {
     // Build query params from filtersCumplimiento and add organizacion_id
     const paramsObj = { ...filtersControlPedimento };
 
-    if(paramsObj.organizacion_id == ''){
+    if (paramsObj.organizacion_id === '') {
-      alert('No se pudo obtener el organizacion_id. Selecciona tu organizacion para intenta de nuevo.');
+      showMessage('Selecciona tu organización antes de generar el reporte.', 'warning');
       return;
     }
 
@@ -155,11 +137,13 @@ export default function Reports() {
     const url = `${import.meta.env.VITE_EFC_API_URL}/reports/control-pedimento/${params ? `?${params}` : ''}`;
     try {
       const res = await fetchWithAuth(url);
-      const data = await res.json();
+      if (!res.ok) {
-      if (!res.ok) throw new Error('Error al generar el reporte');
+        const errMsg = await extractApiError(res);
-      alert('Reporte solicitado correctamente. Aparecerá en el historial cuando esté listo.');
+        throw new Error(errMsg);
+      }
+      showMessage('Reporte solicitado correctamente. Aparecerá en el historial cuando esté listo.', 'success');
     } catch (err) {
-      alert('No se pudo generar el reporte.');
+      showMessage(err.message || 'No se pudo generar el reporte', 'error');
     }
   };
 
@@ -189,6 +173,31 @@ export default function Reports() {
   const isDebugMode = import.meta.env.VITE_DEBUG_MODE === 'true';
   const { showMessage } = useNotification();
 
+  const handleDownloadReport = async (reportId) => {
+    try {
+      const url = `${import.meta.env.VITE_EFC_API_URL}/reports/report-document-download/${reportId}/`;
+      const res = await fetchWithAuth(url);
+      if (!res.ok) {
+        const errMsg = await extractApiError(res);
+        throw new Error(errMsg);
+      }
+      const blob = await res.blob();
+      let filename = `reporte_${reportId}.csv`;
+      const disposition = res.headers.get('Content-Disposition');
+      if (disposition && disposition.includes('filename=')) {
+        filename = disposition.split('filename=')[1].replace(/"/g, '').trim();
+      }
+      const link = document.createElement('a');
+      link.href = window.URL.createObjectURL(blob);
+      link.download = filename;
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+    } catch (err) {
+      showMessage(err.message || 'No se pudo descargar el reporte', 'error');
+    }
+  };
+
   const [isExporting, setIsExporting] = useState(false);
   const [exportFormat, setExportFormat] = useState('excel');
   const [showExportSuccess, setShowExportSuccess] = useState(false);
@@ -198,6 +207,7 @@ export default function Reports() {
 
   const [organizaciones, setOrganizaciones] = useState([]);
   const [importadores, setImportadores] = useState([]);
+  const [rfcOptions, setRfcOptions] = useState([]);
 
   useEffect(() => {
     const fetchOrganizaciones = async () => {
@@ -241,6 +251,27 @@ export default function Reports() {
     pedimento: ''
   });
 
+  // Cargar RFCs cuando cambia la organización seleccionada en filtros globales
+  useEffect(() => {
+    const fetchRfcs = async () => {
+      if (!globalFilters.organizacion) {
+        setRfcOptions([]);
+        return;
+      }
+      try {
+        const url = `${import.meta.env.VITE_EFC_API_URL}/reports/exportmodel/datastage/?organizacion=${globalFilters.organizacion}`;
+        const res = await fetchWithAuth(url);
+        if (!res.ok) throw new Error('Error al obtener RFCs');
+        const data = await res.json();
+        setRfcOptions(data.rfcs || []);
+      } catch (err) {
+        console.error('Error fetching RFCs:', err);
+        setRfcOptions([]);
+      }
+    };
+    fetchRfcs();
+  }, [globalFilters.organizacion]);
+
   const renderGlobalFilters = () => (
     <div className="mb-6">
       <div className="bg-white rounded-xl shadow-lg overflow-hidden border border-blue-100">
@@ -269,16 +300,17 @@ export default function Reports() {
                   value={globalFilters.organizacion || ''}
                   onChange={(e) => setGlobalFilters(prev => ({
                     ...prev,
-                    organizacion: e.target.value
+                    organizacion: e.target.value,
+                    rfc: ''
                   }))}
                   className="block w-full rounded-lg border-gray-300 pl-3 pr-10 py-2.5 text-gray-900 placeholder-gray-500
                     focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 sm:text-sm
                     transition-all duration-200 bg-white appearance-none"
                 >
-                  <option value="">Todas las organizaciones</option>
+                  <option value="" disabled>Selecciona una organización</option>
                   {organizaciones.results && organizaciones.results.map(org => (
                     <option key={org.id} value={org.id}>
-                      {org.nombre} {/* Usar el campo 'nombre' que sí existe */}
+                      {org.nombre}
                     </option>
                   ))}
                 </select>
@@ -318,13 +350,11 @@ export default function Reports() {
                   }))}
                   className="w-full px-3 py-2 border border-green-300 rounded-md shadow-sm focus:ring-2 focus:ring-green-500 focus:border-green-500 transition-all duration-200 bg-white text-slate-900 text-sm font-mono uppercase"
                   style={{ textTransform: 'uppercase' }}
+                  disabled={!globalFilters.organizacion}
                 >
-                  <option value="" >Selecciona un RFC</option>
+                  <option value="">Todos los RFC</option>
-                  {importadores.filter(imp => {
+                  {rfcOptions.map(rfc => (
-                    if (!globalFilters.organizacion) return true;
+                    <option key={rfc} value={rfc}>{rfc}</option>
-                    return imp.organizacion === globalFilters.organizacion;
-                  }).map(imp => (
-                    <option key={imp.rfc} value={imp.rfc}>{imp.rfc}</option>
                   ))}
                 </select>
                 <div className="absolute inset-y-0 right-0 flex items-center pr-3 pointer-events-none">
@@ -807,7 +837,12 @@ export default function Reports() {
       .map(([modelo]) => modelo);
 
     if (modelosConCampos.length === 0) {
-      alert('Por favor selecciona al menos un campo en algún modelo');
+      showMessage('Por favor selecciona al menos un campo en algún modelo', 'error');
+      return;
+    }
+
+    if (!globalFilters.organizacion) {
+      showMessage('Debes seleccionar una organización antes de generar el reporte', 'error');
       return;
     }
 

src/pages/TableroAlmacenamiento.jsx

@@ -1,5 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import fetchWithAuth from '../fetchWithAuth';
+import { useNotification } from '../context/NotificationContext';
+import { extractApiError } from '../api/apiError';
 const initialFilters = {
   pedimento_app: '',
   aduana: '',
@@ -12,6 +14,7 @@ const initialFilters = {
   contribuyente__rfc: '',
 };
 export default function TableroAlmacenamiento() {
+  const { showMessage } = useNotification();
   const [filters, setFilters] = useState(initialFilters);
   const [summary, setSummary] = useState(null);
   const [isLoading, setIsLoading] = useState(false);
@@ -25,10 +28,13 @@ export default function TableroAlmacenamiento() {
         .join('&');
       const url = `${import.meta.env.VITE_EFC_API_URL}/reports/table-summary/${params ? `?${params}` : ''}`;
       const res = await fetchWithAuth(url, { method: 'POST' });
-      if (!res.ok) throw new Error('Error al generar el reporte');
+      if (!res.ok) {
-      alert('Reporte solicitado correctamente. Aparecerá en el historial cuando esté listo.');
+        const errMsg = await extractApiError(res);
+        throw new Error(errMsg);
+      }
+      showMessage('Reporte solicitado correctamente. Aparecerá en el historial cuando esté listo.', 'success');
     } catch (err) {
-      alert('No se pudo generar el reporte.');
+      showMessage(err.message || 'No se pudo generar el reporte', 'error');
     }
   };
 
@@ -36,7 +42,10 @@ export default function TableroAlmacenamiento() {
     try {
       const url = `${import.meta.env.VITE_EFC_API_URL}/reports/report-document-download/${reportId}/`;
       const res = await fetchWithAuth(url);
-      if (!res.ok) throw new Error('Error al descargar el reporte');
+      if (!res.ok) {
+        const errMsg = await extractApiError(res);
+        throw new Error(errMsg);
+      }
       const blob = await res.blob();
       let filename = `reporte_${reportId}.csv`;
       const disposition = res.headers.get('Content-Disposition');
@@ -50,7 +59,7 @@ export default function TableroAlmacenamiento() {
       link.click();
       document.body.removeChild(link);
     } catch (err) {
-      alert('No se pudo descargar el reporte.');
+      showMessage(err.message || 'No se pudo descargar el reporte', 'error');
     }
   };
 
@@ -64,9 +73,14 @@ export default function TableroAlmacenamiento() {
         .join('&');
       const url = `${import.meta.env.VITE_EFC_API_URL}/reports/dashboard/summary/${params ? `?${params}` : ''}`;
       const res = await fetchWithAuth(url);
+      if (!res.ok) {
+        const errMsg = await extractApiError(res);
+        throw new Error(errMsg);
+      }
       const data = await res.json();
       setSummary(data);
     } catch (err) {
+      showMessage(err.message || 'Error al cargar el resumen', 'error');
       setSummary(null);
     }
     setIsLoading(false);
@@ -82,6 +96,7 @@ export default function TableroAlmacenamiento() {
         const data = await res.json();
         setReports(data);
       } catch (err) {
+        showMessage(err.message || 'Error al cargar el historial de reportes', 'error');
         setReports([]);
       }
     };
@@ -147,7 +162,7 @@ export default function TableroAlmacenamiento() {
               <button
                 type="button"
                 className="bg-green-600 text-white px-4 py-2 rounded-md hover:bg-green-700 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2 transition-colors"
-                onClick={() => alert('Generar reporte (implementación pendiente)')}
+                onClick={handleGenerateReport}
               >
                 Generar Reporte
               </button>

src/pages/UserForm.jsx

@@ -0,0 +1,855 @@
+import React, { useEffect, useState } from 'react';
+import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
+import { createUser, updateUser } from '../api/users.ts';
+import { fetchRoles, fetchUserRoles, assignUserRole, revokeUserRole } from '../api/rbac';
+import { useNotification } from '../context/NotificationContext';
+
+const initialForm = {
+  username: '',
+  email: '',
+  first_name: '',
+  last_name: '',
+  password: '',
+  confirmPassword: '',
+  rfc: [],
+  userType: 'agente', // 'agente' | 'importador'
+  is_active: true,
+};
+
+export default function UserForm() {
+  const { id } = useParams();
+  const isEditing = Boolean(id);
+  const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  const { showMessage } = useNotification();
+
+  const initialType = searchParams.get('type') === 'importador' ? 'importador' : 'agente';
+
+  const [form, setForm] = useState({ ...initialForm, userType: initialType });
+  const [importadores, setImportadores] = useState([]);
+  const [submitting, setSubmitting] = useState(false);
+  const [loadingUser, setLoadingUser] = useState(isEditing);
+
+  // RBAC: roles disponibles de la organización
+  const [availableRoles, setAvailableRoles] = useState([]);
+  const [loadingRoles, setLoadingRoles] = useState(true);
+  // IDs de roles seleccionados en el formulario
+  const [selectedRoleIds, setSelectedRoleIds] = useState([]);
+  // Asignaciones actuales del usuario (para calcular diff en edición): [{ id, role }]
+  const [currentUserRoles, setCurrentUserRoles] = useState([]);
+
+  // Validación de contraseña
+  const [passwordValidation, setPasswordValidation] = useState({
+    length: false, uppercase: false, lowercase: false, number: false, special: false,
+  });
+  const [showPasswordValidation, setShowPasswordValidation] = useState(false);
+  const [showPassword, setShowPassword] = useState(false);
+  const [showConfirmPassword, setShowConfirmPassword] = useState(false);
+  const [passwordsMatch, setPasswordsMatch] = useState(true);
+  const [showPasswordMatchValidation, setShowPasswordMatchValidation] = useState(false);
+
+  // Inyectar animaciones
+  useEffect(() => {
+    if (typeof window !== 'undefined' && !document.getElementById('users-animations')) {
+      const style = document.createElement('style');
+      style.id = 'users-animations';
+      style.innerHTML = `
+        @keyframes fadeInUpUsers {
+          0% { opacity: 0; transform: translateY(32px); }
+          100% { opacity: 1; transform: translateY(0); }
+        }
+        .fade-in-up-users { animation: fadeInUpUsers 0.7s cubic-bezier(0.22, 1, 0.36, 1) both; }
+        @keyframes bounce-slow {
+          0%, 100% { transform: translateY(0); }
+          50% { transform: translateY(-8px); }
+        }
+        .animate-bounce-slow { animation: bounce-slow 2.2s infinite; }
+      `;
+      document.head.appendChild(style);
+    }
+  }, []);
+
+  // Cargar roles disponibles de la organización
+  useEffect(() => {
+    fetchRoles()
+      .then(data => {
+        const list = Array.isArray(data) ? data : (data?.results ?? []);
+        setAvailableRoles(list);
+        // Preselección por tipo inicial solo en creación
+        if (!isEditing) {
+          setSelectedRoleIds(getDefaultRoleIds(list, initialType));
+        }
+      })
+      .catch(err => {
+        showMessage(err.message || 'Error al cargar los perfiles disponibles', 'error');
+        setAvailableRoles([]);
+      })
+      .finally(() => setLoadingRoles(false));
+  }, []);
+
+  // Cargar importadores
+  useEffect(() => {
+    const access = localStorage.getItem('access');
+    if (!access) { window.location.href = '/login'; return; }
+    fetch(`${import.meta.env.VITE_EFC_API_URL}/customs/importadores/`, {
+      headers: { Authorization: `Bearer ${access}` },
+    })
+      .then(r => {
+        if (!r.ok) throw new Error(`Error ${r.status} al cargar importadores`);
+        return r.json();
+      })
+      .then(data => setImportadores(Array.isArray(data) ? data : []))
+      .catch(err => {
+        showMessage(err.message || 'Error al cargar el catálogo de importadores', 'error');
+        setImportadores([]);
+      });
+  }, []);
+
+  // Cargar datos del usuario si es edición
+  useEffect(() => {
+    if (!isEditing) return;
+    const access = localStorage.getItem('access');
+
+    Promise.all([
+      fetch(`${import.meta.env.VITE_EFC_API_URL}/user/users/${id}/`, {
+        headers: { Authorization: `Bearer ${access}` },
+      }).then(r => r.json()),
+      fetchUserRoles(id).catch(() => []),
+    ])
+      .then(([data, userRoles]) => {
+        const isImportador = data.is_importador === true;
+        setForm({
+          username: data.username || '',
+          email: data.email || '',
+          first_name: data.first_name || '',
+          last_name: data.last_name || '',
+          password: '',
+          confirmPassword: '',
+          rfc: Array.isArray(data.rfc) ? data.rfc : (data.rfc ? [data.rfc] : []),
+          userType: isImportador ? 'importador' : 'agente',
+          is_active: data.is_active !== false,
+        });
+
+        // user-roles respuesta: [{ id, user: {...}, role: { id, nombre, ... }, created_at }]
+        const normalized = (Array.isArray(userRoles) ? userRoles : (userRoles?.results ?? []))
+          .map(ur => ({
+            id: ur.id,
+            role: typeof ur.role === 'object' ? ur.role?.id : ur.role,
+          }))
+          .filter(ur => ur.role);
+
+        setCurrentUserRoles(normalized);
+        setSelectedRoleIds(normalized.map(ur => ur.role));
+        setLoadingUser(false);
+      })
+      .catch(() => {
+        showMessage('Error al cargar datos del usuario', 'error');
+        setLoadingUser(false);
+      });
+  }, [id, isEditing, showMessage]);
+
+  // Preseleccionar roles por defecto según tipo de usuario
+  function getDefaultRoleIds(roles, type) {
+    const keyword = type === 'importador' ? 'importador' : 'agente';
+    const matches = roles
+      .filter(r => r.nombre?.toLowerCase().includes(keyword))
+      .map(r => r.id);
+    return matches;
+  }
+
+  const validatePassword = (password) => {
+    const v = {
+      length: password.length >= 8,
+      uppercase: /[A-Z]/.test(password),
+      lowercase: /[a-z]/.test(password),
+      number: /\d/.test(password),
+      special: /[!@#$%^&*(),.?":{}|<>]/.test(password),
+    };
+    setPasswordValidation(v);
+    setShowPasswordValidation(password.length > 0);
+  };
+
+  const validatePasswordMatch = (password, confirm) => {
+    setPasswordsMatch(password === confirm);
+    setShowPasswordMatchValidation(confirm.length > 0);
+  };
+
+  const isPasswordValid = () => Object.values(passwordValidation).every(Boolean);
+
+  const isFormValid = () => {
+    if (!isEditing) {
+      return isPasswordValid() && passwordsMatch &&
+        form.password.length > 0 && form.confirmPassword.length > 0;
+    }
+    if (form.password.length > 0) {
+      return isPasswordValid() && passwordsMatch && form.confirmPassword.length > 0;
+    }
+    return true;
+  };
+
+  const handleChange = (e) => {
+    const { name, value } = e.target;
+    setForm(prev => ({ ...prev, [name]: value }));
+    if (name === 'password') {
+      validatePassword(value);
+      if (form.confirmPassword) validatePasswordMatch(value, form.confirmPassword);
+    }
+    if (name === 'confirmPassword') validatePasswordMatch(form.password, value);
+  };
+
+  const handleUserTypeChange = (type) => {
+    setForm(prev => ({
+      ...prev,
+      userType: type,
+      rfc: type === 'agente' ? [] : prev.rfc,
+    }));
+    // Preseleccionar roles según tipo
+    setSelectedRoleIds(getDefaultRoleIds(availableRoles, type));
+  };
+
+  const handleRoleToggle = (roleId) => {
+    setSelectedRoleIds(prev =>
+      prev.includes(roleId)
+        ? prev.filter(id => id !== roleId)
+        : [...prev, roleId]
+    );
+  };
+
+  const handleRfcToggle = (rfc) => {
+    setForm(prev => {
+      const current = Array.isArray(prev.rfc) ? prev.rfc : [];
+      const next = current.includes(rfc)
+        ? current.filter(r => r !== rfc)
+        : [...current, rfc];
+      return { ...prev, rfc: next };
+    });
+  };
+
+  // Sincronizar roles: calcular diff y llamar assign/revoke
+  const syncRoles = async (userId) => {
+    const currentRoleIds = currentUserRoles.map(ur => ur.role);
+    const toAdd = selectedRoleIds.filter(id => !currentRoleIds.includes(id));
+    const toRemove = currentUserRoles.filter(ur => !selectedRoleIds.includes(ur.role));
+
+    await Promise.all([
+      ...toAdd.map(roleId => assignUserRole(userId, roleId).catch(() => null)),
+      ...toRemove.map(ur => revokeUserRole(ur.id).catch(() => null)),
+    ]);
+  };
+
+  const handleSubmit = async (e) => {
+    e.preventDefault();
+    if (!isFormValid()) return;
+    setSubmitting(true);
+    try {
+      const payload = {
+        username: form.username,
+        email: form.email,
+        first_name: form.first_name,
+        last_name: form.last_name,
+        is_importador: form.userType === 'importador',
+        is_active: form.is_active,
+      };
+      if (form.userType === 'importador') {
+        payload.rfc = Array.isArray(form.rfc) ? form.rfc : [];
+      }
+      if (form.password) payload.password = form.password;
+
+      if (isEditing) {
+        await updateUser(id, payload);
+        await syncRoles(id);
+        showMessage('Usuario actualizado exitosamente', 'success');
+      } else {
+        const newUser = await createUser(payload);
+        const newUserId = newUser?.id;
+        if (newUserId && selectedRoleIds.length > 0) {
+          await Promise.all(
+            selectedRoleIds.map(roleId => assignUserRole(newUserId, roleId).catch(() => null))
+          );
+        }
+        showMessage('Usuario creado exitosamente', 'success');
+      }
+      navigate('/users');
+    } catch (err) {
+      showMessage(err.message, 'error');
+    } finally {
+      setSubmitting(false);
+    }
+  };
+
+  const isImportador = form.userType === 'importador';
+
+  if (loadingUser) {
+    return (
+      <div className="min-h-screen p-4 sm:p-6 bg-gradient-to-br from-gray-50 to-blue-50 flex items-center justify-center">
+        <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-600" />
+      </div>
+    );
+  }
+
+  return (
+    <div className="min-h-screen p-4 sm:p-6 bg-gradient-to-br from-gray-50 to-blue-50">
+      <div className="max-w-3xl mx-auto">
+
+        {/* Header */}
+        <div className="mb-8 relative overflow-hidden rounded-2xl shadow bg-gradient-to-r from-blue-600 via-blue-700 to-blue-800 border border-blue-200 p-6 sm:p-8 flex flex-col sm:flex-row items-start sm:items-center gap-4 sm:gap-6">
+          <div className="flex-shrink-0 bg-white/20 backdrop-blur-sm rounded-full p-3 sm:p-4 shadow-lg animate-bounce-slow">
+            <svg className="h-8 w-8 sm:h-10 sm:w-10 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
+            </svg>
+          </div>
+          <div className="flex-1">
+            <h1 className="text-2xl sm:text-3xl font-extrabold text-white tracking-tight mb-1">
+              {isEditing ? 'Editar Usuario' : 'Nuevo Usuario'}
+            </h1>
+            <p className="text-sm sm:text-base text-white/80 font-medium">
+              {isEditing ? 'Modifica los datos del usuario seleccionado' : 'Registro en el Sistema de Gestión de Usuarios'}
+            </p>
+          </div>
+          <button
+            type="button"
+            onClick={() => navigate('/users')}
+            className="flex-shrink-0 inline-flex items-center gap-2 px-4 py-2 bg-white/20 hover:bg-white/30 text-white text-sm font-medium rounded-lg border border-white/30 transition-all duration-200"
+          >
+            <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M10 19l-7-7m0 0l7-7m-7 7h18" />
+            </svg>
+            Regresar
+          </button>
+          <div className="absolute -top-10 -right-10 opacity-20 pointer-events-none select-none">
+            <svg width="120" height="120" viewBox="0 0 120 120" fill="none">
+              <circle cx="60" cy="60" r="50" fill="white" fillOpacity="0.15" />
+            </svg>
+          </div>
+        </div>
+
+        <form onSubmit={handleSubmit} className="space-y-6">
+
+          {/* Tipo de usuario — solo en creación */}
+          {!isEditing && (
+            <div className="bg-white rounded-2xl shadow-lg border border-gray-100 p-6 fade-in-up-users">
+              <div className="flex items-center mb-4 pb-3 border-b border-gray-200">
+                <div className="bg-purple-600 rounded-lg p-2 mr-3 shadow-sm">
+                  <svg className="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M8 9l4-4 4 4m0 6l-4 4-4-4" />
+                  </svg>
+                </div>
+                <div>
+                  <h4 className="text-sm font-semibold text-slate-800">Tipo de Usuario</h4>
+                  <p className="text-xs text-slate-500">Define el rol principal del nuevo usuario</p>
+                </div>
+              </div>
+              <div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+                <button
+                  type="button"
+                  onClick={() => handleUserTypeChange('agente')}
+                  className={`relative flex flex-col items-start p-4 rounded-xl border-2 transition-all duration-200 ${
+                    !isImportador
+                      ? 'border-blue-500 bg-blue-50 shadow-md'
+                      : 'border-gray-200 bg-white hover:border-blue-300 hover:bg-blue-50/50'
+                  }`}
+                >
+                  <div className={`w-10 h-10 rounded-lg flex items-center justify-center mb-3 ${!isImportador ? 'bg-blue-600' : 'bg-gray-200'}`}>
+                    <svg className={`w-5 h-5 ${!isImportador ? 'text-white' : 'text-gray-500'}`} fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
+                    </svg>
+                  </div>
+                  <span className={`text-sm font-semibold ${!isImportador ? 'text-blue-800' : 'text-gray-700'}`}>Agente Aduanal</span>
+                  <span className="text-xs text-gray-500 mt-1">Gestión de trámites aduaneros</span>
+                  {!isImportador && (
+                    <div className="absolute top-3 right-3 w-5 h-5 bg-blue-600 rounded-full flex items-center justify-center">
+                      <svg className="w-3 h-3 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M5 13l4 4L19 7" />
+                      </svg>
+                    </div>
+                  )}
+                </button>
+                <button
+                  type="button"
+                  onClick={() => handleUserTypeChange('importador')}
+                  className={`relative flex flex-col items-start p-4 rounded-xl border-2 transition-all duration-200 ${
+                    isImportador
+                      ? 'border-blue-500 bg-blue-50 shadow-md'
+                      : 'border-gray-200 bg-white hover:border-blue-300 hover:bg-blue-50/50'
+                  }`}
+                >
+                  <div className={`w-10 h-10 rounded-lg flex items-center justify-center mb-3 ${isImportador ? 'bg-blue-600' : 'bg-gray-200'}`}>
+                    <svg className={`w-5 h-5 ${isImportador ? 'text-white' : 'text-gray-500'}`} fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 21V5a2 2 0 00-2-2H7a2 2 0 00-2 2v16m14 0h2m-2 0h-5m-9 0H3m2 0h5M9 7h1m-1 4h1m4-4h1m-1 4h1m-5 10v-5a1 1 0 011-1h2a1 1 0 011 1v5m-4 0h4" />
+                    </svg>
+                  </div>
+                  <span className={`text-sm font-semibold ${isImportador ? 'text-blue-800' : 'text-gray-700'}`}>Importador</span>
+                  <span className="text-xs text-gray-500 mt-1">Empresa con RFCs asociados</span>
+                  {isImportador && (
+                    <div className="absolute top-3 right-3 w-5 h-5 bg-blue-600 rounded-full flex items-center justify-center">
+                      <svg className="w-3 h-3 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M5 13l4 4L19 7" />
+                      </svg>
+                    </div>
+                  )}
+                </button>
+              </div>
+            </div>
+          )}
+
+          {/* Información Personal */}
+          <div className="bg-white rounded-2xl shadow-lg border border-gray-100 p-6 fade-in-up-users" style={{ animationDelay: '0.05s' }}>
+            <div className="flex items-center mb-4 pb-3 border-b border-gray-200">
+              <div className="bg-blue-600 rounded-lg p-2 mr-3 shadow-sm">
+                <svg className="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
+                </svg>
+              </div>
+              <div>
+                <h4 className="text-sm font-semibold text-slate-800">Información Personal</h4>
+                <p className="text-xs text-slate-500">Datos de identificación del usuario</p>
+              </div>
+            </div>
+            <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
+              <div className="space-y-1">
+                <label className="block text-xs font-semibold text-slate-700">
+                  Nombre de usuario <span className="text-red-600">*</span>
+                </label>
+                <input
+                  type="text"
+                  name="username"
+                  value={form.username}
+                  onChange={handleChange}
+                  required
+                  className="w-full px-3 py-2 border border-slate-300 rounded-md shadow-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-all duration-200 bg-white text-slate-900 placeholder-slate-400 text-sm"
+                  placeholder="nombre_usuario"
+                />
+              </div>
+              <div className="space-y-1">
+                <label className="block text-xs font-semibold text-slate-700">
+                  Correo electrónico <span className="text-red-600">*</span>
+                </label>
+                <input
+                  type="email"
+                  name="email"
+                  value={form.email}
+                  onChange={handleChange}
+                  required
+                  className="w-full px-3 py-2 border border-slate-300 rounded-md shadow-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-all duration-200 bg-white text-slate-900 placeholder-slate-400 text-sm"
+                  placeholder="usuario@ejemplo.com"
+                />
+              </div>
+              <div className="space-y-1">
+                <label className="block text-xs font-semibold text-slate-700">Nombre</label>
+                <input
+                  type="text"
+                  name="first_name"
+                  value={form.first_name}
+                  onChange={handleChange}
+                  className="w-full px-3 py-2 border border-slate-300 rounded-md shadow-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-all duration-200 bg-white text-slate-900 placeholder-slate-400 text-sm"
+                  placeholder="Nombre del usuario"
+                />
+              </div>
+              <div className="space-y-1">
+                <label className="block text-xs font-semibold text-slate-700">Apellido</label>
+                <input
+                  type="text"
+                  name="last_name"
+                  value={form.last_name}
+                  onChange={handleChange}
+                  className="w-full px-3 py-2 border border-slate-300 rounded-md shadow-sm focus:ring-2 focus:ring-blue-500 focus:border-blue-500 transition-all duration-200 bg-white text-slate-900 placeholder-slate-400 text-sm"
+                  placeholder="Apellido del usuario"
+                />
+              </div>
+            </div>
+          </div>
+
+          {/* RFC — solo para importadores */}
+          {isImportador && (
+            <div className="bg-white rounded-2xl shadow-lg border border-blue-100 p-6 fade-in-up-users" style={{ animationDelay: '0.1s' }}>
+              <div className="flex items-center mb-4 pb-3 border-b border-blue-200">
+                <div className="bg-blue-700 rounded-lg p-2 mr-3 shadow-sm">
+                  <svg className="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12h6m-6 4h6m2 5H7a2 2 0 01-2-2V5a2 2 0 012-2h5.586a1 1 0 01.707.293l5.414 5.414a1 1 0 01.293.707V19a2 2 0 01-2 2z" />
+                  </svg>
+                </div>
+                <div>
+                  <h4 className="text-sm font-semibold text-slate-800">Información Fiscal</h4>
+                  <p className="text-xs text-slate-500">RFCs de importadores asociados al usuario (puede ser más de uno)</p>
+                </div>
+              </div>
+              {importadores.length === 0 ? (
+                <p className="text-sm text-gray-500 italic">No hay importadores disponibles en el catálogo.</p>
+              ) : (
+                <div className="flex flex-col sm:flex-row gap-3 items-stretch">
+                  {/* Columna izquierda — disponibles */}
+                  <div className="flex-1 flex flex-col min-w-0">
+                    <div className="flex items-center justify-between mb-1.5">
+                      <span className="text-xs font-semibold text-slate-600 uppercase tracking-wide">Disponibles</span>
+                      <span className="text-xs text-slate-400 font-mono">
+                        {importadores.filter(imp => !(Array.isArray(form.rfc) && form.rfc.includes(imp.rfc))).length}
+                      </span>
+                    </div>
+                    <div className="border border-slate-200 rounded-xl bg-slate-50 overflow-hidden flex flex-col" style={{ minHeight: '200px', maxHeight: '280px' }}>
+                      <div className="overflow-y-auto flex-1">
+                        {importadores.filter(imp => !(Array.isArray(form.rfc) && form.rfc.includes(imp.rfc))).length === 0 ? (
+                          <div className="flex items-center justify-center h-full py-8 text-xs text-slate-400 italic">
+                            Todos los RFC han sido asignados
+                          </div>
+                        ) : (
+                          importadores
+                            .filter(imp => !(Array.isArray(form.rfc) && form.rfc.includes(imp.rfc)))
+                            .map(imp => (
+                              <div
+                                key={imp.rfc}
+                                onDoubleClick={() => handleRfcToggle(imp.rfc)}
+                                className="flex items-center justify-between px-3 py-2 border-b border-slate-100 last:border-b-0 text-xs font-mono text-slate-700 hover:bg-blue-50 hover:text-blue-800 cursor-pointer select-none group transition-colors duration-100"
+                                title="Doble clic para agregar"
+                              >
+                                <span className="uppercase truncate">{imp.rfc}</span>
+                                <svg className="w-3.5 h-3.5 text-slate-300 group-hover:text-blue-400 flex-shrink-0 ml-2 transition-colors" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 5l7 7-7 7" />
+                                </svg>
+                              </div>
+                            ))
+                        )}
+                      </div>
+                    </div>
+                  </div>
+
+                  {/* Botones centrales */}
+                  <div className="flex sm:flex-col items-center justify-center gap-2 py-2 sm:py-0">
+                    <button
+                      type="button"
+                      title="Agregar todos"
+                      onClick={() => setForm(prev => ({ ...prev, rfc: importadores.map(i => i.rfc) }))}
+                      className="w-8 h-8 rounded-lg border border-slate-300 bg-white hover:bg-blue-50 hover:border-blue-400 flex items-center justify-center transition-colors shadow-sm"
+                    >
+                      <svg className="w-4 h-4 text-slate-500 hover:text-blue-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 5l7 7-7 7M5 5l7 7-7 7" />
+                      </svg>
+                    </button>
+                    <button
+                      type="button"
+                      title="Quitar todos"
+                      onClick={() => setForm(prev => ({ ...prev, rfc: [] }))}
+                      className="w-8 h-8 rounded-lg border border-slate-300 bg-white hover:bg-red-50 hover:border-red-400 flex items-center justify-center transition-colors shadow-sm"
+                    >
+                      <svg className="w-4 h-4 text-slate-500 hover:text-red-500" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M11 19l-7-7 7-7m8 14l-7-7 7-7" />
+                      </svg>
+                    </button>
+                  </div>
+
+                  {/* Columna derecha — seleccionados */}
+                  <div className="flex-1 flex flex-col min-w-0">
+                    <div className="flex items-center justify-between mb-1.5">
+                      <span className="text-xs font-semibold text-blue-700 uppercase tracking-wide">Asignados</span>
+                      <span className="text-xs text-blue-500 font-mono font-semibold">
+                        {Array.isArray(form.rfc) ? form.rfc.length : 0}
+                      </span>
+                    </div>
+                    <div className="border border-blue-200 rounded-xl bg-blue-50/40 overflow-hidden flex flex-col" style={{ minHeight: '200px', maxHeight: '280px' }}>
+                      <div className="overflow-y-auto flex-1">
+                        {!Array.isArray(form.rfc) || form.rfc.length === 0 ? (
+                          <div className="flex items-center justify-center h-full py-8 text-xs text-slate-400 italic">
+                            Sin RFC asignados
+                          </div>
+                        ) : (
+                          form.rfc.map(r => (
+                            <div
+                              key={r}
+                              onDoubleClick={() => handleRfcToggle(r)}
+                              className="flex items-center justify-between px-3 py-2 border-b border-blue-100 last:border-b-0 text-xs font-mono text-blue-800 hover:bg-red-50 hover:text-red-700 cursor-pointer select-none group transition-colors duration-100"
+                              title="Doble clic para quitar"
+                            >
+                              <svg className="w-3.5 h-3.5 text-blue-300 group-hover:text-red-400 flex-shrink-0 mr-2 transition-colors" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15 19l-7-7 7-7" />
+                              </svg>
+                              <span className="uppercase truncate flex-1">{r}</span>
+                            </div>
+                          ))
+                        )}
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              )}
+            </div>
+          )}
+
+          {/* Perfiles RBAC */}
+          <div className="bg-white rounded-2xl shadow-lg border border-gray-100 p-6 fade-in-up-users" style={{ animationDelay: '0.15s' }}>
+            <div className="flex items-center justify-between mb-4 pb-3 border-b border-gray-200">
+              <div className="flex items-center">
+                <div className="bg-indigo-600 rounded-lg p-2 mr-3 shadow-sm">
+                  <svg className="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" />
+                  </svg>
+                </div>
+                <div>
+                  <h4 className="text-sm font-semibold text-slate-800">Perfiles</h4>
+                  <p className="text-xs text-slate-500">
+                    Asigna los perfiles que tendrá este usuario en la organización
+                  </p>
+                </div>
+              </div>
+              {selectedRoleIds.length > 0 && (
+                <span className="text-xs text-indigo-600 font-semibold bg-indigo-50 px-2 py-0.5 rounded-full border border-indigo-200">
+                  {selectedRoleIds.length} seleccionado{selectedRoleIds.length !== 1 ? 's' : ''}
+                </span>
+              )}
+            </div>
+
+            {loadingRoles ? (
+              <div className="flex items-center justify-center py-8">
+                <div className="animate-spin rounded-full h-6 w-6 border-b-2 border-indigo-600" />
+              </div>
+            ) : availableRoles.length === 0 ? (
+              <div className="text-center py-8 text-slate-400">
+                <svg className="w-8 h-8 mx-auto mb-2 opacity-40" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12l2 2 4-4m5.618-4.016A11.955 11.955 0 0112 2.944a11.955 11.955 0 01-8.618 3.04A12.02 12.02 0 003 9c0 5.591 3.824 10.29 9 11.622 5.176-1.332 9-6.03 9-11.622 0-1.042-.133-2.052-.382-3.016z" />
+                </svg>
+                <p className="text-xs">No hay perfiles disponibles en la organización</p>
+              </div>
+            ) : (
+              <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3">
+                {availableRoles.map(role => {
+                  const active = selectedRoleIds.includes(role.id);
+                  return (
+                    <button
+                      key={role.id}
+                      type="button"
+                      onClick={() => handleRoleToggle(role.id)}
+                      className={`relative flex flex-col items-start p-3 rounded-xl border-2 text-left transition-all duration-200 ${
+                        active
+                          ? 'border-indigo-500 bg-indigo-50'
+                          : 'border-gray-200 bg-white hover:border-indigo-300 hover:bg-indigo-50/40'
+                      }`}
+                    >
+                      <div className="flex items-center gap-2 w-full">
+                        <div className={`w-6 h-6 rounded-md flex items-center justify-center flex-shrink-0 ${active ? 'bg-indigo-600' : 'bg-gray-100'}`}>
+                          {role.is_admin_role ? (
+                            <svg className={`w-3.5 h-3.5 ${active ? 'text-white' : 'text-amber-500'}`} fill="currentColor" viewBox="0 0 24 24">
+                              <path d="M12 2l2.09 6.26L20 10l-5 4.87L16.18 22 12 18.77 7.82 22 9 14.87 4 10l5.91-1.74z" />
+                            </svg>
+                          ) : (
+                            <svg className={`w-3.5 h-3.5 ${active ? 'text-white' : 'text-gray-400'}`} fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M16 7a4 4 0 11-8 0 4 4 0 018 0zM12 14a7 7 0 00-7 7h14a7 7 0 00-7-7z" />
+                            </svg>
+                          )}
+                        </div>
+                        <span className={`text-xs font-semibold truncate flex-1 ${active ? 'text-indigo-800' : 'text-gray-700'}`}>
+                          {role.nombre}
+                        </span>
+                      </div>
+                      {role.is_admin_role && (
+                        <span className="mt-1.5 text-xs text-amber-600 font-medium">Administrador</span>
+                      )}
+                      {active && (
+                        <div className="absolute top-2 right-2 w-4 h-4 bg-indigo-600 rounded-full flex items-center justify-center">
+                          <svg className="w-2.5 h-2.5 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M5 13l4 4L19 7" />
+                          </svg>
+                        </div>
+                      )}
+                    </button>
+                  );
+                })}
+              </div>
+            )}
+          </div>
+
+          {/* Credenciales */}
+          <div className="bg-white rounded-2xl shadow-lg border border-gray-100 p-6 fade-in-up-users" style={{ animationDelay: '0.2s' }}>
+            <div className="flex items-center mb-4 pb-3 border-b border-gray-200">
+              <div className="bg-red-600 rounded-lg p-2 mr-3 shadow-sm">
+                <svg className="w-4 h-4 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                  <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z" />
+                </svg>
+              </div>
+              <div>
+                <h4 className="text-sm font-semibold text-slate-800">Credenciales de Acceso</h4>
+                <p className="text-xs text-slate-500">
+                  {isEditing ? 'Deja en blanco para mantener la contraseña actual' : 'Configura la contraseña de acceso'}
+                </p>
+              </div>
+            </div>
+            <div className="space-y-4">
+
+              {/* Estado */}
+              <div className="flex items-center justify-between p-3 rounded-xl border border-slate-200 bg-slate-50">
+                <div className="flex items-center gap-3">
+                  <div className={`w-8 h-8 rounded-lg flex items-center justify-center flex-shrink-0 ${form.is_active ? 'bg-blue-100' : 'bg-slate-200'}`}>
+                    <svg className={`w-4 h-4 ${form.is_active ? 'text-blue-600' : 'text-slate-400'}`} fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d={form.is_active ? 'M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z' : 'M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636'} />
+                    </svg>
+                  </div>
+                  <div>
+                    <p className="text-xs font-semibold text-slate-700">Estado de la cuenta</p>
+                    <p className={`text-xs ${form.is_active ? 'text-blue-600' : 'text-slate-400'}`}>
+                      {form.is_active ? 'Activo — el usuario puede iniciar sesión' : 'Inactivo — acceso bloqueado'}
+                    </p>
+                  </div>
+                </div>
+                <button
+                  type="button"
+                  onClick={() => setForm(prev => ({ ...prev, is_active: !prev.is_active }))}
+                  className={`relative inline-flex h-6 w-11 flex-shrink-0 rounded-full border-2 border-transparent transition-colors duration-200 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2 ${form.is_active ? 'bg-blue-600' : 'bg-slate-300'}`}
+                  role="switch"
+                  aria-checked={form.is_active}
+                >
+                  <span className={`pointer-events-none inline-block h-5 w-5 rounded-full bg-white shadow ring-0 transition-transform duration-200 ${form.is_active ? 'translate-x-5' : 'translate-x-0'}`} />
+                </button>
+              </div>
+
+              {/* Contraseña */}
+              <div className="space-y-1">
+                <label className="block text-xs font-semibold text-slate-700">
+                  Contraseña {!isEditing && <span className="text-red-600">*</span>}
+                </label>
+                <div className="relative">
+                  <input
+                    type={showPassword ? 'text' : 'password'}
+                    name="password"
+                    value={form.password}
+                    onChange={handleChange}
+                    required={!isEditing}
+                    className={`w-full px-3 py-2 pr-10 border rounded-md shadow-sm focus:ring-2 transition-all duration-200 bg-white text-slate-900 placeholder-slate-400 text-sm ${
+                      showPasswordValidation && isPasswordValid()
+                        ? 'border-green-300 focus:ring-green-500 focus:border-green-500'
+                        : showPasswordValidation
+                        ? 'border-red-300 focus:ring-red-500 focus:border-red-500'
+                        : 'border-slate-300 focus:ring-red-500 focus:border-red-500'
+                    }`}
+                    placeholder={isEditing ? 'Dejar vacío para mantener actual' : 'Contraseña segura del usuario'}
+                  />
+                  <button
+                    type="button"
+                    onClick={() => setShowPassword(v => !v)}
+                    className="absolute inset-y-0 right-0 flex items-center pr-3 text-slate-400 hover:text-slate-600"
+                  >
+                    {showPassword ? (
+                      <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.878 9.878L8.464 8.464m1.414 1.414L21.536 21.536" />
+                      </svg>
+                    ) : (
+                      <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
+                      </svg>
+                    )}
+                  </button>
+                </div>
+                {showPasswordValidation && (
+                  <div className="mt-3 p-3 bg-slate-100 rounded-lg border">
+                    <div className="flex items-center justify-between mb-2">
+                      <span className="text-xs font-semibold text-slate-700">Requisitos de contraseña:</span>
+                      {isPasswordValid() && (
+                        <div className="flex items-center text-green-600">
+                          <svg className="w-4 h-4 mr-1" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z" />
+                          </svg>
+                          <span className="text-xs font-medium">Válida</span>
+                        </div>
+                      )}
+                    </div>
+                    <div className="grid grid-cols-1 sm:grid-cols-2 gap-2">
+                      {[
+                        { key: 'length', label: 'Mínimo 8 caracteres' },
+                        { key: 'uppercase', label: 'Una letra mayúscula' },
+                        { key: 'lowercase', label: 'Una letra minúscula' },
+                        { key: 'number', label: 'Un número' },
+                        { key: 'special', label: 'Un carácter especial (!@#$%^&*)', span: true },
+                      ].map(({ key, label, span }) => (
+                        <div key={key} className={`flex items-center text-xs ${passwordValidation[key] ? 'text-green-600' : 'text-red-500'} ${span ? 'sm:col-span-2' : ''}`}>
+                          <svg className="w-3 h-3 mr-1.5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d={passwordValidation[key] ? 'M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z' : 'M6 18L18 6M6 6l12 12'} />
+                          </svg>
+                          {label}
+                        </div>
+                      ))}
+                    </div>
+                  </div>
+                )}
+              </div>
+
+              {/* Confirmar contraseña */}
+              <div className="space-y-1">
+                <label className="block text-xs font-semibold text-slate-700">
+                  Confirmar Contraseña {!isEditing && <span className="text-red-600">*</span>}
+                </label>
+                <div className="relative">
+                  <input
+                    type={showConfirmPassword ? 'text' : 'password'}
+                    name="confirmPassword"
+                    value={form.confirmPassword}
+                    onChange={handleChange}
+                    required={!isEditing}
+                    className={`w-full px-3 py-2 pr-10 border rounded-md shadow-sm focus:ring-2 transition-all duration-200 bg-white text-slate-900 placeholder-slate-400 text-sm ${
+                      showPasswordMatchValidation && passwordsMatch && form.confirmPassword.length > 0
+                        ? 'border-green-300 focus:ring-green-500 focus:border-green-500'
+                        : showPasswordMatchValidation && !passwordsMatch
+                        ? 'border-red-300 focus:ring-red-500 focus:border-red-500'
+                        : 'border-slate-300 focus:ring-red-500 focus:border-red-500'
+                    }`}
+                    placeholder="Confirme la contraseña"
+                  />
+                  <button
+                    type="button"
+                    onClick={() => setShowConfirmPassword(v => !v)}
+                    className="absolute inset-y-0 right-0 flex items-center pr-3 text-slate-400 hover:text-slate-600"
+                  >
+                    {showConfirmPassword ? (
+                      <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13.875 18.825A10.05 10.05 0 0112 19c-4.478 0-8.268-2.943-9.543-7a9.97 9.97 0 011.563-3.029m5.858.908a3 3 0 114.243 4.243M9.878 9.878l4.242 4.242M9.878 9.878L8.464 8.464m1.414 1.414L21.536 21.536" />
+                      </svg>
+                    ) : (
+                      <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M2.458 12C3.732 7.943 7.523 5 12 5c4.478 0 8.268 2.943 9.542 7-1.274 4.057-5.064 7-9.542 7-4.477 0-8.268-2.943-9.542-7z" />
+                      </svg>
+                    )}
+                  </button>
+                </div>
+                {showPasswordMatchValidation && (
+                  <div className={`mt-2 flex items-center text-xs ${passwordsMatch ? 'text-green-600' : 'text-red-500'}`}>
+                    <svg className="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d={passwordsMatch ? 'M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z' : 'M6 18L18 6M6 6l12 12'} />
+                    </svg>
+                    <span className="font-medium">
+                      {passwordsMatch ? 'Las contraseñas coinciden' : 'Las contraseñas no coinciden'}
+                    </span>
+                  </div>
+                )}
+              </div>
+            </div>
+          </div>
+
+          {/* Botones */}
+          <div className="flex flex-col sm:flex-row justify-end gap-3 pb-8 fade-in-up-users" style={{ animationDelay: '0.25s' }}>
+            <button
+              type="button"
+              onClick={() => navigate('/users')}
+              disabled={submitting}
+              className="w-full sm:w-auto px-6 py-2.5 border border-slate-300 rounded-lg shadow-sm text-sm font-semibold text-slate-700 bg-white hover:bg-slate-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-slate-500 transition-all duration-200 disabled:opacity-50"
+            >
+              Cancelar
+            </button>
+            <button
+              type="submit"
+              disabled={submitting || (showPasswordValidation && !isFormValid())}
+              className="w-full sm:w-auto px-6 py-2.5 border border-transparent rounded-lg shadow-lg text-sm font-semibold text-white bg-gradient-to-r from-blue-700 to-blue-900 hover:from-blue-800 hover:to-blue-950 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 transition-all duration-200 flex items-center justify-center gap-2 disabled:opacity-50 disabled:cursor-not-allowed"
+            >
+              {submitting && <div className="animate-spin rounded-full h-4 w-4 border-b-2 border-white" />}
+              <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d={isEditing ? 'M5 13l4 4L19 7' : 'M12 6v6m0 0v6m0-6h6m-6 0H6'} />
+              </svg>
+              <span>
+                {submitting
+                  ? (isEditing ? 'Actualizando...' : 'Creando...')
+                  : (isEditing ? 'Actualizar Usuario' : 'Crear Usuario')}
+              </span>
+            </button>
+          </div>
+
+        </form>
+      </div>
+    </div>
+  );
+}

src/pages/Users.jsx

@@ -1,4 +1,5 @@
 import React, { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
 import { fetchUsers, createUser, updateUser, deleteUser, getCurrentUser } from '../api/users.ts';
 import { useNotification } from '../context/NotificationContext';
 
@@ -47,6 +48,7 @@ export default function Users() {
   const [currentPage, setCurrentPage] = useState(1);
   const [itemsPerPage, setItemsPerPage] = useState(10);
   const { showMessage } = useNotification();
+  const navigate = useNavigate();
 
   // Estados para validación de contraseña
   const [passwordValidation, setPasswordValidation] = useState({
@@ -70,8 +72,8 @@ export default function Users() {
         setLoading(false);
       })
       .catch(err => {
-        console.error('Error loading users:', err);
+        setError(err.message);
-        setError('Error al cargar usuarios');
+        showMessage(err.message, 'error');
         setLoading(false);
       });
   };
@@ -97,7 +99,6 @@ export default function Users() {
     // Siempre sincroniza la información del usuario autenticado en localStorage
     getCurrentUser()
       .then(data => {
-        console.log('Respuesta de /api/users/me/:', data);
         if (data && data.username) {
           localStorage.setItem('username', data.username);
           if (data.email) localStorage.setItem('user_email', data.email);
@@ -106,14 +107,10 @@ export default function Users() {
           if (data.first_name) localStorage.setItem('user_first_name', data.first_name);
           if (data.last_name) localStorage.setItem('user_last_name', data.last_name);
           if (typeof data.is_importador !== 'undefined') localStorage.setItem('user_is_importador', String(data.is_importador));
-          console.log('Guardado en localStorage: username', data.username);
-        } else {
-          console.log('No se encontró username en la respuesta');
         }
       })
-      .catch((err) => { console.log('Error en fetch /api/users/me/', err); });
+      .catch(() => {});
-    // eslint-disable-next-line
+  }, []);
-  }, [showMessage]);
 
   // Debounce para el término de búsqueda
   useEffect(() => {
@@ -354,26 +351,6 @@ export default function Users() {
     );
   }
 
-  if (error) {
-    return (
-      <div className="bg-red-50 border border-red-200 rounded-md p-4">
-        <div className="flex">
-          <div className="flex-shrink-0">
-            <svg className="h-5 w-5 text-red-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-2.5L13.732 4c-.77-.833-1.964-.833-2.732 0L4.082 16.5c-.77.833.192 2.5 1.732 2.5z" />
-            </svg>
-          </div>
-          <div className="ml-3">
-            <h3 className="text-sm font-medium text-red-800">Error al cargar usuarios</h3>
-            <div className="mt-2 text-sm text-red-700">
-              <p>{error}</p>
-            </div>
-          </div>
-        </div>
-      </div>
-    );
-  }
-
   // Cuenta de usuarios verificados y activos
   const verifiedCount = users.filter(u => u.is_verified === true).length;
   const activeCount = users.filter(u => u.is_active === true).length;
@@ -552,44 +529,17 @@ export default function Users() {
               </div>
               <div className="flex flex-col sm:flex-row gap-2 sm:gap-3">
                 <button
-                  onClick={() => { setShowCreateModal(true); setCreateType('agente'); }}
+                  onClick={() => navigate('/users/new')}
                   type="button"
                   className="inline-flex items-center justify-center px-4 py-2 border border-transparent rounded-lg shadow-sm text-sm font-medium text-white bg-gradient-to-r from-blue-600 to-blue-700 hover:from-blue-700 hover:to-blue-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 transition-all duration-200 transform hover:scale-105"
                 >
                   <svg className="-ml-1 mr-2 h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" />
                   </svg>
-                  <span className="hidden sm:inline">Nuevo Agente</span>
+                  <span className="hidden sm:inline">Nuevo Usuario</span>
-                  <span className="sm:hidden">Agente</span>
+                  <span className="sm:hidden">Usuario</span>
-                </button>
-                <button
-                  onClick={async () => {
-                    setCreateType('importador');
-                    // Fetch importadores RFC
-                    try {
-                      const res = await fetch(`${import.meta.env.VITE_EFC_API_URL}/customs/importadores/`, { method: 'GET', headers: { 'Authorization': `Bearer ${localStorage.getItem('access')}` } });
-                      const data = await res.json();
-                      if (Array.isArray(data)) {
-                        setImportadores(data);
-                      } else {
-                        setImportadores([]);
-                      }
-                    } catch {
-                      setImportadores([]);
-                    }
-                    setShowCreateModal(true);
-                  }}
-                  type="button"
-                  className="inline-flex items-center justify-center px-4 py-2 border border-transparent rounded-lg shadow-sm text-sm font-medium text-white bg-gradient-to-r from-green-600 to-green-700 hover:from-green-700 hover:to-green-800 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-green-500 transition-all duration-200 transform hover:scale-105"
-                >
-                  <svg className="-ml-1 mr-2 h-5 w-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
-                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 6v6m0 0v6m0-6h6m-6 0H6" />
-                  </svg>
-                  <span className="hidden sm:inline">Nuevo Importador</span>
-                  <span className="sm:hidden">Importador</span>
                 </button>
               </div>
-              {/* Modal para crear usuario (agente o importador) eliminado */}
             </div>
 
             {/* Filtros avanzados */}
@@ -777,6 +727,16 @@ export default function Users() {
                         </td>
                         <td className="px-6 py-4 whitespace-nowrap text-center">
                           <div className="flex justify-center space-x-2">
+                            <button
+                              onClick={() => navigate(`/users/${user.id}/edit`)}
+                              className="inline-flex items-center px-3 py-1.5 border border-blue-300 shadow-sm text-xs font-medium rounded-lg text-blue-700 bg-white hover:bg-blue-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 transition-all duration-200 transform hover:scale-105"
+                              title="Editar usuario"
+                            >
+                              <svg className="w-4 h-4 mr-1.5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                                <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+                              </svg>
+                              Editar
+                            </button>
                             <button
                               onClick={() => { setShowDeleteModal(true); setUserToDelete(user); }}
                               disabled={user.username === localStorage.getItem('username')}
@@ -874,6 +834,16 @@ export default function Users() {
                         <div className="text-xs text-gray-500 mt-1">ID: {user.id}</div>
                       </div>
                     </div>
+                    <div className="flex items-center gap-2">
+                      <button
+                        onClick={() => navigate(`/users/${user.id}/edit`)}
+                        className="inline-flex items-center px-3 py-2 border border-blue-300 shadow-sm text-xs font-medium rounded-lg text-blue-700 bg-white hover:bg-blue-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500 transition-all duration-200"
+                        title="Editar usuario"
+                      >
+                        <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                          <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
+                        </svg>
+                      </button>
                       <button
                         onClick={() => { setShowDeleteModal(true); setUserToDelete(user); }}
                         disabled={user.username === localStorage.getItem('username')}
@@ -885,6 +855,7 @@ export default function Users() {
                         </svg>
                       </button>
                     </div>
+                  </div>
                   <div className="grid grid-cols-2 gap-4 text-xs">
                     <div>
                       <span className="font-medium text-gray-500">Estado:</span>

src/pages/Vucem.jsx

@@ -2,6 +2,7 @@
 function RelacionarImportadoresModal({ open, onClose, vucem }) {
   const [importadoresDisponibles, setImportadoresDisponibles] = React.useState([]);
   const [importadoresSeleccionados, setImportadoresSeleccionados] = React.useState([]);
+  const { showMessage } = useNotification();
 
   React.useEffect(() => {
     if (!open || !vucem) return;
@@ -50,7 +51,10 @@ function RelacionarImportadoresModal({ open, onClose, vucem }) {
           body: JSON.stringify(body)
         }
       );
-      if (!res.ok) throw new Error('Error al relacionar importador');
+      if (!res.ok) {
+        const errMsg = await extractApiError(res);
+        throw new Error(errMsg);
+      }
       const data = await res.json();
       // Guardar el id de la relación en el importador seleccionado
       const impConRelacion = {
@@ -61,7 +65,7 @@ function RelacionarImportadoresModal({ open, onClose, vucem }) {
       setImportadoresDisponibles(importadoresDisponibles.filter(i => i.rfc !== imp.rfc));
       setImportadoresSeleccionados([...importadoresSeleccionados, impConRelacion]);
     } catch (err) {
-      alert('No se pudo relacionar el importador.');
+      showMessage(err.message || 'No se pudo relacionar el importador', 'error');
     }
   };
   // Mover importador de seleccionados a disponibles
@@ -71,16 +75,19 @@ function RelacionarImportadoresModal({ open, onClose, vucem }) {
       // Buscar el id de la relación usuario-importador en el objeto importador
       const relacionId = imp.usuario_importador_id || imp.id_relacion || imp.id;
       if (!relacionId) {
-        alert('No se encontró el id de la relación usuario-importador.');
+        showMessage('No se encontró el ID de la relación usuario-importador', 'warning');
         return;
       }
       const url = `${import.meta.env.VITE_EFC_API_URL}/vucem/usuario-importador/${relacionId}/`;
       const res = await fetchWithAuth(url, { method: 'DELETE' });
-      if (!res.ok) throw new Error('Error al eliminar relación');
+      if (!res.ok) {
+        const errMsg = await extractApiError(res);
+        throw new Error(errMsg);
+      }
       setImportadoresSeleccionados(importadoresSeleccionados.filter(i => i.rfc !== imp.rfc));
       setImportadoresDisponibles([...importadoresDisponibles, imp]);
     } catch (err) {
-      alert('No se pudo eliminar la relación del importador.');
+      showMessage(err.message || 'No se pudo eliminar la relación del importador', 'error');
     }
   };
 
@@ -203,11 +210,12 @@ function RelacionarImportadoresModal({ open, onClose, vucem }) {
 import React, { useEffect, useState } from 'react';
 import { fetchWithAuth, postWithAuth, putWithAuth, deleteWithAuth, putFormDataWithAuth, postFormDataWithAuth, patchWithAuth } from '../fetchWithAuth';
 import { useUser } from '../context/UserContext';
+import { useNotification } from '../context/NotificationContext';
+import { extractApiError } from '../api/apiError';
 
 const API_URL = import.meta.env.VITE_EFC_API_URL;
 export default function Vucem() {
-  // Estado para modal de relacionar importadores
+  const { showMessage } = useNotification();
-
   const isDebugMode = import.meta.env.VITE_DEBUG_MODE === 'true';
   const [showRelacionarModal, setShowRelacionarModal] = useState(false);
   const [selectedVucem, setSelectedVucem] = useState(null);
@@ -378,13 +386,15 @@ export default function Vucem() {
     setLoading(true);
     try {
       const res = await fetchWithAuth(`${API_URL}/vucem/vucem/`);
-      if (!res.ok) throw new Error('Error al cargar Ventanilla Unica');
+      if (!res.ok) {
+        const errMsg = await extractApiError(res);
+        throw new Error(errMsg);
+      }
       const data = await res.json();
-      // console.log('data > ', data);
       setVucemList(data);
       setError(null);
     } catch (err) {
-      setError('Error al cargar Ventanilla Unica');
+      setError(err.message);
     }
     setLoading(false);
   };
@@ -464,14 +474,15 @@ export default function Vucem() {
       });
 
       if (!response.ok) {
-        throw new Error('Error al cambiar el estado');
+        const errMsg = await extractApiError(response);
+        throw new Error(errMsg);
       }
 
       // Recargar la lista para reflejar los cambios
       await fetchVucem();
 
     } catch (err) {
-      alert('Error al cambiar el estado de la credencial');
+      showMessage(err.message || 'Error al cambiar el estado de la credencial', 'error');
     }
   };
 
@@ -1304,11 +1315,14 @@ export default function Vucem() {
                 if (form.cer) formData.append('cer', form.cer);
                 try {
                   const res = await postFormDataWithAuth(`${API_URL}/vucem/vucem/`, formData);
-                  if (!res.ok) throw new Error('Error al crear');
+                  if (!res.ok) {
+                    const errMsg = await extractApiError(res);
+                    throw new Error(errMsg);
+                  }
                   await fetchVucem();
                   closeModals();
                 } catch (err) {
-                  alert('Error al crear');
+                  showMessage(err.message || 'Error al crear la credencial', 'error');
                 }
               }}>
 
@@ -1697,11 +1711,14 @@ export default function Vucem() {
                 formData.append('is_active', form.is_active);
                 try {
                   const res = await putFormDataWithAuth(`${API_URL}/vucem/vucem/${editVucem.id}/`, formData);
-                  if (!res.ok) throw new Error('Error al actualizar');
+                  if (!res.ok) {
+                    const errMsg = await extractApiError(res);
+                    throw new Error(errMsg);
+                  }
                   await fetchVucem();
                   closeModals();
                 } catch (err) {
-                  alert('Error al actualizar');
+                  showMessage(err.message || 'Error al actualizar la credencial', 'error');
                 }
               }}>
 
@@ -2018,11 +2035,14 @@ export default function Vucem() {
                   if (!deleteVucem) return;
                   try {
                     const res = await deleteWithAuth(`${API_URL}/vucem/vucem/${deleteVucem.id}/`);
-                    if (!res.ok) throw new Error('Error al eliminar');
+                    if (!res.ok) {
+                      const errMsg = await extractApiError(res);
+                      throw new Error(errMsg);
+                    }
                     await fetchVucem();
                     closeModals();
                   } catch (err) {
-                    alert('Error al eliminar');
+                    showMessage(err.message || 'Error al eliminar la credencial', 'error');
                   }
                 }} className="px-4 py-2 border border-transparent rounded-md shadow-sm text-sm font-medium text-white bg-red-600 hover:bg-red-700 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 transition-colors disabled:opacity-50 flex items-center">Eliminar</button>
               </div>

src/utils/downloadUtils.js

@@ -1,4 +1,5 @@
 import { fetchWithAuth } from '../fetchWithAuth';
+import { extractApiError } from '../api/apiError';
 
 const API_URL = import.meta.env.VITE_EFC_API_URL;
 
@@ -13,7 +14,8 @@ export const downloadFile = async (id, filename = 'archivo', showMessage) => {
     const res = await fetchWithAuth(`${API_URL}/record/documents/descargar/${id}/`);
     
     if (!res.ok) {
-      showMessage('Error en la descarga del archivo', 'error');
+      const errMsg = await extractApiError(res);
+      showMessage(errMsg, 'error');
       return;
     }
     
@@ -50,7 +52,10 @@ export const downloadBulkZip = async (ids, showMessage, pedimentoName) => {
       body: JSON.stringify({ document_ids: ids })
     });
     
-    if (!response.ok) throw new Error('Error en la descarga');
+    if (!response.ok) {
+      const errMsg = await extractApiError(response);
+      throw new Error(errMsg);
+    }
 
     const blob = await response.blob();
     const url = window.URL.createObjectURL(blob);