feat: milestone enhancements - tabs, task/support/meeting types, progress, status
This commit is contained in:
@@ -201,3 +201,12 @@ dd { font-size: .9rem; }
|
||||
.btn-secondary { background: none; border: 1px solid var(--border); color: var(--text); padding: 6px 12px; border-radius: 6px; cursor: pointer; }
|
||||
.btn-danger { background: var(--danger); color: #fff; border: none; padding: 6px 12px; border-radius: 6px; cursor: pointer; }
|
||||
.btn-danger:hover { opacity: .9; }
|
||||
|
||||
|
||||
/* Tabs */
|
||||
.tabs { display: flex; gap: 4px; border-bottom: 1px solid var(--border); margin-bottom: 16px; }
|
||||
.tab { background: none; border: none; padding: 10px 16px; color: var(--text-dim); cursor: pointer; border-bottom: 2px solid transparent; margin-bottom: -1px; }
|
||||
.tab:hover { color: var(--text); }
|
||||
.tab.active { color: var(--accent); border-bottom-color: var(--accent); }
|
||||
.tab-content { margin-top: 16px; }
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useState, useEffect } from 'react'
|
||||
import { useParams, useNavigate } from 'react-router-dom'
|
||||
import api from '@/services/api'
|
||||
import type { Milestone, MilestoneProgress, Issue } from '@/types'
|
||||
import type { Milestone, MilestoneProgress, MilestoneItems, Issue } from '@/types'
|
||||
import dayjs from 'dayjs'
|
||||
|
||||
export default function MilestoneDetailPage() {
|
||||
@@ -9,25 +9,55 @@ export default function MilestoneDetailPage() {
|
||||
const navigate = useNavigate()
|
||||
const [milestone, setMilestone] = useState<Milestone | null>(null)
|
||||
const [progress, setProgress] = useState<MilestoneProgress | null>(null)
|
||||
const [issues, setIssues] = useState<Issue[]>([])
|
||||
const [items, setItems] = useState<MilestoneItems | null>(null)
|
||||
const [activeTab, setActiveTab] = useState<'tasks' | 'supports' | 'meetings'>('tasks')
|
||||
const [showCreateTask, setShowCreateTask] = useState(false)
|
||||
const [showCreateSupport, setShowCreateSupport] = useState(false)
|
||||
const [showCreateMeeting, setShowCreateMeeting] = useState(false)
|
||||
const [newTitle, setNewTitle] = useState('')
|
||||
const [newDesc, setNewDesc] = useState('')
|
||||
|
||||
useEffect(() => {
|
||||
api.get<Milestone>(`/milestones/${id}`).then(({ data }) => setMilestone(data))
|
||||
api.get<MilestoneProgress>(`/milestones/${id}/progress`).then(({ data }) => setProgress(data)).catch(() => {})
|
||||
api.get<Issue[]>(`/milestones/${id}/issues`).then(({ data }) => setIssues(data)).catch(() => {})
|
||||
api.get<MilestoneItems>(`/milestones/${id}/items`).then(({ data }) => setItems(data)).catch(() => {})
|
||||
}, [id])
|
||||
|
||||
const createItem = async (type: 'tasks' | 'supports' | 'meetings') => {
|
||||
if (!newTitle.trim()) return
|
||||
await api.post(`/milestones/${id}/${type}`, {
|
||||
title: newTitle,
|
||||
description: newDesc || null,
|
||||
status: 'open',
|
||||
priority: 'medium'
|
||||
})
|
||||
setNewTitle('')
|
||||
setNewDesc('')
|
||||
setShowCreateTask(false)
|
||||
setShowCreateSupport(false)
|
||||
setShowCreateMeeting(false)
|
||||
// Refresh items
|
||||
api.get<MilestoneItems>(`/milestones/${id}/items`).then(({ data }) => setItems(data))
|
||||
}
|
||||
|
||||
const isProgressing = milestone?.status === 'progressing'
|
||||
|
||||
if (!milestone) return <div className="loading">Loading...</div>
|
||||
|
||||
const tasks = items?.tasks || []
|
||||
const supports = items?.supports || []
|
||||
const meetings = items?.meetings || []
|
||||
|
||||
return (
|
||||
<div className="milestone-detail">
|
||||
<button className="btn-back" onClick={() => navigate('/milestones')}>← Back to milestones</button>
|
||||
<button className="btn-back" onClick={() => navigate('/milestones')}>← Back to Milestones</button>
|
||||
|
||||
<div className="issue-header">
|
||||
<h2>🏁 {milestone.title}</h2>
|
||||
<div className="issue-meta">
|
||||
<span className={`badge status-${milestone.status === 'active' ? 'open' : 'closed'}`}>{milestone.status}</span>
|
||||
<span className={`badge status-${milestone.status === 'open' ? 'open' : milestone.status === 'progressing' ? 'in_progress' : 'closed'}`}>{milestone.status}</span>
|
||||
{milestone.due_date && <span className="text-dim">Due {dayjs(milestone.due_date).format('YYYY-MM-DD')}</span>}
|
||||
{milestone.planned_release_date && <span className="text-dim">Planned Release: {dayjs(milestone.planned_release_date).format('YYYY-MM-DD')}</span>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -40,36 +70,122 @@ export default function MilestoneDetailPage() {
|
||||
|
||||
{progress && (
|
||||
<div className="section">
|
||||
<h3>Progress</h3>
|
||||
<h3>Progress (Tasks: {progress.completed}/{progress.total})</h3>
|
||||
<div className="progress-bar-container">
|
||||
<div className="progress-bar" style={{ width: `${progress.progress_percent}%` }}>
|
||||
{progress.progress_percent.toFixed(0)}%
|
||||
<div className="progress-bar" style={{ width: `${progress.progress_pct}%` }}>
|
||||
{progress.progress_pct.toFixed(0)}%
|
||||
</div>
|
||||
</div>
|
||||
<p className="text-dim" style={{ marginTop: 8 }}>
|
||||
{progress.completed_issues} / {progress.total_issues} issues completed
|
||||
</p>
|
||||
{progress.time_progress_pct !== null && (
|
||||
<>
|
||||
<p className="text-dim" style={{ marginTop: 8 }}>Time Progress</p>
|
||||
<div className="progress-bar-container">
|
||||
<div className="progress-bar" style={{ width: `${progress.time_progress_pct}%`, backgroundColor: 'var(--color-accent)' }}>
|
||||
{progress.time_progress_pct.toFixed(0)}%
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="section">
|
||||
<h3>Issues ({issues.length})</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr><th>#</th><th>Title</th><th>Status</th><th>Priority</th></tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{issues.map((i) => (
|
||||
<tr key={i.id} className="clickable" onClick={() => navigate(`/issues/${i.id}`)}>
|
||||
<td>{i.id}</td>
|
||||
<td className="issue-title">{i.title}</td>
|
||||
<td><span className={`badge status-${i.status}`}>{i.status}</span></td>
|
||||
<td><span className={`badge priority-${i.priority}`}>{i.priority}</span></td>
|
||||
</tr>
|
||||
))}
|
||||
{issues.length === 0 && <tr><td colSpan={4} className="empty">No linked issues</td></tr>}
|
||||
</tbody>
|
||||
</table>
|
||||
<div style={{ display: 'flex', gap: 8, marginBottom: 16 }}>
|
||||
{!isProgressing && (
|
||||
<>
|
||||
<button className="btn-primary" onClick={() => setShowCreateTask(true)}>+ Create Task</button>
|
||||
<button className="btn-primary" onClick={() => setShowCreateSupport(true)}>+ Create Support</button>
|
||||
<button className="btn-primary" onClick={() => setShowCreateMeeting(true)}>+ Schedule Meeting</button>
|
||||
</>
|
||||
)}
|
||||
{isProgressing && <span className="text-dim">Milestone is in progress - cannot add new items</span>}
|
||||
</div>
|
||||
|
||||
{(showCreateTask || showCreateSupport || showCreateMeeting) && (
|
||||
<div className="card" style={{ marginBottom: 16 }}>
|
||||
<input
|
||||
placeholder="Title"
|
||||
value={newTitle}
|
||||
onChange={(e) => setNewTitle(e.target.value)}
|
||||
style={{ marginBottom: 8 }}
|
||||
/>
|
||||
<textarea
|
||||
placeholder="Description (optional)"
|
||||
value={newDesc}
|
||||
onChange={(e) => setNewDesc(e.target.value)}
|
||||
style={{ marginBottom: 8, width: '100%' }}
|
||||
/>
|
||||
<div style={{ display: 'flex', gap: 8 }}>
|
||||
<button className="btn-primary" onClick={() => createItem(activeTab)}>Create</button>
|
||||
<button className="btn-back" onClick={() => { setShowCreateTask(false); setShowCreateSupport(false); setShowCreateMeeting(false) }}>Cancel</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="tabs">
|
||||
<button className={`tab ${activeTab === 'tasks' ? 'active' : ''}`} onClick={() => setActiveTab('tasks')}>
|
||||
Tasks ({tasks.length})
|
||||
</button>
|
||||
<button className={`tab ${activeTab === 'supports' ? 'active' : ''}`} onClick={() => setActiveTab('supports')}>
|
||||
Supports ({supports.length})
|
||||
</button>
|
||||
<button className={`tab ${activeTab === 'meetings' ? 'active' : ''}`} onClick={() => setActiveTab('meetings')}>
|
||||
Meetings ({meetings.length})
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="tab-content">
|
||||
{activeTab === 'tasks' && (
|
||||
<table>
|
||||
<thead><tr><th>#</th><th>Title</th><th>Status</th><th>Priority</th></tr></thead>
|
||||
<tbody>
|
||||
{tasks.map((i) => (
|
||||
<tr key={i.id} className="clickable" onClick={() => navigate(`/issues/${i.id}`)}>
|
||||
<td>{i.id}</td>
|
||||
<td className="issue-title">{i.title}</td>
|
||||
<td><span className={`badge status-${i.status}`}>{i.status}</span></td>
|
||||
<td><span className={`badge priority-${i.priority}`}>{i.priority}</span></td>
|
||||
</tr>
|
||||
))}
|
||||
{tasks.length === 0 && <tr><td colSpan={4} className="empty">No tasks</td></tr>}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
|
||||
{activeTab === 'supports' && (
|
||||
<table>
|
||||
<thead><tr><th>#</th><th>Title</th><th>Status</th><th>Priority</th></tr></thead>
|
||||
<tbody>
|
||||
{supports.map((i) => (
|
||||
<tr key={i.id} className="clickable" onClick={() => navigate(`/issues/${i.id}`)}>
|
||||
<td>{i.id}</td>
|
||||
<td className="issue-title">{i.title}</td>
|
||||
<td><span className={`badge status-${i.status}`}>{i.status}</span></td>
|
||||
<td><span className={`badge priority-${i.priority}`}>{i.priority}</span></td>
|
||||
</tr>
|
||||
))}
|
||||
{supports.length === 0 && <tr><td colSpan={4} className="empty">No support requests</td></tr>}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
|
||||
{activeTab === 'meetings' && (
|
||||
<table>
|
||||
<thead><tr><th>#</th><th>Title</th><th>Status</th><th>Priority</th></tr></thead>
|
||||
<tbody>
|
||||
{meetings.map((i) => (
|
||||
<tr key={i.id} className="clickable" onClick={() => navigate(`/issues/${i.id}`)}>
|
||||
<td>{i.id}</td>
|
||||
<td className="issue-title">{i.title}</td>
|
||||
<td><span className={`badge status-${i.status}`}>{i.status}</span></td>
|
||||
<td><span className={`badge priority-${i.priority}`}>{i.priority}</span></td>
|
||||
</tr>
|
||||
))}
|
||||
{meetings.length === 0 && <tr><td colSpan={4} className="empty">No meetings</td></tr>}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
|
||||
@@ -9,7 +9,16 @@ export default function MilestonesPage() {
|
||||
const [projects, setProjects] = useState<Project[]>([])
|
||||
const [projectFilter, setProjectFilter] = useState('')
|
||||
const [showCreate, setShowCreate] = useState(false)
|
||||
const [form, setForm] = useState({ title: '', description: '', project_id: 0, due_date: '' })
|
||||
const [form, setForm] = useState({
|
||||
title: '',
|
||||
description: '',
|
||||
project_id: 0,
|
||||
due_date: '',
|
||||
planned_release_date: '',
|
||||
status: 'open',
|
||||
depend_on_milestones: [] as string[],
|
||||
depend_on_tasks: [] as number[]
|
||||
})
|
||||
const navigate = useNavigate()
|
||||
|
||||
const fetchMilestones = () => {
|
||||
@@ -28,8 +37,16 @@ export default function MilestonesPage() {
|
||||
|
||||
const createMilestone = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
const payload: Record<string, unknown> = { ...form }
|
||||
if (!form.due_date) delete payload.due_date
|
||||
const payload: Record<string, unknown> = {
|
||||
title: form.title,
|
||||
description: form.description,
|
||||
project_id: form.project_id,
|
||||
status: form.status,
|
||||
due_date: form.due_date || null,
|
||||
planned_release_date: form.planned_release_date || null,
|
||||
depend_on_milestones: form.depend_on_milestones,
|
||||
depend_on_tasks: form.depend_on_tasks
|
||||
}
|
||||
await api.post('/milestones', payload)
|
||||
setShowCreate(false)
|
||||
fetchMilestones()
|
||||
@@ -60,8 +77,17 @@ export default function MilestonesPage() {
|
||||
<select value={form.project_id} onChange={(e) => setForm({ ...form, project_id: Number(e.target.value) })}>
|
||||
{projects.map((p) => <option key={p.id} value={p.id}>{p.name}</option>)}
|
||||
</select>
|
||||
<select value={form.status} onChange={(e) => setForm({ ...form, status: e.target.value })}>
|
||||
<option value="open">Open</option>
|
||||
<option value="pending">Pending</option>
|
||||
<option value="deferred">Deferred</option>
|
||||
<option value="progressing">Progressing</option>
|
||||
<option value="closed">Closed</option>
|
||||
</select>
|
||||
<input type="date" value={form.due_date}
|
||||
onChange={(e) => setForm({ ...form, due_date: e.target.value })} />
|
||||
<input type="date" placeholder="Planned Release" value={form.planned_release_date}
|
||||
onChange={(e) => setForm({ ...form, planned_release_date: e.target.value })} />
|
||||
<button type="submit" className="btn-primary">Create</button>
|
||||
</form>
|
||||
)}
|
||||
@@ -70,12 +96,13 @@ export default function MilestonesPage() {
|
||||
{milestones.map((ms) => (
|
||||
<div key={ms.id} className="milestone-card" onClick={() => navigate(`/milestones/${ms.id}`)}>
|
||||
<div className="milestone-card-header">
|
||||
<span className={`badge status-${ms.status === 'active' ? 'open' : 'closed'}`}>{ms.status}</span>
|
||||
<span className={`badge status-${ms.status === 'progressing' ? 'in_progress' : ms.status}`}>{ms.status}</span>
|
||||
<h3>{ms.title}</h3>
|
||||
</div>
|
||||
<p className="project-desc">{ms.description || 'No description'}</p>
|
||||
<div className="project-meta">
|
||||
{ms.due_date && <span>Due {dayjs(ms.due_date).format('YYYY-MM-DD')}</span>}
|
||||
{ms.planned_release_date && <span>Release: {dayjs(ms.planned_release_date).format('YYYY-MM-DD')}</span>}
|
||||
{ms.due_date && <span>Due: {dayjs(ms.due_date).format('YYYY-MM-DD')}</span>}
|
||||
<span>Created {dayjs(ms.created_at).format('YYYY-MM-DD')}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -155,7 +155,7 @@ export default function ProjectDetailPage() {
|
||||
<h3>Milestones ({milestones.length}) <button className="btn-sm" onClick={() => setShowAddMilestone(true)}>+ New</button></h3>
|
||||
{milestones.map((ms) => (
|
||||
<div key={ms.id} className="milestone-item" onClick={() => navigate(`/milestones/${ms.id}`)}>
|
||||
<span className={`badge status-${ms.status === 'active' ? 'open' : ms.status === 'closed' ? 'closed' : 'in_progress'}`}>{ms.status}</span>
|
||||
<span className={`badge status-${ms.status === 'open' ? 'open' : ms.status === 'closed' ? 'closed' : 'in_progress'}`}>{ms.status}</span>
|
||||
<span className="milestone-title">{ms.title}</span>
|
||||
{ms.due_date && <span className="text-dim"> · Due {dayjs(ms.due_date).format('YYYY-MM-DD')}</span>}
|
||||
</div>
|
||||
|
||||
@@ -63,18 +63,31 @@ export interface Milestone {
|
||||
id: number
|
||||
title: string
|
||||
description: string | null
|
||||
status: string
|
||||
status: 'open' | 'pending' | 'deferred' | 'progressing' | 'closed'
|
||||
project_id: number
|
||||
due_date: string | null
|
||||
planned_release_date: string | null
|
||||
depend_on_milestones: string[]
|
||||
depend_on_tasks: number[]
|
||||
created_at: string
|
||||
updated_at: string | null
|
||||
}
|
||||
|
||||
export interface MilestoneProgress {
|
||||
milestone_id: number
|
||||
title: string
|
||||
total_issues: number
|
||||
completed_issues: number
|
||||
progress_percent: number
|
||||
total: number
|
||||
completed: number
|
||||
progress_pct: number
|
||||
time_progress_pct: number | null
|
||||
planned_release_date: string | null
|
||||
}
|
||||
|
||||
export interface MilestoneItems {
|
||||
tasks: any[]
|
||||
supports: any[]
|
||||
meetings: any[]
|
||||
}
|
||||
|
||||
export interface Notification {
|
||||
@@ -88,6 +101,7 @@ export interface Notification {
|
||||
|
||||
export interface PaginatedResponse<T> {
|
||||
items: T[]
|
||||
total_issues: number
|
||||
total: number
|
||||
page: number
|
||||
page_size: number
|
||||
@@ -96,6 +110,7 @@ export interface PaginatedResponse<T> {
|
||||
|
||||
export interface DashboardStats {
|
||||
total_issues: number
|
||||
total: number
|
||||
by_status: Record<string, number>
|
||||
by_priority: Record<string, number>
|
||||
by_type: Record<string, number>
|
||||
|
||||
Reference in New Issue
Block a user