feature/nueva funcionalidad al hacer login mediante HUB y nuevos reportes en segundo plano

Reviewed-on: #29

.env.example

@@ -2,3 +2,4 @@ VITE_DEBUG_MODE=false
 
 VITE_EFC_API_URL=https://api.efc-aduanasoft.com/api/v1
 VITE_EFC_MICROSERVICE_URL=https://api.efc-aduanasoft.com/microservice/api/v1
+VITE_HUB_URL=http://localhost:3001

src/App.jsx

@@ -5,6 +5,8 @@ import Vucem from './pages/Vucem';
 import Auditor from './pages/Auditor';
 import { BrowserRouter, Routes, Route, useLocation } from 'react-router-dom';
 import { UserProvider } from './context/UserContext';
+import { TaskProgressProvider } from './context/TaskProgressContext';
+import TaskProgressCard from './components/TaskProgressCard';
 import Navbar from './components/Navbar';
 import Layout from './components/Layout';
 import Login from './pages/Login';
@@ -14,6 +16,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';
@@ -23,11 +28,12 @@ import TableroAlmacenamiento from './pages/TableroAlmacenamiento';
 import Notificaciones from './pages/Notificaciones';
 import ForgotPassword from './pages/ForgotPassword';
 import PasswordResetConfirm from './pages/PasswordResetConfirm';
