* Perfect! I've successfully added search functionality to the TaskKanbanBoard component. The implementation includes: 1. **Search input field** at the top of the kanban board 2. **Real-time filtering** that searches both task titles and descriptions 3. **Case-insensitive search** for better user experience 4. **Clean integration** with the existing kanban board structure The search functionality works by filtering tasks before they're grouped by status, so only matching tasks will appear on the board across all columns. * Perfect! I've successfully moved the search input to the header, positioning it to the left of the "Add Task" button. The improvements include: 1. **Better positioning**: Search input is now in the header alongside the "Add Task" button 2. **Improved layout**: The search input has a fixed width (w-64) and is properly spaced 3. **Clean integration**: The search functionality is maintained while improving the visual hierarchy 4. **Responsive design**: The search input is grouped with the "Add Task" button for better visual balance The search functionality remains the same - it filters tasks by title and description in real-time as you type. * Prettier
487 lines
14 KiB
TypeScript
487 lines
14 KiB
TypeScript
import { useState, useEffect, useCallback } from 'react';
|
|
import { useParams, useNavigate } from 'react-router-dom';
|
|
import { Button } from '@/components/ui/button';
|
|
import { Card, CardContent } from '@/components/ui/card';
|
|
import { Input } from '@/components/ui/input';
|
|
import { Plus, Settings, FolderOpen } from 'lucide-react';
|
|
import { makeRequest } from '@/lib/api';
|
|
import { TaskFormDialog } from '@/components/tasks/TaskFormDialog';
|
|
import { ProjectForm } from '@/components/projects/project-form';
|
|
import { useKeyboardShortcuts } from '@/lib/keyboard-shortcuts';
|
|
import {
|
|
getMainContainerClasses,
|
|
getKanbanSectionClasses,
|
|
} from '@/lib/responsive-config';
|
|
|
|
import { TaskKanbanBoard } from '@/components/tasks/TaskKanbanBoard';
|
|
import { TaskDetailsPanel } from '@/components/tasks/TaskDetailsPanel';
|
|
import type {
|
|
TaskStatus,
|
|
TaskWithAttemptStatus,
|
|
ProjectWithBranch,
|
|
ExecutorConfig,
|
|
CreateTaskAndStart,
|
|
} from 'shared/types';
|
|
import type { DragEndEvent } from '@/components/ui/shadcn-io/kanban';
|
|
|
|
type Task = TaskWithAttemptStatus;
|
|
|
|
interface ApiResponse<T> {
|
|
success: boolean;
|
|
data: T | null;
|
|
message: string | null;
|
|
}
|
|
|
|
export function ProjectTasks() {
|
|
const { projectId, taskId } = useParams<{
|
|
projectId: string;
|
|
taskId?: string;
|
|
}>();
|
|
const navigate = useNavigate();
|
|
const [tasks, setTasks] = useState<Task[]>([]);
|
|
const [project, setProject] = useState<ProjectWithBranch | null>(null);
|
|
const [loading, setLoading] = useState(true);
|
|
const [error, setError] = useState<string | null>(null);
|
|
const [isTaskDialogOpen, setIsTaskDialogOpen] = useState(false);
|
|
const [editingTask, setEditingTask] = useState<Task | null>(null);
|
|
const [isProjectSettingsOpen, setIsProjectSettingsOpen] = useState(false);
|
|
const [searchQuery, setSearchQuery] = useState('');
|
|
|
|
// Panel state
|
|
const [selectedTask, setSelectedTask] = useState<Task | null>(null);
|
|
const [isPanelOpen, setIsPanelOpen] = useState(false);
|
|
|
|
// Define task creation handler
|
|
const handleCreateNewTask = () => {
|
|
setEditingTask(null);
|
|
setIsTaskDialogOpen(true);
|
|
};
|
|
|
|
const handleOpenInIDE = async () => {
|
|
if (!projectId) return;
|
|
|
|
try {
|
|
const response = await makeRequest(
|
|
`/api/projects/${projectId}/open-editor`,
|
|
{
|
|
method: 'POST',
|
|
headers: {
|
|
'Content-Type': 'application/json',
|
|
},
|
|
body: JSON.stringify(null),
|
|
}
|
|
);
|
|
|
|
if (!response.ok) {
|
|
throw new Error('Failed to open project in IDE');
|
|
}
|
|
} catch (error) {
|
|
console.error('Failed to open project in IDE:', error);
|
|
setError('Failed to open project in IDE');
|
|
}
|
|
};
|
|
|
|
// Setup keyboard shortcuts
|
|
useKeyboardShortcuts({
|
|
navigate,
|
|
currentPath: `/projects/${projectId}/tasks`,
|
|
hasOpenDialog: isTaskDialogOpen,
|
|
closeDialog: () => setIsTaskDialogOpen(false),
|
|
openCreateTask: handleCreateNewTask,
|
|
});
|
|
|
|
useEffect(() => {
|
|
if (projectId) {
|
|
fetchProject();
|
|
fetchTasks();
|
|
|
|
// Set up polling to refresh tasks every 5 seconds
|
|
const interval = setInterval(() => {
|
|
fetchTasks(true); // Skip loading spinner for polling
|
|
}, 2000);
|
|
|
|
// Cleanup interval on unmount
|
|
return () => clearInterval(interval);
|
|
}
|
|
}, [projectId]);
|
|
|
|
// Handle direct navigation to task URLs
|
|
useEffect(() => {
|
|
if (taskId && tasks.length > 0) {
|
|
const task = tasks.find((t) => t.id === taskId);
|
|
if (task) {
|
|
setSelectedTask(task);
|
|
setIsPanelOpen(true);
|
|
}
|
|
}
|
|
}, [taskId, tasks]);
|
|
|
|
const fetchProject = useCallback(async () => {
|
|
try {
|
|
const response = await makeRequest(
|
|
`/api/projects/${projectId}/with-branch`
|
|
);
|
|
|
|
if (response.ok) {
|
|
const result: ApiResponse<ProjectWithBranch> = await response.json();
|
|
if (result.success && result.data) {
|
|
setProject(result.data);
|
|
}
|
|
} else if (response.status === 404) {
|
|
setError('Project not found');
|
|
navigate('/projects');
|
|
}
|
|
} catch (err) {
|
|
setError('Failed to load project');
|
|
}
|
|
}, [projectId, navigate]);
|
|
|
|
const fetchTasks = useCallback(
|
|
async (skipLoading = false) => {
|
|
try {
|
|
if (!skipLoading) {
|
|
setLoading(true);
|
|
}
|
|
const response = await makeRequest(`/api/projects/${projectId}/tasks`);
|
|
|
|
if (response.ok) {
|
|
const result: ApiResponse<Task[]> = await response.json();
|
|
if (result.success && result.data) {
|
|
// Only update if data has actually changed
|
|
setTasks((prevTasks) => {
|
|
const newTasks = result.data!;
|
|
if (JSON.stringify(prevTasks) === JSON.stringify(newTasks)) {
|
|
return prevTasks; // Return same reference to prevent re-render
|
|
}
|
|
|
|
// Update selectedTask if it exists and has been modified
|
|
if (selectedTask) {
|
|
const updatedSelectedTask = newTasks.find(
|
|
(task) => task.id === selectedTask.id
|
|
);
|
|
if (
|
|
updatedSelectedTask &&
|
|
JSON.stringify(selectedTask) !==
|
|
JSON.stringify(updatedSelectedTask)
|
|
) {
|
|
setSelectedTask(updatedSelectedTask);
|
|
}
|
|
}
|
|
|
|
return newTasks;
|
|
});
|
|
}
|
|
} else {
|
|
setError('Failed to load tasks');
|
|
}
|
|
} catch (err) {
|
|
setError('Failed to load tasks');
|
|
} finally {
|
|
if (!skipLoading) {
|
|
setLoading(false);
|
|
}
|
|
}
|
|
},
|
|
[projectId, selectedTask]
|
|
);
|
|
|
|
const handleCreateTask = async (title: string, description: string) => {
|
|
try {
|
|
const response = await makeRequest(`/api/projects/${projectId}/tasks`, {
|
|
method: 'POST',
|
|
body: JSON.stringify({
|
|
project_id: projectId,
|
|
title,
|
|
description: description || null,
|
|
}),
|
|
});
|
|
|
|
if (response.ok) {
|
|
await fetchTasks();
|
|
} else {
|
|
setError('Failed to create task');
|
|
}
|
|
} catch (err) {
|
|
setError('Failed to create task');
|
|
}
|
|
};
|
|
|
|
const handleCreateAndStartTask = async (
|
|
title: string,
|
|
description: string,
|
|
executor?: ExecutorConfig
|
|
) => {
|
|
try {
|
|
const payload: CreateTaskAndStart = {
|
|
project_id: projectId!,
|
|
title,
|
|
description: description || null,
|
|
executor: executor || null,
|
|
};
|
|
|
|
const response = await makeRequest(
|
|
`/api/projects/${projectId}/tasks/create-and-start`,
|
|
{
|
|
method: 'POST',
|
|
body: JSON.stringify(payload),
|
|
}
|
|
);
|
|
|
|
if (response.ok) {
|
|
await fetchTasks();
|
|
} else {
|
|
setError('Failed to create and start task');
|
|
}
|
|
} catch (err) {
|
|
setError('Failed to create and start task');
|
|
}
|
|
};
|
|
|
|
const handleUpdateTask = async (
|
|
title: string,
|
|
description: string,
|
|
status: TaskStatus
|
|
) => {
|
|
if (!editingTask) return;
|
|
|
|
try {
|
|
const response = await makeRequest(
|
|
`/api/projects/${projectId}/tasks/${editingTask.id}`,
|
|
{
|
|
method: 'PUT',
|
|
body: JSON.stringify({
|
|
title,
|
|
description: description || null,
|
|
status,
|
|
}),
|
|
}
|
|
);
|
|
|
|
if (response.ok) {
|
|
await fetchTasks();
|
|
setEditingTask(null);
|
|
} else {
|
|
setError('Failed to update task');
|
|
}
|
|
} catch (err) {
|
|
setError('Failed to update task');
|
|
}
|
|
};
|
|
|
|
const handleDeleteTask = async (taskId: string) => {
|
|
if (!confirm('Are you sure you want to delete this task?')) return;
|
|
|
|
try {
|
|
const response = await makeRequest(
|
|
`/api/projects/${projectId}/tasks/${taskId}`,
|
|
{
|
|
method: 'DELETE',
|
|
}
|
|
);
|
|
|
|
if (response.ok) {
|
|
await fetchTasks();
|
|
} else {
|
|
setError('Failed to delete task');
|
|
}
|
|
} catch (err) {
|
|
setError('Failed to delete task');
|
|
}
|
|
};
|
|
|
|
const handleEditTask = (task: Task) => {
|
|
setEditingTask(task);
|
|
setIsTaskDialogOpen(true);
|
|
};
|
|
|
|
const handleViewTaskDetails = (task: Task) => {
|
|
setSelectedTask(task);
|
|
setIsPanelOpen(true);
|
|
// Update URL to include task ID
|
|
navigate(`/projects/${projectId}/tasks/${task.id}`, { replace: true });
|
|
};
|
|
|
|
const handleClosePanel = () => {
|
|
setIsPanelOpen(false);
|
|
setSelectedTask(null);
|
|
// Remove task ID from URL when closing panel
|
|
navigate(`/projects/${projectId}/tasks`, { replace: true });
|
|
};
|
|
|
|
const handleProjectSettingsSuccess = () => {
|
|
setIsProjectSettingsOpen(false);
|
|
fetchProject(); // Refresh project data after settings change
|
|
};
|
|
|
|
const handleDragEnd = async (event: DragEndEvent) => {
|
|
const { active, over } = event;
|
|
|
|
if (!over || !active.data.current) return;
|
|
|
|
const taskId = active.id as string;
|
|
const newStatus = over.id as Task['status'];
|
|
const task = tasks.find((t) => t.id === taskId);
|
|
|
|
if (!task || task.status === newStatus) return;
|
|
|
|
// Optimistically update the UI immediately
|
|
const previousStatus = task.status;
|
|
setTasks((prev) =>
|
|
prev.map((t) => (t.id === taskId ? { ...t, status: newStatus } : t))
|
|
);
|
|
|
|
try {
|
|
const response = await makeRequest(
|
|
`/api/projects/${projectId}/tasks/${taskId}`,
|
|
{
|
|
method: 'PUT',
|
|
body: JSON.stringify({
|
|
title: task.title,
|
|
description: task.description,
|
|
status: newStatus,
|
|
}),
|
|
}
|
|
);
|
|
|
|
if (!response.ok) {
|
|
// Revert the optimistic update if the API call failed
|
|
setTasks((prev) =>
|
|
prev.map((t) =>
|
|
t.id === taskId ? { ...t, status: previousStatus } : t
|
|
)
|
|
);
|
|
setError('Failed to update task status');
|
|
}
|
|
} catch (err) {
|
|
// Revert the optimistic update if the API call failed
|
|
setTasks((prev) =>
|
|
prev.map((t) =>
|
|
t.id === taskId ? { ...t, status: previousStatus } : t
|
|
)
|
|
);
|
|
setError('Failed to update task status');
|
|
}
|
|
};
|
|
|
|
if (loading) {
|
|
return <div className="text-center py-8">Loading tasks...</div>;
|
|
}
|
|
|
|
if (error) {
|
|
return <div className="text-center py-8 text-destructive">{error}</div>;
|
|
}
|
|
|
|
return (
|
|
<div className={getMainContainerClasses(isPanelOpen)}>
|
|
{/* Left Column - Kanban Section */}
|
|
<div className={getKanbanSectionClasses(isPanelOpen)}>
|
|
{/* Header */}
|
|
|
|
<div className="px-8 my-12 flex flex-row">
|
|
<div className="w-full flex items-center gap-3">
|
|
<h1 className="text-2xl font-bold">{project?.name || 'Project'}</h1>
|
|
{project?.current_branch && (
|
|
<span className="text-sm text-muted-foreground bg-muted px-2 py-1 rounded-md">
|
|
{project.current_branch}
|
|
</span>
|
|
)}
|
|
<Button
|
|
variant="ghost"
|
|
size="sm"
|
|
onClick={handleOpenInIDE}
|
|
className="h-8 w-8 p-0"
|
|
title="Open in IDE"
|
|
>
|
|
<FolderOpen className="h-4 w-4" />
|
|
</Button>
|
|
<Button
|
|
variant="ghost"
|
|
size="sm"
|
|
onClick={() => setIsProjectSettingsOpen(true)}
|
|
className="h-8 w-8 p-0"
|
|
title="Project Settings"
|
|
>
|
|
<Settings className="h-4 w-4" />
|
|
</Button>
|
|
</div>
|
|
<div className="flex items-center gap-3">
|
|
<Input
|
|
type="text"
|
|
placeholder="Search tasks..."
|
|
value={searchQuery}
|
|
onChange={(e) => setSearchQuery(e.target.value)}
|
|
className="w-64"
|
|
/>
|
|
<Button onClick={handleCreateNewTask}>
|
|
<Plus className="h-4 w-4 mr-2" />
|
|
Add Task
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
|
|
{/* Tasks View */}
|
|
{tasks.length === 0 ? (
|
|
<div className="max-w-7xl mx-auto">
|
|
<Card>
|
|
<CardContent className="text-center py-8">
|
|
<p className="text-muted-foreground">
|
|
No tasks found for this project.
|
|
</p>
|
|
<Button className="mt-4" onClick={handleCreateNewTask}>
|
|
<Plus className="h-4 w-4 mr-2" />
|
|
Create First Task
|
|
</Button>
|
|
</CardContent>
|
|
</Card>
|
|
</div>
|
|
) : (
|
|
<div className="px-8 overflow-x-scroll my-4">
|
|
<div className="min-w-[900px] max-w-[2000px] relative py-1">
|
|
<TaskKanbanBoard
|
|
tasks={tasks}
|
|
searchQuery={searchQuery}
|
|
onDragEnd={handleDragEnd}
|
|
onEditTask={handleEditTask}
|
|
onDeleteTask={handleDeleteTask}
|
|
onViewTaskDetails={handleViewTaskDetails}
|
|
/>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</div>
|
|
|
|
{/* Right Column - Task Details Panel */}
|
|
{isPanelOpen && (
|
|
<TaskDetailsPanel
|
|
task={selectedTask}
|
|
project={project}
|
|
projectId={projectId!}
|
|
isOpen={isPanelOpen}
|
|
onClose={handleClosePanel}
|
|
onEditTask={handleEditTask}
|
|
onDeleteTask={handleDeleteTask}
|
|
isDialogOpen={isTaskDialogOpen || isProjectSettingsOpen}
|
|
/>
|
|
)}
|
|
|
|
{/* Dialogs - rendered at main container level to avoid stacking issues */}
|
|
<TaskFormDialog
|
|
isOpen={isTaskDialogOpen}
|
|
onOpenChange={setIsTaskDialogOpen}
|
|
task={editingTask}
|
|
projectId={projectId}
|
|
onCreateTask={handleCreateTask}
|
|
onCreateAndStartTask={handleCreateAndStartTask}
|
|
onUpdateTask={handleUpdateTask}
|
|
/>
|
|
|
|
<ProjectForm
|
|
open={isProjectSettingsOpen}
|
|
onClose={() => setIsProjectSettingsOpen(false)}
|
|
onSuccess={handleProjectSettingsSuccess}
|
|
project={project}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|