feat: implement drag & drop functionality using @dnd-kit
- Added drag & drop capabilities to the Kanban board with @dnd-kit for task status updates. - Integrated DndContext in `KanbanBoard` and utilized `useDroppable` in `KanbanColumn` for drop zones. - Enhanced `TaskCard` with draggable features and visual feedback during dragging. - Updated `TODO.md` to reflect the completion of drag & drop tasks and optimistically update task statuses. - Introduced optimistic updates in `useTasks` for smoother user experience during drag & drop operations.
This commit is contained in:
6
TODO.md
6
TODO.md
@@ -43,7 +43,7 @@
|
|||||||
- [x] Formulaire d'édition de tâche (Modal + Form avec pré-remplissage)
|
- [x] Formulaire d'édition de tâche (Modal + Form avec pré-remplissage)
|
||||||
- [x] Édition inline du titre des tâches (clic sur titre → input)
|
- [x] Édition inline du titre des tâches (clic sur titre → input)
|
||||||
- [x] Suppression de tâche (icône discrète + API call)
|
- [x] Suppression de tâche (icône discrète + API call)
|
||||||
- [ ] Changement de statut par drag & drop ou boutons
|
- [x] Changement de statut par drag & drop (@dnd-kit)
|
||||||
- [x] Validation des formulaires et gestion d'erreurs
|
- [x] Validation des formulaires et gestion d'erreurs
|
||||||
|
|
||||||
### 2.4 Gestion des tags
|
### 2.4 Gestion des tags
|
||||||
@@ -64,7 +64,8 @@
|
|||||||
- [x] Architecture SSR + hydratation client optimisée
|
- [x] Architecture SSR + hydratation client optimisée
|
||||||
|
|
||||||
### 2.6 Fonctionnalités Kanban avancées
|
### 2.6 Fonctionnalités Kanban avancées
|
||||||
- [ ] Drag & drop entre colonnes (react-beautiful-dnd)
|
- [x] Drag & drop entre colonnes (@dnd-kit avec React 19)
|
||||||
|
- [x] Drag & drop optimiste (mise à jour immédiate + rollback si erreur)
|
||||||
- [ ] Filtrage par statut/priorité/assigné
|
- [ ] Filtrage par statut/priorité/assigné
|
||||||
- [ ] Recherche en temps réel dans les tâches
|
- [ ] Recherche en temps réel dans les tâches
|
||||||
- [ ] Tri des tâches (date, priorité, alphabétique)
|
- [ ] Tri des tâches (date, priorité, alphabétique)
|
||||||
@@ -159,6 +160,7 @@ lib/
|
|||||||
- ✅ CRUD tâches complet (création, édition, suppression)
|
- ✅ CRUD tâches complet (création, édition, suppression)
|
||||||
- ✅ Création rapide inline (QuickAddTask)
|
- ✅ Création rapide inline (QuickAddTask)
|
||||||
- ✅ Édition inline du titre (clic sur titre → input éditable)
|
- ✅ Édition inline du titre (clic sur titre → input éditable)
|
||||||
|
- ✅ Drag & drop entre colonnes (@dnd-kit) + optimiste
|
||||||
- ✅ Client HTTP et hooks React
|
- ✅ Client HTTP et hooks React
|
||||||
- ✅ Refactoring Kanban avec nouveaux composants
|
- ✅ Refactoring Kanban avec nouveaux composants
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,16 @@ import { Button } from '@/components/ui/Button';
|
|||||||
import { CreateTaskForm } from '@/components/forms/CreateTaskForm';
|
import { CreateTaskForm } from '@/components/forms/CreateTaskForm';
|
||||||
import { CreateTaskData } from '@/clients/tasks-client';
|
import { CreateTaskData } from '@/clients/tasks-client';
|
||||||
import { useMemo, useState } from 'react';
|
import { useMemo, useState } from 'react';
|
||||||
|
import {
|
||||||
|
DndContext,
|
||||||
|
DragEndEvent,
|
||||||
|
DragOverlay,
|
||||||
|
DragStartEvent,
|
||||||
|
PointerSensor,
|
||||||
|
useSensor,
|
||||||
|
useSensors,
|
||||||
|
} from '@dnd-kit/core';
|
||||||
|
import { TaskCard } from './TaskCard';
|
||||||
|
|
||||||
interface KanbanBoardProps {
|
interface KanbanBoardProps {
|
||||||
tasks: Task[];
|
tasks: Task[];
|
||||||
@@ -13,11 +23,22 @@ interface KanbanBoardProps {
|
|||||||
onDeleteTask?: (taskId: string) => Promise<void>;
|
onDeleteTask?: (taskId: string) => Promise<void>;
|
||||||
onEditTask?: (task: Task) => void;
|
onEditTask?: (task: Task) => void;
|
||||||
onUpdateTitle?: (taskId: string, newTitle: string) => Promise<void>;
|
onUpdateTitle?: (taskId: string, newTitle: string) => Promise<void>;
|
||||||
|
onUpdateStatus?: (taskId: string, newStatus: TaskStatus) => Promise<void>;
|
||||||
loading?: boolean;
|
loading?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function KanbanBoard({ tasks, onCreateTask, onDeleteTask, onEditTask, onUpdateTitle, loading = false }: KanbanBoardProps) {
|
export function KanbanBoard({ tasks, onCreateTask, onDeleteTask, onEditTask, onUpdateTitle, onUpdateStatus, loading = false }: KanbanBoardProps) {
|
||||||
const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
|
const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
|
||||||
|
const [activeTask, setActiveTask] = useState<Task | null>(null);
|
||||||
|
|
||||||
|
// Configuration des capteurs pour le drag & drop
|
||||||
|
const sensors = useSensors(
|
||||||
|
useSensor(PointerSensor, {
|
||||||
|
activationConstraint: {
|
||||||
|
distance: 8, // Évite les clics accidentels
|
||||||
|
},
|
||||||
|
})
|
||||||
|
);
|
||||||
// Organiser les tâches par statut
|
// Organiser les tâches par statut
|
||||||
const tasksByStatus = useMemo(() => {
|
const tasksByStatus = useMemo(() => {
|
||||||
const grouped = tasks.reduce((acc, task) => {
|
const grouped = tasks.reduce((acc, task) => {
|
||||||
@@ -70,54 +91,99 @@ export function KanbanBoard({ tasks, onCreateTask, onDeleteTask, onEditTask, onU
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Gestion du début du drag
|
||||||
|
const handleDragStart = (event: DragStartEvent) => {
|
||||||
|
const { active } = event;
|
||||||
|
const task = tasks.find(t => t.id === active.id);
|
||||||
|
setActiveTask(task || null);
|
||||||
|
};
|
||||||
|
|
||||||
|
// Gestion de la fin du drag
|
||||||
|
const handleDragEnd = async (event: DragEndEvent) => {
|
||||||
|
const { active, over } = event;
|
||||||
|
setActiveTask(null);
|
||||||
|
|
||||||
|
if (!over || !onUpdateStatus) return;
|
||||||
|
|
||||||
|
const taskId = active.id as string;
|
||||||
|
const newStatus = over.id as TaskStatus;
|
||||||
|
|
||||||
|
// Trouver la tâche actuelle
|
||||||
|
const task = tasks.find(t => t.id === taskId);
|
||||||
|
if (!task || task.status === newStatus) return;
|
||||||
|
|
||||||
|
// Mettre à jour le statut
|
||||||
|
await onUpdateStatus(taskId, newStatus);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="h-full flex flex-col bg-slate-950">
|
<DndContext
|
||||||
{/* Header avec bouton nouvelle tâche */}
|
sensors={sensors}
|
||||||
<div className="flex justify-between items-center p-6 pb-0">
|
onDragStart={handleDragStart}
|
||||||
<div className="flex items-center gap-3">
|
onDragEnd={handleDragEnd}
|
||||||
<div className="w-2 h-2 bg-cyan-400 rounded-full animate-pulse"></div>
|
>
|
||||||
<h2 className="text-lg font-mono font-bold text-slate-100 uppercase tracking-wider">
|
<div className="h-full flex flex-col bg-slate-950">
|
||||||
Kanban Board
|
{/* Header avec bouton nouvelle tâche */}
|
||||||
</h2>
|
<div className="flex justify-between items-center p-6 pb-0">
|
||||||
|
<div className="flex items-center gap-3">
|
||||||
|
<div className="w-2 h-2 bg-cyan-400 rounded-full animate-pulse"></div>
|
||||||
|
<h2 className="text-lg font-mono font-bold text-slate-100 uppercase tracking-wider">
|
||||||
|
Kanban Board
|
||||||
|
</h2>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{onCreateTask && (
|
||||||
|
<Button
|
||||||
|
variant="primary"
|
||||||
|
onClick={() => setIsCreateModalOpen(true)}
|
||||||
|
disabled={loading}
|
||||||
|
>
|
||||||
|
+ Nouvelle tâche
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{/* Board tech dark */}
|
||||||
|
<div className="flex-1 flex gap-6 overflow-x-auto p-6">
|
||||||
|
{columns.map((column) => (
|
||||||
|
<KanbanColumn
|
||||||
|
key={column.id}
|
||||||
|
id={column.id}
|
||||||
|
title={column.title}
|
||||||
|
color={column.color}
|
||||||
|
tasks={column.tasks}
|
||||||
|
onCreateTask={onCreateTask ? handleCreateTask : undefined}
|
||||||
|
onDeleteTask={onDeleteTask}
|
||||||
|
onEditTask={onEditTask}
|
||||||
|
onUpdateTitle={onUpdateTitle}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Modal de création */}
|
||||||
{onCreateTask && (
|
{onCreateTask && (
|
||||||
<Button
|
<CreateTaskForm
|
||||||
variant="primary"
|
isOpen={isCreateModalOpen}
|
||||||
onClick={() => setIsCreateModalOpen(true)}
|
onClose={() => setIsCreateModalOpen(false)}
|
||||||
disabled={loading}
|
onSubmit={handleCreateTask}
|
||||||
>
|
loading={loading}
|
||||||
+ Nouvelle tâche
|
/>
|
||||||
</Button>
|
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Board tech dark */}
|
{/* Overlay pour le drag & drop */}
|
||||||
<div className="flex-1 flex gap-6 overflow-x-auto p-6">
|
<DragOverlay>
|
||||||
{columns.map((column) => (
|
{activeTask ? (
|
||||||
<KanbanColumn
|
<div className="rotate-3 opacity-90">
|
||||||
key={column.id}
|
<TaskCard
|
||||||
id={column.id}
|
task={activeTask}
|
||||||
title={column.title}
|
onDelete={undefined}
|
||||||
color={column.color}
|
onEdit={undefined}
|
||||||
tasks={column.tasks}
|
onUpdateTitle={undefined}
|
||||||
onCreateTask={onCreateTask ? handleCreateTask : undefined}
|
/>
|
||||||
onDeleteTask={onDeleteTask}
|
</div>
|
||||||
onEditTask={onEditTask}
|
) : null}
|
||||||
onUpdateTitle={onUpdateTitle}
|
</DragOverlay>
|
||||||
/>
|
</DndContext>
|
||||||
))}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{/* Modal de création */}
|
|
||||||
{onCreateTask && (
|
|
||||||
<CreateTaskForm
|
|
||||||
isOpen={isCreateModalOpen}
|
|
||||||
onClose={() => setIsCreateModalOpen(false)}
|
|
||||||
onSubmit={handleCreateTask}
|
|
||||||
loading={loading}
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ import { useState } from 'react';
|
|||||||
import { KanbanBoard } from './Board';
|
import { KanbanBoard } from './Board';
|
||||||
import { EditTaskForm } from '@/components/forms/EditTaskForm';
|
import { EditTaskForm } from '@/components/forms/EditTaskForm';
|
||||||
import { useTasks } from '@/hooks/useTasks';
|
import { useTasks } from '@/hooks/useTasks';
|
||||||
import { Task } from '@/lib/types';
|
import { Task, TaskStatus } from '@/lib/types';
|
||||||
import { UpdateTaskData } from '@/clients/tasks-client';
|
import { UpdateTaskData } from '@/clients/tasks-client';
|
||||||
|
|
||||||
interface BoardContainerProps {
|
interface BoardContainerProps {
|
||||||
@@ -19,7 +19,7 @@ interface BoardContainerProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function KanbanBoardContainer({ initialTasks, initialStats }: BoardContainerProps) {
|
export function KanbanBoardContainer({ initialTasks, initialStats }: BoardContainerProps) {
|
||||||
const { tasks, loading, createTask, deleteTask, updateTask } = useTasks(
|
const { tasks, loading, syncing, createTask, deleteTask, updateTask, updateTaskOptimistic } = useTasks(
|
||||||
{ limit: 20 },
|
{ limit: 20 },
|
||||||
{ tasks: initialTasks, stats: initialStats }
|
{ tasks: initialTasks, stats: initialStats }
|
||||||
);
|
);
|
||||||
@@ -42,6 +42,14 @@ export function KanbanBoardContainer({ initialTasks, initialStats }: BoardContai
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleUpdateStatus = async (taskId: string, newStatus: TaskStatus) => {
|
||||||
|
// Utiliser la mise à jour optimiste pour le drag & drop
|
||||||
|
await updateTaskOptimistic({
|
||||||
|
taskId,
|
||||||
|
status: newStatus
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<KanbanBoard
|
<KanbanBoard
|
||||||
@@ -50,6 +58,7 @@ export function KanbanBoardContainer({ initialTasks, initialStats }: BoardContai
|
|||||||
onDeleteTask={deleteTask}
|
onDeleteTask={deleteTask}
|
||||||
onEditTask={handleEditTask}
|
onEditTask={handleEditTask}
|
||||||
onUpdateTitle={handleUpdateTitle}
|
onUpdateTitle={handleUpdateTitle}
|
||||||
|
onUpdateStatus={handleUpdateStatus}
|
||||||
loading={loading}
|
loading={loading}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { Card, CardHeader, CardContent } from '@/components/ui/Card';
|
|||||||
import { Badge } from '@/components/ui/Badge';
|
import { Badge } from '@/components/ui/Badge';
|
||||||
import { CreateTaskData } from '@/clients/tasks-client';
|
import { CreateTaskData } from '@/clients/tasks-client';
|
||||||
import { useState } from 'react';
|
import { useState } from 'react';
|
||||||
|
import { useDroppable } from '@dnd-kit/core';
|
||||||
|
|
||||||
interface KanbanColumnProps {
|
interface KanbanColumnProps {
|
||||||
id: TaskStatus;
|
id: TaskStatus;
|
||||||
@@ -19,6 +20,11 @@ interface KanbanColumnProps {
|
|||||||
|
|
||||||
export function KanbanColumn({ id, title, color, tasks, onCreateTask, onDeleteTask, onEditTask, onUpdateTitle }: KanbanColumnProps) {
|
export function KanbanColumn({ id, title, color, tasks, onCreateTask, onDeleteTask, onEditTask, onUpdateTitle }: KanbanColumnProps) {
|
||||||
const [showQuickAdd, setShowQuickAdd] = useState(false);
|
const [showQuickAdd, setShowQuickAdd] = useState(false);
|
||||||
|
|
||||||
|
// Configuration de la zone droppable
|
||||||
|
const { setNodeRef, isOver } = useDroppable({
|
||||||
|
id: id,
|
||||||
|
});
|
||||||
// Couleurs tech/cyberpunk
|
// Couleurs tech/cyberpunk
|
||||||
const techStyles = {
|
const techStyles = {
|
||||||
gray: {
|
gray: {
|
||||||
@@ -61,7 +67,13 @@ export function KanbanColumn({ id, title, color, tasks, onCreateTask, onDeleteTa
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex-shrink-0 w-80 h-full">
|
<div className="flex-shrink-0 w-80 h-full">
|
||||||
<Card variant="elevated" className="h-full flex flex-col">
|
<Card
|
||||||
|
ref={setNodeRef}
|
||||||
|
variant="elevated"
|
||||||
|
className={`h-full flex flex-col transition-all duration-200 ${
|
||||||
|
isOver ? 'ring-2 ring-cyan-400/50 bg-slate-800/60' : ''
|
||||||
|
}`}
|
||||||
|
>
|
||||||
<CardHeader className="pb-3">
|
<CardHeader className="pb-3">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<div className="flex items-center gap-3">
|
<div className="flex items-center gap-3">
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import { formatDistanceToNow } from 'date-fns';
|
|||||||
import { fr } from 'date-fns/locale';
|
import { fr } from 'date-fns/locale';
|
||||||
import { Card } from '@/components/ui/Card';
|
import { Card } from '@/components/ui/Card';
|
||||||
import { Badge } from '@/components/ui/Badge';
|
import { Badge } from '@/components/ui/Badge';
|
||||||
|
import { useDraggable } from '@dnd-kit/core';
|
||||||
|
|
||||||
interface TaskCardProps {
|
interface TaskCardProps {
|
||||||
task: Task;
|
task: Task;
|
||||||
@@ -16,6 +17,17 @@ export function TaskCard({ task, onDelete, onEdit, onUpdateTitle }: TaskCardProp
|
|||||||
const [isEditingTitle, setIsEditingTitle] = useState(false);
|
const [isEditingTitle, setIsEditingTitle] = useState(false);
|
||||||
const [editTitle, setEditTitle] = useState(task.title);
|
const [editTitle, setEditTitle] = useState(task.title);
|
||||||
|
|
||||||
|
// Configuration du draggable
|
||||||
|
const {
|
||||||
|
attributes,
|
||||||
|
listeners,
|
||||||
|
setNodeRef,
|
||||||
|
transform,
|
||||||
|
isDragging,
|
||||||
|
} = useDraggable({
|
||||||
|
id: task.id,
|
||||||
|
});
|
||||||
|
|
||||||
// Mettre à jour le titre local quand la tâche change
|
// Mettre à jour le titre local quand la tâche change
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
setEditTitle(task.title);
|
setEditTitle(task.title);
|
||||||
@@ -39,7 +51,7 @@ export function TaskCard({ task, onDelete, onEdit, onUpdateTitle }: TaskCardProp
|
|||||||
const handleTitleClick = (e: React.MouseEvent) => {
|
const handleTitleClick = (e: React.MouseEvent) => {
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
if (onUpdateTitle) {
|
if (onUpdateTitle && !isDragging) {
|
||||||
setIsEditingTitle(true);
|
setIsEditingTitle(true);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@@ -66,6 +78,11 @@ export function TaskCard({ task, onDelete, onEdit, onUpdateTitle }: TaskCardProp
|
|||||||
handleTitleCancel();
|
handleTitleCancel();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
// Style de transformation pour le drag
|
||||||
|
const style = transform ? {
|
||||||
|
transform: `translate3d(${transform.x}px, ${transform.y}px, 0)`,
|
||||||
|
} : undefined;
|
||||||
|
|
||||||
// Extraire les emojis du titre pour les afficher comme tags visuels
|
// Extraire les emojis du titre pour les afficher comme tags visuels
|
||||||
const emojiRegex = /[\u{1F600}-\u{1F64F}]|[\u{1F300}-\u{1F5FF}]|[\u{1F680}-\u{1F6FF}]|[\u{1F1E0}-\u{1F1FF}]|[\u{2600}-\u{26FF}]|[\u{2700}-\u{27BF}]/gu;
|
const emojiRegex = /[\u{1F600}-\u{1F64F}]|[\u{1F300}-\u{1F5FF}]|[\u{1F680}-\u{1F6FF}]|[\u{1F1E0}-\u{1F1FF}]|[\u{2600}-\u{26FF}]|[\u{2700}-\u{27BF}]/gu;
|
||||||
const emojis = task.title.match(emojiRegex) || [];
|
const emojis = task.title.match(emojiRegex) || [];
|
||||||
@@ -73,7 +90,15 @@ export function TaskCard({ task, onDelete, onEdit, onUpdateTitle }: TaskCardProp
|
|||||||
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Card className="p-3 hover:border-cyan-500/30 hover:shadow-lg hover:shadow-cyan-500/10 transition-all duration-300 cursor-pointer group">
|
<Card
|
||||||
|
ref={setNodeRef}
|
||||||
|
style={style}
|
||||||
|
className={`p-3 hover:border-cyan-500/30 hover:shadow-lg hover:shadow-cyan-500/10 transition-all duration-300 cursor-pointer group ${
|
||||||
|
isDragging ? 'opacity-50 rotate-3 scale-105' : ''
|
||||||
|
}`}
|
||||||
|
{...attributes}
|
||||||
|
{...(isEditingTitle ? {} : listeners)}
|
||||||
|
>
|
||||||
{/* Header tech avec titre et status */}
|
{/* Header tech avec titre et status */}
|
||||||
<div className="flex items-start gap-2 mb-2">
|
<div className="flex items-start gap-2 mb-2">
|
||||||
{emojis.length > 0 && (
|
{emojis.length > 0 && (
|
||||||
|
|||||||
@@ -10,22 +10,27 @@ interface HeaderProps {
|
|||||||
todo: number;
|
todo: number;
|
||||||
completionRate: number;
|
completionRate: number;
|
||||||
};
|
};
|
||||||
|
syncing?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Header({ title, subtitle, stats }: HeaderProps) {
|
export function Header({ title, subtitle, stats, syncing = false }: HeaderProps) {
|
||||||
return (
|
return (
|
||||||
<header className="bg-slate-900/80 backdrop-blur-sm border-b border-slate-700/50 shadow-lg shadow-slate-900/20">
|
<header className="bg-slate-900/80 backdrop-blur-sm border-b border-slate-700/50 shadow-lg shadow-slate-900/20">
|
||||||
<div className="container mx-auto px-6 py-4">
|
<div className="container mx-auto px-6 py-4">
|
||||||
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-6">
|
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between gap-6">
|
||||||
{/* Titre tech avec glow */}
|
{/* Titre tech avec glow */}
|
||||||
<div className="flex items-center gap-4">
|
<div className="flex items-center gap-4">
|
||||||
<div className="w-3 h-3 bg-cyan-400 rounded-full animate-pulse shadow-cyan-400/50 shadow-lg"></div>
|
<div className={`w-3 h-3 rounded-full shadow-lg ${
|
||||||
|
syncing
|
||||||
|
? 'bg-yellow-400 animate-spin shadow-yellow-400/50'
|
||||||
|
: 'bg-cyan-400 animate-pulse shadow-cyan-400/50'
|
||||||
|
}`}></div>
|
||||||
<div>
|
<div>
|
||||||
<h1 className="text-2xl font-mono font-bold text-slate-100 tracking-wider">
|
<h1 className="text-2xl font-mono font-bold text-slate-100 tracking-wider">
|
||||||
{title}
|
{title}
|
||||||
</h1>
|
</h1>
|
||||||
<p className="text-slate-400 mt-1 font-mono text-sm">
|
<p className="text-slate-400 mt-1 font-mono text-sm">
|
||||||
{subtitle}
|
{subtitle} {syncing && '• Synchronisation...'}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,8 +1,7 @@
|
|||||||
'use client';
|
'use client';
|
||||||
|
|
||||||
import { useState, useEffect } from 'react';
|
|
||||||
import { Header } from './Header';
|
import { Header } from './Header';
|
||||||
import { tasksClient } from '@/clients/tasks-client';
|
import { useTasks } from '@/hooks/useTasks';
|
||||||
|
|
||||||
interface HeaderContainerProps {
|
interface HeaderContainerProps {
|
||||||
title: string;
|
title: string;
|
||||||
@@ -17,41 +16,17 @@ interface HeaderContainerProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function HeaderContainer({ title, subtitle, initialStats }: HeaderContainerProps) {
|
export function HeaderContainer({ title, subtitle, initialStats }: HeaderContainerProps) {
|
||||||
const [stats, setStats] = useState(initialStats);
|
const { stats, syncing } = useTasks(
|
||||||
const [isHydrated, setIsHydrated] = useState(false);
|
{ limit: 1 }, // Juste pour les stats
|
||||||
|
{ tasks: [], stats: initialStats }
|
||||||
// Hydratation côté client
|
);
|
||||||
useEffect(() => {
|
|
||||||
setIsHydrated(true);
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
// Rafraîchir les stats périodiquement côté client
|
|
||||||
useEffect(() => {
|
|
||||||
if (!isHydrated) return;
|
|
||||||
|
|
||||||
const refreshStats = async () => {
|
|
||||||
try {
|
|
||||||
const response = await tasksClient.getTasks({ limit: 1 }); // Juste pour les stats
|
|
||||||
setStats(response.stats);
|
|
||||||
} catch (error) {
|
|
||||||
console.error('Erreur lors du rafraîchissement des stats:', error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Rafraîchir les stats toutes les 30 secondes
|
|
||||||
const interval = setInterval(refreshStats, 30000);
|
|
||||||
|
|
||||||
// Rafraîchir immédiatement après hydratation
|
|
||||||
refreshStats();
|
|
||||||
|
|
||||||
return () => clearInterval(interval);
|
|
||||||
}, [isHydrated]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Header
|
<Header
|
||||||
title={title}
|
title={title}
|
||||||
subtitle={subtitle}
|
subtitle={subtitle}
|
||||||
stats={stats}
|
stats={stats}
|
||||||
|
syncing={syncing}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,12 +15,14 @@ interface UseTasksState {
|
|||||||
};
|
};
|
||||||
loading: boolean;
|
loading: boolean;
|
||||||
error: string | null;
|
error: string | null;
|
||||||
|
syncing: boolean; // Pour indiquer les opérations optimistes en cours
|
||||||
}
|
}
|
||||||
|
|
||||||
interface UseTasksActions {
|
interface UseTasksActions {
|
||||||
refreshTasks: () => Promise<void>;
|
refreshTasks: () => Promise<void>;
|
||||||
createTask: (data: CreateTaskData) => Promise<Task | null>;
|
createTask: (data: CreateTaskData) => Promise<Task | null>;
|
||||||
updateTask: (data: UpdateTaskData) => Promise<Task | null>;
|
updateTask: (data: UpdateTaskData) => Promise<Task | null>;
|
||||||
|
updateTaskOptimistic: (data: UpdateTaskData) => Promise<Task | null>;
|
||||||
deleteTask: (taskId: string) => Promise<void>;
|
deleteTask: (taskId: string) => Promise<void>;
|
||||||
setFilters: (filters: TaskFilters) => void;
|
setFilters: (filters: TaskFilters) => void;
|
||||||
}
|
}
|
||||||
@@ -42,7 +44,8 @@ export function useTasks(
|
|||||||
completionRate: 0
|
completionRate: 0
|
||||||
},
|
},
|
||||||
loading: false,
|
loading: false,
|
||||||
error: null
|
error: null,
|
||||||
|
syncing: false
|
||||||
});
|
});
|
||||||
|
|
||||||
const [filters, setFilters] = useState<TaskFilters>(initialFilters || {});
|
const [filters, setFilters] = useState<TaskFilters>(initialFilters || {});
|
||||||
@@ -117,6 +120,87 @@ export function useTasks(
|
|||||||
}
|
}
|
||||||
}, [refreshTasks]);
|
}, [refreshTasks]);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Met à jour une tâche de manière optimiste (pour drag & drop)
|
||||||
|
*/
|
||||||
|
const updateTaskOptimistic = useCallback(async (data: UpdateTaskData): Promise<Task | null> => {
|
||||||
|
const { taskId, ...updates } = data;
|
||||||
|
|
||||||
|
// 1. Sauvegarder l'état actuel pour rollback
|
||||||
|
const currentTasks = state.tasks;
|
||||||
|
const taskToUpdate = currentTasks.find(t => t.id === taskId);
|
||||||
|
|
||||||
|
if (!taskToUpdate) {
|
||||||
|
console.error('Tâche non trouvée pour mise à jour optimiste:', taskId);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Mise à jour optimiste immédiate de l'état local
|
||||||
|
const updatedTask = { ...taskToUpdate, ...updates };
|
||||||
|
const updatedTasks = currentTasks.map(task =>
|
||||||
|
task.id === taskId ? updatedTask : task
|
||||||
|
);
|
||||||
|
|
||||||
|
// Recalculer les stats
|
||||||
|
const newStats = {
|
||||||
|
total: updatedTasks.length,
|
||||||
|
completed: updatedTasks.filter(t => t.status === 'done').length,
|
||||||
|
inProgress: updatedTasks.filter(t => t.status === 'in_progress').length,
|
||||||
|
todo: updatedTasks.filter(t => t.status === 'todo').length,
|
||||||
|
completionRate: updatedTasks.length > 0
|
||||||
|
? Math.round((updatedTasks.filter(t => t.status === 'done').length / updatedTasks.length) * 100)
|
||||||
|
: 0
|
||||||
|
};
|
||||||
|
|
||||||
|
setState(prev => ({
|
||||||
|
...prev,
|
||||||
|
tasks: updatedTasks,
|
||||||
|
stats: newStats,
|
||||||
|
error: null,
|
||||||
|
syncing: true // Indiquer qu'une synchronisation est en cours
|
||||||
|
}));
|
||||||
|
|
||||||
|
// 3. Appel API en arrière-plan
|
||||||
|
try {
|
||||||
|
const response = await tasksClient.updateTask(data);
|
||||||
|
|
||||||
|
// Si l'API retourne des données différentes, on met à jour
|
||||||
|
if (response.data) {
|
||||||
|
setState(prev => ({
|
||||||
|
...prev,
|
||||||
|
tasks: prev.tasks.map(task =>
|
||||||
|
task.id === taskId ? response.data : task
|
||||||
|
),
|
||||||
|
syncing: false // Synchronisation terminée
|
||||||
|
}));
|
||||||
|
} else {
|
||||||
|
setState(prev => ({ ...prev, syncing: false }));
|
||||||
|
}
|
||||||
|
|
||||||
|
return response.data;
|
||||||
|
} catch (error) {
|
||||||
|
// 4. Rollback en cas d'erreur
|
||||||
|
setState(prev => ({
|
||||||
|
...prev,
|
||||||
|
tasks: currentTasks,
|
||||||
|
stats: {
|
||||||
|
total: currentTasks.length,
|
||||||
|
completed: currentTasks.filter(t => t.status === 'done').length,
|
||||||
|
inProgress: currentTasks.filter(t => t.status === 'in_progress').length,
|
||||||
|
todo: currentTasks.filter(t => t.status === 'todo').length,
|
||||||
|
completionRate: currentTasks.length > 0
|
||||||
|
? Math.round((currentTasks.filter(t => t.status === 'done').length / currentTasks.length) * 100)
|
||||||
|
: 0
|
||||||
|
},
|
||||||
|
error: error instanceof Error ? error.message : 'Erreur lors de la mise à jour',
|
||||||
|
syncing: false // Arrêter l'indicateur de synchronisation
|
||||||
|
}));
|
||||||
|
|
||||||
|
console.error('Erreur lors de la mise à jour optimiste:', error);
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}, [state.tasks]);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Supprime une tâche
|
* Supprime une tâche
|
||||||
*/
|
*/
|
||||||
@@ -148,6 +232,7 @@ export function useTasks(
|
|||||||
refreshTasks,
|
refreshTasks,
|
||||||
createTask,
|
createTask,
|
||||||
updateTask,
|
updateTask,
|
||||||
|
updateTaskOptimistic,
|
||||||
deleteTask,
|
deleteTask,
|
||||||
setFilters
|
setFilters
|
||||||
};
|
};
|
||||||
|
|||||||
56
package-lock.json
generated
56
package-lock.json
generated
@@ -8,6 +8,9 @@
|
|||||||
"name": "towercontrol-temp",
|
"name": "towercontrol-temp",
|
||||||
"version": "0.1.0",
|
"version": "0.1.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@dnd-kit/core": "^6.3.1",
|
||||||
|
"@dnd-kit/sortable": "^10.0.0",
|
||||||
|
"@dnd-kit/utilities": "^3.2.2",
|
||||||
"@prisma/client": "^6.16.1",
|
"@prisma/client": "^6.16.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"date-fns": "^4.1.0",
|
"date-fns": "^4.1.0",
|
||||||
@@ -46,6 +49,59 @@
|
|||||||
"url": "https://github.com/sponsors/sindresorhus"
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@dnd-kit/accessibility": {
|
||||||
|
"version": "3.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
|
||||||
|
"integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": ">=16.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@dnd-kit/core": {
|
||||||
|
"version": "6.3.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
|
||||||
|
"integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@dnd-kit/accessibility": "^3.1.1",
|
||||||
|
"@dnd-kit/utilities": "^3.2.2",
|
||||||
|
"tslib": "^2.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": ">=16.8.0",
|
||||||
|
"react-dom": ">=16.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@dnd-kit/sortable": {
|
||||||
|
"version": "10.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
|
||||||
|
"integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"@dnd-kit/utilities": "^3.2.2",
|
||||||
|
"tslib": "^2.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"@dnd-kit/core": "^6.3.0",
|
||||||
|
"react": ">=16.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@dnd-kit/utilities": {
|
||||||
|
"version": "3.2.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
|
||||||
|
"integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"tslib": "^2.0.0"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"react": ">=16.8.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@emnapi/core": {
|
"node_modules/@emnapi/core": {
|
||||||
"version": "1.5.0",
|
"version": "1.5.0",
|
||||||
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.5.0.tgz",
|
||||||
|
|||||||
@@ -9,6 +9,9 @@
|
|||||||
"lint": "eslint"
|
"lint": "eslint"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"@dnd-kit/core": "^6.3.1",
|
||||||
|
"@dnd-kit/sortable": "^10.0.0",
|
||||||
|
"@dnd-kit/utilities": "^3.2.2",
|
||||||
"@prisma/client": "^6.16.1",
|
"@prisma/client": "^6.16.1",
|
||||||
"clsx": "^2.1.1",
|
"clsx": "^2.1.1",
|
||||||
"date-fns": "^4.1.0",
|
"date-fns": "^4.1.0",
|
||||||
|
|||||||
Reference in New Issue
Block a user