fix/T2025-09-056 corregir reportes de datastage para cargar en un solo documento

Reviewed-on: #23

src/App.jsx

@@ -14,6 +14,7 @@ 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 Reports from './pages/Reports';
 import Settings from './pages/Settings';
 import Importers from './pages/Importers';
@@ -76,6 +77,16 @@ function AppContent() {
             <Users />
           </RequireAuth>
         } />
+        <Route path="/users/new" element={
+          <RequireAuth>
+            <UserForm />
+          </RequireAuth>
+        } />
+        <Route path="/users/:id/edit" element={
+          <RequireAuth>
+            <UserForm />
+          </RequireAuth>
+        } />
         <Route path="/reports" element={
           <RequireAuth>
             <Reports />

src/api/procesos.ts

@@ -1,4 +1,4 @@
-import { fetchWithAuth } from '../fetchWithAuth';
+import { fetchWithAuth, postWithAuth } from '../fetchWithAuth';
 
 // Tipos para la respuesta y registros
 export interface Task {
@@ -39,6 +39,7 @@ export async function fetchTasks(
       }
     });
     
+    console.log('Params:', params.toString());
     const res = await fetchWithAuth(`${API_URL}/tasks/tasks/?${params.toString()}`);
     
     if (!res.ok) {
@@ -51,3 +52,66 @@ export async function fetchTasks(
     throw error;
   }
 }
+
+// Interfaz para la respuesta del comando
+export interface ComandoResponse {
+  message?: string;
+  error?: string;
+}
+
+// Interfaz para los parámetros de ejecución
+export interface EjecutarComandoParams {
+  procesamiento?: string;
+  organizacionid?: string;  
+  todos?: boolean;
+}
+
+// API para ejecutar comando de procesamiento
+export async function ejecutarComando(
+  params: EjecutarComandoParams
+): Promise<ComandoResponse> {
+  try {
+    const API_URL = (import.meta as any).env.VITE_EFC_API_URL;
+
+    console.log('API_URL:', API_URL);    
+    // Preparar los datos para la petición POST
+    const requestData: any = {};
+    
+    if (params.procesamiento !== undefined) {
+      requestData.procesamiento = params.procesamiento;
+    }
+
+    if (params.organizacionid !== undefined) {
+      requestData.organizacionid = params.organizacionid;
+    }
+    
+    if (params.todos !== undefined) {
+      requestData.todos = params.todos;
+    }
+    
+    // const res = await fetchWithAuth(`${API_URL}/customs/procesamientopedimentos-ejecutar-comando/`, {
+    //   method: 'POST',
+    //   headers: {
+    //     'Content-Type': 'application/json',
+    //   },
+    //   body: JSON.stringify(requestData),
+    // });
+
+    const res = await postWithAuth(`${API_URL}/customs/procesamientopedimentos-ejecutar-comando/`, requestData);
+    
+    if (!res.ok) {
+      // Intentar obtener el mensaje de error del servidor
+      try {
+        const errorData = await res.json();
+        throw new Error(errorData.message || errorData.error || `Error ${res.status}: ${res.statusText}`);
+      } catch {
+        throw new Error(`Error ${res.status}: ${res.statusText}`);
+      }
+    }
+    
+    return await res.json();
+  } catch (error) {
+    // console.error('Error in ejecutarComando:', error);
+    throw error;
+  }
+}

src/pages/Datastage.jsx

@@ -381,11 +381,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,7 +399,7 @@ 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 '';
@@ -507,16 +507,16 @@ 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 ''; } })()
                                                     )}
                                                 >
                                                     <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
