feat: add task blocker dependency graph + actionable now view
- New task_blockers join table (many-to-many, cross-project)
- Cycle detection prevents circular dependencies
- GET /api/tasks/{id}/blockers and /blocking endpoints
- POST/DELETE /api/tasks/{id}/blockers/{blocker_id}
- GET /api/actionable — all non-done tasks with no incomplete blockers
- BlockerPanel.jsx — search & manage blockers per task (via task menu)
- ActionableView.jsx — "what can I do right now?" dashboard grouped by project
- "Now" button in nav header routes to actionable view
- migrate_add_blockers.py migration script for existing databases
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -186,3 +186,98 @@ def get_tasks_by_status(db: Session, project_id: int, status: str) -> List[model
|
||||
models.Task.project_id == project_id,
|
||||
models.Task.status == status
|
||||
).all()
|
||||
|
||||
|
||||
# ========== BLOCKER CRUD ==========
|
||||
|
||||
def _has_cycle(db: Session, start_id: int, target_id: int) -> bool:
|
||||
"""BFS from start_id following its blockers. Returns True if target_id is reachable,
|
||||
which would mean adding target_id as a blocker of start_id creates a cycle."""
|
||||
visited = set()
|
||||
queue = [start_id]
|
||||
while queue:
|
||||
current = queue.pop(0)
|
||||
if current == target_id:
|
||||
return True
|
||||
if current in visited:
|
||||
continue
|
||||
visited.add(current)
|
||||
task = db.query(models.Task).filter(models.Task.id == current).first()
|
||||
if task:
|
||||
for b in task.blockers:
|
||||
if b.id not in visited:
|
||||
queue.append(b.id)
|
||||
return False
|
||||
|
||||
|
||||
def add_blocker(db: Session, task_id: int, blocker_id: int) -> models.Task:
|
||||
"""Add blocker_id as a prerequisite of task_id.
|
||||
Raises ValueError on self-reference or cycle."""
|
||||
if task_id == blocker_id:
|
||||
raise ValueError("A task cannot block itself")
|
||||
|
||||
task = get_task(db, task_id)
|
||||
blocker = get_task(db, blocker_id)
|
||||
|
||||
if not task:
|
||||
raise ValueError("Task not found")
|
||||
if not blocker:
|
||||
raise ValueError("Blocker task not found")
|
||||
|
||||
# Already linked — idempotent
|
||||
if any(b.id == blocker_id for b in task.blockers):
|
||||
return task
|
||||
|
||||
# Cycle detection: would blocker_id eventually depend on task_id?
|
||||
if _has_cycle(db, blocker_id, task_id):
|
||||
raise ValueError("Adding this blocker would create a circular dependency")
|
||||
|
||||
task.blockers.append(blocker)
|
||||
db.commit()
|
||||
db.refresh(task)
|
||||
return task
|
||||
|
||||
|
||||
def remove_blocker(db: Session, task_id: int, blocker_id: int) -> bool:
|
||||
"""Remove blocker_id as a prerequisite of task_id."""
|
||||
task = get_task(db, task_id)
|
||||
blocker = get_task(db, blocker_id)
|
||||
|
||||
if not task or not blocker:
|
||||
return False
|
||||
|
||||
if not any(b.id == blocker_id for b in task.blockers):
|
||||
return False
|
||||
|
||||
task.blockers.remove(blocker)
|
||||
db.commit()
|
||||
return True
|
||||
|
||||
|
||||
def get_task_with_blockers(db: Session, task_id: int) -> Optional[models.Task]:
|
||||
"""Get a task including its blockers and blocking lists."""
|
||||
return db.query(models.Task).filter(models.Task.id == task_id).first()
|
||||
|
||||
|
||||
def get_actionable_tasks(db: Session) -> List[dict]:
|
||||
"""Return all non-done tasks that have no incomplete blockers, with project name."""
|
||||
tasks = db.query(models.Task).filter(
|
||||
models.Task.status != "done"
|
||||
).all()
|
||||
|
||||
result = []
|
||||
for task in tasks:
|
||||
incomplete_blockers = [b for b in task.blockers if b.status != "done"]
|
||||
if not incomplete_blockers:
|
||||
result.append({
|
||||
"id": task.id,
|
||||
"title": task.title,
|
||||
"project_id": task.project_id,
|
||||
"project_name": task.project.name,
|
||||
"status": task.status,
|
||||
"estimated_minutes": task.estimated_minutes,
|
||||
"tags": task.tags,
|
||||
"flag_color": task.flag_color,
|
||||
})
|
||||
|
||||
return result
|
||||
|
||||
@@ -159,6 +159,50 @@ def delete_task(task_id: int, db: Session = Depends(get_db)):
|
||||
return None
|
||||
|
||||
|
||||
# ========== BLOCKER ENDPOINTS ==========
|
||||
|
||||
@app.get("/api/tasks/{task_id}/blockers", response_model=List[schemas.BlockerInfo])
|
||||
def get_task_blockers(task_id: int, db: Session = Depends(get_db)):
|
||||
"""Get all tasks that are blocking a given task."""
|
||||
task = crud.get_task_with_blockers(db, task_id)
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
return task.blockers
|
||||
|
||||
|
||||
@app.get("/api/tasks/{task_id}/blocking", response_model=List[schemas.BlockerInfo])
|
||||
def get_tasks_this_blocks(task_id: int, db: Session = Depends(get_db)):
|
||||
"""Get all tasks that this task is currently blocking."""
|
||||
task = crud.get_task_with_blockers(db, task_id)
|
||||
if not task:
|
||||
raise HTTPException(status_code=404, detail="Task not found")
|
||||
return task.blocking
|
||||
|
||||
|
||||
@app.post("/api/tasks/{task_id}/blockers/{blocker_id}", status_code=201)
|
||||
def add_blocker(task_id: int, blocker_id: int, db: Session = Depends(get_db)):
|
||||
"""Add blocker_id as a prerequisite of task_id."""
|
||||
try:
|
||||
crud.add_blocker(db, task_id, blocker_id)
|
||||
return {"status": "ok"}
|
||||
except ValueError as e:
|
||||
raise HTTPException(status_code=400, detail=str(e))
|
||||
|
||||
|
||||
@app.delete("/api/tasks/{task_id}/blockers/{blocker_id}", status_code=204)
|
||||
def remove_blocker(task_id: int, blocker_id: int, db: Session = Depends(get_db)):
|
||||
"""Remove blocker_id as a prerequisite of task_id."""
|
||||
if not crud.remove_blocker(db, task_id, blocker_id):
|
||||
raise HTTPException(status_code=404, detail="Blocker relationship not found")
|
||||
return None
|
||||
|
||||
|
||||
@app.get("/api/actionable", response_model=List[schemas.ActionableTask])
|
||||
def get_actionable_tasks(db: Session = Depends(get_db)):
|
||||
"""Get all non-done tasks with no incomplete blockers, across all projects."""
|
||||
return crud.get_actionable_tasks(db)
|
||||
|
||||
|
||||
# ========== SEARCH ENDPOINT ==========
|
||||
|
||||
@app.get("/api/search", response_model=List[schemas.Task])
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, JSON, Boolean
|
||||
from sqlalchemy import Column, Integer, String, Text, DateTime, ForeignKey, JSON, Boolean, Table
|
||||
from sqlalchemy.orm import relationship
|
||||
from datetime import datetime
|
||||
from .database import Base
|
||||
@@ -8,6 +8,15 @@ from .database import Base
|
||||
DEFAULT_STATUSES = ["backlog", "in_progress", "on_hold", "done"]
|
||||
|
||||
|
||||
# Association table for task blocker relationships (many-to-many)
|
||||
task_blockers = Table(
|
||||
"task_blockers",
|
||||
Base.metadata,
|
||||
Column("task_id", Integer, ForeignKey("tasks.id", ondelete="CASCADE"), primary_key=True),
|
||||
Column("blocked_by_id", Integer, ForeignKey("tasks.id", ondelete="CASCADE"), primary_key=True),
|
||||
)
|
||||
|
||||
|
||||
class Project(Base):
|
||||
__tablename__ = "projects"
|
||||
|
||||
@@ -40,3 +49,13 @@ class Task(Base):
|
||||
|
||||
project = relationship("Project", back_populates="tasks")
|
||||
parent = relationship("Task", remote_side=[id], backref="subtasks")
|
||||
|
||||
# blockers: tasks that must be done before this task can start
|
||||
# blocking: tasks that this task is holding up
|
||||
blockers = relationship(
|
||||
"Task",
|
||||
secondary=task_blockers,
|
||||
primaryjoin=lambda: Task.id == task_blockers.c.task_id,
|
||||
secondaryjoin=lambda: Task.id == task_blockers.c.blocked_by_id,
|
||||
backref="blocking",
|
||||
)
|
||||
|
||||
@@ -46,6 +46,37 @@ class TaskWithSubtasks(Task):
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
class BlockerInfo(BaseModel):
|
||||
"""Lightweight task info used when listing blockers/blocking relationships."""
|
||||
id: int
|
||||
title: str
|
||||
project_id: int
|
||||
status: str
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
class TaskWithBlockers(Task):
|
||||
blockers: List[BlockerInfo] = []
|
||||
blocking: List[BlockerInfo] = []
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
class ActionableTask(BaseModel):
|
||||
"""A task that is ready to work on — not done, and all blockers are resolved."""
|
||||
id: int
|
||||
title: str
|
||||
project_id: int
|
||||
project_name: str
|
||||
status: str
|
||||
estimated_minutes: Optional[int] = None
|
||||
tags: Optional[List[str]] = None
|
||||
flag_color: Optional[str] = None
|
||||
|
||||
model_config = ConfigDict(from_attributes=True)
|
||||
|
||||
|
||||
# Project Schemas
|
||||
class ProjectBase(BaseModel):
|
||||
name: str
|
||||
|
||||
40
backend/migrate_add_blockers.py
Normal file
40
backend/migrate_add_blockers.py
Normal file
@@ -0,0 +1,40 @@
|
||||
"""
|
||||
Migration script to add the task_blockers association table.
|
||||
Run this once if you have an existing database.
|
||||
|
||||
Usage (from inside the backend container or with the venv active):
|
||||
python migrate_add_blockers.py
|
||||
"""
|
||||
import sqlite3
|
||||
import os
|
||||
|
||||
db_path = os.path.join(os.path.dirname(__file__), 'bit.db')
|
||||
|
||||
if not os.path.exists(db_path):
|
||||
print(f"Database not found at {db_path}")
|
||||
print("No migration needed — new database will be created with the correct schema.")
|
||||
exit(0)
|
||||
|
||||
conn = sqlite3.connect(db_path)
|
||||
cursor = conn.cursor()
|
||||
|
||||
try:
|
||||
# Check if the table already exists
|
||||
cursor.execute("SELECT name FROM sqlite_master WHERE type='table' AND name='task_blockers'")
|
||||
if cursor.fetchone():
|
||||
print("Table 'task_blockers' already exists. Migration not needed.")
|
||||
else:
|
||||
cursor.execute("""
|
||||
CREATE TABLE task_blockers (
|
||||
task_id INTEGER NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
|
||||
blocked_by_id INTEGER NOT NULL REFERENCES tasks(id) ON DELETE CASCADE,
|
||||
PRIMARY KEY (task_id, blocked_by_id)
|
||||
)
|
||||
""")
|
||||
conn.commit()
|
||||
print("Successfully created 'task_blockers' table.")
|
||||
except Exception as e:
|
||||
print(f"Error during migration: {e}")
|
||||
conn.rollback()
|
||||
finally:
|
||||
conn.close()
|
||||
@@ -1,20 +1,41 @@
|
||||
import { Routes, Route } from 'react-router-dom'
|
||||
import { Routes, Route, useNavigate, useLocation } from 'react-router-dom'
|
||||
import { Zap } from 'lucide-react'
|
||||
import ProjectList from './pages/ProjectList'
|
||||
import ProjectView from './pages/ProjectView'
|
||||
import ActionableView from './pages/ActionableView'
|
||||
import SearchBar from './components/SearchBar'
|
||||
|
||||
function App() {
|
||||
const navigate = useNavigate()
|
||||
const location = useLocation()
|
||||
const isActionable = location.pathname === '/actionable'
|
||||
|
||||
return (
|
||||
<div className="min-h-screen bg-cyber-dark">
|
||||
<header className="border-b border-cyber-orange/30 bg-cyber-darkest">
|
||||
<div className="container mx-auto px-4 py-4">
|
||||
<div className="flex justify-between items-center">
|
||||
<div>
|
||||
<h1 className="text-2xl font-bold text-cyber-orange">
|
||||
<div className="flex items-center gap-4">
|
||||
<h1
|
||||
className="text-2xl font-bold text-cyber-orange cursor-pointer"
|
||||
onClick={() => navigate('/')}
|
||||
>
|
||||
BIT
|
||||
<span className="ml-3 text-sm text-gray-500">Break It Down</span>
|
||||
<span className="ml-2 text-xs text-gray-600">v{import.meta.env.VITE_APP_VERSION || '0.1.6'}</span>
|
||||
</h1>
|
||||
<button
|
||||
onClick={() => navigate(isActionable ? '/' : '/actionable')}
|
||||
className={`flex items-center gap-1.5 px-3 py-1.5 rounded text-sm font-medium transition-all ${
|
||||
isActionable
|
||||
? 'bg-cyber-orange text-cyber-darkest'
|
||||
: 'border border-cyber-orange/40 text-cyber-orange hover:bg-cyber-orange/10'
|
||||
}`}
|
||||
title="What can I do right now?"
|
||||
>
|
||||
<Zap size={14} />
|
||||
Now
|
||||
</button>
|
||||
</div>
|
||||
<SearchBar />
|
||||
</div>
|
||||
@@ -25,6 +46,7 @@ function App() {
|
||||
<Routes>
|
||||
<Route path="/" element={<ProjectList />} />
|
||||
<Route path="/project/:projectId" element={<ProjectView />} />
|
||||
<Route path="/actionable" element={<ActionableView />} />
|
||||
</Routes>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
201
frontend/src/components/BlockerPanel.jsx
Normal file
201
frontend/src/components/BlockerPanel.jsx
Normal file
@@ -0,0 +1,201 @@
|
||||
import { useState, useEffect, useRef } from 'react'
|
||||
import { X, Search, Lock, Unlock, AlertTriangle } from 'lucide-react'
|
||||
import { getTaskBlockers, addBlocker, removeBlocker, searchTasks } from '../utils/api'
|
||||
|
||||
function BlockerPanel({ task, onClose, onUpdate }) {
|
||||
const [blockers, setBlockers] = useState([])
|
||||
const [searchQuery, setSearchQuery] = useState('')
|
||||
const [searchResults, setSearchResults] = useState([])
|
||||
const [searching, setSearching] = useState(false)
|
||||
const [error, setError] = useState('')
|
||||
const [loading, setLoading] = useState(true)
|
||||
const searchTimeout = useRef(null)
|
||||
|
||||
useEffect(() => {
|
||||
loadBlockers()
|
||||
}, [task.id])
|
||||
|
||||
const loadBlockers = async () => {
|
||||
try {
|
||||
setLoading(true)
|
||||
const data = await getTaskBlockers(task.id)
|
||||
setBlockers(data)
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleSearch = (query) => {
|
||||
setSearchQuery(query)
|
||||
setError('')
|
||||
|
||||
if (searchTimeout.current) clearTimeout(searchTimeout.current)
|
||||
|
||||
if (!query.trim()) {
|
||||
setSearchResults([])
|
||||
return
|
||||
}
|
||||
|
||||
searchTimeout.current = setTimeout(async () => {
|
||||
try {
|
||||
setSearching(true)
|
||||
const results = await searchTasks(query)
|
||||
// Filter out the current task and tasks already blocking this one
|
||||
const blockerIds = new Set(blockers.map(b => b.id))
|
||||
const filtered = results.filter(t => t.id !== task.id && !blockerIds.has(t.id))
|
||||
setSearchResults(filtered.slice(0, 8))
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
} finally {
|
||||
setSearching(false)
|
||||
}
|
||||
}, 300)
|
||||
}
|
||||
|
||||
const handleAddBlocker = async (blocker) => {
|
||||
try {
|
||||
setError('')
|
||||
await addBlocker(task.id, blocker.id)
|
||||
setBlockers(prev => [...prev, blocker])
|
||||
setSearchResults(prev => prev.filter(t => t.id !== blocker.id))
|
||||
setSearchQuery('')
|
||||
setSearchResults([])
|
||||
onUpdate()
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
}
|
||||
}
|
||||
|
||||
const handleRemoveBlocker = async (blockerId) => {
|
||||
try {
|
||||
setError('')
|
||||
await removeBlocker(task.id, blockerId)
|
||||
setBlockers(prev => prev.filter(b => b.id !== blockerId))
|
||||
onUpdate()
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
}
|
||||
}
|
||||
|
||||
const incompleteBlockers = blockers.filter(b => b.status !== 'done')
|
||||
const isBlocked = incompleteBlockers.length > 0
|
||||
|
||||
return (
|
||||
<div className="fixed inset-0 bg-black/70 flex items-center justify-center z-50" onClick={onClose}>
|
||||
<div
|
||||
className="bg-cyber-darkest border border-cyber-orange/50 rounded-lg w-full max-w-lg shadow-xl"
|
||||
onClick={e => e.stopPropagation()}
|
||||
>
|
||||
{/* Header */}
|
||||
<div className="flex items-center justify-between px-5 py-4 border-b border-cyber-orange/20">
|
||||
<div className="flex items-center gap-2">
|
||||
{isBlocked
|
||||
? <Lock size={16} className="text-red-400" />
|
||||
: <Unlock size={16} className="text-green-400" />
|
||||
}
|
||||
<span className="font-semibold text-gray-100 text-sm">Blockers</span>
|
||||
<span className="text-xs text-gray-500 ml-1 truncate max-w-[200px]" title={task.title}>
|
||||
— {task.title}
|
||||
</span>
|
||||
</div>
|
||||
<button onClick={onClose} className="text-gray-400 hover:text-gray-200 transition-colors">
|
||||
<X size={18} />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="p-5 space-y-4">
|
||||
{/* Status banner */}
|
||||
{isBlocked ? (
|
||||
<div className="flex items-center gap-2 px-3 py-2 bg-red-900/20 border border-red-500/30 rounded text-red-300 text-sm">
|
||||
<AlertTriangle size={14} />
|
||||
<span>{incompleteBlockers.length} incomplete blocker{incompleteBlockers.length !== 1 ? 's' : ''} — this task is locked</span>
|
||||
</div>
|
||||
) : (
|
||||
<div className="flex items-center gap-2 px-3 py-2 bg-green-900/20 border border-green-500/30 rounded text-green-300 text-sm">
|
||||
<Unlock size={14} />
|
||||
<span>No active blockers — this task is ready to work on</span>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Current blockers list */}
|
||||
{loading ? (
|
||||
<div className="text-gray-500 text-sm text-center py-2">Loading...</div>
|
||||
) : blockers.length > 0 ? (
|
||||
<div className="space-y-1">
|
||||
<p className="text-xs text-gray-500 uppercase tracking-wider mb-2">Blocked by</p>
|
||||
{blockers.map(b => (
|
||||
<div
|
||||
key={b.id}
|
||||
className="flex items-center justify-between px-3 py-2 bg-cyber-darker rounded border border-cyber-orange/10"
|
||||
>
|
||||
<div className="flex items-center gap-2 min-w-0">
|
||||
<span className={`w-2 h-2 rounded-full flex-shrink-0 ${b.status === 'done' ? 'bg-green-400' : 'bg-red-400'}`} />
|
||||
<span className="text-sm text-gray-200 truncate">{b.title}</span>
|
||||
<span className="text-xs text-gray-500 flex-shrink-0">#{b.id}</span>
|
||||
</div>
|
||||
<button
|
||||
onClick={() => handleRemoveBlocker(b.id)}
|
||||
className="text-gray-600 hover:text-red-400 transition-colors flex-shrink-0 ml-2"
|
||||
title="Remove blocker"
|
||||
>
|
||||
<X size={14} />
|
||||
</button>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
<p className="text-xs text-gray-600 text-center py-1">No blockers added yet</p>
|
||||
)}
|
||||
|
||||
{/* Search to add blocker */}
|
||||
<div>
|
||||
<p className="text-xs text-gray-500 uppercase tracking-wider mb-2">Add a blocker</p>
|
||||
<div className="relative">
|
||||
<Search size={14} className="absolute left-3 top-1/2 -translate-y-1/2 text-gray-500" />
|
||||
<input
|
||||
type="text"
|
||||
value={searchQuery}
|
||||
onChange={e => handleSearch(e.target.value)}
|
||||
placeholder="Search tasks across all projects..."
|
||||
className="w-full pl-9 pr-3 py-2 bg-cyber-darker border border-cyber-orange/30 rounded text-gray-100 text-sm focus:outline-none focus:border-cyber-orange"
|
||||
autoFocus
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Search results */}
|
||||
{(searchResults.length > 0 || searching) && (
|
||||
<div className="mt-1 border border-cyber-orange/20 rounded overflow-hidden">
|
||||
{searching && (
|
||||
<div className="px-3 py-2 text-xs text-gray-500">Searching...</div>
|
||||
)}
|
||||
{searchResults.map(result => (
|
||||
<button
|
||||
key={result.id}
|
||||
onClick={() => handleAddBlocker(result)}
|
||||
className="w-full flex items-center gap-2 px-3 py-2 hover:bg-cyber-darker text-left transition-colors border-b border-cyber-orange/10 last:border-0"
|
||||
>
|
||||
<span className="text-sm text-gray-200 truncate flex-1">{result.title}</span>
|
||||
<span className="text-xs text-gray-600 flex-shrink-0">project #{result.project_id}</span>
|
||||
</button>
|
||||
))}
|
||||
{!searching && searchResults.length === 0 && searchQuery && (
|
||||
<div className="px-3 py-2 text-xs text-gray-500">No matching tasks found</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="px-3 py-2 bg-red-900/30 border border-red-500/40 rounded text-red-300 text-sm">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default BlockerPanel
|
||||
@@ -1,6 +1,7 @@
|
||||
import { useState, useRef, useEffect } from 'react'
|
||||
import { MoreVertical, Clock, Tag, Flag, Edit2, Trash2, X, Check, ListTodo, FileText } from 'lucide-react'
|
||||
import { MoreVertical, Clock, Tag, Flag, Edit2, Trash2, X, Check, ListTodo, FileText, Lock } from 'lucide-react'
|
||||
import { updateTask } from '../utils/api'
|
||||
import BlockerPanel from './BlockerPanel'
|
||||
|
||||
const FLAG_COLORS = [
|
||||
{ name: 'red', color: 'bg-red-500' },
|
||||
@@ -35,6 +36,7 @@ function TaskMenu({ task, onUpdate, onDelete, onEdit, projectStatuses }) {
|
||||
const [showTagsEdit, setShowTagsEdit] = useState(false)
|
||||
const [showFlagEdit, setShowFlagEdit] = useState(false)
|
||||
const [showStatusEdit, setShowStatusEdit] = useState(false)
|
||||
const [showBlockerPanel, setShowBlockerPanel] = useState(false)
|
||||
|
||||
// Calculate hours and minutes from task.estimated_minutes
|
||||
const initialHours = task.estimated_minutes ? Math.floor(task.estimated_minutes / 60) : ''
|
||||
@@ -371,6 +373,19 @@ function TaskMenu({ task, onUpdate, onDelete, onEdit, projectStatuses }) {
|
||||
</button>
|
||||
)}
|
||||
|
||||
{/* Manage Blockers */}
|
||||
<button
|
||||
onClick={(e) => {
|
||||
e.stopPropagation()
|
||||
setShowBlockerPanel(true)
|
||||
setIsOpen(false)
|
||||
}}
|
||||
className="w-full flex items-center gap-2 px-3 py-2 hover:bg-cyber-darker text-gray-300 text-sm"
|
||||
>
|
||||
<Lock size={14} />
|
||||
<span>Manage Blockers</span>
|
||||
</button>
|
||||
|
||||
{/* Edit Title */}
|
||||
<button
|
||||
onClick={(e) => {
|
||||
@@ -398,6 +413,15 @@ function TaskMenu({ task, onUpdate, onDelete, onEdit, projectStatuses }) {
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Blocker panel modal */}
|
||||
{showBlockerPanel && (
|
||||
<BlockerPanel
|
||||
task={task}
|
||||
onClose={() => setShowBlockerPanel(false)}
|
||||
onUpdate={onUpdate}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
190
frontend/src/pages/ActionableView.jsx
Normal file
190
frontend/src/pages/ActionableView.jsx
Normal file
@@ -0,0 +1,190 @@
|
||||
import { useState, useEffect } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import { Zap, Clock, RefreshCw, ChevronRight, Check } from 'lucide-react'
|
||||
import { getActionableTasks, updateTask } from '../utils/api'
|
||||
|
||||
const FLAG_DOT = {
|
||||
red: 'bg-red-500',
|
||||
orange: 'bg-orange-500',
|
||||
yellow: 'bg-yellow-500',
|
||||
green: 'bg-green-500',
|
||||
blue: 'bg-blue-500',
|
||||
purple: 'bg-purple-500',
|
||||
pink: 'bg-pink-500',
|
||||
}
|
||||
|
||||
const formatTime = (minutes) => {
|
||||
if (!minutes) return null
|
||||
const h = Math.floor(minutes / 60)
|
||||
const m = minutes % 60
|
||||
if (h && m) return `${h}h ${m}m`
|
||||
if (h) return `${h}h`
|
||||
return `${m}m`
|
||||
}
|
||||
|
||||
const formatStatusLabel = (status) =>
|
||||
status.split('_').map(w => w.charAt(0).toUpperCase() + w.slice(1)).join(' ')
|
||||
|
||||
const getStatusColor = (status) => {
|
||||
const s = status.toLowerCase()
|
||||
if (s === 'in_progress' || s.includes('progress')) return 'text-blue-400'
|
||||
if (s === 'on_hold' || s.includes('hold')) return 'text-yellow-400'
|
||||
return 'text-gray-500'
|
||||
}
|
||||
|
||||
function ActionableView() {
|
||||
const [tasks, setTasks] = useState([])
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [error, setError] = useState('')
|
||||
const [completingId, setCompletingId] = useState(null)
|
||||
const navigate = useNavigate()
|
||||
|
||||
useEffect(() => {
|
||||
loadTasks()
|
||||
}, [])
|
||||
|
||||
const loadTasks = async () => {
|
||||
try {
|
||||
setLoading(true)
|
||||
setError('')
|
||||
const data = await getActionableTasks()
|
||||
setTasks(data)
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handleMarkDone = async (task) => {
|
||||
try {
|
||||
setCompletingId(task.id)
|
||||
await updateTask(task.id, { status: 'done' })
|
||||
// Remove from list and reload to surface newly unblocked tasks
|
||||
setTasks(prev => prev.filter(t => t.id !== task.id))
|
||||
// Reload after a short beat so the user sees the removal first
|
||||
setTimeout(() => loadTasks(), 600)
|
||||
} catch (err) {
|
||||
setError(err.message)
|
||||
} finally {
|
||||
setCompletingId(null)
|
||||
}
|
||||
}
|
||||
|
||||
// Group by project
|
||||
const byProject = tasks.reduce((acc, task) => {
|
||||
const key = task.project_id
|
||||
if (!acc[key]) acc[key] = { name: task.project_name, tasks: [] }
|
||||
acc[key].tasks.push(task)
|
||||
return acc
|
||||
}, {})
|
||||
|
||||
const projectGroups = Object.entries(byProject)
|
||||
|
||||
return (
|
||||
<div className="max-w-2xl mx-auto">
|
||||
{/* Header */}
|
||||
<div className="flex items-center justify-between mb-8">
|
||||
<div className="flex items-center gap-3">
|
||||
<Zap size={24} className="text-cyber-orange" />
|
||||
<div>
|
||||
<h2 className="text-2xl font-bold text-gray-100">What can I do right now?</h2>
|
||||
<p className="text-sm text-gray-500 mt-0.5">
|
||||
{loading ? '...' : `${tasks.length} task${tasks.length !== 1 ? 's' : ''} ready across all projects`}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
<button
|
||||
onClick={loadTasks}
|
||||
className="flex items-center gap-2 px-3 py-2 text-sm text-gray-400 hover:text-gray-200 border border-cyber-orange/20 hover:border-cyber-orange/40 rounded transition-colors"
|
||||
title="Refresh"
|
||||
>
|
||||
<RefreshCw size={14} className={loading ? 'animate-spin' : ''} />
|
||||
Refresh
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{error && (
|
||||
<div className="mb-6 px-4 py-3 bg-red-900/30 border border-red-500/40 rounded text-red-300 text-sm">
|
||||
{error}
|
||||
</div>
|
||||
)}
|
||||
|
||||
{!loading && tasks.length === 0 && (
|
||||
<div className="text-center py-20 text-gray-600">
|
||||
<Zap size={40} className="mx-auto mb-4 opacity-30" />
|
||||
<p className="text-lg">Nothing actionable right now.</p>
|
||||
<p className="text-sm mt-1">All tasks are either done or blocked.</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Project groups */}
|
||||
<div className="space-y-8">
|
||||
{projectGroups.map(([projectId, group]) => (
|
||||
<div key={projectId}>
|
||||
{/* Project header */}
|
||||
<button
|
||||
onClick={() => navigate(`/project/${projectId}`)}
|
||||
className="flex items-center gap-2 mb-3 text-cyber-orange hover:text-cyber-orange-bright transition-colors group"
|
||||
>
|
||||
<span className="text-sm font-semibold uppercase tracking-wider">{group.name}</span>
|
||||
<ChevronRight size={14} className="opacity-0 group-hover:opacity-100 transition-opacity" />
|
||||
</button>
|
||||
|
||||
{/* Task cards */}
|
||||
<div className="space-y-2">
|
||||
{group.tasks.map(task => (
|
||||
<div
|
||||
key={task.id}
|
||||
className={`flex items-center gap-3 px-4 py-3 bg-cyber-darkest border border-cyber-orange/20 rounded-lg hover:border-cyber-orange/40 transition-all ${
|
||||
completingId === task.id ? 'opacity-50' : ''
|
||||
}`}
|
||||
>
|
||||
{/* Done button */}
|
||||
<button
|
||||
onClick={() => handleMarkDone(task)}
|
||||
disabled={completingId === task.id}
|
||||
className="flex-shrink-0 w-6 h-6 rounded-full border-2 border-cyber-orange/40 hover:border-green-400 hover:bg-green-400/10 flex items-center justify-center transition-all group"
|
||||
title="Mark as done"
|
||||
>
|
||||
<Check size={12} className="text-transparent group-hover:text-green-400 transition-colors" />
|
||||
</button>
|
||||
|
||||
{/* Flag dot */}
|
||||
{task.flag_color && (
|
||||
<span className={`flex-shrink-0 w-2 h-2 rounded-full ${FLAG_DOT[task.flag_color] || 'bg-gray-500'}`} />
|
||||
)}
|
||||
|
||||
{/* Title + meta */}
|
||||
<div className="flex-1 min-w-0">
|
||||
<span className="text-sm text-gray-100">{task.title}</span>
|
||||
<div className="flex items-center gap-3 mt-0.5 flex-wrap">
|
||||
{task.status !== 'backlog' && (
|
||||
<span className={`text-xs ${getStatusColor(task.status)}`}>
|
||||
{formatStatusLabel(task.status)}
|
||||
</span>
|
||||
)}
|
||||
{task.estimated_minutes && (
|
||||
<span className="flex items-center gap-1 text-xs text-gray-600">
|
||||
<Clock size={10} />
|
||||
{formatTime(task.estimated_minutes)}
|
||||
</span>
|
||||
)}
|
||||
{task.tags && task.tags.map(tag => (
|
||||
<span key={tag} className="text-xs text-cyber-orange/60 bg-cyber-orange/5 px-1.5 py-0.5 rounded">
|
||||
{tag}
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export default ActionableView
|
||||
@@ -66,6 +66,15 @@ export const importJSON = (data) => fetchAPI('/import-json', {
|
||||
body: JSON.stringify(data),
|
||||
});
|
||||
|
||||
// Blockers
|
||||
export const getTaskBlockers = (taskId) => fetchAPI(`/tasks/${taskId}/blockers`);
|
||||
export const getTaskBlocking = (taskId) => fetchAPI(`/tasks/${taskId}/blocking`);
|
||||
export const addBlocker = (taskId, blockerId) => fetchAPI(`/tasks/${taskId}/blockers/${blockerId}`, { method: 'POST' });
|
||||
export const removeBlocker = (taskId, blockerId) => fetchAPI(`/tasks/${taskId}/blockers/${blockerId}`, { method: 'DELETE' });
|
||||
|
||||
// Actionable tasks (no incomplete blockers, not done)
|
||||
export const getActionableTasks = () => fetchAPI('/actionable');
|
||||
|
||||
// Search
|
||||
export const searchTasks = (query, projectIds = null) => {
|
||||
const params = new URLSearchParams({ query });
|
||||
|
||||
Reference in New Issue
Block a user