+import SSOCallback from './pages/SSOCallback';
 
 // Componente para manejar el layout condicional
 function AppContent() {
   const location = useLocation();
-  const isAuthPage = location.pathname === '/login' || location.pathname === '/' || location.pathname === '/forgot-password' || location.pathname.startsWith('/user/password-reset-confirm/');
+  const isAuthPage = location.pathname === '/login' || location.pathname === '/' || location.pathname === '/forgot-password' || location.pathname.startsWith('/user/password-reset-confirm/') || location.pathname === '/auth/sso';
 
   if (isAuthPage) {
     return (
@@ -37,6 +43,7 @@ function AppContent() {
           <Route path="/login" element={<Login />} />
           <Route path="/forgot-password" element={<ForgotPassword />} />
           <Route path="/user/password-reset-confirm/:uid/:token/" element={<PasswordResetConfirm />} />
+          <Route path="/auth/sso" element={<SSOCallback />} />
         </Routes>
       </>
     );
@@ -76,6 +83,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 />
@@ -138,7 +170,10 @@ function App() {
   return (
     <BrowserRouter>
       <UserProvider>
+        <TaskProgressProvider>
           <AppContent />
+          <TaskProgressCard />
+        </TaskProgressProvider>
       </UserProvider>
     </BrowserRouter>
   );

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/auth.js

@@ -1,24 +1,74 @@
 const API_URL = import.meta.env.VITE_EFC_API_URL;
+const HUB_URL = import.meta.env.VITE_HUB_URL || 'https://workspace.aduanasoft.com';
 
-export async function login(username, password) {
+/**
-  const response = await fetch(`${API_URL}/token/`, {
+ * Login directo email/password via Hub.
+ * Devuelve { access_token, user_id, email, ... }
+ * o { needs_tenant: true, tenants: [...] } si es multi-tenant.
+ */
+export async function login(username, password, tenant_slug) {
+  const body = { username, password };
+  if (tenant_slug) body.tenant_slug = tenant_slug;
+
+  const response = await fetch(`${API_URL}/auth/login/`, {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
-    body: JSON.stringify({ username, password }),
+    credentials: 'include', // recibir cookie HTTP-only
+    body: JSON.stringify(body),
   });
 
-  if (!response.ok) {
+  if (response.status === 401) throw new Error('Credenciales inválidas');
-    throw new Error('Credenciales inválidas');
+  if (response.status === 403) throw new Error('Usuario inactivo o sin permisos');
-  }
+  if (!response.ok) throw new Error('Error al iniciar sesión');
-  return response.json(); // { access, refresh }
+
+  return response.json();
 }
 
-// export async function refreshToken(refresh) {
+/** Canjea relay token del Hub por sesión local (SSO entre productos / Microsoft). */
-//   const res = await fetch(`${API_URL}/token/refresh/`, {
+export async function ssoExchange(relay_token) {
-//     method: 'POST',
+  const response = await fetch(`${API_URL}/auth/sso/exchange/`, {
-//     headers: { 'Content-Type': 'application/json' },
+    method: 'POST',
-//     body: JSON.stringify({ refresh }),
+    headers: { 'Content-Type': 'application/json' },
-//   });
+    credentials: 'include',
-//   if (!res.ok) throw new Error('SESSION_EXPIRED');
+    body: JSON.stringify({ relay_token }),
-//   return res.json(); // { access: '...' }
+  });
-// }
+
+  if (response.status === 401) throw new Error('Relay token inválido o expirado');
+  if (!response.ok) throw new Error('Error al completar inicio de sesión SSO');
+
+  return response.json();
+}
+
+/** Usuario autenticado actual. */
+export async function getMe(token) {
+  const headers = { 'Content-Type': 'application/json' };
+  if (token) headers['Authorization'] = `Bearer ${token}`;
+
+  const response = await fetch(`${API_URL}/auth/me/`, {
+    headers,
+    credentials: 'include',
+  });
+
+  if (!response.ok) throw new Error('No autenticado');
+  return response.json();
+}
+
+/** Cierra sesión: limpia estado local de inmediato, backend en background. */
+export function logout() {
+  // 1. Limpiar localStorage inmediatamente (síncrono, sin esperar al servidor)
+  ['access', 'refresh', 'user_id', 'username', 'user_email',
+   'user_first_name', 'user_last_name', 'user_groups',
+   'user_is_importador', 'user_permissions'].forEach(k => localStorage.removeItem(k));
+
+  // 2. Notificar a los componentes que la sesión terminó
+  window.dispatchEvent(new CustomEvent('authStateChanged'));
+
+  // 3. Llamar al backend en segundo plano para limpiar cookies (fire and forget)
+  fetch(`${API_URL}/auth/logout/`, { method: 'POST', credentials: 'include' }).catch(() => {});
+}
+
+/** URL para login con Microsoft (redirige al Hub). */
+export function getMicrosoftLoginUrl() {
+  const returnTo = encodeURIComponent(`${window.location.origin}/auth/sso`);
+  return `${HUB_URL}/login?return_to=${returnTo}&idp=microsoft`;
+}

src/api/coves.js

@@ -1,58 +1,35 @@
 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) {
+  // Estado de 3 valores (pendiente | descargado | error) — T2026-05-027
-      params.append('numero_cove__icontains', filters.numero_cove);
+  if (filters.cove_estado) params.append('cove_estado', filters.cove_estado);
-    }
+  if (filters.acuse_cove_estado) params.append('acuse_cove_estado', filters.acuse_cove_estado);
-    if (filters.cove_descargado !== undefined && filters.cove_descargado !== '') {
+  // Filtros booleanos legados (compatibilidad)
-      params.append('cove_descargado', filters.cove_descargado);
+  if (filters.cove_descargado !== undefined && filters.cove_descargado !== '') 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.acuse_cove_descargado !== undefined && filters.acuse_cove_descargado !== '') {
+  if (filters.date_from || filters.created_at__gte) params.append('created_at__gte', filters.date_from || filters.created_at__gte);
-      params.append('acuse_cove_descargado', filters.acuse_cove_descargado);
+  if (filters.date_to || filters.created_at__lte) params.append('created_at__lte', filters.date_to || filters.created_at__lte);
-    }
-    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 +41,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 +57,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,37 @@
 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);
-    }
+  // Estado de 3 valores (pendiente | descargado | error) — T2026-05-027
-    if (filters.clave) {
+  if (filters.edocument_estado) params.append('edocument_estado', filters.edocument_estado);
-      params.append('clave__icontains', filters.clave);
+  if (filters.acuse_estado) params.append('acuse_estado', filters.acuse_estado);
-    }
+  // Filtros booleanos legados (compatibilidad)
-    if (filters.descripcion) {
+  if (filters.edocument_descargado !== undefined && filters.edocument_descargado !== '') params.append('edocument_descargado', filters.edocument_descargado);
-      params.append('descripcion__icontains', filters.descripcion);
+  if (filters.acuse_descargado !== undefined && filters.acuse_descargado !== '') params.append('acuse_descargado', filters.acuse_descargado);
-    }
+  if (filters.date_from || filters.created_at__gte) params.append('created_at__gte', filters.date_from || filters.created_at__gte);
-    if (filters.edocument_descargado !== undefined && filters.edocument_descargado !== '') {
+  if (filters.date_to || filters.created_at__lte) params.append('created_at__lte', filters.date_to || filters.created_at__lte);
-      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 +43,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 +59,13 @@ 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;
+export const resetAcuseEdocument = async (edocId) => {
-  }
+  const response = await fetchWithAuth(
+    `${API_BASE_URL}/customs/edocuments/${edocId}/reset-acuse/`,
+    { method: 'POST' }
+  );
+  if (!response.ok) throw new Error(await extractApiError(response));
+  return response.json();
 };

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/notificaciones.ts

@@ -15,11 +15,18 @@ export interface TipoNotificacion {
   descripcion: string;
 }
 
+export interface NotificacionDatos {
+  task_id: string;
+  label: string;
+  resultado: Record<string, unknown>;
+}
+
 export interface Notificacion {
   id: number;
   tipo: TipoNotificacion;
   dirigido: string;
   mensaje: string;
+  datos: NotificacionDatos | null;
   fecha_envio: string;
   created_at: string;
   visto: boolean;
@@ -48,3 +55,11 @@ export async function fetchAllNotifications({page = 1, page_size=10}): Promise<N
     if (!res.ok) throw new Error('Error al obtener notificaciones');
     return await res.json();
 }
+
+export async function fetchNotificacionByTaskId(taskId: string): Promise<Notificacion | null> {
+  const url = `${API_URL}/notificaciones/notificaciones/by-task/${taskId}/`;
+  const res = await fetchWithAuth(url);
+  if (res.status === 404) return null;
+  if (!res.ok) throw new Error('Error al obtener notificación por task_id');
+  return await res.json();
+}

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/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/LogoutButton.jsx

@@ -1,17 +1,12 @@
 import React from 'react';
-import { useNavigate } from 'react-router-dom';
+import { logout } from '../api/auth';
+
+const HUB_URL = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
 
 export default function LogoutButton() {
-  const navigate = useNavigate();
-
   const handleLogout = () => {
-    localStorage.removeItem('access');
+    logout(); // limpia estado + llama backend en bg
-    localStorage.removeItem('refresh');
+    window.location.href = `${HUB_URL}/login`;
-    
-    // Disparar evento para actualizar el navbar
-    window.dispatchEvent(new CustomEvent('authStateChanged'));
-    
-    navigate('/login');
   };
 
   return (

src/components/Navbar.jsx

@@ -1,7 +1,13 @@
 import React, { useState, useEffect } from 'react';
-import { Link, useLocation } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { colors } from '../theme';
 
+const hubLoginUrl = () => {
+  const HUB_URL = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
+  const returnTo = encodeURIComponent(`${window.location.origin}/auth/sso`);
+  return `${HUB_URL}/login?return_to=${returnTo}`;
+};
+
 export default function Navbar() {
   const [isLoggedIn, setIsLoggedIn] = useState(false);
   const [isMenuOpen, setIsMenuOpen] = useState(false);
@@ -18,11 +24,11 @@ export default function Navbar() {
     return () => window.removeEventListener('authStateChanged', checkAuthStatus);
   }, []);
 
-  const logout = () => {
+  const logout = async () => {
-    localStorage.removeItem('access');
+    const { logout: doLogout } = await import('../api/auth');
-    localStorage.removeItem('refresh');
+    doLogout(); // limpia estado + llama backend en bg
-    window.dispatchEvent(new CustomEvent('authStateChanged'));
+    const hubUrl = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
-    window.location.href = '/';
+    window.location.href = `${hubUrl}/login`;
   };
 
   const navLinks = [
@@ -97,15 +103,15 @@ export default function Navbar() {
                   </button>
                 </div>
               ) : (
-                <Link
+                <a
-                  to="/login"
+                  href={hubLoginUrl()}
                   className="bg-gradient-to-r from-navy-600 to-navy-700 hover:from-navy-700 hover:to-navy-800 text-white px-4 py-2 rounded-lg text-sm font-medium transition-all duration-200 flex items-center space-x-2 shadow-lg hover:shadow-xl transform hover:scale-105"
                 >
                   <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M11 16l-4-4m0 0l4-4m-4 4h14m-5 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1" />
                   </svg>
                   <span>Ingresar</span>
-                </Link>
+                </a>
               )}
             </div>
           </div>

src/components/RequireAuth.jsx

@@ -1,17 +1,17 @@
 import React from 'react';
-import { Navigate } from 'react-router-dom';
 
-// Esta función verifica si el usuario está autenticado (por ejemplo, si hay un token en localStorage)
+const HUB_URL = import.meta.env.VITE_HUB_URL || 'https://workspace.aduanasoft.com';
+
 function isAuthenticated() {
-  const token = localStorage.getItem('access');
+  return !!localStorage.getItem('access');
-  return !!token;
 }
 
 export default function RequireAuth({ children }) {
-  const authenticated = isAuthenticated();
+  if (!isAuthenticated()) {
-  
+    // Sesión expirada o no iniciada → redirigir al Hub con return_to
-  if (!authenticated) {
+    const returnTo = encodeURIComponent(`${window.location.origin}/auth/sso`);
-    return <Navigate to="/login" replace />;
+    window.location.href = `${HUB_URL}/login?return_to=${returnTo}`;
+    return null;
   }
 
   return children;

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);
@@ -31,11 +29,11 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
   const navigate = useNavigate();
   const { user: currentUser, loading } = useUser();
 
-  const handleLogout = () => {
+  const handleLogout = async () => {
-    localStorage.removeItem('access');
+    const { logout } = await import('../api/auth');
-    localStorage.removeItem('refresh');
+    logout(); // limpia estado + llama backend en bg
-    window.dispatchEvent(new CustomEvent('authStateChanged'));
+    const hubUrl = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
-    navigate('/login');
+    window.location.href = `${hubUrl}/login`;
   };
 
   // Cerrar menú móvil cuando se navega o cuando la pantalla es grande
@@ -55,6 +53,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 +85,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',
@@ -93,7 +106,7 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
       title: 'Servicios',
       items: [
         {
-          name: 'Procesos',
+          name: 'Historial de Procesos',
           path: '/procesos',
           icon: (
             <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -101,7 +114,9 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
             </svg>
           )
         },
-        {
+        ...(
+          hasPermission('auditoria.view')
+            ? [{
                 name: 'Auditor',
                 path: '/auditor',
                 icon: (
@@ -109,14 +124,17 @@ 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>
                 )
-        }
+              }]
+            : []
+        )
       ]
     },
     {
       title: 'Documentación',
       items: [
-        // Mostrar Reportes siempre
+        ...(
-        {
+          hasPermission('reportes.view')
+            ? [{
                 name: 'Reportes',
                 path: '/reports',
                 icon: (
@@ -124,8 +142,12 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
                     <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M9 19v-6a2 2 0 00-2-2H5a2 2 0 00-2 2v6a2 2 0 002 2h2a2 2 0 002-2zm0 0V9a2 2 0 012-2h2a2 2 0 012 2v10m-6 0a2 2 0 002 2h2a2 2 0 002-2m0 0V5a2 2 0 012-2h2a2 2 0 012 2v14a2 2 0 01-2 2h-2a2 2 0 01-2-2z" />
                   </svg>
                 )
-        },
+              }]
-        {
+            : []
+        ),
+        ...(
+          hasPermission('pedimentos.view')
+            ? [{
                 name: 'Expedientes',
                 path: '/expedientes',
                 icon: (
@@ -134,8 +156,12 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
                     <path d="M16 3H8a2 2 0 00-2 2v2h12V5a2 2 0 00-2-2z" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round" />
                   </svg>
                 )
-        },
+              }]
-        {
+            : []
+        ),
+        ...(
+          hasPermission('documentos.view')
+            ? [{
                 name: 'Documentos',
                 path: '/documents',
                 icon: (
@@ -143,8 +169,12 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
                     <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>
                 )
-        },
+              }]
-        {
+            : []
+        ),
+        ...(
+          hasPermission('datastage.view')
+            ? [{
                 name: 'Datastage',
                 path: '/datastage',
                 icon: (
@@ -155,12 +185,14 @@ export default function Sidebar({ isMobileOpen, onMobileClose }) {
                   </svg>
                 ),
                 onClick: () => navigate('/datastage')
-        }
+              }]
+            : []
+        ),
       ]
     },
-    // 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 +211,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 +224,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 +237,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 +264,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/components/SidebarNew.jsx

@@ -6,14 +6,11 @@ export default function Sidebar() {
   const location = useLocation();
   const navigate = useNavigate();
 
-  const handleLogout = () => {
+  const handleLogout = async () => {
-    localStorage.removeItem('access');
+    const { logout } = await import('../api/auth');
-    localStorage.removeItem('refresh');
+    logout(); // limpia estado + llama backend en bg
-    
+    const hubUrl = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
-    // Disparar evento para actualizar el navbar
+    window.location.href = `${hubUrl}/login`;
-    window.dispatchEvent(new CustomEvent('authStateChanged'));
-    
-    navigate('/login');
   };
 
   const menuItems = [

src/components/TaskProgressCard.jsx

@@ -0,0 +1,302 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { useNavigate, useLocation } from 'react-router-dom';
+import { useTaskProgress } from '../context/TaskProgressContext';
+import { useServerSentEvents } from '../hooks/useServerSentEvents';
+import { fetchWithAuth } from '../fetchWithAuth';
+
+const API_URL = import.meta.env.VITE_EFC_API_URL;
+
+const STATUS_LABEL = {
+  submitted:  'Enviando...',
+  processing: 'Procesando',
+  completed:  'Completado',
+  failed:     'Error',
+};
+
+const BADGE_COLOR = {
+  submitted:  'bg-slate-200 text-slate-700',
+  processing: 'bg-blue-100  text-blue-700',
+  completed:  'bg-green-100 text-green-700',
+  failed:     'bg-red-100   text-red-700',
+};
+
+const AUTH_PATHS = new Set(['/', '/login', '/forgot-password', '/auth/sso']);
+
+/** Conecta SSE para UNA tarea y actualiza el contexto. Se mantiene vivo independientemente del estado del panel. */
+function TaskSSEConnector({ task }) {
+  const { updateTask } = useTaskProgress();
+  useServerSentEvents(
+    task.status === 'completed' || task.status === 'failed' ? null : task.task_id,
+    {
+      onUpdate(data) {
+        updateTask(task.task_id, {
+          status:    data.status,
+          message:   data.message,
+          progress:  data.progress ?? task.progress,
+          resultado: data.resultado ?? task.resultado,
+        });
+      },
+      onCompleted(resultado) {
+        updateTask(task.task_id, { status: 'completed', progress: 100, resultado });
+      },
+      onFailed(message) {
+        updateTask(task.task_id, { status: 'failed', message });
+      },
+    }
+  );
+  return null;
+}
+
+/** Card compacta de una tarea dentro del panel expandido. */
+function SingleTaskCard({ task }) {
+  const { dismissTask, openTaskInAuditor } = useTaskProgress();
+  const navigate = useNavigate();
+  const [downloading, setDownloading] = useState(false);
+  const isActive   = task.status === 'submitted' || task.status === 'processing';
+  const isReport   = task.taskType === 'report';
+
+  const handleVerResultado = () => {
+    openTaskInAuditor(task.task_id);
+    navigate('/auditor');
+  };
+
+  const handleDescargarReporte = async () => {
+    const reportId = task.resultado?.report_id ?? task.report_id;
+    if (!reportId) { navigate('/reports'); return; }
+    setDownloading(true);
+    try {
+      const res = await fetchWithAuth(`${API_URL}/reports/report-document-download/${reportId}/`);
+      if (!res.ok) { navigate('/reports'); return; }
+      const blob = await res.blob();
+      const disposition = res.headers.get('Content-Disposition');
+      let filename = '';
+      if (disposition) {
+        const match = disposition.match(/filename="?([^";\s]+)"?/);
+        if (match) filename = match[1];
+      }
+      if (!filename) filename = `reporte_${reportId}.xlsx`;
+      const link = document.createElement('a');
+      link.href = window.URL.createObjectURL(blob);
+      link.download = filename;
+      document.body.appendChild(link);
+      link.click();
+      document.body.removeChild(link);
+      dismissTask(task.task_id);
+    } catch {
+      navigate('/reports');
+    } finally {
+      setDownloading(false);
+    }
+  };
+
+  return (
+    <div className="flex flex-col gap-1.5 p-2.5 rounded-lg border border-gray-100 bg-gray-50 text-xs">
+      <div className="flex items-center justify-between gap-2">
+        <div className="flex items-center gap-1.5 min-w-0">
+          <span className="font-semibold truncate text-gray-800">{task.label}</span>
+          <span className={`px-1.5 py-0.5 rounded text-xs font-medium flex-shrink-0 ${BADGE_COLOR[task.status]}`}>
+            {STATUS_LABEL[task.status] ?? task.status}
+          </span>
+        </div>
+        <button
+          onClick={() => dismissTask(task.task_id)}
+          aria-label="Descartar tarea"
+          className="text-gray-300 hover:text-gray-500 flex-shrink-0"
+        >
+          <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="M6 18L18 6M6 6l12 12" />
+          </svg>
+        </button>
+      </div>
+
+      {task.message && (
+        <p className="text-xs text-gray-400 truncate">{task.message}</p>
+      )}
+
+      {isActive && (
+        <div className="w-full bg-blue-100 rounded-full h-1 overflow-hidden">
+          <div
+            className="bg-blue-500 h-1 rounded-full transition-all duration-500"
+            style={{ width: `${task.progress ?? 0}%` }}
+          />
+        </div>
+      )}
+
+      {task.status === 'completed' && isReport && (
+        <button
+          onClick={handleDescargarReporte}
+          disabled={downloading}
+          className="w-full py-1 px-2 rounded bg-green-600 hover:bg-green-700 disabled:bg-green-400 text-white text-xs font-semibold transition-colors flex items-center justify-center gap-1"
+        >
+          {downloading ? (
+            <>
+              <svg className="w-3 h-3 animate-spin" fill="none" viewBox="0 0 24 24">
+                <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" />
+                <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z" />
+              </svg>
+              Descargando...
+            </>
+          ) : (
+            <>
+              <svg className="w-3 h-3" 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>
+              Descargar reporte
+            </>
+          )}
+        </button>
+      )}
+
+      {task.status === 'completed' && !isReport && (
+        <button
+          onClick={handleVerResultado}
+          className="w-full py-1 px-2 rounded bg-green-600 hover:bg-green-700 text-white text-xs font-semibold transition-colors"
+        >
+          Ver resultado en Auditoría →
+        </button>
+      )}
+
+      {task.status === 'failed' && isReport && (
+        <p className="text-xs text-red-500">
+          Falló — revisa el historial en{' '}
+          <button onClick={() => navigate('/reports')} className="underline">Reportes</button>.
+        </p>
+      )}
+
+      {task.status === 'failed' && !isReport && (
+        <p className="text-xs text-red-500">Falló — revisa el Panel de Auditoría.</p>
+      )}
+    </div>
+  );
+}
+
+/**
+ * TaskProgressCard — pill minimizado en bottom-left.
+ * Las conexiones SSE viven siempre; el panel es solo visual y no bloquea la UI.
+ * Se auto-expande cuando una tarea pasa a completada o fallida.
+ */
+export default function TaskProgressCard() {
+  const { visibleTasks } = useTaskProgress();
+  const location = useLocation();
+  const [expanded, setExpanded] = useState(false);
+  const prevStatusesRef = useRef({});
+  const containerRef = useRef(null);
+
+  // Cierra el panel al hacer click fuera del componente
+  useEffect(() => {
+    if (!expanded) return;
+    function handleClickOutside(e) {
+      if (containerRef.current && !containerRef.current.contains(e.target)) {
+        setExpanded(false);
+      }
+    }
+    document.addEventListener('mousedown', handleClickOutside);
+    return () => document.removeEventListener('mousedown', handleClickOutside);
+  }, [expanded]);
+
+  // Auto-expandir cuando una tarea activa pasa a estado terminal
+  useEffect(() => {
+    let shouldExpand = false;
+    visibleTasks.forEach(t => {
+      const prev = prevStatusesRef.current[t.task_id];
+      if (
+        (t.status === 'completed' || t.status === 'failed') &&
+        prev !== undefined && prev !== 'completed' && prev !== 'failed'
+      ) {
+        shouldExpand = true;
+      }
+      prevStatusesRef.current[t.task_id] = t.status;
+    });
+    if (shouldExpand) setExpanded(true);
+  }, [visibleTasks]);
+
+  // Solo renderizar dentro de la app autenticada
+  const isAuthPage = AUTH_PATHS.has(location.pathname)
+    || location.pathname.startsWith('/user/password-reset-confirm/');
+
+  if (isAuthPage || visibleTasks.length === 0) return null;
+
+  const activeTasks  = visibleTasks.filter(t => t.status === 'submitted' || t.status === 'processing');
+  const completedTasks = visibleTasks.filter(t => t.status === 'completed');
+  const failedTasks  = visibleTasks.filter(t => t.status === 'failed');
+
+  // Estilo y contenido del pill según estado dominante
+  let pillLabel, pillClass, pillIconType;
+  if (activeTasks.length > 0) {
+    pillLabel     = `${activeTasks.length} tarea${activeTasks.length > 1 ? 's' : ''} en proceso`;
+    pillClass     = 'bg-blue-600 text-white border-blue-700 hover:bg-blue-700';
+    pillIconType  = 'spinner';
+  } else if (failedTasks.length > 0 && completedTasks.length === 0) {
+    pillLabel     = `${failedTasks.length} tarea${failedTasks.length > 1 ? 's' : ''} fallida${failedTasks.length > 1 ? 's' : ''}`;
+    pillClass     = 'bg-red-50 text-red-700 border-red-300 hover:bg-red-100';
+    pillIconType  = 'x';
+  } else {
+    pillLabel     = `${completedTasks.length} tarea${completedTasks.length > 1 ? 's' : ''} completada${completedTasks.length > 1 ? 's' : ''}`;
+    pillClass     = 'bg-green-50 text-green-700 border-green-300 hover:bg-green-100';
+    pillIconType  = 'check';
+  }
+
+  return (
+    <>
+      {/* Conectores SSE — siempre activos, independientes del estado del panel */}
+      {visibleTasks
+        .filter(t => t.status === 'processing' || t.status === 'submitted')
+        .map(task => <TaskSSEConnector key={task.task_id} task={task} />)}
+
+      {/*
+        Dock flotante en top-right. El pill queda arriba y el panel se expande hacia abajo.
+        items-end alinea todo a la derecha.
+      */}
+      <div ref={containerRef} className="fixed top-4 right-4 z-40 flex flex-col items-end gap-2">
+
+        {/* Pill — botón de toggle siempre visible, arriba */}
+        <button
+          onClick={() => setExpanded(e => !e)}
+          className={`flex items-center gap-1.5 pl-2.5 pr-3 py-1.5 rounded-full text-xs font-semibold shadow-md border transition-all ${pillClass}`}
+        >
+          {pillIconType === 'spinner' && (
+            <svg className="w-3 h-3 animate-spin flex-shrink-0" fill="none" viewBox="0 0 24 24">
+              <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" />
+              <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4z" />
+            </svg>
+          )}
+          {pillIconType === 'check' && (
+            <svg className="w-3 h-3 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2.5" d="M5 13l4 4L19 7" />
+            </svg>
+          )}
+          {pillIconType === 'x' && (
+            <svg className="w-3 h-3 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2.5" d="M6 18L18 6M6 6l12 12" />
+            </svg>
+          )}
+          <span>{pillLabel}</span>
+        </button>
+
+        {/* Panel expandido — aparece debajo del pill */}
+        {expanded && (
+          <div className="bg-white border border-gray-200 rounded-xl shadow-xl w-72 overflow-hidden">
+            <div className="flex items-center justify-between px-3 py-2 bg-gray-50 border-b border-gray-100">
+              <span className="text-xs font-semibold text-gray-500 uppercase tracking-wide">
+                Tareas en segundo plano
+              </span>
+              <button
+                onClick={() => setExpanded(false)}
+                aria-label="Minimizar panel"
+                className="text-gray-400 hover:text-gray-600"
+              >
+                <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="M5 15l7-7 7 7" />
+                </svg>
+              </button>
+            </div>
+            <div className="p-2 flex flex-col gap-1.5 max-h-72 overflow-y-auto">
+              {visibleTasks.map(task => <SingleTaskCard key={task.task_id} task={task} />)}
+            </div>
+          </div>
+        )}
+
+      </div>
+    </>
+  );
+}

src/context/TaskProgressContext.jsx

@@ -0,0 +1,174 @@
+import React, { createContext, useContext, useState, useEffect, useCallback } from 'react';
+import { fetchNotificacionByTaskId } from '../api/notificaciones';
+
+const STORAGE_KEY = 'efc_audit_tasks';
+
+/**
+ * TaskProgressContext
+ *
+ * Gestiona las tareas de auditoría en background. Persiste en localStorage para
+ * sobrevivir recargas de página. Reconecta SSE automáticamente para tareas que
+ * quedaron en "processing" tras un refresh.
+ *
+ * Estructura de cada tarea:
+ * {
+ *   task_id:      string,
+ *   label:        string,   // 'EDocuments', 'COVEs', etc.
+ *   status:       'submitted' | 'processing' | 'completed' | 'failed',
+ *   message:      string,
+ *   progress:     number,   // 0-100
+ *   resultado:    object | null,
+ *   organizacion_id: string,
+ *   started_at:   ISO string,
+ *   dismissed:    boolean,
+ * }
+ */
+
+const TaskProgressContext = createContext(null);
+
+export function useTaskProgress() {
+  const ctx = useContext(TaskProgressContext);
+  if (!ctx) throw new Error('useTaskProgress debe usarse dentro de TaskProgressProvider');
+  return ctx;
+}
+
+function loadFromStorage() {
+  try {
+    const raw = localStorage.getItem(STORAGE_KEY);
+    if (!raw) return [];
+    const tasks = JSON.parse(raw);
+    const cutoff = Date.now() - 24 * 60 * 60 * 1000; // 24 horas
+    // Auto-descartar tareas "processing/submitted" con más de 24h (nunca terminaron)
+    return tasks.map(t => {
+      if (
+        (t.status === 'processing' || t.status === 'submitted') &&
+        t.started_at &&
+        new Date(t.started_at).getTime() < cutoff
+      ) {
+        return { ...t, dismissed: true, status: 'failed', message: 'Tarea expirada' };
+      }
+      return t;
+    });
+  } catch {
+    return [];
+  }
+}
+
+function saveToStorage(tasks) {
+  try {
+    // Solo persistir las últimas 20 tareas no descartadas para no crecer indefinidamente
+    const toSave = tasks.slice(-20);
+    localStorage.setItem(STORAGE_KEY, JSON.stringify(toSave));
+  } catch {
+    // Storage lleno — ignorar
+  }
+}
+
+export function TaskProgressProvider({ children }) {
+  const [tasks, setTasksRaw] = useState(() => loadFromStorage());
+  // task_id que Auditor.jsx debe abrir automáticamente al montar
+  const [pendingOpenTaskId, setPendingOpenTaskId] = useState(null);
+
+  const setTasks = useCallback((updater) => {
+    setTasksRaw((prev) => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
+      saveToStorage(next);
+      return next;
+    });
+  }, []);
+
+  // Añade una tarea nueva (cuando el usuario dispara una auditoría)
+  const addTask = useCallback((taskData) => {
+    setTasks((prev) => {
+      // Evitar duplicados
+      if (prev.find((t) => t.task_id === taskData.task_id)) return prev;
+      return [
+        ...prev,
+        {
+          status: 'submitted',
+          message: 'Tarea enviada',
+          progress: 0,
+          resultado: null,
+          dismissed: false,
+          started_at: new Date().toISOString(),
+          ...taskData,
+        },
+      ];
+    });
+  }, [setTasks]);
+
+  // Actualiza campos de una tarea existente por task_id
+  const updateTask = useCallback((task_id, patch) => {
+    setTasks((prev) =>
+      prev.map((t) => (t.task_id === task_id ? { ...t, ...patch } : t))
+    );
+  }, [setTasks]);
+
+  // Descarta una tarea de la vista (no la borra de storage)
+  const dismissTask = useCallback((task_id) => {
+    setTasks((prev) =>
+      prev.map((t) => (t.task_id === task_id ? { ...t, dismissed: true } : t))
+    );
+  }, [setTasks]);
+
+  // Llamado desde TaskProgressCard cuando el usuario hace click en "Ver resultado"
+  const openTaskInAuditor = useCallback((task_id) => {
+    setPendingOpenTaskId(task_id);
+  }, []);
+
+  // Llamado desde Auditor.jsx después de consumir el pendingOpenTaskId
+  const clearPendingOpen = useCallback(() => {
+    setPendingOpenTaskId(null);
+  }, []);
+
+  const getTask = useCallback(
+    (task_id) => tasks.find((t) => t.task_id === task_id) ?? null,
+    [tasks]
+  );
+
+  // Al montar: intenta recuperar tareas que completaron mientras el cliente no estaba conectado
+  // (Redis TTL expirado, página cerrada, etc.). Consulta la Notificacion en DB por task_id.
+  useEffect(() => {
+    const staleTasks = loadFromStorage().filter(
+      (t) => !t.dismissed && t.status !== 'completed' && t.status !== 'failed'
+    );
+    if (staleTasks.length === 0) return;
+
+    staleTasks.forEach(async (task) => {
+      try {
+        const notif = await fetchNotificacionByTaskId(task.task_id);
+        if (notif?.datos?.resultado) {
+          updateTask(task.task_id, {
+            status: 'completed',
+            resultado: notif.datos.resultado,
+            message: notif.mensaje,
+            progress: 100,
+          });
+        }
+      } catch {
+        // Tarea aún en proceso o usuario no autenticado aún — ignorar
+      }
+    });
+  }, []); // eslint-disable-line react-hooks/exhaustive-deps
+
+  // Tareas visibles (no descartadas)
+  const visibleTasks = tasks.filter((t) => !t.dismissed);
+
+  return (
+    <TaskProgressContext.Provider
+      value={{
+        tasks,
+        visibleTasks,
+        addTask,
+        updateTask,
+        dismissTask,
+        openTaskInAuditor,
+        pendingOpenTaskId,
+        clearPendingOpen,
+        getTask,
+      }}
+    >
+      {children}
+    </TaskProgressContext.Provider>
+  );
+}

src/fetchWithAuth.js

@@ -1,4 +1,5 @@
-const API_URL = import.meta.env.VITE_EFC_API_URL;
+const API_URL  = import.meta.env.VITE_EFC_API_URL;               // e.g. http://localhost:8000/api/v1
+const BASE_URL = API_URL.replace(/\/api\/v1\/?$/, '');            // e.g. http://localhost:8000
 
 // Variable para controlar si ya hay una renovación de token en proceso
 let isRefreshing = false;
@@ -17,71 +18,69 @@ const processQueue = (error, token = null) => {
   failedQueue = [];
 };
 
-// Función para renovar el token usando el refresh token
+/**
+ * Intenta renovar el token. Estrategia:
+ *   1. Nuevo endpoint cookie-based (SSO / hub-frontend): no requiere body,
+ *      lee el refresh_token desde la cookie HTTP-only.
+ *   2. Fallback legacy (apps antiguas): lee refresh de localStorage y llama
+ *      al endpoint de SimpleJWT.
+ */
 const refreshToken = async () => {
-  try {
+  // ── Intento 1: SimpleJWT refresh (login directo EFC) ──────────────────
+  // Usa el endpoint estándar de SimpleJWT con el token de localStorage.
   const refresh = localStorage.getItem('refresh');
-    if (!refresh) {
+  if (refresh) {
-      throw new Error('No refresh token available');
+    try {
-    }
+      // Endpoint SimpleJWT estándar (login EFC directo) — campo "refresh"
-
+      const res = await fetch(`${BASE_URL}/api/v1/token/refresh/`, {
-    // Intentar primero con el endpoint completo
-    let refreshEndpoint = `${API_URL}/token/refresh/`;
-    
-    let response = await fetch(refreshEndpoint, {
         method: 'POST',
-      headers: {
+        headers: { 'Content-Type': 'application/json' },
-        'Content-Type': 'application/json',
+        body: JSON.stringify({ refresh }),
-      },
-      body: JSON.stringify({
-        refresh: refresh
-      }),
       });
+      if (res.ok) {
+        const data = await res.json();
+        const newAccess = data.access;
+        if (newAccess) {
+          localStorage.setItem('access', newAccess);
+          if (data.refresh) localStorage.setItem('refresh', data.refresh);
+          return newAccess;
+        }
+      }
+    } catch (_) {
+      // continúa al fallback
+    }
 
-    // Si falla con 404, intentar con el endpoint alternativo
+    try {
-    if (response.status === 404) {
+      // Fallback: endpoint SSO local (tokens HS256 de sesiones Hub)
-      refreshEndpoint = `${API_URL}/token/refresh/`;
+      const res = await fetch(`${API_URL}/auth/session/refresh/`, {
-      response = await fetch(refreshEndpoint, {
         method: 'POST',
-        headers: {
+        credentials: 'include',
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({
-          refresh: refresh
-        }),
       });
+      if (res.ok) {
+        const data = await res.json();
+        const newAccess = data.access_token || data.access;
+        if (newAccess) {
+          localStorage.setItem('access', newAccess);
+          return newAccess;
+        }
+      }
+    } catch (_) {}
   }
 
-    if (!response.ok) {
+  // ── Fallo total: limpiar sesión y redirigir al Hub ─────────────────────
-      const errorText = await response.text();
-      throw new Error(`Failed to refresh token: ${response.status} - ${errorText}`);
-    }
-
-    const data = await response.json();
-    
-    // Guardar el nuevo access token
-    localStorage.setItem('access', data.access);
-    
-    // Si viene un nuevo refresh token, guardarlo también
-    if (data.refresh) {
-      localStorage.setItem('refresh', data.refresh);
-    }
-
-    return data.access;
-  } catch (error) {
-    // Si falla la renovación, limpiar tokens y redirigir al login
   localStorage.removeItem('access');
   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
+  const hubUrl = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
+  const returnTo = encodeURIComponent(`${window.location.origin}/auth/sso`);
   setTimeout(() => {
-      window.location.href = '/login';
+    window.location.href = `${hubUrl}/login?return_to=${returnTo}`;
   }, 1000);
 
   throw new Error('SESSION_EXPIRED');
-  }
 };
 
 // Función principal para hacer peticiones con manejo automático de tokens
@@ -107,85 +106,66 @@ export const fetchWithAuth = async (url, options = {}) => {
     }
   };
 
+  // Helper: ejecutar fetch con reintento ante error de red (Fix E)
+  const safeFetch = async (u, opts, retries = 1) => {
+    for (let i = 0; i <= retries; i++) {
       try {
-    // Hacer la petición inicial
+        return await fetch(u, opts);
-    let response = await fetch(url, finalOptions);
+      } catch (networkErr) {
+        if (i === retries) throw networkErr;
+        await new Promise(r => setTimeout(r, 300 * (i + 1))); // backoff 300ms
+      }
+    }
+  };
 
-    // Si la respuesta es 401 (Unauthorized), manejar renovación de token
+  try {
+    let response = await safeFetch(url, finalOptions);
+
+    // 401 → intentar renovar token
     if (response.status === 401) {
       if (!isRefreshing) {
         isRefreshing = true;
-
         try {
-          // Renovar el token
           const newToken = await refreshToken();
-          
-          // Procesar la cola de peticiones pendientes
           processQueue(null, newToken);
-          
-          // Actualizar el header de autorización y reintentar la petición original
           finalOptions.headers['Authorization'] = `Bearer ${newToken}`;
-          response = await fetch(url, finalOptions);
+          response = await safeFetch(url, finalOptions);
-          
         } catch (refreshError) {
-          // Si falla la renovación, procesar la cola con error
           processQueue(refreshError, null);
           throw refreshError;
         } finally {
           isRefreshing = false;
         }
       } else {
-        // Ya hay un refresh en proceso, agregar esta petición a la cola
+        // Otro refresh en curso — encolar y esperar
         return new Promise((resolve, reject) => {
           failedQueue.push({
-            resolve: (token) => {
+            resolve: (tok) => {
-              finalOptions.headers['Authorization'] = `Bearer ${token}`;
+              finalOptions.headers['Authorization'] = `Bearer ${tok}`;
-              fetch(url, finalOptions)
+              safeFetch(url, finalOptions).then(resolve).catch(reject);
-                .then(resolve)
-                .catch(reject);
             },
-            reject
+            reject,
           });
         });
       }
     }
 
-    // Si todavía hay un 401 después del intento de renovación, verificar si realmente es un problema de auth
+    // 401 persistente después del retry → la sesión expiró definitivamente
     if (response.status === 401) {
-      // Verificar si tenemos un token válido en localStorage
-      const currentToken = localStorage.getItem('access');
-      
-      // Intentar obtener más información del error
-      let errorDetails = '';
-      try {
-        const errorText = await response.text();
-        errorDetails = errorText;
-      } catch (e) {
-        // Error al leer respuesta
-      }
-      
-      // Si no hay token o el error indica problema de autenticación, limpiar sesión
-      if (!currentToken || errorDetails.includes('token') || errorDetails.includes('auth')) {
       localStorage.removeItem('access');
       localStorage.removeItem('refresh');
       localStorage.removeItem('user_id');
       localStorage.removeItem('user_is_importador');
-        
+      localStorage.removeItem('user_permissions');
-        setTimeout(() => {
+      const hubUrl = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
-          window.location.href = '/login';
+      const returnTo = encodeURIComponent(`${window.location.origin}/auth/sso`);
-        }, 1000);
+      setTimeout(() => { window.location.href = `${hubUrl}/login?return_to=${returnTo}`; }, 800);
-        
       throw new Error('SESSION_EXPIRED');
-      } else {
-        // Si hay token pero sigue fallando, podría ser un problema del servidor
-        // No limpiar la sesión, dejar que el error se propague
-      }
     }
 
     return response;
 
   } catch (error) {
-    // Si hay un error de red o cualquier otro error, propagarlo
     throw error;
   }
 };

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/hooks/useServerSentEvents.js

@@ -0,0 +1,96 @@
+import { useEffect, useRef, useState, useCallback } from 'react';
+
+const MICROSERVICE_V2_URL = import.meta.env.VITE_EFC_MICROSERVICE_URL?.replace('/api/v1', '/api/v2') ?? '';
+
+/**
+ * Hook para conectarse a un endpoint SSE del microservicio y recibir eventos
+ * de progreso de una tarea de auditoría.
+ *
+ * @param {string|null} taskId  - ID de la tarea Celery. null = no conectar.
+ * @param {object}      options
+ * @param {function}    options.onUpdate    - cb({ task_id, status, message, progress, resultado })
+ * @param {function}    options.onCompleted - cb(resultado)
+ * @param {function}    options.onFailed    - cb(message)
+ */
+export function useServerSentEvents(taskId, { onUpdate, onCompleted, onFailed } = {}) {
+  const [connected, setConnected] = useState(false);
+  const [lastEvent, setLastEvent] = useState(null);
+  const esRef = useRef(null);
+  const taskIdRef = useRef(taskId);
+  taskIdRef.current = taskId;
+
+  const disconnect = useCallback(() => {
+    if (esRef.current) {
+      esRef.current.close();
+      esRef.current = null;
+      setConnected(false);
+    }
+  }, []);
+
+  useEffect(() => {
+    if (!taskId) {
+      disconnect();
+      return;
+    }
+
+    // Evita reconexión si ya estamos conectados al mismo taskId
+    if (esRef.current) {
+      disconnect();
+    }
+
+    const url = `${MICROSERVICE_V2_URL}/stream/tasks/${taskId}`;
+    const es = new EventSource(url);
+    esRef.current = es;
+
+    es.onopen = () => setConnected(true);
+
+    es.addEventListener('task_update', (e) => {
+      try {
+        const data = JSON.parse(e.data);
+        setLastEvent(data);
+        onUpdate?.(data);
+
+        if (data.status === 'completed') {
+          onCompleted?.(data.resultado ?? data);
+          disconnect();
+        } else if (data.status === 'failed') {
+          onFailed?.(data.message ?? 'La tarea falló');
+          disconnect();
+        }
+      } catch {
+        // JSON mal formado — ignorar
+      }
+    });
+
+    es.addEventListener('heartbeat', () => {
+      // Mantiene la conexión viva, no requiere acción
+    });
+
+    es.addEventListener('error', (e) => {
+      // Solo fallar ante un evento SSE explícito del servidor (tiene e.data).
+      // Los errores nativos de EventSource (red caída, timeout de Nginx) NO tienen e.data
+      // y EventSource se reconecta automáticamente — no deben marcar la tarea como fallida.
+      if (e instanceof MessageEvent && e.data) {
+        try {
+          onFailed?.(JSON.parse(e.data)?.message ?? 'Error en el stream');
+        } catch {
+          onFailed?.('Error en el stream');
+        }
+        disconnect();
+      }
+    });
+
+    es.onerror = () => {
+      // Error de conexión nativo — EventSource reintenta automáticamente.
+      setConnected(false);
+    };
+
+    return () => {
+      es.close();
+      esRef.current = null;
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [taskId]);
+
+  return { connected, lastEvent, disconnect };
+}

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/Documents.jsx

@@ -88,7 +88,8 @@ export default function Documents() {
       localStorage.removeItem('refresh');
       showMessage('Tu sesión ha expirado, por favor inicia sesión de nuevo.', 'error');
       setTimeout(() => {
-        window.location.href = '/login';
+        const _hub = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
+        window.location.href = `${_hub}/login?return_to=${encodeURIComponent(window.location.origin + '/auth/sso')}`;
       }, 2000);
     } else if (error) {
       showMessage(error.message, 'error');

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
@@ -135,7 +140,8 @@ export default function Documents() {
       localStorage.removeItem('refresh');
       showMessage('Tu sesión ha expirado, por favor inicia sesión de nuevo.', 'error');
       setTimeout(() => {
-        window.location.href = '/login';
+        const _hub = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
+        window.location.href = `${_hub}/login?return_to=${encodeURIComponent(window.location.origin + '/auth/sso')}`;
       }, 2000);
     } else if (error) {
       showMessage(error.message, 'error');
@@ -810,13 +816,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 (
@@ -898,7 +971,7 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                   <input
                     type="text"
                     value={searchFilter}
-                    onChange={e => setSearchFilter(e.target.value)}
+                    onChange={e => { setSearchFilter(e.target.value); setCurrentPage(1); }}
                     placeholder="Buscar pedimento, contribuyente..."
                     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"
                   />
@@ -909,7 +982,7 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                   <input
                     type="text"
                     value={pedimentoFilter}
-                    onChange={e => setPedimentoFilter(e.target.value)}
+                    onChange={e => { setPedimentoFilter(e.target.value); setCurrentPage(1); }}
                     placeholder="Número de pedimento..."
                     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"
                   />
@@ -917,7 +990,7 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                 {/* Expediente */}
                 <div className="flex flex-col">
                   <label className="text-xs font-semibold text-gray-700 mb-1.5">Expediente</label>
-                  <select value={expedienteFilter} onChange={e => setExpedienteFilter(e.target.value)}
+                  <select value={expedienteFilter} onChange={e => { setExpedienteFilter(e.target.value); setCurrentPage(1); }}
                     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">
                     <option value="all">Todos</option>
                     <option value="true">Con expediente</option>
@@ -932,11 +1005,16 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                     value={contribuyenteInput}
                     onChange={e => {
                       setContribuyenteInput(e.target.value);
-                      setContribuyenteFilter(e.target.value);
+                      // Solo limpiar el filtro cuando el input queda vacío.
-                    }}
+                      // El filtro real se aplica al hacer clic en una sugerencia del dropdown.
-                    onBlur={e => {
+                      // Actualizar el filtro con RFC parcial causa fuga de datos: el backend
-                      setContribuyenteFilter(e.target.value);
+                      // omite silenciosamente el filtro cuando el RFC no existe en Importador.
+                      if (!e.target.value) {
+                        setContribuyenteFilter('');
+                        setCurrentPage(1);
+                      }
                     }}
+                    onBlur={() => {}}
                     placeholder="Buscar o escribir..."
                     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"
                     autoComplete="off"
@@ -955,6 +1033,7 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                             onClick={() => {
                               setContribuyenteFilter(c);
                               setContribuyenteInput('');
+                              setCurrentPage(1);
                             }}
                           >
                             {c}
@@ -970,16 +1049,38 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                   <input
                     type="text"
                     value={curpApoderadoFilter}
-                    onChange={e => setCurpApoderadoFilter(e.target.value)}
+                    onChange={e => { setCurpApoderadoFilter(e.target.value); setCurrentPage(1); }}
                     placeholder="CURP del apoderado..."
                     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">
@@ -987,7 +1088,7 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                   <input
                     type="text"
                     value={patenteFilter}
-                    onChange={e => setPatenteFilter(e.target.value)}
+                    onChange={e => { setPatenteFilter(e.target.value); setCurrentPage(1); }}
                     placeholder="Patente..."
                     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"
                   />
@@ -998,7 +1099,7 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                   <input
                     type="text"
                     value={aduanaFilter}
-                    onChange={e => setAduanaFilter(e.target.value)}
+                    onChange={e => { setAduanaFilter(e.target.value); setCurrentPage(1); }}
                     placeholder="Aduana..."
                     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"
                   />
@@ -1008,7 +1109,7 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                   <label className="text-xs font-semibold text-gray-700 mb-1.5">Tipo de operación</label>
                   <select
                     value={tipoOperacionFilter}
-                    onChange={e => setTipoOperacionFilter(e.target.value)}
+                    onChange={e => { setTipoOperacionFilter(e.target.value); setCurrentPage(1); }}
                     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"
                   >
                     <option value="">Todos</option>
@@ -1022,7 +1123,7 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                   <input
                     type="text"
                     value={clavePedimentoFilter}
-                    onChange={e => setClavePedimentoFilter(e.target.value)}
+                    onChange={e => { setClavePedimentoFilter(e.target.value); setCurrentPage(1); }}
                     placeholder="Clave pedimento..."
                     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"
                   />
@@ -1135,13 +1236,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>
@@ -1176,12 +1286,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>
@@ -1233,6 +1380,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>

src/pages/LandingAnimated.jsx

@@ -1,7 +1,12 @@
 import React, { useState, useEffect, useRef } from 'react';
-import { Link } from 'react-router-dom';
 import { colors, tailwindClasses } from '../theme';
 
+const HUB_URL = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
+const hubLoginUrl = () => {
+  const returnTo = encodeURIComponent(`${window.location.origin}/auth/sso`);
+  return `${HUB_URL}/login?return_to=${returnTo}`;
+};
+
 export default function LandingAnimated() {
   const [isScrolled, setIsScrolled] = useState(false);
   const [activeSection, setActiveSection] = useState('inicio');
@@ -199,8 +204,8 @@ export default function LandingAnimated() {
               </nav>
             </div>
             <div className="flex items-center space-x-4">
-              <Link
+              <a
-                to="/login"
+                href="/login"
                 className="px-6 py-2 rounded-full text-sm font-medium transition-all duration-200 shadow-lg hover:shadow-xl transform hover:-translate-y-0.5 text-white"
                 style={{
                   background: 'linear-gradient(to right, #1B2A41, #4DA6FF)',
@@ -213,7 +218,7 @@ export default function LandingAnimated() {
                 }}
               >
                 Acceder
-              </Link>
+              </a>
             </div>
           </div>
         </div>
@@ -313,8 +318,8 @@ export default function LandingAnimated() {
                   : 'opacity-0 translate-y-10'
               }`}
             >
-              <Link
+              <a
-                to="/login"
+                href="/login"
                 className="inline-flex items-center px-8 py-4 text-lg font-semibold transition-all duration-300 transform rounded-full shadow-2xl group hover:shadow-3xl hover:-translate-y-1 hover:scale-105"
                 style={{
                   color: '#1B2A41',
@@ -331,7 +336,7 @@ export default function LandingAnimated() {
                 <svg className="w-5 h-5 ml-2 transition-transform duration-200 group-hover:translate-x-1" fill="currentColor" viewBox="0 0 20 20">
                   <path fillRule="evenodd" d="M10.293 3.293a1 1 0 011.414 0l6 6a1 1 0 010 1.414l-6 6a1 1 0 01-1.414-1.414L14.586 11H3a1 1 0 110-2h11.586l-4.293-4.293a1 1 0 010-1.414z" clipRule="evenodd" />
                 </svg>
-              </Link>
+              </a>
               <button 
                 onClick={() => scrollToSection('caracteristicas')}
                 className="inline-flex items-center px-8 py-4 text-lg font-semibold text-white transition-all duration-300 bg-transparent border-2 rounded-full group border-white/30 hover:border-white hover:bg-white/10 backdrop-blur-sm"

src/pages/Login.jsx

@@ -1,7 +1,6 @@
 import React, { useState } from 'react';
-import { login } from '../api/auth';
+import { login, getMicrosoftLoginUrl } from '../api/auth';
 import { Link } from 'react-router-dom';
-import { colors } from '../theme';
 
 export default function Login() {
   const [username, setUsername]         = useState('');
@@ -9,85 +8,110 @@ export default function Login() {
   const [error, setError]               = useState('');
   const [loading, setLoading]           = useState(false);
   const [showPassword, setShowPassword] = useState(false);
+  const [tenantChoices, setTenantChoices] = useState(null);
 
-  const handleSubmit = async (e) => {
+  const handleSubmit = async (e, tenantSlug) => {
-    e.preventDefault();
+    if (e) e.preventDefault();
     setError('');
     setLoading(true);
     try {
-      const data = await login(username, password);
+      const data = await login(username, password, tenantSlug || undefined);
-      localStorage.setItem('access', data.access);
-      localStorage.setItem('refresh', data.refresh);
 
-      // Obtener y guardar la información del usuario autenticado
+      if (data.needs_tenant) {
-      const apiUrl = import.meta.env.VITE_EFC_API_URL || '';
+        setTenantChoices(data.tenants || []);
-      const token = data.access;
+        setLoading(false);
-      try {
+        return;
-        const res = await fetch(`${apiUrl}/user/users/me/`, {
-          headers: { 'Authorization': `Bearer ${token}` }
-        });
-        if (res.ok) {
-          const user = await res.json();
-          if (user && user.username) {
-            localStorage.setItem('username', user.username);
-            if (user.email) localStorage.setItem('user_email', user.email);
-            if (user.id) localStorage.setItem('user_id', String(user.id));
-            if (user.groups) localStorage.setItem('user_groups', JSON.stringify(user.groups));
-            if (user.first_name) localStorage.setItem('user_first_name', user.first_name);
-            if (user.last_name) localStorage.setItem('user_last_name', user.last_name);
-            if (typeof user.is_importador !== 'undefined') localStorage.setItem('user_is_importador', String(user.is_importador));
-          }
-        }
-      } catch (e) {
-        // Si falla, continuar igual
-        console.error('No se pudo guardar info de usuario en localStorage', e);
       }
 
-      // Disparar evento personalizado para que el navbar se actualice
+      // SimpleJWT devuelve "access" y "refresh" (tokens estándar de EFC)
+      const accessToken  = data.access  || data.access_token;
+      const refreshToken = data.refresh || data.refresh_token;
+      if (accessToken)  localStorage.setItem('access',  accessToken);
+      if (refreshToken) localStorage.setItem('refresh', refreshToken);
+
       window.dispatchEvent(new CustomEvent('authStateChanged'));
 
-      // Redirigir al dashboard
+      // Login único: la sesión local de EFC ya quedó establecida con los tokens
+      // recibidos. En el primer ingreso el backend dispara la provisión/migración
+      // en Hub en segundo plano — no forzamos al usuario a pasar por el Hub.
+      // (El logout sí lo redirige al Hub para cerrar la sesión KC.)
       window.location.href = '/admin';
+
     } catch (err) {
-      setError('Usuario o contraseña incorrectos');
+      setError(err.message || 'Usuario o contraseña incorrectos');
     } finally {
       setLoading(false);
     }
   };
 
   return (
-    <div className="min-h-screen flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8" style={{ backgroundColor: '#F2F4F7' }}>
+    <div
+      className="min-h-screen flex items-center justify-center py-12 px-4 sm:px-6 lg:px-8"
+      style={{ backgroundColor: '#F2F4F7' }}
+    >
       {/* Background pattern */}
       <div className="absolute inset-0 opacity-20">
-        <div className="absolute inset-0" style={{
+        <div
-          backgroundImage: `url("data:image/svg+xml,%3Csvg width='60' height='60' viewBox='0 0 60 60' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fillRule='evenodd'%3E%3Cg fill='%231B2A41' fillOpacity='0.1'%3E%3Ccircle cx='30' cy='30' r='2'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E")`
+          className="absolute inset-0"
-        }}></div>
+          style={{
+            backgroundImage: `url("data:image/svg+xml,%3Csvg width='60' height='60' viewBox='0 0 60 60' xmlns='http://www.w3.org/2000/svg'%3E%3Cg fill='none' fillRule='evenodd'%3E%3Cg fill='%231B2A41' fillOpacity='0.1'%3E%3Ccircle cx='30' cy='30' r='2'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E")`,
+          }}
+        />
       </div>
 
       <div className="relative max-w-md w-full">
-        {/* Main Card */}
         <div className="bg-white backdrop-blur-md rounded-3xl shadow-2xl border border-gray-200 overflow-hidden">
-          {/* Header with navy background */}
+
+          {/* Header */}
           <div className="px-8 py-10 text-center" style={{ backgroundColor: '#1B2A41' }}>
             <div className="mb-4">
               <Link to="/" className="inline-block">
-                <h1 className="text-4xl font-bold text-white">
+                <h1 className="text-4xl font-bold text-white">EFC</h1>
-                  EFC
-                </h1>
               </Link>
             </div>
-            <h2 className="text-2xl font-bold text-white mb-2">
+            <h2 className="text-2xl font-bold text-white mb-2">Bienvenido de vuelta</h2>
-              Bienvenido de vuelta
-            </h2>
             <p className="text-sm" style={{ color: 'rgba(255,255,255,0.8)' }}>
               Inicia sesión para acceder a tu plataforma aduanal
             </p>
           </div>
 
-          {/* Form */}
           <div className="px-8 py-8">
-            <form onSubmit={handleSubmit} className="space-y-6">
+
-              {/* Username Field */}
+            {/* Selector multi-tenant */}
+            {tenantChoices && (
+              <div className="mb-6">
+                <p className="text-sm font-semibold mb-3" style={{ color: '#333333' }}>
+                  Tu cuenta tiene acceso a varias organizaciones. Selecciona una:
+                </p>
+                <div className="space-y-2">
+                  {tenantChoices.map(t => (
+                    <button
+                      key={t.id}
+                      type="button"
+                      onClick={() => handleSubmit(null, t.slug)}
+                      className="w-full py-3 px-4 rounded-xl border text-left text-sm font-medium transition-all duration-200 hover:shadow-md"
+                      style={{ borderColor: '#4DA6FF', color: '#1B2A41', backgroundColor: '#F8FAFF' }}
+                    >
+                      {t.name}
+                    </button>
+                  ))}
+                </div>
+                <button
+                  type="button"
+                  onClick={() => setTenantChoices(null)}
+                  className="mt-3 text-xs font-medium"
+                  style={{ color: '#7A7A7A' }}
+                >
+                  ← Volver
+                </button>
+              </div>
+            )}
+
+            <form
+              onSubmit={handleSubmit}
+              className={`space-y-6 ${tenantChoices ? 'hidden' : ''}`}
+            >
+              {/* Username */}
               <div>
                 <label htmlFor="username" className="block text-sm font-semibold mb-2" style={{ color: '#333333' }}>
                   Usuario
@@ -100,47 +124,20 @@ export default function Login() {
                   </div>
                   <input
                     id="username"
-                    name="username"
                     type="text"
                     required
-                    className="block w-full pl-10 pr-3 py-3 border border-gray-300 rounded-xl focus:outline-none focus:ring-2 focus:border-transparent transition duration-200"
+                    className="block w-full pl-10 pr-3 py-3 border border-gray-300 rounded-xl focus:outline-none transition duration-200"
-                    style={{ 
+                    style={{ color: '#333333', borderColor: '#d1d5db' }}
-                      color: '#333333',
-                      borderColor: '#d1d5db',
-                      ':focus': { 
-                        ringColor: '#4DA6FF',
-                        borderColor: 'transparent' 
-                      },
-                      ':hover': { 
-                        borderColor: '#4DA6FF' 
-                      }
-                    }}
                     placeholder="Ingresa tu usuario"
                     value={username}
                     onChange={e => setUsername(e.target.value)}
-                    onFocus={(e) => {
+                    onFocus={e => { e.target.style.borderColor = 'transparent'; e.target.style.boxShadow = '0 0 0 2px #4DA6FF'; }}
-                      e.target.style.borderColor = 'transparent';
+                    onBlur={e => { e.target.style.borderColor = '#d1d5db'; e.target.style.boxShadow = 'none'; }}
-                      e.target.style.boxShadow = '0 0 0 2px #4DA6FF';
-                    }}
-                    onBlur={(e) => {
-                      e.target.style.borderColor = '#d1d5db';
-                      e.target.style.boxShadow = 'none';
-                    }}
-                    onMouseEnter={(e) => {
-                      if (document.activeElement !== e.target) {
-                        e.target.style.borderColor = '#4DA6FF';
-                      }
-                    }}
-                    onMouseLeave={(e) => {
-                      if (document.activeElement !== e.target) {
-                        e.target.style.borderColor = '#d1d5db';
-                      }
-                    }}
                   />
                 </div>
               </div>
 
-              {/* Password Field */}
+              {/* Password */}
               <div>
                 <label htmlFor="password" className="block text-sm font-semibold mb-2" style={{ color: '#333333' }}>
                   Contraseña
@@ -153,47 +150,27 @@ export default function Login() {
                   </div>
                   <input
                     id="password"
-                    name="password"
+                    type={showPassword ? 'text' : 'password'}
-                    type={showPassword ? "text" : "password"}
                     required
-                    className="block w-full pl-10 pr-12 py-3 border border-gray-300 rounded-xl focus:outline-none focus:ring-2 focus:border-transparent transition duration-200"
+                    className="block w-full pl-10 pr-12 py-3 border border-gray-300 rounded-xl focus:outline-none transition duration-200"
-                    style={{ 
+                    style={{ color: '#333333', borderColor: '#d1d5db' }}
-                      color: '#333333',
-                      borderColor: '#d1d5db'
-                    }}
                     placeholder="Ingresa tu contraseña"
                     value={password}
                     onChange={e => setPassword(e.target.value)}
-                    onFocus={(e) => {
+                    onFocus={e => { e.target.style.borderColor = 'transparent'; e.target.style.boxShadow = '0 0 0 2px #4DA6FF'; }}
-                      e.target.style.borderColor = 'transparent';
+                    onBlur={e => { e.target.style.borderColor = '#d1d5db'; e.target.style.boxShadow = 'none'; }}
-                      e.target.style.boxShadow = '0 0 0 2px #4DA6FF';
-                    }}
-                    onBlur={(e) => {
-                      e.target.style.borderColor = '#d1d5db';
-                      e.target.style.boxShadow = 'none';
-                    }}
-                    onMouseEnter={(e) => {
-                      if (document.activeElement !== e.target) {
-                        e.target.style.borderColor = '#4DA6FF';
-                      }
-                    }}
-                    onMouseLeave={(e) => {
-                      if (document.activeElement !== e.target) {
-                        e.target.style.borderColor = '#d1d5db';
-                      }
-                    }}
                   />
                   <button
                     type="button"
-                    className="absolute inset-y-0 right-0 pr-3 flex items-center transition-colors duration-200"
+                    className="absolute inset-y-0 right-0 pr-3 flex items-center"
                     onClick={() => setShowPassword(!showPassword)}
                   >
                     {showPassword ? (
-                      <svg className="h-5 w-5 hover:opacity-70" style={{ color: '#7A7A7A' }} fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <svg className="h-5 w-5" style={{ color: '#7A7A7A' }} 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.414L12 12m0 0l2.122 2.122m0 0l1.414 1.414" />
                       </svg>
                     ) : (
-                      <svg className="h-5 w-5 hover:opacity-70" style={{ color: '#7A7A7A' }} fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                      <svg className="h-5 w-5" style={{ color: '#7A7A7A' }} 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>
@@ -202,73 +179,61 @@ export default function Login() {
                 </div>
               </div>
 
-              {/* Error Message */}
+              {/* Error */}
               {error && (
-                <div className="rounded-xl bg-red-50 border p-4 animate-pulse" style={{ borderColor: 'rgba(198, 40, 40, 0.2)' }}>
+                <div className="rounded-xl bg-red-50 border p-4" style={{ borderColor: 'rgba(198,40,40,0.2)' }}>
                   <div className="flex">
-                    <div className="flex-shrink-0">
+                    <svg className="h-5 w-5 flex-shrink-0" style={{ color: '#C62828' }} viewBox="0 0 20 20" fill="currentColor">
-                      <svg className="h-5 w-5" style={{ color: '#C62828' }} viewBox="0 0 20 20" fill="currentColor">
                       <path fillRule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clipRule="evenodd" />
                     </svg>
-                    </div>
+                    <p className="ml-3 text-sm font-medium" style={{ color: '#C62828' }}>{error}</p>
-                    <div className="ml-3">
-                      <h3 className="text-sm font-medium" style={{ color: '#C62828' }}>
-                        {error}
-                      </h3>
-                    </div>
                   </div>
                 </div>
               )}
 
-              {/* Login Button */}
+              {/* Botón login */}
-              <div>
               <button
                 type="submit"
                 disabled={loading}
-                  className="group relative w-full flex justify-center py-3 px-4 border border-transparent text-sm font-semibold rounded-xl text-white focus:outline-none focus:ring-2 focus:ring-offset-2 disabled:opacity-50 disabled:cursor-not-allowed transition-all duration-300 shadow-lg hover:shadow-xl transform hover:-translate-y-0.5"
+                className="w-full flex justify-center items-center py-3 px-4 rounded-xl text-sm font-semibold text-white disabled:opacity-50 disabled:cursor-not-allowed transition-all duration-300 shadow-lg hover:shadow-xl transform hover:-translate-y-0.5"
-                  style={{
+                style={{ backgroundColor: '#1B2A41' }}
-                    backgroundColor: '#1B2A41',
+                onMouseEnter={e => { if (!loading) e.currentTarget.style.backgroundColor = '#162234'; }}
-                    '--tw-ring-color': '#1B2A41'
+                onMouseLeave={e => { if (!loading) e.currentTarget.style.backgroundColor = '#1B2A41'; }}
-                  }}
-                  onMouseEnter={(e) => {
-                    if (!loading) {
-                      e.target.style.backgroundColor = '#162234';
-                    }
-                  }}
-                  onMouseLeave={(e) => {
-                    if (!loading) {
-                      e.target.style.backgroundColor = '#1B2A41';
-                    }
-                  }}
               >
                 {loading ? (
                   <>
                     <svg className="animate-spin -ml-1 mr-3 h-5 w-5 text-white" fill="none" viewBox="0 0 24 24">
-                        <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>
+                      <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" />
-                        <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>
+                      <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" />
                     </svg>
-                      Ingresando...
+                    Verificando…
                   </>
                 ) : (
                   <>
                     <span>Ingresar</span>
-                      <svg className="ml-2 w-4 h-4 group-hover:translate-x-1 transition-transform duration-200" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <svg className="ml-2 w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                       <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 7l5 5m0 0l-5 5m5-5H6" />
                     </svg>
                   </>
                 )}
               </button>
+
+              {/* Divider */}
+              <div className="flex items-center gap-3">
+                <div className="flex-1 border-t border-gray-200" />
+                <span className="text-xs" style={{ color: '#7A7A7A' }}>o continúa con</span>
+                <div className="flex-1 border-t border-gray-200" />
               </div>
 
-              {/* Additional Links */}
+              {/* Links */}
               <div className="text-center space-y-3">
                 <div className="text-sm">
                   <Link
                     to="/forgot-password"
                     className="font-medium transition-colors duration-200"
                     style={{ color: '#4DA6FF' }}
-                    onMouseEnter={(e) => e.target.style.color = '#1976D2'}
+                    onMouseEnter={e => e.target.style.color = '#1976D2'}
-                    onMouseLeave={(e) => e.target.style.color = '#4DA6FF'}
+                    onMouseLeave={e => e.target.style.color = '#4DA6FF'}
                   >
                     ¿Olvidaste tu contraseña?
                   </Link>
@@ -276,12 +241,12 @@ export default function Login() {
                 <div className="border-t border-gray-200 pt-4">
                   <Link
                     to="/"
-                    className="inline-flex items-center text-sm font-medium group transition-colors duration-200"
+                    className="inline-flex items-center text-sm font-medium transition-colors duration-200"
                     style={{ color: '#4DA6FF' }}
-                    onMouseEnter={(e) => e.target.style.color = '#1976D2'}
+                    onMouseEnter={e => e.target.style.color = '#1976D2'}
-                    onMouseLeave={(e) => e.target.style.color = '#4DA6FF'}
+                    onMouseLeave={e => e.target.style.color = '#4DA6FF'}
                   >
-                    <svg className="mr-2 w-4 h-4 group-hover:-translate-x-1 transition-transform duration-200" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <svg className="mr-2 w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                       <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M11 17l-5-5m0 0l5-5m-5 5h12" />
                     </svg>
                     Volver al inicio
@@ -304,9 +269,9 @@ export default function Login() {
           </div>
         </div>
 
-        {/* Floating elements */}
+        {/* Floating decorations */}
-        <div className="absolute -top-4 -left-4 w-24 h-24 rounded-full blur-xl" style={{ backgroundColor: 'rgba(255, 255, 255, 0.1)' }}></div>
+        <div className="absolute -top-4 -left-4 w-24 h-24 rounded-full blur-xl" style={{ backgroundColor: 'rgba(255,255,255,0.1)' }} />
-        <div className="absolute -bottom-4 -right-4 w-32 h-32 rounded-full blur-xl" style={{ backgroundColor: 'rgba(27, 42, 65, 0.2)' }}></div>
+        <div className="absolute -bottom-4 -right-4 w-32 h-32 rounded-full blur-xl" style={{ backgroundColor: 'rgba(27,42,65,0.2)' }} />
       </div>
     </div>
   );

src/pages/Procesos.jsx

@@ -553,7 +553,7 @@ useEffect(() => {
           </div>
           <div className="flex-1 min-w-0">
             <h1 className="flex flex-col gap-2 mb-1 text-2xl font-extrabold tracking-tight text-white sm:text-3xl lg:text-4xl sm:flex-row sm:items-center">
-              <span>Procesos del Sistema</span>
+              <span>Historial de Procesos del Sistema</span>
               {count > 0 && (
                 <span className="inline-block px-3 py-1 text-xs font-semibold text-white rounded-full shadow-lg bg-white/20 backdrop-blur-sm sm:text-sm animate-fade-in">
                   {count} procesos

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

@@ -1,4 +1,5 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback, useRef } from 'react';
+import { useTaskProgress } from '../context/TaskProgressContext';
 import { getCurrentUser } from '../api/users';
 // Helper to get current user with fetchWithAuth
 const fetchCurrentUserWithAuth = async () => {
@@ -9,6 +10,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 +44,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
@@ -82,13 +63,16 @@ export default function Reports() {
     fetchOrgId();
   }, []);
 
+  const { tasks, addTask } = useTaskProgress();
+  const pendingReportTasksRef = useRef(new Set());
+  const pollingIntervalRef = useRef(null);
+
   // 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
     const paramsObj = { ...filtersCumplimiento, organizacion_id: organizacionId };
     const params = Object.entries(paramsObj)
       .filter(([_, v]) => v)
@@ -97,11 +81,25 @@ export default function Reports() {
     const url = `${import.meta.env.VITE_EFC_API_URL}/reports/table-summary/${params ? `?${params}` : ''}`;
     try {
       const res = await fetchWithAuth(url);
+      if (!res.ok) {
+        const errMsg = await extractApiError(res);
+        throw new Error(errMsg);
+      }
       const data = await res.json();
-      if (!res.ok) throw new Error('Error al generar el reporte');
+      if (data.task_id) {
-      alert('Reporte solicitado correctamente. Aparecerá en el historial cuando esté listo.');
+        addTask({
+          task_id:        data.task_id,
+          label:          'Reporte de Cumplimiento',
+          organizacion_id: organizacionId,
+          taskType:       'report',
+          report_id:      data.report_id,
+          status:         'submitted',
+        });
+        pendingReportTasksRef.current.add(data.task_id);
+      }
+      showMessage('Reporte solicitado. Puedes ver el progreso en la barra inferior.', '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 +141,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 +153,15 @@ 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');
+      fetchReports();
+      startPolling();
     } catch (err) {
-      alert('No se pudo generar el reporte.');
+      showMessage(err.message || 'No se pudo generar el reporte', 'error');
     }
   };
 
@@ -189,6 +191,36 @@ 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();
+      const disposition = res.headers.get('Content-Disposition');
+      let filename = '';
+      if (disposition) {
+        const match = disposition.match(/filename="?([^";\s]+)"?/);
+        if (match) filename = match[1];
+      }
+      if (!filename) {
+        const isXlsx = blob.type.includes('spreadsheetml') || blob.type.includes('openxmlformats');
+        filename = `reporte_${reportId}.${isXlsx ? 'xlsx' : 'csv'}`;
+      }
+      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 +230,8 @@ export default function Reports() {
 
   const [organizaciones, setOrganizaciones] = useState([]);
   const [importadores, setImportadores] = useState([]);
+  const [rfcOptions, setRfcOptions] = useState([]);
+  const [rfcsCumplimiento, setRfcsCumplimiento] = useState([]);
 
   useEffect(() => {
     const fetchOrganizaciones = async () => {
@@ -232,6 +266,22 @@ export default function Reports() {
     fetchImportadores();
   }, []);
 
+  useEffect(() => {
+    if (!organizacionId) return;
+    const load = async () => {
+      try {
+        const url = `${API_URL}/reports/exportmodel/datastage/?organizacion=${organizacionId}`;
+        const res = await fetchWithAuth(url);
+        if (!res.ok) return;
+        const data = await res.json();
+        setRfcsCumplimiento(data.rfcs || []);
+      } catch {
+        setRfcsCumplimiento([]);
+      }
+    };
+    load();
+  }, [organizacionId]);
+
   const [globalFilters, setGlobalFilters] = useState({
     rfc: '',
     fecha_pago_desde: '',
@@ -241,6 +291,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 +340,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 +390,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">
@@ -463,8 +533,19 @@ export default function Reports() {
   // Estado para formato de exportación personalizado
   const [showFormatSelector, setShowFormatSelector] = useState(false);
 
-  // Estado para pestañas
+  // Estado para pestañas — persiste en URL (?tab=...)
-  const [activeTab, setActiveTab] = useState('pedimentos');
+  const VALID_TABS = ['pedimentos', 'control_pedimentos', 'datastage', 'Cumplimiento', 'coves'];
+  const [activeTab, setActiveTab] = useState(() => {
+    const params = new URLSearchParams(window.location.search);
+    const tab = params.get('tab');
+    return VALID_TABS.includes(tab) ? tab : 'pedimentos';
+  });
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    params.set('tab', activeTab);
+    history.replaceState(null, '', `${window.location.pathname}?${params.toString()}`);
+  }, [activeTab]);
 
   // Mostrar Cumplimiento en producción: eliminar lógica que oculta la pestaña
 
@@ -625,22 +706,59 @@ export default function Reports() {
     setTourStep(0);
   };
 
-  // Fetch report list from API
+  const fetchReports = useCallback(async () => {
-  useEffect(() => {
-    const fetchReports = async () => {
     try {
       const url = `${import.meta.env.VITE_EFC_API_URL}/reports/report-document-list/`;
       const res = await fetchWithAuth(url);
       if (!res.ok) throw new Error('Error al obtener el historial de reportes');
       const data = await res.json();
       setReports(data);
-      } catch (err) {
+    } catch {
       setReports([]);
     }
-    };
-    fetchReports();
   }, []);
 
+  const stopPolling = useCallback(() => {
+    if (pollingIntervalRef.current) {
+      clearInterval(pollingIntervalRef.current);
+      pollingIntervalRef.current = null;
+    }
+  }, []);
+
+  const startPolling = useCallback(() => {
+    if (pollingIntervalRef.current) return;
+    pollingIntervalRef.current = setInterval(fetchReports, 5000);
+  }, [fetchReports]);
+
+  useEffect(() => { fetchReports(); }, [fetchReports]);
+
+  // Detener polling cuando todos los reportes de control_pedimento lleguen a estado terminal
+  useEffect(() => {
+    const hasPending = reports
+      .filter(r => r.report_type === 'control_pedimento')
+      .some(r => r.status !== 'ready' && r.status !== 'error');
+    if (!hasPending) stopPolling();
+  }, [reports, stopPolling]);
+
+  // Limpiar intervalo al desmontar
+  useEffect(() => () => stopPolling(), [stopPolling]);
+
+  // Refrescar historial cuando completa una tarea de reporte de cumplimiento
+  useEffect(() => {
+    if (!tasks || pendingReportTasksRef.current.size === 0) return;
+    let changed = false;
+    tasks.forEach(t => {
+      if (
+        pendingReportTasksRef.current.has(t.task_id) &&
+        (t.status === 'completed' || t.status === 'failed')
+      ) {
+        pendingReportTasksRef.current.delete(t.task_id);
+        changed = true;
+      }
+    });
+    if (changed) fetchReports();
+  }, [tasks, fetchReports]);
+
   useEffect(() => {
     fetchSummary();
   }, []);
@@ -807,23 +925,18 @@ 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;
     }
 
     setIsExporting(true);
 
     try {
-      const progressDiv = document.createElement('div');
-      progressDiv.className = 'fixed bottom-4 right-4 bg-white p-4 rounded-lg shadow-xl border border-blue-100';
-      progressDiv.innerHTML = `
-        <div class="flex items-center gap-3">
-          <div class="animate-spin rounded-full h-5 w-5 border-b-2 border-blue-500"></div>
-          <p class="text-sm text-gray-600">Preparando exportación DataStage...</p>
-        </div>
-      `;
-      document.body.appendChild(progressDiv);
-
       // DETECCIÓN AUTOMÁTICA DEL MODO
       const modo = modelosConCampos.length > 1 ? 'multiple' : 'simple';
 
@@ -836,7 +949,6 @@ export default function Reports() {
       if (modo === 'simple') {
         // MODO SIMPLE: solo un modelo con campos
         const modeloUnico = modelosConCampos[0];
-        const modelData = datastageModels.find(m => m.model === modeloUnico);
 
         exportData.model = modeloUnico;
         exportData.fields = modelFieldsMap[modeloUnico];
@@ -853,14 +965,8 @@ export default function Reports() {
         });
       }
 
-      // Resto del código de exportación...
+      // El backend encola la generación en Celery y responde 202 con task_id;
-      progressDiv.innerHTML = `
+      // el progreso llega por SSE al TaskProgressCard y ahí se descarga el archivo.
-        <div class="flex items-center gap-3">
-          <div class="animate-spin rounded-full h-5 w-5 border-b-2 border-green-500"></div>
-          <p class="text-sm text-gray-600">Generando archivo DataStage...</p>
-        </div>
-      `;
-
       const response = await fetchWithAuth(`${API_URL}/reports/exportmodel/datastage/`, {
         method: 'POST',
         headers: {
@@ -874,68 +980,26 @@ export default function Reports() {
         throw new Error(errorData.error || errorData.message || 'Error al exportar DataStage');
       }
 
-      const blob = await response.blob();
+      const data = await response.json();
-      
+      if (data.task_id) {
-      const contentDisposition = response.headers.get('Content-Disposition');
+        addTask({
-      
+          task_id:        data.task_id,
-      let fileName = '';
+          label:          'Reporte DataStage',
-      
+          organizacion_id: globalFilters.organizacion,
-      if (contentDisposition) {
+          taskType:       'report',
-        const filenameMatch = contentDisposition.match(/filename="(.+?)"/) || 
+          report_id:      data.report_id,
-                             contentDisposition.match(/filename=([^;]+)/);
+          status:         'submitted',
-        
+        });
-        if (filenameMatch) {
+        pendingReportTasksRef.current.add(data.task_id);
-          fileName = filenameMatch[1].replace(/"/g, '');
-        }
       }
 
-      if (!fileName) {
+      showMessage('Reporte solicitado. Puedes ver el progreso en la barra inferior.', 'success');
-        const isZip = blob.type === 'application/zip';
-        const isExcel = blob.type.includes('spreadsheetml');
-        
-        if (isZip) {
-          fileName = modo === 'multiple' 
-            ? `datastage_reports_${new Date().toISOString().split('T')[0]}.zip`
-            : `datastage_${modelosConCampos[0]}_particionado_${new Date().toISOString().split('T')[0]}.zip`;
-        } else if (isExcel) {
-          fileName = `datastage_${modelosConCampos[0]}_${new Date().toISOString().split('T')[0]}.xlsx`;
-        } else {
-          fileName = `datastage_${modelosConCampos[0]}_${new Date().toISOString().split('T')[0]}.csv`;
-        }
-      }
-
-      const url = window.URL.createObjectURL(blob);
-      const link = document.createElement('a');
-      link.href = url;
-      link.setAttribute('download', fileName);
-      document.body.appendChild(link);
-      link.click();
-      document.body.removeChild(link);
-      window.URL.revokeObjectURL(url);
-
-      progressDiv.innerHTML = `
-        <div class="flex items-center gap-3 text-green-600">
-          <svg class="h-5 w-5" fill="none" viewBox="0 0 24 24" stroke="currentColor">
-            <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7" />
-          </svg>
-          <p class="text-sm">¡Exportación completada! (Modo ${modo})</p>
-        </div>
-      `;
-      setTimeout(() => {
-        progressDiv.style.opacity = '0';
-        progressDiv.style.transform = 'translateY(100%)';
-        setTimeout(() => progressDiv.remove(), 300);
-      }, 2000);
-
-      showMessage(`¡Archivo ${fileName} descargado exitosamente! (${modo === 'multiple' ? 'Múltiple' : 'Simple'})`, 'success');
 
     } catch (error) {
       console.error('❌ ERROR AL EXPORTAR DATASTAGE:', error);
       showMessage(error.message || 'Error al exportar DataStage. Por favor intente nuevamente.', 'error');
     } finally {
       setIsExporting(false);
-      const progressDiv = document.querySelector('.fixed.bottom-4.right-4');
-      if (progressDiv) progressDiv.remove();
     }
   };
 
@@ -1672,10 +1736,61 @@ export default function Reports() {
                 <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M12 10v6m0 0l-3-3m3 3l3-3m2 8H7a2 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>
             )}
-            <span>{isExporting ? 'Generando archivo...' : `Generar y descargar ${exportFormat.toUpperCase()}`}</span>
+            <span>{isExporting ? 'Generando archivo...' : `Generar reporte ${exportFormat.toUpperCase()}`}</span>
           </span>
         </button>
 
+        <div className="mt-10">
+          <h2 className="text-lg font-bold text-slate-700 mb-4">Historial de Reportes</h2>
+          <div className="overflow-x-auto">
+            <table className="min-w-full bg-white rounded-lg shadow border border-slate-200">
+              <thead>
+                <tr className="bg-slate-100">
+                  <th className="px-4 py-2 text-left text-xs font-semibold text-slate-600">ID</th>
+                  <th className="px-4 py-2 text-left text-xs font-semibold text-slate-600">Estado</th>
+                  <th className="px-4 py-2 text-left text-xs font-semibold text-slate-600">Creado</th>
+                  <th className="px-4 py-2 text-left text-xs font-semibold text-slate-600">Finalizado</th>
+                  <th className="px-4 py-2 text-left text-xs font-semibold text-slate-600">Error</th>
+                  <th className="px-4 py-2 text-left text-xs font-semibold text-slate-600">Descargar</th>
+                </tr>
+              </thead>
+              <tbody>
+                {reports.filter(r => r.report_type === 'datastage').length > 0 ? (
+                  reports
+                    .filter(r => r.report_type === 'datastage')
+                    .map((r) => (
+                      <tr key={r.report_id}>
+                        <td className="px-4 py-2 text-xs text-slate-700">{r.report_id}</td>
+                        <td className="px-4 py-2 text-xs text-slate-700">{r.status}</td>
+                        <td className="px-4 py-2 text-xs text-slate-700">{r.created_at}</td>
+                        <td className="px-4 py-2 text-xs text-slate-700">{r.finished_at}</td>
+                        <td className="px-4 py-2 text-xs text-red-500">{r.error_message ? r.error_message : '-'}</td>
+                        <td className="px-4 py-2 text-xs">
+                          {r.status === 'ready' ? (
+                            <button
+                              className="text-blue-600 hover:underline"
+                              onClick={() => handleDownloadReport(r.report_id)}
+                            >
+                              Descargar
+                            </button>
+                          ) : (
+                            <span className="text-slate-400">-</span>
+                          )}
+                        </td>
+                      </tr>
+                    ))
+                ) : (
+                  <tr>
+                    <td colSpan={6} className="px-4 py-2 text-center text-slate-400">
+                      No hay reportes de datastage
+                    </td>
+                  </tr>
+                )}
+              </tbody>
+            </table>
+          </div>
+        </div>
+
         <style>{`
           .skeleton-animation {
             animation: shimmer 2s linear infinite;
@@ -1692,31 +1807,137 @@ export default function Reports() {
       <div className="p-6">
         <h2 className="text-xl font-bold mb-2 text-blue-900">Generar reporte de Cumplimiento</h2>
         <p className="mb-4 text-gray-700">Aquí puedes generar y descargar el reporte de Cumplimiento.</p>
-        {/* Filtros replicados */}
         <div className="max-w-7xl mx-auto mt-6 mb-4 px-4">
-          <form onSubmit={(e) => {
+          <form onSubmit={(e) => e.preventDefault()} className="bg-white rounded-lg shadow-sm border border-slate-200 p-4">
-            e.preventDefault();
-            fetchSummary();
-          }} className="bg-white rounded-lg shadow-sm border border-slate-200 p-4">
             <div className="grid grid-cols-2 md:grid-cols-4 gap-4 mb-4">
-              {Object.keys(initialFiltersCumplimiento).map((key) => (
+
-                <div key={key}>
+              {/* Organización — solo lectura */}
-                  <label className="block text-xs font-medium text-slate-600 mb-1" htmlFor={key}>
+              <div>
-                    {key.replace(/_/g, ' ').replace('gte', 'desde').replace('lte', 'hasta')}
+                <label className="block text-xs font-medium text-slate-600 mb-1">Organización</label>
-                  </label>
                 <input
-                    type={key.includes('fecha') ? 'date' : 'text'}
+                  type="text"
-                    name={key}
+                  readOnly
-                    id={key}
+                  value={organizaciones?.results?.find(o => o.id === organizacionId)?.nombre || organizacionId || ''}
-                    value={filtersCumplimiento[key]}
+                  className="w-full border border-slate-200 rounded px-2 py-1 text-sm bg-slate-50 text-slate-500 cursor-not-allowed"
+                />
+              </div>
+
+              {/* RFC Contribuyente — dropdown dinámico */}
+              <div>
+                <label className="block text-xs font-medium text-slate-600 mb-1">RFC Contribuyente</label>
+                <select
+                  name="contribuyente__rfc"
+                  value={filtersCumplimiento.contribuyente__rfc}
+                  onChange={handleFilterChangeCumplimiento}
+                  className="w-full border border-slate-300 rounded px-2 py-1 text-sm focus:ring-blue-500 focus:border-blue-500 bg-white"
+                >
+                  <option value="">Todos los RFC</option>
+                  <option value="SIN_RFC">Pedimentos sin RFC</option>
+                  {rfcsCumplimiento.map(rfc => (
+                    <option key={rfc} value={rfc}>{rfc}</option>
+                  ))}
+                </select>
+              </div>
+
+              {/* Pedimento App */}
+              <div>
+                <label className="block text-xs font-medium text-slate-600 mb-1">Pedimento</label>
+                <input
+                  type="text"
+                  name="pedimento_app"
+                  value={filtersCumplimiento.pedimento_app}
+                  onChange={handleFilterChangeCumplimiento}
+                  placeholder="Ej. 21-160-3910-0003357"
+                  className="w-full border border-slate-300 rounded px-2 py-1 text-sm focus:ring-blue-500 focus:border-blue-500"
+                />
+              </div>
+
+              {/* Aduana */}
+              <div>
+                <label className="block text-xs font-medium text-slate-600 mb-1">Aduana</label>
+                <input
+                  type="text"
+                  name="aduana"
+                  value={filtersCumplimiento.aduana}
                   onChange={handleFilterChangeCumplimiento}
                   className="w-full border border-slate-300 rounded px-2 py-1 text-sm focus:ring-blue-500 focus:border-blue-500"
                 />
               </div>
-              ))}
+
+              {/* Patente */}
+              <div>
+                <label className="block text-xs font-medium text-slate-600 mb-1">Patente</label>
+                <input
+                  type="text"
+                  name="patente"
+                  value={filtersCumplimiento.patente}
+                  onChange={handleFilterChangeCumplimiento}
+                  className="w-full border border-slate-300 rounded px-2 py-1 text-sm focus:ring-blue-500 focus:border-blue-500"
+                />
+              </div>
+
+              {/* Régimen */}
+              <div>
+                <label className="block text-xs font-medium text-slate-600 mb-1">Régimen</label>
+                <input
+                  type="text"
+                  name="regimen"
+                  value={filtersCumplimiento.regimen}
+                  onChange={handleFilterChangeCumplimiento}
+                  className="w-full border border-slate-300 rounded px-2 py-1 text-sm focus:ring-blue-500 focus:border-blue-500"
+                />
+              </div>
+
+              {/* Agente Aduanal */}
+              <div>
+                <label className="block text-xs font-medium text-slate-600 mb-1">Agente Aduanal</label>
+                <input
+                  type="text"
+                  name="agente_aduanal"
+                  value={filtersCumplimiento.agente_aduanal}
+                  onChange={handleFilterChangeCumplimiento}
+                  className="w-full border border-slate-300 rounded px-2 py-1 text-sm focus:ring-blue-500 focus:border-blue-500"
+                />
+              </div>
+
+              {/* Tipo Operación */}
+              <div>
+                <label className="block text-xs font-medium text-slate-600 mb-1">Tipo Operación</label>
+                <input
+                  type="text"
+                  name="tipo_operacion"
+                  value={filtersCumplimiento.tipo_operacion}
+                  onChange={handleFilterChangeCumplimiento}
+                  className="w-full border border-slate-300 rounded px-2 py-1 text-sm focus:ring-blue-500 focus:border-blue-500"
+                />
+              </div>
+
+              {/* Fecha Pago Desde */}
+              <div>
+                <label className="block text-xs font-medium text-slate-600 mb-1">Fecha pago desde</label>
+                <input
+                  type="date"
+                  name="fecha_pago_gte"
+                  value={filtersCumplimiento.fecha_pago_gte}
+                  onChange={handleFilterChangeCumplimiento}
+                  className="w-full border border-slate-300 rounded px-2 py-1 text-sm focus:ring-blue-500 focus:border-blue-500"
+                />
+              </div>
+
+              {/* Fecha Pago Hasta */}
+              <div>
+                <label className="block text-xs font-medium text-slate-600 mb-1">Fecha pago hasta</label>
+                <input
+                  type="date"
+                  name="fecha_pago_lte"
+                  value={filtersCumplimiento.fecha_pago_lte}
+                  onChange={handleFilterChangeCumplimiento}
+                  className="w-full border border-slate-300 rounded px-2 py-1 text-sm focus:ring-blue-500 focus:border-blue-500"
+                />
+              </div>
+
             </div>
             <div className="flex justify-end">
-              <div className="flex gap-2">
               <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"
@@ -1725,7 +1946,6 @@ export default function Reports() {
                 Generar Reporte
               </button>
             </div>
-            </div>
           </form>
         </div>
         {/* Aquí va la lógica y UI específica para Cumplimiento */}

src/pages/SSOCallback.jsx

@@ -0,0 +1,114 @@
+/**
+ * Receptor del relay token del Hub.
+ * Maneja dos flujos:
+ *   - SSO entre productos: Hub redirige a /auth/sso?relay=<uuid>
+ *   - Login con Microsoft: Hub redirige al mismo endpoint tras OAuth
+ */
+import { useEffect, useState } from 'react';
+
+const API_URL = import.meta.env.VITE_EFC_API_URL;
+
+export default function SSOCallback() {
+  const [error, setError] = useState(null);
+
+  useEffect(() => {
+    const params = new URLSearchParams(window.location.search);
+    const relay = params.get('relay');
+
+    if (!relay) {
+      setError('No se recibió relay token. Acceso denegado.');
+      return;
+    }
+
+    (async () => {
+      try {
+        const res = await fetch(`${API_URL}/auth/sso/exchange/`, {
+          method: 'POST',
+          headers: { 'Content-Type': 'application/json' },
+          credentials: 'include',
+          body: JSON.stringify({ relay_token: relay }),
+        });
+
+        if (!res.ok) {
+          const body = await res.json().catch(() => ({}));
+          throw new Error(body.detail || 'Error al iniciar sesión SSO');
+        }
+
+        const data = await res.json();
+
+        // Guardar tokens en localStorage para fetchWithAuth
+        if (data.access_token) {
+          localStorage.setItem('access', data.access_token);
+        }
+        if (data.refresh_token) {
+          localStorage.setItem('refresh', data.refresh_token);
+        }
+
+        // Sincronizar datos de usuario
+        const apiUrl = import.meta.env.VITE_EFC_API_URL || '';
+        try {
+          const [resUser, resPerms] = await Promise.all([
+            fetch(`${apiUrl}/user/users/me/`, { headers: { Authorization: `Bearer ${data.access_token}` }, credentials: 'include' }),
+            fetch(`${apiUrl}/rbac/my-permissions/`, { headers: { Authorization: `Bearer ${data.access_token}` }, credentials: 'include' }),
+          ]);
+          if (resUser.ok) {
+            const user = await resUser.json();
+            if (user?.username) {
+              localStorage.setItem('username', user.username);
+              if (user.email)      localStorage.setItem('user_email', user.email);
+              if (user.id)         localStorage.setItem('user_id', String(user.id));
+              if (user.first_name) localStorage.setItem('user_first_name', user.first_name);
+              if (user.last_name)  localStorage.setItem('user_last_name', user.last_name);
+              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?.permissions)
+              localStorage.setItem('user_permissions', JSON.stringify(permsData.permissions));
+          }
+        } catch (_) {}
+
+        window.dispatchEvent(new CustomEvent('authStateChanged'));
+        window.location.href = '/admin';
+      } catch (err) {
+        setError(err.message || 'Error al iniciar sesión vía workspace');
+      }
+    })();
+  }, []);
+
+  if (error) {
+    return (
+      <div className="min-h-screen flex items-center justify-center bg-gray-50">
+        <div className="max-w-md w-full bg-white rounded-2xl shadow-lg p-8 text-center space-y-4">
+          <div className="w-12 h-12 bg-red-100 rounded-full flex items-center justify-center mx-auto">
+            <svg className="w-6 h-6 text-red-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+              <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M6 18L18 6M6 6l12 12" />
+            </svg>
+          </div>
+          <h2 className="text-lg font-bold text-gray-900">Error de inicio de sesión</h2>
+          <p className="text-sm text-gray-600">{error}</p>
+          <a
+            href={`${import.meta.env.VITE_HUB_URL || 'http://localhost:3001'}/login`}
+            className="inline-block mt-2 text-sm font-medium text-blue-600 hover:underline"
+          >
+            Volver al login
+          </a>
+        </div>
+      </div>
+    );
+  }
+
+  return (
+    <div className="min-h-screen flex items-center justify-center bg-gray-50">
+      <div className="text-center space-y-3">
+        <svg className="w-8 h-8 text-blue-500 animate-spin mx-auto" fill="none" viewBox="0 0 24 24">
+          <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4" />
+          <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" />
+        </svg>
+        <p className="text-sm text-gray-600 font-medium">Iniciando sesión…</p>
+      </div>
+    </div>
+  );
+}

src/pages/Settings.jsx

@@ -304,7 +304,8 @@ const Settings = () => {
         localStorage.removeItem('access');
         localStorage.removeItem('refresh');
         setTimeout(() => {
-          window.location.href = '/login';
+          const _hub = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
+          window.location.href = `${_hub}/login?return_to=${encodeURIComponent(window.location.origin + '/auth/sso')}`;
         }, 2000);
         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,859 @@
+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) {
+      const _hub = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
+      window.location.href = `${_hub}/login?return_to=${encodeURIComponent(window.location.origin + '/auth/sso')}`;
+      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);
       });
   };
@@ -89,7 +91,8 @@ export default function Users() {
       localStorage.removeItem('user_first_name');
       localStorage.removeItem('user_last_name');
       localStorage.removeItem('user_is_importador');
-      window.location.href = '/login';
+      const _hub = import.meta.env.VITE_HUB_URL || 'http://localhost:3001';
+      window.location.href = `${_hub}/login?return_to=${encodeURIComponent(window.location.origin + '/auth/sso')}`;
       return;
     }
 
@@ -97,7 +100,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 +108,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 +352,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 +530,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 +728,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 +835,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 +856,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);