@@ -803,7 +803,7 @@ export default function Datastage() {
                     <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-40">
                         <div className="bg-white rounded-xl shadow-2xl border border-blue-200 p-8 max-w-sm w-full flex flex-col animate-fade-in">
                             <h3 className="text-lg font-bold mb-2 text-blue-900">Detalle de Datastage #{selected.id}</h3>
-                            <div className="mb-1"><b>Archivo:</b> {selected.archivo ? <a href={selected.archivo} target="_blank" rel="noopener noreferrer" className="text-blue-600 underline break-all">Descargar</a> : <span className="text-gray-400">Sin archivo</span>}</div>
+                            {/* <div className="mb-1"><b>Archivo:</b> {selected.download_url ? <a href={selected.download_url} target="_blank" rel="noopener noreferrer" className="text-blue-600 underline break-all">Descargar</a> : <span className="text-gray-400">Sin archivo</span>}</div> */}
                             <div className="mb-1"><b>Contribuyente:</b> {selected.contribuyente}</div>
                             <div className="mb-1"><b>Procesado:</b> <span className={selected.procesado ? 'bg-green-100 text-green-700 px-2 py-0.5 rounded-full text-xs' : 'bg-yellow-100 text-yellow-700 px-2 py-0.5 rounded-full text-xs'}>{selected.procesado ? 'Sí' : 'No'}</span></div>
                             <div className="mb-1"><b>Organización:</b> {selected.organizacion}</div>

src/pages/Expedientes.jsx

@@ -230,6 +230,125 @@ export default function Documents() {
   //    }
   //   // showMessage('Error durante la descarga masiva', 'error');
   // };
+
+  // accionar pedimento completo si no se proceso
+  const handleEjecutarServicio = async (pedimentoId, org) => {
+    try {
+      showMessage(`Procesando pedimento ${pedimentoId}...`, 'info');
+      
+      // Construir el body de la petición
+      const body = {
+        organizacion: org, // Ajusta según tu organización, puede ser string o número
+        pedimento: pedimentoId.toString() // Convertir a string si es necesario
+      };
+      
+      // Endpoint para pedimento completo
+      const MICROSERVICE_URL = import.meta.env.VITE_EFC_MICROSERVICE_URL;
+      const endpoint = `${MICROSERVICE_URL}/services/pedimento_completo`;
+      
+      const response = await postWithAuth(endpoint, body);
+      
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}));
+        throw new Error(errorData.message || errorData.detail || `Error ${response.status}: ${response.statusText}`);
+      }
+      
+      const result = await response.json();
+      console.log('Resultado del servicio:', result);
+      
+      showMessage(`Pedimento ${pedimentoId} procesado correctamente`, 'success');
+      
+      // Opcional: Refrescar la lista después de procesar
+      setTimeout(() => {
+        refetch();
+      }, 2000);
+      
+    } catch (error) {
+      console.error('Error ejecutando servicio:', error);
+      showMessage(`Error al procesar pedimento ${pedimentoId}: ${error.message}`, 'error');
+    }
+  };
+
+  // Agrega esta función después de handleEjecutarServicio
+  const handleProcesarMultiplesPedimentos = async () => {
+    const pedimentosNoProcesados = currentDocuments.filter(ped => selectedDocuments.includes(ped.id) && !ped.existe_expediente);
+
+    if (pedimentosNoProcesados.length === 0) {
+      showMessage('No hay pedimentos seleccionados que estén sin procesar', 'warning');
+      return;
+    }
+
+    if (pedimentosNoProcesados.length > 200) {
+      showMessage(`Máximo 200 pedimentos por solicitud. Seleccionados: ${pedimentosNoProcesados.length}`, 'warning');
+      return;
+    }
+
+    try {
+      showMessage(`Iniciando procesamiento de ${pedimentosNoProcesados.length} pedimentos...`, 'info');
+      
+      const pedimentosData = pedimentosNoProcesados.map(ped => ({
+        id: ped.id,
+        pedimento_app: ped.pedimento_app,
+        aduana: ped.aduana,
+        patente: ped.patente,
+        pedimento: ped.pedimento,
+        organizacion: ped.organizacion
+      }));
+
+      const MICROSERVICE_URL = import.meta.env.VITE_EFC_MICROSERVICE_URL;
+      const response = await postWithAuth(`${MICROSERVICE_URL}/async/services/pedimento_completo/multiple`, {
+        organizacion: pedimentosNoProcesados[0].organizacion.toString(),
+        pedimentos: pedimentosNoProcesados.map(p => p.id.toString())
+      });
+
+      if (!response.ok) {
+        const errorData = await response.json().catch(() => ({}));
+        throw new Error(errorData.message || errorData.detail || `Error ${response.status}: ${response.statusText}`);
+      }
+
+      const result = await response.json();
+      
+      showMessage(
+        `Tarea iniciada: ${result.total_pedimentos} pedimentos encolados. Task ID: ${result.task_id}`,
+        'success'
+      );
+
+      setSelectedDocuments([]);
+      setIsSelectAll(false);
+
+      // Opcional: Iniciar polling para monitorear el progreso
+      // const intervalId = setInterval(async () => {
+      //   const statusResponse = await fetchWithAuth(`${MICROSERVICE_URL}/async/task-status/${result.task_id}`);
+        
+      //   if (statusResponse.ok) {
+      //     const status = await statusResponse.json();
+          
+      //     if (status.status === 'SUCCESS') {
+      //       clearInterval(intervalId);
+      //       const { success_count, failed_count, elapsed_seconds } = status.result;
+      //       showMessage(
+      //         `Procesamiento completado: ${success_count} exitosos, ${failed_count} fallidos. Tiempo: ${elapsed_seconds}s`,
+      //         failed_count > 0 ? 'warning' : 'success'
+      //       );
+      //       refetch(); // Refrescar la lista
+      //     } else if (status.status === 'FAILURE') {
+      //       clearInterval(intervalId);
+      //       showMessage(`Error en el procesamiento: ${status.message}`, 'error');
+      //     } else if (status.status === 'PROGRESS' && status.progress) {
+      //       const { current, total, current_pedimento, percentage } = status.progress;
+      //       console.log(`Progreso: ${percentage}% - ${current}/${total}: ${current_pedimento}`);
+      //     }
+      //   }
+      // }, 5000);
+
+      setTimeout(() => clearInterval(intervalId), 600000);
+
+    } catch (error) {
+      console.error('Error procesando múltiples pedimentos:', error);
+      showMessage(`Error: ${error.message}`, 'error');
+    }
+  };
+
   // Función para descargar documentos seleccionados
   const handleDownloadSelected = async () => {
      if (selectedDocuments.length === 0) {
@@ -945,6 +1064,21 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                 </div>
                 <div className="px-6 py-4">
                   <div className="flex flex-wrap gap-3">
+                    {/* NUEVO BOTÓN PARA PROCESAR MÚLTIPLES */}
+                    <button
+                      onClick={handleProcesarMultiplesPedimentos}
+                      className="inline-flex items-center px-4 py-2 font-medium text-white transition-colors duration-200 bg-green-600 rounded-lg shadow-sm hover:bg-green-700 hover:shadow-md"
+                    >
+                      <svg className="w-5 h-5 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 10V3L4 14h7v7l9-11h-7z" />
+                      </svg>
+                      Procesar seleccionados ({selectedDocuments.filter(id => {
+                        const ped = currentDocuments.find(p => p.id === id);
+                        return ped && !ped.existe_expediente;
+                      }).length} pendientes)
+                    </button>
+                    
+                    {/* Botón existente de eliminar */}
                     <button
                       onClick={handleDeleteSelected}
                       className="inline-flex items-center px-4 py-2 font-medium text-white transition-colors duration-200 bg-red-600 rounded-lg shadow-sm hover:bg-red-700 hover:shadow-md"
@@ -1145,6 +1279,21 @@ const downloadExpediente = async (pedimentoId, pedimentoName, setSuccess, showMe
                             </span>
                           </td>
                           <td className="px-4 py-3 text-center whitespace-nowrap">
+                            {ped.existe_expediente ? (
+                              <>
+                              </>
+                            ) : (
+                              <button
+                                className="p-2 text-green-600 transition-colors duration-200 rounded-full hover:text-green-800 hover:bg-green-50 focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2"
+                                onClick={() => handleEjecutarServicio(ped.id, ped.organizacion)}
+                                title="Procesar"
+                              >
+                                <svg className="w-4 h-4 text-green-600" fill="currentColor" viewBox="0 0 24 24">
+                                  <path d="M8 5v14l11-7z" />
+                                </svg>
+                              </button>
+                            )}
+                            {/* handleEjecutarServicio */}
                             <button
                               className="p-2 text-blue-600 transition-colors duration-200 rounded-full hover:text-blue-800 hover:bg-blue-50 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-offset-2"
                               onClick={() => handleDownloadTodoElExpediente(ped.id, ped.pedimento_app)}

src/pages/Procesos.jsx

@@ -1,8 +1,10 @@
 
 import React, { useEffect, useState, useRef } from 'react';
 import { Link } from 'react-router-dom';
-import { fetchTasks } from '../api/procesos.ts';
+import { fetchTasks, ejecutarComando } from '../api/procesos.ts';
 import { fetchWithAuth } from '../fetchWithAuth';
+import { useNotification } from '../context/NotificationContext';
+const API_URL = import.meta.env.VITE_EFC_API_URL;
 
 // Modal para mostrar detalles del task
 const TaskDetailsModal = ({ task, onClose }) => {
@@ -42,9 +44,9 @@ const TaskDetailsModal = ({ task, onClose }) => {
   };
   
   return (
-    <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+    <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50">
       <div className="bg-white rounded-2xl p-6 max-w-3xl w-full mx-4 max-h-[90vh] overflow-y-auto">
-        <div className="flex justify-between items-center mb-6">
+        <div className="flex items-center justify-between mb-6">
           <h3 className="text-xl font-semibold text-gray-900">Detalles de la Tarea</h3>
           <button
             onClick={onClose}
@@ -58,20 +60,20 @@ const TaskDetailsModal = ({ task, onClose }) => {
         
         <div className="space-y-6">
           {/* Información básica de la tarea */}
-          <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+          <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-            <div className="bg-gray-50 p-4 rounded-xl">
+            <div className="p-4 bg-gray-50 rounded-xl">
               <h4 className="text-sm font-medium text-gray-500">Task ID</h4>
-              <p className="mt-1 text-sm font-mono text-gray-900">{task.task_id}</p>
+              <p className="mt-1 font-mono text-sm text-gray-900">{task.task_id}</p>
             </div>
             
-            <div className="bg-gray-50 p-4 rounded-xl">
+            <div className="p-4 bg-gray-50 rounded-xl">
               <h4 className="text-sm font-medium text-gray-500">Estado</h4>
               <span className={`mt-2 inline-flex items-center px-2.5 py-1 rounded-lg text-xs font-semibold border ${getStatusColor(task.status)}`}>
                 {task.status}
               </span>
             </div>
             
-            <div className="bg-gray-50 p-4 rounded-xl">
+            <div className="p-4 bg-gray-50 rounded-xl">
               <h4 className="text-sm font-medium text-gray-500">Fecha</h4>
               <p className="mt-1 text-sm text-gray-900">
                 {new Date(task.timestamp).toLocaleString('es-MX', {
@@ -86,14 +88,14 @@ const TaskDetailsModal = ({ task, onClose }) => {
               </p>
             </div>
             
-            <div className="bg-gray-50 p-4 rounded-xl">
+            <div className="p-4 bg-gray-50 rounded-xl">
               <h4 className="text-sm font-medium text-gray-500">Progreso</h4>
               <p className="mt-1 text-sm text-gray-900">{task.progress || 0}%</p>
             </div>
           </div>
 
           {/* Mensajes y Errores */}
-          <div className="bg-gray-50 p-4 rounded-xl">
+          <div className="p-4 bg-gray-50 rounded-xl">
             <h4 className="text-sm font-medium text-gray-500">Mensaje de la tarea</h4>
             {(() => {
               // Intentar parsear el mensaje si contiene un error HTTPException
@@ -104,12 +106,12 @@ const TaskDetailsModal = ({ task, onClose }) => {
                     const detail = JSON.parse(match[1].replace(/'/g, '"'));
                     return (
                       <div className="mt-2 space-y-3">
-                        <div className="bg-red-50 p-3 rounded-lg">
+                        <div className="p-3 rounded-lg bg-red-50">
-                          <p className="text-sm text-red-700 font-medium">{detail.message}</p>
+                          <p className="text-sm font-medium text-red-700">{detail.message}</p>
                         </div>
                         {detail.errors && detail.errors.length > 0 && (
-                          <div className="bg-red-50 p-3 rounded-lg">
+                          <div className="p-3 rounded-lg bg-red-50">
-                            <ul className="list-disc pl-4 space-y-1">
+                            <ul className="pl-4 space-y-1 list-disc">
                               {detail.errors.map((error, idx) => (
                                 <li key={idx} className="text-sm text-red-600">{error}</li>
                               ))}
@@ -117,14 +119,14 @@ const TaskDetailsModal = ({ task, onClose }) => {
                           </div>
                         )}
                         {detail.data && (
-                          <div className="bg-orange-50 p-3 rounded-lg">
+                          <div className="p-3 rounded-lg bg-orange-50">
-                            <h5 className="text-sm font-medium text-orange-700 mb-2">Archivo de Error:</h5>
+                            <h5 className="mb-2 text-sm font-medium text-orange-700">Archivo de Error:</h5>
-                            <p className="text-sm text-orange-600 font-mono">{detail.data.error_file}</p>
+                            <p className="font-mono text-sm text-orange-600">{detail.data.error_file}</p>
                           </div>
                         )}
                         {detail.metadata && (
-                          <div className="bg-blue-50 p-3 rounded-lg">
+                          <div className="p-3 rounded-lg bg-blue-50">
-                            <h5 className="text-sm font-medium text-blue-700 mb-2">Información Adicional:</h5>
+                            <h5 className="mb-2 text-sm font-medium text-blue-700">Información Adicional:</h5>
                             <div className="grid grid-cols-2 gap-2">
                               {Object.entries(detail.metadata).map(([key, value]) => (
                                 <div key={key} className="flex items-start gap-2">
@@ -149,7 +151,7 @@ const TaskDetailsModal = ({ task, onClose }) => {
             {/* Mostrar detalles de error si existe */}
             {(task.status === 'FAILURE' || task.status === 'FAILED') && task.error && (
               <div className="mt-4 space-y-4">
-                <div className="border-t pt-4">
+                <div className="pt-4 border-t">
                   <h4 className="text-sm font-medium text-red-600">Detalles del Error</h4>
                   {(() => {
                     const errorDetail = parseError(task.error);
@@ -158,16 +160,16 @@ const TaskDetailsModal = ({ task, onClose }) => {
                         <div className="mt-3 space-y-4">
                           {/* Mensaje principal del error */}
                           {errorDetail.detail.message && (
-                            <div className="bg-red-50 p-3 rounded-lg">
+                            <div className="p-3 rounded-lg bg-red-50">
                               <p className="text-sm text-red-700">{errorDetail.detail.message}</p>
                             </div>
                           )}
                           
                           {/* Lista de errores específicos */}
                           {errorDetail.detail.errors && errorDetail.detail.errors.length > 0 && (
-                            <div className="bg-red-50 p-3 rounded-lg">
+                            <div className="p-3 rounded-lg bg-red-50">
-                              <h5 className="text-sm font-medium text-red-700 mb-2">Errores detectados:</h5>
+                              <h5 className="mb-2 text-sm font-medium text-red-700">Errores detectados:</h5>
-                              <ul className="list-disc pl-4 space-y-1">
+                              <ul className="pl-4 space-y-1 list-disc">
                                 {errorDetail.detail.errors.map((error, idx) => (
                                   <li key={idx} className="text-sm text-red-600">{error}</li>
                                 ))}
@@ -177,8 +179,8 @@ const TaskDetailsModal = ({ task, onClose }) => {
                           
                           {/* Datos adicionales del error */}
                           {errorDetail.detail.data && (
-                            <div className="bg-orange-50 p-3 rounded-lg">
+                            <div className="p-3 rounded-lg bg-orange-50">
-                              <h5 className="text-sm font-medium text-orange-700 mb-2">Archivos relacionados:</h5>
+                              <h5 className="mb-2 text-sm font-medium text-orange-700">Archivos relacionados:</h5>
                               <div className="grid grid-cols-1 gap-2">
                                 {Object.entries(errorDetail.detail.data).map(([key, value]) => (
                                   <div key={key} className="flex items-start gap-2">
@@ -192,9 +194,9 @@ const TaskDetailsModal = ({ task, onClose }) => {
                           
                           {/* Metadata */}
                           {errorDetail.detail.metadata && (
-                            <div className="bg-blue-50 p-3 rounded-lg">
+                            <div className="p-3 rounded-lg bg-blue-50">
-                              <h5 className="text-sm font-medium text-blue-700 mb-2">Metadata:</h5>
+                              <h5 className="mb-2 text-sm font-medium text-blue-700">Metadata:</h5>
-                              <div className="grid grid-cols-1 md:grid-cols-2 gap-2">
+                              <div className="grid grid-cols-1 gap-2 md:grid-cols-2">
                                 {Object.entries(errorDetail.detail.metadata).map(([key, value]) => (
                                   <div key={key} className="flex items-start gap-2">
                                     <span className="text-sm font-medium text-blue-600">{key}:</span>
@@ -208,7 +210,7 @@ const TaskDetailsModal = ({ task, onClose }) => {
                       );
                     }
                     return (
-                      <div className="bg-red-50 p-3 rounded-lg mt-2">
+                      <div className="p-3 mt-2 rounded-lg bg-red-50">
                         <p className="text-sm text-red-700">{task.error}</p>
                       </div>
                     );
@@ -220,7 +222,7 @@ const TaskDetailsModal = ({ task, onClose }) => {
             {/* Mensaje del resultado si existe */}
             {task.result?.message && (
               <>
-                <h4 className="text-sm font-medium text-gray-500 mt-3">Mensaje del resultado</h4>
+                <h4 className="mt-3 text-sm font-medium text-gray-500">Mensaje del resultado</h4>
                 <p className="mt-1 text-sm text-gray-900">{task.result.message}</p>
               </>
             )}
@@ -229,13 +231,13 @@ const TaskDetailsModal = ({ task, onClose }) => {
           {/* Detalles del resultado */}
           {task.result?.data && (
             <div className="space-y-4">
-              <h4 className="text-lg font-medium text-gray-700 border-b pb-2">Detalles del Resultado</h4>
+              <h4 className="pb-2 text-lg font-medium text-gray-700 border-b">Detalles del Resultado</h4>
               
               {/* Información del documento si existe */}
               {task.result.data.data?.documento && (
-                <div className="bg-blue-50 p-4 rounded-xl">
+                <div className="p-4 bg-blue-50 rounded-xl">
-                  <h5 className="text-sm font-medium text-blue-700 mb-3">Información del Documento</h5>
+                  <h5 className="mb-3 text-sm font-medium text-blue-700">Información del Documento</h5>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                  <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
                     <div>
                       <p className="text-xs font-medium text-blue-600">Número de Pedimento</p>
                       <p className="text-sm text-blue-900">{task.result.data.data.documento.pedimento_numero}</p>
@@ -258,9 +260,9 @@ const TaskDetailsModal = ({ task, onClose }) => {
 
               {/* Información de la partida si existe */}
               {task.result.data.data?.partida_update_response && (
-                <div className="bg-indigo-50 p-4 rounded-xl">
+                <div className="p-4 bg-indigo-50 rounded-xl">
-                  <h5 className="text-sm font-medium text-indigo-700 mb-3">Información de la Partida</h5>
+                  <h5 className="mb-3 text-sm font-medium text-indigo-700">Información de la Partida</h5>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                  <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
                     <div>
                       <p className="text-xs font-medium text-indigo-600">Número de Partida</p>
                       <p className="text-sm text-indigo-900">{task.result.data.data.partida_update_response.numero_partida}</p>
@@ -277,9 +279,9 @@ const TaskDetailsModal = ({ task, onClose }) => {
 
               {/* Metadata si existe */}
               {task.result.data?.metadata && (
-                <div className="bg-gray-50 p-4 rounded-xl">
+                <div className="p-4 bg-gray-50 rounded-xl">
-                  <h5 className="text-sm font-medium text-gray-700 mb-3">Metadata</h5>
+                  <h5 className="mb-3 text-sm font-medium text-gray-700">Metadata</h5>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
+                  <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
                     {Object.entries(task.result.data.metadata).map(([key, value]) => (
                       <div key={key}>
                         <p className="text-xs font-medium text-gray-500">{key}</p>
@@ -298,7 +300,10 @@ const TaskDetailsModal = ({ task, onClose }) => {
 };
 
 
+
+
 export default function Procesos() {
+  const { showMessage } = useNotification();
   const [procesos, setProcesos] = useState([]);
   const [loading, setLoading] = useState(true);
   const [error, setError] = useState('');
@@ -347,6 +352,10 @@ export default function Procesos() {
   const [pedimentoPedimentoFilter, setPedimentoPedimentoFilter] = useState('');
   const [servicioFilter, setServicioFilter] = useState('');
   const [statusFilter, setStatusFilter] = useState('');
+
+  const [organizacionFilter, setOrganizacionFilter] = useState('');
+  const [organizaciones, setOrganizaciones] = useState([]);
+  const [loadingOrganizaciones, setLoadingOrganizaciones] = useState(false);
   
   // Sorting
   const [sortField, setSortField] = useState('');
@@ -357,6 +366,7 @@ export default function Procesos() {
     pedimentoPedimentoFilter: '',
     statusFilter: '',
     servicioFilter: '',
+    organizacionFilter: '',  // Añadir esta línea
     sortField: '',
     sortOrder: 'asc'
   });
@@ -370,6 +380,7 @@ export default function Procesos() {
         pedimentoPedimentoFilter,
         servicioFilter,
         statusFilter,
+        organizacionFilter,  // Añadir esta línea
         sortField,
         sortOrder
       };
@@ -397,6 +408,7 @@ export default function Procesos() {
         if (pedimentoPedimentoFilter) filters['pedimento_app'] = pedimentoPedimentoFilter;
         if (servicioFilter) filters['servicio'] = servicioFilter;
         if (statusFilter) filters['status'] = statusFilter;
+        if (organizacionFilter) filters['organizacion'] = organizacionFilter;  // Añadir esta línea
         if (sortField) {
           // Mapear campos antiguos a nuevos si es necesario
           const fieldMapping = {
@@ -422,10 +434,98 @@ export default function Procesos() {
       }
     }
     fetchData();
-  }, [page, itemsPerPage, pedimentoPedimentoFilter, servicioFilter, statusFilter, sortField, sortOrder]);
+  }, [page, itemsPerPage, pedimentoPedimentoFilter, servicioFilter, statusFilter, organizacionFilter, sortField, sortOrder]);
+
+  const [showProcesosDropdown, setShowProcesosDropdown] = useState(false);
+  const [ejecutandoProceso, setEjecutandoProceso] = useState(false);
+
+  const handleEjecutarProcesamiento = async (params) => {
+    // Verificar si se ha seleccionado una organización
+    if (!organizacionFilter) {
+      showMessage('Debes seleccionar una organización antes de ejecutar el proceso', 'warning');
+      return; // Detener la ejecución
+    }
+    
+    try {
+      setEjecutandoProceso(true);
+      setShowProcesosDropdown(false);
+
+      // Agregar el ID de la organización a los parámetros
+      const paramsConOrganizacion = {
+        ...params,
+        organizacionid: organizacionFilter // Solo necesitamos el ID
+      };
+      
+       console.log('Ejecutando proceso con parámetros:', paramsConOrganizacion);
+      
+      const resultado = await ejecutarComando(paramsConOrganizacion);
+    
+      if (resultado.message) {
+        // Mostrar mensaje de éxito
+        showMessage(`${resultado.message}`, 'success');
+  
+        // Recargar los datos después de 2 segundos
+        setTimeout(() => {
+          // Forzar recarga de datos
+          const currentFilters = {
+            pedimentoPedimentoFilter,
+            servicioFilter,
+            statusFilter,
+            sortField,
+            sortOrder
+          };
+          prevFiltersRef.current = { ...currentFilters };
+          // Esto activará el useEffect para recargar
+          setPage(prev => prev);
+        }, 2000);
+      } else if (resultado.error) {
+        showMessage(`Error: ${resultado.error}`, 'error');
+      }
+    } catch (error) {
+      // console.error('Error al ejecutar procesamiento:', error);
+      showMessage(`Error: ${error.message}`, 'error');
+    } finally {
+      setEjecutandoProceso(false);
+    }
+  };
+
+// Agrega este efecto para cerrar el dropdown
+useEffect(() => {
+  const handleClickOutside = (event) => {
+    if (showProcesosDropdown && !event.target.closest('.relative')) {
+      setShowProcesosDropdown(false);
+    }
+  };
+  
+  document.addEventListener('click', handleClickOutside);
+  return () => {
+    document.removeEventListener('click', handleClickOutside);
+  };
+}, [showProcesosDropdown]);
+
+useEffect(() => {
+  async function fetchOrganizaciones() {
+    try {
+      setLoadingOrganizaciones(true);
+      const response = await fetchWithAuth(`${API_URL}/organization/organizaciones/`);
+      if (response.ok) {
+        const data = await response.json();
+        setOrganizaciones(data.results || []);
+      }
+    } catch (error) {
+      console.error('Error al cargar organizaciones:', error);
+    } finally {
+      setLoadingOrganizaciones(false);
+    }
+  }
+  
+  fetchOrganizaciones();
+}, []);
+
+
 
   return (
-    <div className="min-h-screen bg-gradient-to-br from-slate-50 via-blue-50 to-indigo-100 p-4 sm:p-6 lg:p-8">
+    <div className="min-h-screen p-4 bg-gradient-to-br from-slate-50 via-blue-50 to-indigo-100 sm:p-6 lg:p-8">
       {/* Modal de detalles del task */}
       {selectedTask && (
         <TaskDetailsModal
@@ -435,45 +535,45 @@ export default function Procesos() {
       )}
       
       {loadingTask && (
-        <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
+        <div className="fixed inset-0 z-50 flex items-center justify-center bg-black bg-opacity-50">
-          <div className="bg-white rounded-full p-4">
+          <div className="p-4 bg-white rounded-full">
-            <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-blue-600"></div>
+            <div className="w-8 h-8 border-b-2 border-blue-600 rounded-full animate-spin"></div>
           </div>
         </div>
       )}
       
-      <div className="max-w-7xl mx-auto">
+      <div className="mx-auto max-w-7xl">
         {/* Header mejorado y responsivo */}
-        <div className="mb-6 sm:mb-8 relative overflow-hidden rounded-3xl shadow-2xl bg-gradient-to-r from-blue-600 via-blue-700 to-blue-800 p-6 sm:p-8 flex items-center gap-4 sm:gap-6 animate-fadein-slideup opacity-0" 
+        <div className="relative flex items-center gap-4 p-6 mb-6 overflow-hidden shadow-2xl opacity-0 sm:mb-8 rounded-3xl bg-gradient-to-r from-blue-600 via-blue-700 to-blue-800 sm:p-8 sm:gap-6 animate-fadein-slideup" 
           style={{ animation: 'fadein-slideup 0.7s cubic-bezier(0.22,1,0.36,1) 0.05s forwards' }}>
-          <div className="flex-shrink-0 bg-white/20 backdrop-blur-sm rounded-full p-3 sm:p-4 shadow-lg animate-bounce-slow">
+          <div className="flex-shrink-0 p-3 rounded-full shadow-lg bg-white/20 backdrop-blur-sm sm:p-4 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">
+            <svg className="w-8 h-8 text-white sm:h-10 sm:w-10" 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 className="flex-1 min-w-0">
-            <h1 className="text-2xl sm:text-3xl lg:text-4xl font-extrabold text-white tracking-tight mb-1 flex flex-col sm:flex-row sm:items-center gap-2">
+            <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>
               {count > 0 && (
-                <span className="inline-block bg-white/20 backdrop-blur-sm text-white text-xs sm:text-sm font-semibold px-3 py-1 rounded-full shadow-lg animate-fade-in">
+                <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
                 </span>
               )}
             </h1>
-            <p className="text-sm sm:text-lg text-blue-100 font-medium leading-relaxed">Estado actual de los procesos de la agencia aduanal</p>
+            <p className="text-sm font-medium leading-relaxed text-blue-100 sm:text-lg">Estado actual de los procesos de la agencia aduanal</p>
           </div>
           {/* Efectos decorativos de fondo modernos */}
-          <div className="absolute -top-10 -right-10 opacity-20 pointer-events-none select-none">
+          <div className="absolute pointer-events-none select-none -top-10 -right-10 opacity-20">
-            <div className="w-32 h-32 bg-white/10 rounded-full blur-xl"></div>
+            <div className="w-32 h-32 rounded-full bg-white/10 blur-xl"></div>
           </div>
-          <div className="absolute -bottom-6 -left-6 opacity-15 pointer-events-none select-none">
+          <div className="absolute pointer-events-none select-none -bottom-6 -left-6 opacity-15">
-            <div className="w-24 h-24 bg-white/10 rounded-full blur-lg"></div>
+            <div className="w-24 h-24 rounded-full bg-white/10 blur-lg"></div>
           </div>
           {/* Partículas flotantes */}
           <div className="absolute inset-0 overflow-hidden pointer-events-none">
-            <div className="absolute top-1/4 left-1/4 w-2 h-2 bg-white/30 rounded-full animate-ping"></div>
+            <div className="absolute w-2 h-2 rounded-full top-1/4 left-1/4 bg-white/30 animate-ping"></div>
-            <div className="absolute top-3/4 right-1/3 w-1 h-1 bg-white/40 rounded-full animate-pulse"></div>
+            <div className="absolute w-1 h-1 rounded-full top-3/4 right-1/3 bg-white/40 animate-pulse"></div>
-            <div className="absolute top-1/2 right-1/4 w-3 h-3 bg-white/20 rounded-full animate-bounce"></div>
+            <div className="absolute w-3 h-3 rounded-full top-1/2 right-1/4 bg-white/20 animate-bounce"></div>
           </div>
           {/* Animaciones CSS */}
           <style>{`
@@ -501,20 +601,20 @@ export default function Procesos() {
           `}</style>
         </div>
         {/* Contenido principal */}
-        <div className="bg-white rounded-3xl shadow-2xl border border-gray-100 p-4 sm:p-6 lg:p-8 animate-fadein-slideup opacity-0" 
+        <div className="p-4 bg-white border border-gray-100 shadow-2xl opacity-0 rounded-3xl sm:p-6 lg:p-8 animate-fadein-slideup" 
           style={{ animation: 'fadein-slideup 0.7s cubic-bezier(0.22,1,0.36,1) 0.15s forwards' }}>
-          <div className="flex flex-col sm:flex-row sm:items-center justify-between mb-6 gap-4">
+          <div className="flex flex-col justify-between gap-4 mb-6 sm:flex-row sm:items-center">
-            <h2 className="text-xl sm:text-2xl font-bold text-gray-900 flex items-center gap-3">
+            <h2 className="flex items-center gap-3 text-xl font-bold text-gray-900 sm:text-2xl">
-              <div className="bg-gradient-to-br from-blue-500 to-blue-600 rounded-xl p-2 shadow-lg">
+              <div className="p-2 shadow-lg bg-gradient-to-br from-blue-500 to-blue-600 rounded-xl">
-                <svg className="w-5 h-5 sm:w-6 sm:h-6 text-white" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                <svg className="w-5 h-5 text-white sm:w-6 sm:h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                   <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>
               </div>
               Procesamiento de Pedimentos
             </h2>
-            <div className="flex flex-col sm:flex-row gap-3">
+            <div className="flex flex-col gap-3 sm:flex-row">
               {count > 0 && (
-                <div className="bg-gradient-to-r from-blue-50 to-indigo-50 rounded-xl px-4 py-2 border border-blue-100">
+                <div className="px-4 py-2 border border-blue-100 bg-gradient-to-r from-blue-50 to-indigo-50 rounded-xl">
                   <span className="text-sm font-medium text-blue-700">Total de registros: </span>
                   <span className="text-lg font-bold text-blue-800">{count}</span>
                 </div>
@@ -525,16 +625,16 @@ export default function Procesos() {
 
           
           {/* Filtros responsivos mejorados */}
-          <div className="mb-6 bg-gradient-to-r from-gray-50 to-slate-50 rounded-2xl p-4 sm:p-6 border border-gray-100">
+          <div className="p-4 mb-6 border border-gray-100 bg-gradient-to-r from-gray-50 to-slate-50 rounded-2xl sm:p-6">
-            <h3 className="text-lg font-semibold text-gray-800 mb-4 flex items-center gap-2">
+            <h3 className="flex items-center gap-2 mb-4 text-lg font-semibold text-gray-800">
               <svg className="w-5 h-5 text-gray-600" fill="none" stroke="currentColor" viewBox="0 0 24 24">
                 <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M3 4a1 1 0 011-1h16a1 1 0 011 1v2.586a1 1 0 01-.293.707l-6.414 6.414a1 1 0 00-.293.707V17l-4 4v-6.586a1 1 0 00-.293-.707L3.293 7.414A1 1 0 013 6.707V4z" />
               </svg>
               Filtros de búsqueda
             </h3>
-                          <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-4">
+            <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 lg:grid-cols-4">
               <div className="space-y-2">
-                <label className="text-sm font-semibold text-gray-700 flex items-center gap-2">
+                <label className="flex items-center gap-2 text-sm font-semibold text-gray-700">
                   <div className="w-2 h-2 bg-blue-500 rounded-full"></div>
                   Pedimento
                 </label>
@@ -546,12 +646,12 @@ export default function Procesos() {
                     setPage(1);
                   }}
                   placeholder="Buscar por pedimento..."
-                  className="w-full border border-gray-300 rounded-xl px-4 py-3 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"
+                  className="w-full px-4 py-3 text-sm transition-all duration-200 bg-white border border-gray-300 shadow-sm rounded-xl focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 hover:shadow-md"
                 />
               </div>
 
               <div className="space-y-2">
-                <label className="text-sm font-semibold text-gray-700 flex items-center gap-2">
+                <label className="flex items-center gap-2 text-sm font-semibold text-gray-700">
                   <div className="w-2 h-2 bg-purple-500 rounded-full"></div>
                   Estado
                 </label>
@@ -561,7 +661,7 @@ export default function Procesos() {
                     setStatusFilter(e.target.value);
                     setPage(1);
                   }}
-                  className="w-full border border-gray-300 rounded-xl px-4 py-3 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"
+                  className="w-full px-4 py-3 text-sm transition-all duration-200 bg-white border border-gray-300 shadow-sm rounded-xl focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 hover:shadow-md"
                 >
                   <option value="">Todos los estados</option>
                   <option value="submitted">Enviado</option>
@@ -572,7 +672,7 @@ export default function Procesos() {
               </div>
 
               <div className="space-y-2">
-                <label className="text-sm font-semibold text-gray-700 flex items-center gap-2">
+                <label className="flex items-center gap-2 text-sm font-semibold text-gray-700">
                   <div className="w-2 h-2 bg-orange-500 rounded-full"></div>
                   Servicio
                 </label>
@@ -582,7 +682,7 @@ export default function Procesos() {
                     setServicioFilter(e.target.value);
                     setPage(1);
                   }}
-                  className="w-full border border-gray-300 rounded-xl px-4 py-3 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"
+                  className="w-full px-4 py-3 text-sm transition-all duration-200 bg-white border border-gray-300 shadow-sm rounded-xl focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 hover:shadow-md"
                 >
                   <option value="">Todos los servicios</option>
                   <option value="1">Estado de pedimento</option>
@@ -596,39 +696,151 @@ export default function Procesos() {
                   <option value="9">Acuse Cove</option>
                 </select>
               </div>
+              <div className="space-y-2">
+                <label className="flex items-center gap-2 text-sm font-semibold text-gray-700">
+                  <div className="w-2 h-2 bg-teal-500 rounded-full"></div>
+                    Organización
+                </label>
+                <select
+                className="w-full px-4 py-3 text-sm transition-all duration-200 bg-white border border-gray-300 shadow-sm rounded-xl focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 hover:shadow-md"
+                disabled={loadingOrganizaciones}
+                value={organizacionFilter}
+                onChange={e => {
+                setOrganizacionFilter(e.target.value);
+                setPage(1);
+                }}
+                >
+                  <option value="">Todas las organizaciones</option>
+                  {loadingOrganizaciones ? (
+                    <option value="" disabled>Cargando organizaciones...</option>
+                  ) : (
+                      organizaciones.map((org) => (
+                      <option key={org.id} value={org.id}>
+                        {org.nombre}
+                      </option>
+                      ))
+                  )}
+
+                </select>
+              </div>
+          </div>
+        </div>
+        {/* BOTÓN PARA EJECUTAR PROCESAMIENTOS - AGREGAR AQUÍ */}
+        <div className="flex justify-end mb-6">
+          <div className="relative">
+            <button
+              type="button"
+              className="inline-flex items-center gap-2 bg-gradient-to-r from-green-600 to-emerald-600 hover:from-green-700 hover:to-emerald-700 text-white font-semibold py-3 px-6 rounded-2xl shadow-lg hover:shadow-xl transition-all duration-300 transform hover:-translate-y-0.5"
+              onClick={() => setShowProcesosDropdown(!showProcesosDropdown)}
+              disabled={ejecutandoProceso}
+            >
+              {ejecutandoProceso ? (
+                <>
+                  <div className="w-4 h-4 border-b-2 border-white rounded-full animate-spin"></div>
+                  Ejecutando...
+                </>
+              ) : (
+                <>
+                  <svg className="w-5 h-5" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M13 10V3L4 14h7v7l9-11h-7z" />
+                  </svg>
+                  Ejecutar Procesamiento
+                  <svg 
+                    className={`w-4 h-4 transition-transform duration-200 ${showProcesosDropdown ? 'rotate-180' : ''}`} 
+                    fill="none" 
+                    stroke="currentColor" 
+                    viewBox="0 0 24 24"
+                  >
+                    <path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M19 9l-7 7-7-7" />
+                  </svg>
+                </>
+              )}
+            </button>
+            
+            {/* Dropdown de opciones de procesamiento */}
+            {showProcesosDropdown && (
+              <div className="absolute right-0 z-50 w-64 mt-2 overflow-hidden bg-white border border-gray-200 shadow-2xl rounded-2xl animate-fade-in">
+                <div className="p-2">
+                  {/* Encabezado del dropdown */}
+                  <div className="px-3 py-2 mb-1 rounded-lg bg-gradient-to-r from-green-50 to-emerald-50">
+                    <p className="text-sm font-semibold text-green-800">Selecciona un proceso</p>
+                    <p className="text-xs text-green-600">Se ejecutará para tu organización</p>
+                  </div>
+                  
+                  {/* Opción "Todos" */}
+                  <button
+                    onClick={() => handleEjecutarProcesamiento({ todos: true })}
+                    className="flex items-center w-full gap-3 px-4 py-3 mb-1 font-medium text-left text-gray-700 transition-colors duration-200 hover:bg-green-50 rounded-xl hover:text-green-700 group"
+                  >
+                    <div className="w-3 h-3 transition-transform duration-200 bg-green-500 rounded-full group-hover:scale-125"></div>
+                    <div className="flex-1">
+                      <span className="font-semibold">Todos</span>
+                      <p className="text-xs text-gray-500 group-hover:text-green-600">Ejecutar todos los procesos</p>
+                    </div>
+                    <span className="text-xs text-gray-400 group-hover:text-green-500"></span>
+                  </button>
+                  
+                  <div className="my-2 border-t border-gray-100"></div>
+                  
+                  {/* Opciones específicas */}
+                  {[
+                    { id: 'procesamiento_pedimento', label: 'Procesamiento Inicial', desc: 'Procemiento Inicial de consulta a VU' },
+                    { id: 'pedimentos_completos', label: 'Pedimento Completo', desc: 'Procesar pedimentos completos' },
+                    { id: 'remesas', label: 'Remesas', desc: 'Procesar remesas' },
+                    { id: 'partidas', label: 'Partidas', desc: 'Procesar partidas' },
+                    { id: 'coves', label: 'Coves', desc: 'Procesar coves' },
+                    { id: 'edocs', label: 'Edocuments', desc: 'Procesar edocuments' },
+                    { id: 'acuse_coves', label: 'Acuses COVE', desc: 'Procesar acuses COVE' },
+                    { id: 'acuses', label: 'Acuses', desc: 'Procesar acuses' }
+                  ].map((proceso) => (
+                    <button
+                      key={proceso.id}
+                      onClick={() => handleEjecutarProcesamiento({ procesamiento: proceso.id })}
+                      className="flex items-center w-full gap-3 px-4 py-3 font-medium text-left text-gray-700 transition-colors duration-200 hover:bg-blue-50 rounded-xl hover:text-blue-700 group"
+                    >
+                      <div className="w-2 h-2 transition-transform duration-200 bg-blue-500 rounded-full group-hover:scale-125"></div>
+                      <div className="flex-1">
+                        <span>{proceso.label}</span>
+                        <p className="text-xs text-gray-500 group-hover:text-blue-600">{proceso.desc}</p>
+                      </div>
+                    </button>
+                  ))}
+                </div>
+              </div>
+            )}
           </div>
         </div>
         {/* Estados de carga y error mejorados */}
           {loading ? (
             <div className="flex flex-col items-center justify-center py-12">
               <div className="relative">
-                <div className="animate-spin rounded-full h-16 w-16 border-b-2 border-blue-600"></div>
+                <div className="w-16 h-16 border-b-2 border-blue-600 rounded-full animate-spin"></div>
-                <div className="absolute inset-0 bg-blue-500/10 rounded-full blur-xl animate-pulse"></div>
+                <div className="absolute inset-0 rounded-full bg-blue-500/10 blur-xl animate-pulse"></div>
               </div>
-              <p className="mt-4 text-gray-600 font-medium">Cargando procesos...</p>
+              <p className="mt-4 font-medium text-gray-600">Cargando procesos...</p>
             </div>
           ) : error ? (
-            <div className="bg-red-50 border border-red-200 rounded-2xl p-6 text-center">
+            <div className="p-6 text-center border border-red-200 bg-red-50 rounded-2xl">
-              <div className="bg-red-100 rounded-full p-3 w-12 h-12 mx-auto mb-4 flex items-center justify-center">
+              <div className="flex items-center justify-center w-12 h-12 p-3 mx-auto mb-4 bg-red-100 rounded-full">
                 <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="M12 8v4m0 4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
                 </svg>
               </div>
-              <h3 className="text-lg font-semibold text-red-800 mb-2">Error al cargar</h3>
+              <h3 className="mb-2 text-lg font-semibold text-red-800">Error al cargar</h3>
               <p className="text-red-600">{error}</p>
             </div>
           ) : (
             <>
               {/* Vista de tabla para pantallas grandes */}
-              <div className="hidden lg:block overflow-x-auto bg-white rounded-2xl border border-gray-200 shadow-sm relative pb-20"
+              <div className="relative hidden pb-20 overflow-x-auto bg-white border border-gray-200 shadow-sm lg:block rounded-2xl"
                 style={{ 
                   overflowY: 'visible' // Permitir que los dropdowns se muestren fuera del contenedor
                 }}>
-                <table className="min-w-full divide-y divide-gray-300 relative"
+                <table className="relative min-w-full divide-y divide-gray-300"
                   style={{ position: 'relative', zIndex: 1 }}>
-                  <thead className="bg-gray-50 sticky top-0 z-10">
+                  <thead className="sticky top-0 z-10 bg-gray-50">
                     <tr>
-                      <th className="px-4 py-4 text-center text-xs font-bold text-gray-600 uppercase tracking-wider cursor-pointer select-none hover:bg-gray-100 transition-colors duration-200"
+                      <th className="px-4 py-4 text-xs font-bold tracking-wider text-center text-gray-600 uppercase transition-colors duration-200 cursor-pointer select-none hover:bg-gray-100"
                         onClick={() => {
                           setSortField('task_id');
                           setSortOrder(sortField === 'task_id' && sortOrder === 'asc' ? 'desc' : 'asc');
@@ -638,7 +850,7 @@ export default function Procesos() {
                           Task ID {sortField === 'task_id' && (sortOrder === 'asc' ? '▲' : '▼')}
                         </div>
                       </th>
-                      <th className="px-4 py-4 text-left text-xs font-bold text-gray-600 uppercase tracking-wider cursor-pointer select-none hover:bg-gray-100 transition-colors duration-200"
+                      <th className="px-4 py-4 text-xs font-bold tracking-wider text-left text-gray-600 uppercase transition-colors duration-200 cursor-pointer select-none hover:bg-gray-100"
                         onClick={() => {
                           setSortField('pedimento_app');
                           setSortOrder(sortField === 'pedimento_app' && sortOrder === 'asc' ? 'desc' : 'asc');
@@ -648,7 +860,7 @@ export default function Procesos() {
                           Pedimento {sortField === 'pedimento_app' && (sortOrder === 'asc' ? '▲' : '▼')}
                         </div>
                       </th>
-                      <th className="px-4 py-4 text-left text-xs font-bold text-gray-600 uppercase tracking-wider cursor-pointer select-none hover:bg-gray-100 transition-colors duration-200"
+                      <th className="px-4 py-4 text-xs font-bold tracking-wider text-left text-gray-600 uppercase transition-colors duration-200 cursor-pointer select-none hover:bg-gray-100"
                         onClick={() => {
                           setSortField('status');
                           setSortOrder(sortField === 'status' && sortOrder === 'asc' ? 'desc' : 'asc');
@@ -658,7 +870,7 @@ export default function Procesos() {
                           Estado {sortField === 'status' && (sortOrder === 'asc' ? '▲' : '▼')}
                         </div>
                       </th>
-                      <th className="px-4 py-4 text-left text-xs font-bold text-gray-600 uppercase tracking-wider cursor-pointer select-none hover:bg-gray-100 transition-colors duration-200 rounded-tr-2xl"
+                      <th className="px-4 py-4 text-xs font-bold tracking-wider text-left text-gray-600 uppercase transition-colors duration-200 cursor-pointer select-none hover:bg-gray-100 rounded-tr-2xl"
                         onClick={() => {
                           setSortField('timestamp');
                           setSortOrder(sortField === 'timestamp' && sortOrder === 'asc' ? 'desc' : 'asc');
@@ -668,7 +880,7 @@ export default function Procesos() {
                           Fecha de creación {sortField === 'timestamp' && (sortOrder === 'asc' ? '▲' : '▼')}
                         </div>
                       </th>
-                      <th className="px-4 py-4 text-left text-xs font-bold text-gray-600 uppercase tracking-wider cursor-pointer select-none hover:bg-gray-100 transition-colors duration-200 rounded-tr-2xl"
+                      <th className="px-4 py-4 text-xs font-bold tracking-wider text-left text-gray-600 uppercase transition-colors duration-200 cursor-pointer select-none hover:bg-gray-100 rounded-tr-2xl"
                         onClick={() => {
                           setSortField('servicio');
                           setSortOrder(sortField === 'servicio' && sortOrder === 'asc' ? 'desc' : 'asc');
@@ -680,18 +892,18 @@ export default function Procesos() {
                       </th>
                     </tr>
                   </thead>
-                  <tbody className="bg-white divide-y divide-gray-100 relative" style={{ position: 'relative' }}>
+                  <tbody className="relative bg-white divide-y divide-gray-100" style={{ position: 'relative' }}>
                     {procesos.length === 0 ? (
                       <tr>
-                        <td colSpan={5} className="text-center py-12">
+                        <td colSpan={5} className="py-12 text-center">
                           <div className="flex flex-col items-center">
-                            <div className="bg-gray-100 rounded-full p-4 w-16 h-16 mx-auto mb-4 flex items-center justify-center">
+                            <div className="flex items-center justify-center w-16 h-16 p-4 mx-auto mb-4 bg-gray-100 rounded-full">
                               <svg className="w-8 h-8 text-gray-400" 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>
-                            <p className="text-gray-500 font-medium">No hay procesos disponibles</p>
+                            <p className="font-medium text-gray-500">No hay procesos disponibles</p>
-                            <p className="text-gray-400 text-sm mt-1">Intenta ajustar los filtros de búsqueda</p>
+                            <p className="mt-1 text-sm text-gray-400">Intenta ajustar los filtros de búsqueda</p>
                           </div>
                         </td>
                       </tr>
@@ -701,17 +913,17 @@ export default function Procesos() {
                           <td className="px-4 py-4 text-center align-middle whitespace-nowrap">
                             <button
                               onClick={() => handleTaskClick(proc.task_id)}
-                              className="bg-gray-100 text-gray-800 px-2 py-1 rounded-lg text-sm font-semibold hover:bg-blue-100 hover:text-blue-800 transition-colors duration-200 cursor-pointer"
+                              className="px-2 py-1 text-sm font-semibold text-gray-800 transition-colors duration-200 bg-gray-100 rounded-lg cursor-pointer hover:bg-blue-100 hover:text-blue-800"
                             >
                               {proc.task_id}
                             </button>
                           </td>
-                          <td className="px-4 py-4 whitespace-nowrap align-middle text-sm font-medium text-gray-900">
+                          <td className="px-4 py-4 text-sm font-medium text-gray-900 align-middle whitespace-nowrap">
                             <Link to={`/expedientes/pedimento/${proc.pedimento}`} className='hover:text-blue-500 hover:text-bold hover:text-underline'>
                               {proc.pedimento_app || '-'}
                             </Link>
                           </td>
-                          <td className="px-4 py-4 whitespace-nowrap align-middle">
+                          <td className="px-4 py-4 align-middle whitespace-nowrap">
                             {(() => {
                               const estado = proc.status?.toLowerCase() === 'pending' ? { text: 'En Espera', color: 'bg-yellow-100 text-yellow-800 border-yellow-200' }
                                 : proc.status?.toLowerCase() === 'running' ? { text: 'Procesando', color: 'bg-blue-100 text-blue-800 border-blue-200' }
@@ -725,7 +937,7 @@ export default function Procesos() {
                               );
                             })()}
                           </td>
-                          <td className="px-4 py-4 whitespace-nowrap align-middle text-sm text-gray-600">
+                          <td className="px-4 py-4 text-sm text-gray-600 align-middle whitespace-nowrap">
                             {new Date(proc.timestamp).toLocaleString('es-MX', {
                               day: '2-digit',
                               month: '2-digit',
@@ -735,7 +947,7 @@ export default function Procesos() {
                               hour12: true
                             })}
                           </td>
-                          <td className="px-4 py-4 whitespace-nowrap align-middle">
+                          <td className="px-4 py-4 align-middle whitespace-nowrap">
                             {(() => {
                               const services = {
                                 '1': 'Estado de pedimento',
@@ -763,29 +975,29 @@ export default function Procesos() {
               </div>
 
               {/* Vista de tarjetas para pantallas pequeñas y medianas */}
-              <div className="lg:hidden space-y-4">
+              <div className="space-y-4 lg:hidden">
                 {procesos.length === 0 ? (
-                  <div className="bg-gray-50 rounded-2xl p-8 text-center">
+                  <div className="p-8 text-center bg-gray-50 rounded-2xl">
-                    <div className="bg-gray-100 rounded-full p-4 w-16 h-16 mx-auto mb-4 flex items-center justify-center">
+                    <div className="flex items-center justify-center w-16 h-16 p-4 mx-auto mb-4 bg-gray-100 rounded-full">
                       <svg className="w-8 h-8 text-gray-400" 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>
-                    <p className="text-gray-500 font-medium">No hay procesos disponibles</p>
+                    <p className="font-medium text-gray-500">No hay procesos disponibles</p>
-                    <p className="text-gray-400 text-sm mt-1">Intenta ajustar los filtros de búsqueda</p>
+                    <p className="mt-1 text-sm text-gray-400">Intenta ajustar los filtros de búsqueda</p>
                   </div>
                 ) : (
                   procesos.map((proc) => (
-                    <div key={proc.task_id} className="bg-white rounded-2xl shadow-lg border border-gray-200 p-4 hover:shadow-xl transition-all duration-300">
+                    <div key={proc.task_id} className="p-4 transition-all duration-300 bg-white border border-gray-200 shadow-lg rounded-2xl hover:shadow-xl">
                       <div className="flex items-start justify-between mb-4">
                         <div className="flex items-center gap-3">
 
-                          <div className="bg-blue-100 rounded-xl p-2 flex-shrink-0">
+                          <div className="flex-shrink-0 p-2 bg-blue-100 rounded-xl">
                             <svg className="w-5 h-5 text-blue-600" 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 className="min-w-0 flex-1">
+                          <div className="flex-1 min-w-0">
                             <h3 className="text-lg font-semibold text-gray-900">Proceso #{proc.task_id}</h3>
                             <p className="text-sm text-gray-500">{proc.organizacion_name || 'Sin organización'}</p>
                           </div>
@@ -804,10 +1016,10 @@ export default function Procesos() {
                         })()}
                       </div>
                       
-                      <div className="space-y-3 mb-4">
+                      <div className="mb-4 space-y-3">
                         <div className="flex items-center justify-between">
                           <span className="text-sm font-medium text-gray-600">Pedimento:</span>
-                          <span className="text-sm font-mono text-gray-900 bg-gray-100 px-2 py-1 rounded">
+                          <span className="px-2 py-1 font-mono text-sm text-gray-900 bg-gray-100 rounded">
                             {proc.pedimento_app || '-'}
                           </span>
                         </div>
@@ -854,7 +1066,7 @@ export default function Procesos() {
 
               {/* Paginación compartida mejorada */}
               {count > 0 && (
-                <div className="bg-gradient-to-r from-gray-50 to-slate-50 px-4 sm:px-6 py-4 mt-6 rounded-2xl border border-gray-200 flex flex-col sm:flex-row items-center justify-between gap-4">
+                <div className="flex flex-col items-center justify-between gap-4 px-4 py-4 mt-6 border border-gray-200 bg-gradient-to-r from-gray-50 to-slate-50 sm:px-6 rounded-2xl sm:flex-row">
                   {(() => {
                     const totalPages = Math.max(1, Math.ceil(count / itemsPerPage));
                     const maxPagesToShow = 5;
@@ -871,12 +1083,12 @@ export default function Procesos() {
                     return (
                       <>
                         <div className="flex items-center gap-3">
-                          <label htmlFor="itemsPerPage" className="text-sm text-gray-600 font-medium">Registros por página:</label>
+                          <label htmlFor="itemsPerPage" className="text-sm font-medium text-gray-600">Registros por página:</label>
                           <select
                             id="itemsPerPage"
                             value={itemsPerPage}
                             onChange={e => { setItemsPerPage(Number(e.target.value)); setPage(1); }}
-                            className="border border-gray-300 rounded-xl px-3 py-2 text-sm focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500 bg-white shadow-sm"
+                            className="px-3 py-2 text-sm bg-white border border-gray-300 shadow-sm rounded-xl focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
                           >
                             {[5, 8, 12, 20, 50, 100].map(size => (
                               <option key={size} value={size}>{size}</option>

src/pages/Reports.jsx

@@ -198,6 +198,7 @@ export default function Reports() {
 
   const [organizaciones, setOrganizaciones] = useState([]);
   const [importadores, setImportadores] = useState([]);
+  const [rfcOptions, setRfcOptions] = useState([]);
 
   useEffect(() => {
     const fetchOrganizaciones = async () => {
@@ -241,6 +242,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 +291,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 
+                  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 +341,11 @@ export default function Reports() {
                   }))}
                   className="w-full px-3 py-2 border border-green-300 rounded-md shadow-sm focus:ring-2 focus:ring-green-500 focus:border-green-500 transition-all duration-200 bg-white text-slate-900 text-sm font-mono uppercase"
                   style={{ textTransform: 'uppercase' }}
+                  disabled={!globalFilters.organizacion}
                 >
-                  <option value="" >Selecciona un RFC</option>
+                  <option value="">Todos los RFC</option>
-                  {importadores.filter(imp => {
+                  {rfcOptions.map(rfc => (
-                    if (!globalFilters.organizacion) return true;
+                    <option key={rfc} value={rfc}>{rfc}</option>
-                    return imp.organizacion === globalFilters.organizacion;
-                  }).map(imp => (
-                    <option key={imp.rfc} value={imp.rfc}>{imp.rfc}</option>
                   ))}
                 </select>
                 <div className="absolute inset-y-0 right-0 flex items-center pr-3 pointer-events-none">
@@ -807,7 +828,12 @@ export default function Reports() {
       .map(([modelo]) => modelo);
 
     if (modelosConCampos.length === 0) {
-      alert('Por favor selecciona al menos un campo en algún modelo');
+      showMessage('Por favor selecciona al menos un campo en algún modelo', 'error');
+      return;
+    }
+
+    if (!globalFilters.organizacion) {
+      showMessage('Debes seleccionar una organización antes de generar el reporte', 'error');
       return;
     }
 

src/pages/UserForm.jsx

@@ -0,0 +1,770 @@
+import React, { useEffect, useState } from 'react';
+import { useNavigate, useParams, useSearchParams } from 'react-router-dom';
+import { createUser, updateUser } from '../api/users.ts';
+import { useNotification } from '../context/NotificationContext';
+
+const initialForm = {
+  username: '',
+  email: '',
+  first_name: '',
+  last_name: '',
+  password: '',
+  confirmPassword: '',
+  rfc: [],
+  userType: 'agente', // 'agente' | 'importador'
+  groups: [],
+  is_active: true,
+};
+
+// Perfiles disponibles en el sistema
+const AVAILABLE_GROUPS = [
+  { id: 1, label: 'Admin', description: 'Administrador del sistema' },
+  { id: 2, label: 'Developer', description: 'Desarrollador' },
+  { id: 3, label: 'User', description: 'Acceso base (requerido)' },
+  { id: 4, label: 'Agente Aduanal', description: 'Agente aduanal' },
+  { id: 5, label: 'Importador', description: 'Importador general' }
+];
+
+export default function UserForm() {
+  const { id } = useParams(); // presente si es edición
+  const isEditing = Boolean(id);
+  const navigate = useNavigate();
+  const [searchParams] = useSearchParams();
+  const { showMessage } = useNotification();
+
+  // Preseleccionar tipo desde query param (?type=agente|importador)
+  const initialType = searchParams.get('type') === 'importador' ? 'importador' : 'agente';
+
+  const [form, setForm] = useState({
+    ...initialForm,
+    userType: initialType,
+    groups: initialType === 'importador' ? [3, 5] : [4, 3],
+  });
+  const [importadores, setImportadores] = useState([]);
+  const [submitting, setSubmitting] = useState(false);
+  const [loadingUser, setLoadingUser] = useState(isEditing);
+
+  // 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 importadores
+  useEffect(() => {
+    const access = localStorage.getItem('access');
+    if (!access) { window.location.href = '/login'; return; }
+    fetch(`${import.meta.env.VITE_EFC_API_URL}/customs/importadores/`, {
+      headers: { Authorization: `Bearer ${access}` },
+    })
+      .then(r => r.json())
+      .then(data => setImportadores(Array.isArray(data) ? data : []))
+      .catch(() => setImportadores([]));
+  }, []);
+
+  // Cargar datos del usuario si es edición
+  useEffect(() => {
+    if (!isEditing) return;
+    const access = localStorage.getItem('access');
+    fetch(`${import.meta.env.VITE_EFC_API_URL}/user/users/${id}/`, {
+      headers: { Authorization: `Bearer ${access}` },
+    })
+      .then(r => r.json())
+      .then(data => {
+        const isImportador = data.is_importador === true ||
+          (Array.isArray(data.groups) && data.groups.includes(5));
+        setForm({
+          username: data.username || '',
+          email: data.email || '',
+          first_name: data.first_name || '',
+          last_name: data.last_name || '',
+          password: '',
+          confirmPassword: '',
+          // rfc es M2M: viene como array de PKs (strings de RFC)
+          rfc: Array.isArray(data.rfc) ? data.rfc : (data.rfc ? [data.rfc] : []),
+          userType: isImportador ? 'importador' : 'agente',
+          groups: Array.isArray(data.groups) ? data.groups : [],
+          is_active: data.is_active !== false,
+        });
+        setLoadingUser(false);
+      })
+      .catch(() => {
+        showMessage('Error al cargar datos del usuario', 'error');
+        setLoadingUser(false);
+      });
+  }, [id, isEditing, showMessage]);
+
+  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;
+    }
+    // En edición la contraseña es opcional
+    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,
+      // Limpiar RFCs si cambia a agente
+      rfc: type === 'agente' ? [] : prev.rfc,
+      // Preseleccionar perfiles por defecto según tipo
+      groups: type === 'importador' ? [3, 5] : [4, 3],
+    }));
+  };
+
+  const handleGroupToggle = (groupId) => {
+    setForm(prev => {
+      const groups = prev.groups.includes(groupId)
+        ? prev.groups.filter(g => g !== groupId)
+        : [...prev.groups, groupId];
+      return { ...prev, groups };
+    });
+  };
+
+  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 };
+    });
+  };
+
+  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,
+        groups: form.groups,
+        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);
+        showMessage('Usuario actualizado exitosamente', 'success');
+      } else {
+        await createUser(payload);
+        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>
+      </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>
+          {/* Botón regresar */}
+          <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>
+
+        {/* Formulario */}
+        <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 */}
+          <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 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="M17 20h5v-2a3 3 0 00-5.356-1.857M17 20H7m10 0v-2c0-.656-.126-1.283-.356-1.857M7 20H2v-2a3 3 0 015.356-1.857M7 20v-2c0-.656.126-1.283.356-1.857m0 0a5.002 5.002 0 019.288 0M15 7a3 3 0 11-6 0 3 3 0 016 0zm6 3a2 2 0 11-4 0 2 2 0 014 0zM7 10a2 2 0 11-4 0 2 2 0 014 0z" />
+                </svg>
+              </div>
+              <div>
+                <h4 className="text-sm font-semibold text-slate-800">Perfiles</h4>
+                <p className="text-xs text-slate-500">Asigna los perfiles a los que pertenecerá el usuario</p>
+              </div>
+            </div>
+            <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3">
+              {AVAILABLE_GROUPS.map(group => {
+                const active = form.groups.includes(group.id);
+                return (
+                  <button
+                    key={group.id}
+                    type="button"
+                    onClick={() => handleGroupToggle(group.id)}
+                    className={`relative flex flex-col items-start p-3 rounded-xl border-2 text-left transition-all duration-200 ${
+                      active
+                        ? 'border-blue-500 bg-blue-50'
+                        : 'border-gray-200 bg-white hover:border-gray-300 hover:bg-gray-50'
+                    }`}
+                  >
+                    <span className={`text-xs font-semibold ${active ? 'text-blue-800' : 'text-gray-700'}`}>
+                      {group.label}
+                    </span>
+                    <span className="text-xs text-gray-400 mt-0.5">{group.description}</span>
+                    {active && (
+                      <div className="absolute top-2 right-2 w-4 h-4 bg-blue-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 del usuario */}
+              <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>
+
+                {/* Indicadores de validación */}
+                {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 de acción */}
+          <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"></div>}
+              <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({
@@ -552,44 +554,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 +752,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,16 +859,27 @@ export default function Users() {
                         <div className="text-xs text-gray-500 mt-1">ID: {user.id}</div>
                       </div>
                     </div>
-                    <button
+                    <div className="flex items-center gap-2">
-                      onClick={() => { setShowDeleteModal(true); setUserToDelete(user); }}
+                      <button
-                      disabled={user.username === localStorage.getItem('username')}
+                        onClick={() => navigate(`/users/${user.id}/edit`)}
-                      className={`inline-flex items-center px-3 py-2 border border-red-300 shadow-sm text-xs font-medium rounded-lg text-red-700 bg-white hover:bg-red-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 transition-all duration-200 ${user.username === localStorage.getItem('username') ? 'opacity-50 cursor-not-allowed' : ''}`}
+                        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={user.username === localStorage.getItem('username') ? 'No puedes eliminar tu propia cuenta' : 'Eliminar usuario'}
+                        title="Editar usuario"
-                    >
+                      >
-                      <svg className="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+                        <svg className="w-4 h-4" 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" />
+                          <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>
+                        </svg>
-                    </button>
+                      </button>
+                      <button
+                        onClick={() => { setShowDeleteModal(true); setUserToDelete(user); }}
+                        disabled={user.username === localStorage.getItem('username')}
+                        className={`inline-flex items-center px-3 py-2 border border-red-300 shadow-sm text-xs font-medium rounded-lg text-red-700 bg-white hover:bg-red-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-red-500 transition-all duration-200 ${user.username === localStorage.getItem('username') ? 'opacity-50 cursor-not-allowed' : ''}`}
+                        title={user.username === localStorage.getItem('username') ? 'No puedes eliminar tu propia cuenta' : 'Eliminar usuario'}
+                      >
+                        <svg className="w-4 h-4" 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>
+                      </button>
+                    </div>
                   </div>
                   <div className="grid grid-cols-2 gap-4 text-xs">
                     <div>