- {attributes.map((attr: any) => (
+ {attributes.map((attr: { id: number; attributeName: string; value: string }) => (
{attr.attributeName}
{attr.value}
diff --git a/frontend/admin-panel/src/pages/Audit/AuditTimeline.tsx b/frontend/admin-panel/src/pages/Audit/AuditTimeline.tsx
index fb13f36..3ec2260 100644
--- a/frontend/admin-panel/src/pages/Audit/AuditTimeline.tsx
+++ b/frontend/admin-panel/src/pages/Audit/AuditTimeline.tsx
@@ -2,8 +2,16 @@ import { useState, useEffect } from 'react';
import api from '../../services/api';
import { History, User as UserIcon, CheckCircle, XCircle, FileText, Clock } from 'lucide-react';
+interface AuditLog {
+ id: number;
+ action: string;
+ username: string;
+ createdAt: string;
+ details: string;
+}
+
export default function AuditTimeline() {
- const [logs, setLogs] = useState([]);
+ const [logs, setLogs] = useState([]);
const [loading, setLoading] = useState(true);
useEffect(() => {
diff --git a/frontend/admin-panel/src/pages/Categories/CategoryManager.tsx b/frontend/admin-panel/src/pages/Categories/CategoryManager.tsx
index 3e4a3cd..7436c5b 100644
--- a/frontend/admin-panel/src/pages/Categories/CategoryManager.tsx
+++ b/frontend/admin-panel/src/pages/Categories/CategoryManager.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect } from 'react';
+import { useState, useEffect, useCallback } from 'react';
import { type Category } from '../../types/Category';
import OperationManager from './OperationManager';
import { categoryService } from '../../services/categoryService';
@@ -50,14 +50,20 @@ export default function CategoryManager() {
const [isMergeModalOpen, setIsMergeModalOpen] = useState(false);
const [targetMergeId, setTargetMergeId] = useState(0);
- // State for Move Content (Nueva funcionalidad)
+ // State for Move Content
const [isMoveContentModalOpen, setIsMoveContentModalOpen] = useState(false);
- useEffect(() => {
- loadCategories();
+ const buildTree = useCallback((cats: Category[], parentId: number | null = null, level = 0): CategoryNode[] => {
+ return cats
+ .filter(c => c.parentId === parentId)
+ .map(c => ({
+ ...c,
+ level,
+ children: buildTree(cats, c.id, level + 1)
+ }));
}, []);
- const loadCategories = async () => {
+ const loadCategories = useCallback(async () => {
setIsLoading(true);
try {
const data = await categoryService.getAll();
@@ -69,17 +75,11 @@ export default function CategoryManager() {
} finally {
setIsLoading(false);
}
- };
+ }, [buildTree]);
- const buildTree = (cats: Category[], parentId: number | null = null, level = 0): CategoryNode[] => {
- return cats
- .filter(c => c.parentId === parentId)
- .map(c => ({
- ...c,
- level,
- children: buildTree(cats, c.id, level + 1)
- }));
- };
+ useEffect(() => {
+ loadCategories();
+ }, [loadCategories]);
// --- LÓGICA DRAG & DROP ---
@@ -98,6 +98,11 @@ export default function CategoryManager() {
setDragOverNodeId(null);
};
+ const isDescendant = (sourceNode: CategoryNode, targetId: number): boolean => {
+ if (sourceNode.children.some(child => child.id === targetId)) return true;
+ return sourceNode.children.some(child => isDescendant(child, targetId));
+ };
+
const handleDragOver = (e: React.DragEvent, targetId: number) => {
e.preventDefault();
e.stopPropagation();
@@ -120,13 +125,11 @@ export default function CategoryManager() {
const newParentId = targetNode ? targetNode.id : null;
- // 1. Validación: No mover si es el mismo padre
if (draggedNode.parentId === newParentId) {
setDraggedNode(null);
return;
}
- // 2. Validación: No mover dentro de sus propios hijos (Ciclo)
if (targetNode && isDescendant(draggedNode, targetNode.id)) {
alert("Operación inválida: No puedes mover una categoría dentro de sus propios hijos.");
setDraggedNode(null);
@@ -149,23 +152,23 @@ export default function CategoryManager() {
parentId: newParentId
});
- loadCategories(); // Recargar árbol si tuvo éxito
- } catch (error: any) {
+ loadCategories();
+ } catch (error: unknown) {
console.error("Error detallado en Drop:", error);
-
let errorMessage = "Error al mover la categoría";
- // Caso 1: BadRequest simple (string plano desde .NET)
- if (typeof error.response?.data === 'string') {
- errorMessage = error.response.data;
- }
- // Caso 2: Objeto JSON con propiedad 'message' o 'title' (ProblemDetails)
- else if (error.response?.data) {
- errorMessage = error.response.data.message || error.response.data.title || JSON.stringify(error.response.data);
- }
- // Caso 3: Error de red sin respuesta
- else if (error.message) {
- errorMessage = error.message;
+ // Casteo seguro para acceder a las propiedades de Axios
+ const err = error as {
+ response?: { data?: string | { message?: string; title?: string } };
+ message?: string
+ };
+
+ if (typeof err.response?.data === 'string') {
+ errorMessage = err.response.data;
+ } else if (err.response?.data) {
+ errorMessage = err.response.data.message || err.response.data.title || JSON.stringify(err.response.data);
+ } else if (err.message) {
+ errorMessage = err.message;
}
alert(`❌ Operación Rechazada:\n${errorMessage}`);
@@ -174,11 +177,6 @@ export default function CategoryManager() {
}
};
- const isDescendant = (sourceNode: CategoryNode, targetId: number): boolean => {
- if (sourceNode.children.some(child => child.id === targetId)) return true;
- return sourceNode.children.some(child => isDescendant(child, targetId));
- };
-
// --- FIN LÓGICA DRAG & DROP ---
const handleCreate = (parentId: number | null = null) => {
@@ -214,10 +212,10 @@ export default function CategoryManager() {
}
setIsModalOpen(false);
loadCategories();
- } catch (error: any) {
+ } catch (error: unknown) {
console.error('Error saving category:', error);
- // Mostrar validación del backend (ej: Padre con avisos)
- alert(error.response?.data || 'Error al guardar la categoría. Verifique las reglas.');
+ const err = error as { response?: { data?: string } };
+ alert(err.response?.data || 'Error al guardar la categoría. Verifique las reglas.');
}
};
@@ -232,17 +230,17 @@ export default function CategoryManager() {
setSelectedCategoryOps(catOps);
};
+ const loadAttributes = useCallback(async (categoryId: number) => {
+ const attrs = await attributeService.getByCategoryId(categoryId);
+ setAttributes(attrs);
+ }, []);
+
const handleConfigureAttributes = async (category: Category) => {
setConfiguringCategory(category);
setIsAttrModalOpen(true);
loadAttributes(category.id);
};
- const loadAttributes = async (categoryId: number) => {
- const attrs = await attributeService.getByCategoryId(categoryId);
- setAttributes(attrs);
- };
-
const handleCreateAttribute = async (e: React.FormEvent) => {
e.preventDefault();
if (!configuringCategory || !newAttrData.name) return;
@@ -250,11 +248,13 @@ export default function CategoryManager() {
await attributeService.create({
...newAttrData,
categoryId: configuringCategory.id,
- dataType: newAttrData.dataType as any
+ dataType: newAttrData.dataType as 'text' | 'number' | 'boolean' | 'date'
});
setNewAttrData({ name: '', dataType: 'text', required: false });
loadAttributes(configuringCategory.id);
- } catch (error) { console.error(error); }
+ } catch (error: unknown) {
+ console.error("Error creando atributo:", error);
+ }
};
const handleDeleteAttribute = async (id: number) => {
@@ -262,7 +262,9 @@ export default function CategoryManager() {
try {
await attributeService.delete(id);
if (configuringCategory) loadAttributes(configuringCategory.id);
- } catch (error) { console.error(error); }
+ } catch (error: unknown) {
+ console.error("Error eliminando atributo:", error);
+ }
};
const toggleOperation = async (opId: number, isChecked: boolean) => {
@@ -276,10 +278,12 @@ export default function CategoryManager() {
await categoryService.removeOperation(configuringCategory.id, opId);
setSelectedCategoryOps(selectedCategoryOps.filter(o => o.id !== opId));
}
- } catch (error) { console.error(error); alert("Error actualizando operación"); }
+ } catch (error: unknown) {
+ console.error("Error actualizando operación:", error);
+ alert("Error actualizando operación");
+ }
};
- // --- MERGE LOGIC ---
const handleOpenMerge = (cat: Category) => {
setEditingCategory(cat);
setTargetMergeId(0);
@@ -294,11 +298,13 @@ export default function CategoryManager() {
setIsMergeModalOpen(false);
loadCategories();
alert("Fusión completada.");
- } catch (e) { console.error(e); alert("Error al fusionar"); }
+ } catch (error: unknown) {
+ console.error("Error en la operación:", error);
+ alert("Error al procesar la solicitud");
+ }
}
}
- // --- MOVE CONTENT LOGIC (Nuevo) ---
const handleOpenMoveContent = (cat: Category) => {
setEditingCategory(cat);
setTargetMergeId(0);
@@ -308,7 +314,6 @@ export default function CategoryManager() {
const handleMoveContent = async () => {
if (!editingCategory || !targetMergeId) return;
try {
- // Usamos el endpoint para mover solo avisos
await api.post('/categories/move-content', {
sourceId: editingCategory.id,
targetId: targetMergeId
@@ -321,7 +326,10 @@ export default function CategoryManager() {
}
}
- // Componente Recursivo de Nodo
+ const isParentCategory = (id: number) => {
+ return flatCategories.some(c => c.parentId === id);
+ };
+
const CategoryItem = ({ node }: { node: CategoryNode }) => {
const [isExpanded, setIsExpanded] = useState(true);
const isDragOver = dragOverNodeId === node.id;
@@ -364,10 +372,7 @@ export default function CategoryManager() {
-
- {/* Botón Mover Contenido (Nuevo) */}
-
@@ -384,11 +389,6 @@ export default function CategoryManager() {
);
};
- // Helper para saber si una categoría es padre (tiene hijos)
- const isParentCategory = (id: number) => {
- return flatCategories.some(c => c.parentId === id);
- };
-
return (
setIsAttrModalOpen(false)}
title={`Atributos de: ${configuringCategory?.name}`}
>
@@ -438,7 +438,6 @@ export default function CategoryManager() {
{/* --- MODALES --- */}
- {/* Main Modal (Create/Edit) */}
setIsModalOpen(false)}
@@ -494,7 +493,6 @@ export default function CategoryManager() {
- {/* Matrix Operations Modal */}
setIsOpsModalOpen(false)}
@@ -525,14 +523,12 @@ export default function CategoryManager() {
- {/* Attributes Configuration Modal */}
- {/* List Existing Attributes */}
- {/* Add New Attribute Form */}