Merge pull request 'feat/task-type-hierarchy' (#3) from feat/task-type-hierarchy into main
Reviewed-on: #3
This commit was merged in pull request #3.
This commit is contained in:
@@ -13,6 +13,7 @@ import ProjectDetailPage from '@/pages/ProjectDetailPage'
|
||||
import MilestonesPage from '@/pages/MilestonesPage'
|
||||
import MilestoneDetailPage from '@/pages/MilestoneDetailPage'
|
||||
import NotificationsPage from '@/pages/NotificationsPage'
|
||||
import RoleEditorPage from '@/pages/RoleEditorPage'
|
||||
import MonitorPage from '@/pages/MonitorPage'
|
||||
import axios from 'axios'
|
||||
|
||||
@@ -66,7 +67,8 @@ export default function App() {
|
||||
<Sidebar user={null} onLogout={logout} />
|
||||
<main className="main-content">
|
||||
<Routes>
|
||||
<Route path="/monitor" element={<MonitorPage />} />
|
||||
<Route path="/roles" element={<RoleEditorPage />} />
|
||||
<Route path="/monitor" element={<MonitorPage />} />
|
||||
<Route path="/login" element={<LoginPage onLogin={login} />} />
|
||||
<Route path="*" element={<Navigate to="/monitor" />} />
|
||||
</Routes>
|
||||
@@ -91,6 +93,7 @@ export default function App() {
|
||||
<Route path="/milestones" element={<MilestonesPage />} />
|
||||
<Route path="/milestones/:id" element={<MilestoneDetailPage />} />
|
||||
<Route path="/notifications" element={<NotificationsPage />} />
|
||||
<Route path="/roles" element={<RoleEditorPage />} />
|
||||
<Route path="/monitor" element={<MonitorPage />} />
|
||||
<Route path="*" element={<Navigate to="/" />} />
|
||||
</Routes>
|
||||
|
||||
@@ -31,11 +31,10 @@ export default function Sidebar({ user, onLogout }: Props) {
|
||||
|
||||
const links = user ? [
|
||||
{ to: '/', icon: '📊', label: 'Dashboard' },
|
||||
{ to: '/issues', icon: '📋', label: 'Issues' },
|
||||
{ to: '/projects', icon: '📁', label: 'Projects' },
|
||||
{ to: '/milestones', icon: '🏁', label: 'Milestones' },
|
||||
{ to: '/notifications', icon: '🔔', label: 'Notifications' + (unreadCount > 0 ? ' (' + unreadCount + ')' : '') },
|
||||
{ to: '/monitor', icon: '📡', label: 'Monitor' },
|
||||
...(user.is_admin ? [{ to: '/roles', icon: '🔐', label: 'Roles' }] : []),
|
||||
] : [
|
||||
{ to: '/monitor', icon: '📡', label: 'Monitor' },
|
||||
]
|
||||
|
||||
@@ -3,12 +3,25 @@ import { useNavigate } from 'react-router-dom'
|
||||
import api from '@/services/api'
|
||||
import type { Project } from '@/types'
|
||||
|
||||
const ISSUE_TYPES = [
|
||||
{ value: 'story', label: 'Story', subtypes: ['feature', 'improvement', 'refactor'] },
|
||||
{ value: 'issue', label: 'Issue', subtypes: ['infrastructure', 'performance', 'regression', 'security', 'user_experience', 'defect'] },
|
||||
{ value: 'task', label: 'Task', subtypes: ['defect'] },
|
||||
{ value: 'test', label: 'Test', subtypes: ['regression', 'security', 'smoke', 'stress'] },
|
||||
{ value: 'maintenance', label: 'Maintenance', subtypes: ['deploy', 'release'] },
|
||||
{ value: 'research', label: 'Research', subtypes: [] },
|
||||
{ value: 'review', label: 'Review', subtypes: ['code_review', 'decision_review', 'function_review'] },
|
||||
{ value: 'support', label: 'Support', subtypes: ['access', 'information'] },
|
||||
{ value: 'meeting', label: 'Meeting', subtypes: ['conference', 'handover', 'recap'] },
|
||||
{ value: 'resolution', label: 'Resolution', subtypes: [] },
|
||||
]
|
||||
|
||||
export default function CreateIssuePage() {
|
||||
const navigate = useNavigate()
|
||||
const [projects, setProjects] = useState<Project[]>([])
|
||||
const [form, setForm] = useState({
|
||||
title: '', description: '', project_id: 0, issue_type: 'task',
|
||||
priority: 'medium', tags: '', reporter_id: 1,
|
||||
title: '', description: '', project_id: 0, issue_type: 'issue',
|
||||
issue_subtype: '', priority: 'medium', tags: '', reporter_id: 1,
|
||||
})
|
||||
|
||||
useEffect(() => {
|
||||
@@ -18,9 +31,17 @@ export default function CreateIssuePage() {
|
||||
})
|
||||
}, [])
|
||||
|
||||
const currentType = ISSUE_TYPES.find(t => t.value === form.issue_type) || ISSUE_TYPES[1]
|
||||
const subtypes = currentType.subtypes || []
|
||||
|
||||
const handleTypeChange = (newType: string) => {
|
||||
setForm(f => ({ ...f, issue_type: newType, issue_subtype: '' }))
|
||||
}
|
||||
|
||||
const submit = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
const payload = { ...form, tags: form.tags || null }
|
||||
const payload: any = { ...form, tags: form.tags || null }
|
||||
if (!form.issue_subtype) delete payload.issue_subtype
|
||||
await api.post('/issues', payload)
|
||||
navigate('/issues')
|
||||
}
|
||||
@@ -37,13 +58,18 @@ export default function CreateIssuePage() {
|
||||
</select>
|
||||
</label>
|
||||
<label>Type
|
||||
<select value={form.issue_type} onChange={(e) => setForm({ ...form, issue_type: e.target.value })}>
|
||||
<option value="task">Task</option>
|
||||
<option value="bug">Bug</option>
|
||||
<option value="feature">Feature</option>
|
||||
<option value="resolution">Resolution</option>
|
||||
<select value={form.issue_type} onChange={(e) => handleTypeChange(e.target.value)}>
|
||||
{ISSUE_TYPES.map((t) => <option key={t.value} value={t.value}>{t.label}</option>)}
|
||||
</select>
|
||||
</label>
|
||||
{subtypes.length > 0 && (
|
||||
<label>Subtype
|
||||
<select value={form.issue_subtype} onChange={(e) => setForm({ ...form, issue_subtype: e.target.value })}>
|
||||
<option value="">Select subtype</option>
|
||||
{subtypes.map((s) => <option key={s} value={s}>{s.replace('_', ' ')}</option>)}
|
||||
</select>
|
||||
</label>
|
||||
)}
|
||||
<label>Priority
|
||||
<select value={form.priority} onChange={(e) => setForm({ ...form, priority: e.target.value })}>
|
||||
<option value="low">Low</option>
|
||||
|
||||
@@ -55,7 +55,7 @@ export default function DashboardPage() {
|
||||
<h3>Recent Issues</h3>
|
||||
<table>
|
||||
<thead>
|
||||
<tr><th>ID</th><th>Title</th><th>Status</th><th>Priority</th><th>Type</th></tr>
|
||||
<tr><th>ID</th><th>Title</th><th>Status</th><th>Priority</th><th>Type</th><th>Subtype</th></tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{(stats.recent_issues || []).map((i) => (
|
||||
@@ -64,7 +64,7 @@ export default function DashboardPage() {
|
||||
<td><a href={`/issues/${i.id}`}>{i.title}</a></td>
|
||||
<td><span className={`badge status-${i.status}`}>{i.status}</span></td>
|
||||
<td><span className={`badge priority-${i.priority}`}>{i.priority}</span></td>
|
||||
<td>{i.issue_type}</td>
|
||||
<td>{i.issue_type}</td><td>{i.issue_subtype || "-"}</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
|
||||
@@ -49,7 +49,7 @@ export default function IssueDetailPage() {
|
||||
<div className="issue-meta">
|
||||
<span className={`badge status-${issue.status}`}>{issue.status}</span>
|
||||
<span className={`badge priority-${issue.priority}`}>{issue.priority}</span>
|
||||
<span className="badge">{issue.issue_type}</span>
|
||||
<span className="badge">{issue.issue_type}</span>{issue.issue_subtype && <span className="badge">{issue.issue_subtype}</span>}
|
||||
{issue.tags && <span className="tags">{issue.tags}</span>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -49,7 +49,7 @@ export default function IssuesPage() {
|
||||
|
||||
<table className="issues-table">
|
||||
<thead>
|
||||
<tr><th>#</th><th>Title</th><th>Status</th><th>Priority</th><th>Type</th><th>Tags</th><th>Created</th></tr>
|
||||
<tr><th>#</th><th>Title</th><th>Status</th><th>Priority</th><th>Type</th><th>Subtype</th><th>Tags</th><th>Created</th></tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{issues.map((i) => (
|
||||
@@ -58,7 +58,7 @@ export default function IssuesPage() {
|
||||
<td className="issue-title">{i.title}</td>
|
||||
<td><span className="badge" style={{ backgroundColor: statusColors[i.status] || '#ccc' }}>{i.status}</span></td>
|
||||
<td><span className={`badge priority-${i.priority}`}>{i.priority}</span></td>
|
||||
<td>{i.issue_type}</td>
|
||||
<td>{i.issue_type}</td><td>{i.issue_subtype || "-"}</td>
|
||||
<td>{i.tags || '-'}</td>
|
||||
<td>{new Date(i.created_at).toLocaleDateString()}</td>
|
||||
</tr>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { useState, useEffect } from 'react'
|
||||
import { useParams, useNavigate } from 'react-router-dom'
|
||||
import api from '@/services/api'
|
||||
import type { Project, ProjectMember, Issue, Milestone, PaginatedResponse } from '@/types'
|
||||
import type { Project, ProjectMember, Milestone } from '@/types'
|
||||
import dayjs from 'dayjs'
|
||||
|
||||
export default function ProjectDetailPage() {
|
||||
@@ -9,21 +9,42 @@ export default function ProjectDetailPage() {
|
||||
const navigate = useNavigate()
|
||||
const [project, setProject] = useState<Project | null>(null)
|
||||
const [members, setMembers] = useState<ProjectMember[]>([])
|
||||
const [issues, setIssues] = useState<Issue[]>([])
|
||||
const [milestones, setMilestones] = useState<Milestone[]>([])
|
||||
const [allProjects, setAllProjects] = useState<Project[]>([])
|
||||
const [showAddMember, setShowAddMember] = useState(false)
|
||||
const [showAddMilestone, setShowAddMilestone] = useState(false)
|
||||
const [newMemberUserId, setNewMemberUserId] = useState(1)
|
||||
const [newMemberRole, setNewMemberRole] = useState('developer')
|
||||
const [newMilestoneTitle, setNewMilestoneTitle] = useState('')
|
||||
const [users, setUsers] = useState<any[]>([])
|
||||
const [roles, setRoles] = useState<any[]>([])
|
||||
const [editing, setEditing] = useState(false)
|
||||
const [editForm, setEditForm] = useState({ name: '', description: '' })
|
||||
const [editForm, setEditForm] = useState({ owner: '', repo: '', description: '', sub_projects: [] as string[], related_projects: [] as string[] })
|
||||
|
||||
useEffect(() => {
|
||||
api.get<Project>(`/projects/${id}`).then(({ data }) => {
|
||||
setProject(data)
|
||||
setEditForm({ name: data.name, description: data.description || '' })
|
||||
setEditForm({
|
||||
owner: data.owner_name || data.owner || '',
|
||||
repo: data.repo || '',
|
||||
description: data.description || '',
|
||||
sub_projects: data.sub_projects || [],
|
||||
related_projects: data.related_projects || [],
|
||||
})
|
||||
})
|
||||
api.get<ProjectMember[]>(`/projects/${id}/members`).then(({ data }) => setMembers(data))
|
||||
api.get<PaginatedResponse<Issue>>(`/issues?project_id=${id}&page_size=10`).then(({ data }) => setIssues(data.items))
|
||||
api.get<Milestone[]>(`/milestones?project_id=${id}`).then(({ data }) => setMilestones(data))
|
||||
api.get<Project[]>('/projects').then(({ data }) => setAllProjects(data))
|
||||
api.get('/users').then(r => setUsers(r.data)).catch(() => {})
|
||||
api.get('/roles').then(r => setRoles(r.data)).catch(() => {})
|
||||
api.get('/users').then(r => setUsers(r.data)).catch(() => {})
|
||||
}, [id])
|
||||
|
||||
const handleMulti = (e: React.ChangeEvent<HTMLSelectElement>, field: 'sub_projects' | 'related_projects') => {
|
||||
const values = Array.from(e.target.selectedOptions).map((o) => o.value)
|
||||
setEditForm({ ...editForm, [field]: values })
|
||||
}
|
||||
|
||||
const updateProject = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
const { data } = await api.patch<Project>(`/projects/${id}`, editForm)
|
||||
@@ -31,8 +52,46 @@ export default function ProjectDetailPage() {
|
||||
setEditing(false)
|
||||
}
|
||||
|
||||
const addMember = async () => {
|
||||
if (!newMemberUserId) return
|
||||
await api.post(`/projects/${id}/members`, { user_id: newMemberUserId, role: newMemberRole })
|
||||
setShowAddMember(false)
|
||||
api.get<ProjectMember[]>(`/projects/${id}/members`).then(({ data }) => setMembers(data))
|
||||
}
|
||||
|
||||
const removeMember = async (userId: number, role: string) => {
|
||||
// Prevent removing owner
|
||||
if (role === 'admin') {
|
||||
alert('Cannot remove project owner (admin)')
|
||||
return
|
||||
}
|
||||
if (!confirm('Remove this member?')) return
|
||||
await api.delete(`/projects/${id}/members/${userId}`)
|
||||
api.get<ProjectMember[]>(`/projects/${id}/members`).then(({ data }) => setMembers(data))
|
||||
}
|
||||
|
||||
const addMilestone = async () => {
|
||||
if (!newMilestoneTitle.trim()) return
|
||||
await api.post(`/projects/${id}/milestones`, { title: newMilestoneTitle, status: 'open' })
|
||||
setShowAddMilestone(false)
|
||||
setNewMilestoneTitle('')
|
||||
api.get<Milestone[]>(`/projects/${id}/milestones`).then(({ data }) => setMilestones(data)).catch(() => {})
|
||||
}
|
||||
|
||||
const deleteProject = async () => {
|
||||
const confirmName = prompt(`Type the project name "${project?.name}" to confirm deletion:`)
|
||||
if (confirmName !== project?.name) {
|
||||
alert('Project name does not match. Deletion cancelled.')
|
||||
return
|
||||
}
|
||||
await api.delete(`/projects/${id}`)
|
||||
navigate('/projects')
|
||||
}
|
||||
|
||||
if (!project) return <div className="loading">Loading...</div>
|
||||
|
||||
const selectableProjects = allProjects.filter((p) => p.id !== project.id && p.project_code)
|
||||
|
||||
return (
|
||||
<div className="project-detail">
|
||||
<button className="btn-back" onClick={() => navigate('/projects')}>← Back to projects</button>
|
||||
@@ -40,26 +99,49 @@ export default function ProjectDetailPage() {
|
||||
<div className="issue-header">
|
||||
{editing ? (
|
||||
<form className="inline-form" onSubmit={updateProject}>
|
||||
<input value={editForm.name} onChange={(e) => setEditForm({ ...editForm, name: e.target.value })} required />
|
||||
<div style={{ fontWeight: 600 }}>{project.name}</div>
|
||||
{project.project_code && <span className="badge">{project.project_code}</span>}
|
||||
<select value={editForm.owner} onChange={(e) => setEditForm({ ...editForm, owner: e.target.value })}>
|
||||
{users.map((u: any) => <option key={u.id} value={u.username}>{u.username} ({u.full_name})</option>)}
|
||||
</select>
|
||||
<input value={editForm.description} onChange={(e) => setEditForm({ ...editForm, description: e.target.value })} placeholder="Description" />
|
||||
<label>Sub-projects
|
||||
<select multiple value={editForm.sub_projects} onChange={(e) => handleMulti(e, 'sub_projects')}>
|
||||
{selectableProjects.map((p) => (
|
||||
<option key={p.id} value={p.project_code || ''}>{p.project_code || p.name}</option>
|
||||
))}
|
||||
</select>
|
||||
</label>
|
||||
<label>Related projects
|
||||
<select multiple value={editForm.related_projects} onChange={(e) => handleMulti(e, 'related_projects')}>
|
||||
{selectableProjects.map((p) => (
|
||||
<option key={p.id} value={p.project_code || ''}>{p.project_code || p.name}</option>
|
||||
))}
|
||||
</select>
|
||||
</label>
|
||||
<button type="submit" className="btn-primary">Save</button>
|
||||
<button type="button" className="btn-back" onClick={() => setEditing(false)}>Cancel</button>
|
||||
</form>
|
||||
) : (
|
||||
<>
|
||||
<h2>📁 {project.name}</h2>
|
||||
<h2>📁 {project.name} {project.project_code && <span className="badge">{project.project_code}</span>}</h2>
|
||||
<p style={{ color: 'var(--text-dim)', marginTop: 4 }}>{project.description || 'No description'}</p>
|
||||
<div className="text-dim">Owner: {project.owner_name || project.owner || "Unknown"}</div>
|
||||
<button className="btn-transition" style={{ marginTop: 8 }} onClick={() => setEditing(true)}>Edit</button>
|
||||
<button className="btn-danger" style={{ marginLeft: 8 }} onClick={deleteProject}>Delete</button>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<div className="section">
|
||||
<h3>Members ({members.length})</h3>
|
||||
<h3>Members ({members.length}) <button className="btn-sm" onClick={() => setShowAddMember(true)}>+ Add</button></h3>
|
||||
{members.length > 0 ? (
|
||||
<div className="member-list">
|
||||
{members.map((m) => (
|
||||
<span key={m.id} className="badge">{`User #${m.user_id} (${m.role})`}</span>
|
||||
<span key={m.id} className="badge" style={{marginRight: 8}}>
|
||||
{`User #${m.user_id} (${m.role})`}
|
||||
<button onClick={(e) => { e.stopPropagation(); removeMember(m.user_id, m.role) }} style={{marginLeft: 8, background: 'none', border: 'none', color: 'red', cursor: 'pointer'}}>×</button>
|
||||
</span>
|
||||
))}
|
||||
</div>
|
||||
) : (
|
||||
@@ -68,7 +150,7 @@ export default function ProjectDetailPage() {
|
||||
</div>
|
||||
|
||||
<div className="section">
|
||||
<h3>Milestones ({milestones.length})</h3>
|
||||
<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>
|
||||
@@ -79,27 +161,36 @@ export default function ProjectDetailPage() {
|
||||
{milestones.length === 0 && <p className="empty">No milestones</p>}
|
||||
</div>
|
||||
|
||||
<div className="section">
|
||||
<div className="page-header">
|
||||
<h3>Recent Issues</h3>
|
||||
<button className="btn-primary" onClick={() => navigate('/issues/new')}>+ New</button>
|
||||
{showAddMember && (
|
||||
<div className="modal-overlay" onClick={() => setShowAddMember(false)}>
|
||||
<div className="modal" onClick={e => e.stopPropagation()}>
|
||||
<h3>Add Member</h3>
|
||||
<select value={newMemberUserId} onChange={e => setNewMemberUserId(Number(e.target.value))}>
|
||||
{users.map(u => <option key={u.id} value={u.id}>{u.username} ({u.full_name})</option>)}
|
||||
</select>
|
||||
<select value={newMemberRole} onChange={e => setNewMemberRole(e.target.value)}>
|
||||
{roles.map(r => <option key={r.id} value={r.name}>{r.name}</option>)}
|
||||
</select>
|
||||
<div style={{marginTop: 10}}>
|
||||
<button className="btn-primary" onClick={addMember}>Add</button>
|
||||
<button className="btn-back" onClick={() => setShowAddMember(false)}>Cancel</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{showAddMilestone && (
|
||||
<div className="modal-overlay" onClick={() => setShowAddMilestone(false)}>
|
||||
<div className="modal" onClick={e => e.stopPropagation()}>
|
||||
<h3>New Milestone</h3>
|
||||
<input value={newMilestoneTitle} onChange={e => setNewMilestoneTitle(e.target.value)} placeholder="Milestone title" />
|
||||
<div style={{marginTop: 10}}>
|
||||
<button className="btn-primary" onClick={addMilestone}>Create</button>
|
||||
<button className="btn-back" onClick={() => setShowAddMilestone(false)}>Cancel</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useState, useEffect } from 'react'
|
||||
import { useState, useEffect, useMemo } from 'react'
|
||||
import { useNavigate } from 'react-router-dom'
|
||||
import api from '@/services/api'
|
||||
import type { Project } from '@/types'
|
||||
@@ -6,8 +6,9 @@ import dayjs from 'dayjs'
|
||||
|
||||
export default function ProjectsPage() {
|
||||
const [projects, setProjects] = useState<Project[]>([])
|
||||
const [users, setUsers] = useState<any[]>([])
|
||||
const [showCreate, setShowCreate] = useState(false)
|
||||
const [form, setForm] = useState({ name: '', description: '', owner_id: 1 })
|
||||
const [form, setForm] = useState({ name: '', description: '', owner_id: 1, repo: '', sub_projects: [] as string[], related_projects: [] as string[] })
|
||||
const navigate = useNavigate()
|
||||
|
||||
const fetchProjects = () => {
|
||||
@@ -15,11 +16,21 @@ export default function ProjectsPage() {
|
||||
}
|
||||
|
||||
useEffect(() => { fetchProjects() }, [])
|
||||
useEffect(() => {
|
||||
api.get('/users').then(({ data }) => setUsers(data)).catch(console.error)
|
||||
}, [])
|
||||
|
||||
const projectOptions = useMemo(() => projects.filter(p => p.project_code), [projects])
|
||||
|
||||
const handleMulti = (e: React.ChangeEvent<HTMLSelectElement>, field: 'sub_projects' | 'related_projects') => {
|
||||
const values = Array.from(e.target.selectedOptions).map((o) => o.value)
|
||||
setForm({ ...form, [field]: values })
|
||||
}
|
||||
|
||||
const createProject = async (e: React.FormEvent) => {
|
||||
e.preventDefault()
|
||||
await api.post('/projects', form)
|
||||
setForm({ name: '', description: '', owner_id: 1 })
|
||||
setForm({ name: '', description: '', owner_id: 1, repo: '', sub_projects: [], related_projects: [] })
|
||||
setShowCreate(false)
|
||||
fetchProjects()
|
||||
}
|
||||
@@ -29,7 +40,7 @@ export default function ProjectsPage() {
|
||||
<div className="page-header">
|
||||
<h2>📁 Projects ({projects.length})</h2>
|
||||
<button className="btn-primary" onClick={() => setShowCreate(!showCreate)}>
|
||||
{showCreate ? 'Cancel' : '+ NewProjects'}
|
||||
{showCreate ? 'Cancel' : '+ New'}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@@ -39,10 +50,33 @@ export default function ProjectsPage() {
|
||||
required placeholder="Project name" value={form.name}
|
||||
onChange={(e) => setForm({ ...form, name: e.target.value })}
|
||||
/>
|
||||
<select
|
||||
value={form.owner_id}
|
||||
onChange={(e) => setForm({ ...form, owner_id: Number(e.target.value) })}
|
||||
style={{width:'100%',padding:'8px',marginBottom:'8px'}}
|
||||
>
|
||||
{users.map(u => <option key={u.id} value={u.id}>{u.username} ({u.full_name})</option>)}
|
||||
</select>
|
||||
<input
|
||||
placeholder="ProjectsDescription (optional)" value={form.description}
|
||||
placeholder="Description (optional)" value={form.description}
|
||||
onChange={(e) => setForm({ ...form, description: e.target.value })}
|
||||
/>
|
||||
<input
|
||||
placeholder="Repository URL (optional)" value={form.repo}
|
||||
onChange={(e) => setForm({ ...form, repo: e.target.value })}
|
||||
/>
|
||||
<label>Sub-projects (Ctrl+Click to select multiple)</label>
|
||||
<select multiple value={form.sub_projects} onChange={(e) => handleMulti(e, 'sub_projects')} style={{height:80}}>
|
||||
{projectOptions.map((p) => (
|
||||
<option key={p.id} value={p.project_code || ''}>{p.project_code} - {p.name}</option>
|
||||
))}
|
||||
</select>
|
||||
<label>Related Projects (Ctrl+Click to select multiple)</label>
|
||||
<select multiple value={form.related_projects} onChange={(e) => handleMulti(e, 'related_projects')} style={{height:80}}>
|
||||
{projectOptions.map((p) => (
|
||||
<option key={p.id} value={p.project_code || ''}>{p.project_code} - {p.name}</option>
|
||||
))}
|
||||
</select>
|
||||
<button type="submit" className="btn-primary">Create</button>
|
||||
</form>
|
||||
)}
|
||||
@@ -50,10 +84,11 @@ export default function ProjectsPage() {
|
||||
<div className="project-grid">
|
||||
{projects.map((p) => (
|
||||
<div key={p.id} className="project-card" onClick={() => navigate(`/projects/${p.id}`)}>
|
||||
<h3>{p.name}</h3>
|
||||
<h3>{p.name}</h3>{p.project_code && <span className="badge" style={{ marginLeft: 8 }}>{p.project_code}</span>}
|
||||
<p className="project-desc">{p.description || 'No description'}</p>
|
||||
<div className="project-meta">
|
||||
<span>Created {dayjs(p.created_at).format('YYYY-MM-DD')}</span>
|
||||
<span>👤 {p.owner_name || 'Unknown'}</span>
|
||||
<span> · Created {dayjs(p.created_at).format('YYYY-MM-DD')}</span>
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
|
||||
184
src/pages/RoleEditorPage.tsx
Normal file
184
src/pages/RoleEditorPage.tsx
Normal file
@@ -0,0 +1,184 @@
|
||||
import { useState, useEffect } from 'react'
|
||||
import api from '@/services/api'
|
||||
|
||||
interface Permission {
|
||||
id: number
|
||||
name: string
|
||||
description: string
|
||||
category: string
|
||||
}
|
||||
|
||||
interface Role {
|
||||
id: number
|
||||
name: string
|
||||
description: string
|
||||
is_global: boolean
|
||||
permission_ids: number[]
|
||||
}
|
||||
|
||||
export default function RoleEditorPage() {
|
||||
const [roles, setRoles] = useState<Role[]>([])
|
||||
const [permissions, setPermissions] = useState<Permission[]>([])
|
||||
const [selectedRole, setSelectedRole] = useState<Role | null>(null)
|
||||
const [loading, setLoading] = useState(true)
|
||||
const [saving, setSaving] = useState(false)
|
||||
const [message, setMessage] = useState('')
|
||||
|
||||
useEffect(() => {
|
||||
fetchData()
|
||||
}, [])
|
||||
|
||||
const fetchData = async () => {
|
||||
try {
|
||||
const [rolesRes, permsRes] = await Promise.all([
|
||||
api.get('/roles'),
|
||||
api.get('/roles/permissions')
|
||||
])
|
||||
setRoles(rolesRes.data)
|
||||
setPermissions(permsRes.data)
|
||||
} catch (err) {
|
||||
console.error('Failed to fetch data:', err)
|
||||
} finally {
|
||||
setLoading(false)
|
||||
}
|
||||
}
|
||||
|
||||
const handlePermissionToggle = (permId: number) => {
|
||||
if (!selectedRole) return
|
||||
const newPermIds = selectedRole.permission_ids.includes(permId)
|
||||
? selectedRole.permission_ids.filter(id => id !== permId)
|
||||
: [...selectedRole.permission_ids, permId]
|
||||
setSelectedRole({ ...selectedRole, permission_ids: newPermIds })
|
||||
}
|
||||
|
||||
const handleSave = async () => {
|
||||
if (!selectedRole) return
|
||||
setSaving(true)
|
||||
setMessage('')
|
||||
try {
|
||||
await api.post(`/roles/${selectedRole.id}/permissions`, {
|
||||
permission_ids: selectedRole.permission_ids
|
||||
})
|
||||
setMessage('Saved successfully!')
|
||||
fetchData()
|
||||
} catch (err: any) {
|
||||
setMessage(err.response?.data?.detail || 'Failed to save')
|
||||
} finally {
|
||||
setSaving(false)
|
||||
}
|
||||
}
|
||||
|
||||
const groupedPermissions = permissions.reduce((acc, p) => {
|
||||
if (!acc[p.category]) acc[p.category] = []
|
||||
acc[p.category].push(p)
|
||||
return acc
|
||||
}, {} as Record<string, Permission[]>)
|
||||
|
||||
if (loading) return <div className="p-4">Loading...</div>
|
||||
|
||||
return (
|
||||
<div className="role-editor-page" style={{ padding: '20px' }}>
|
||||
<h2>🔐 Role Editor</h2>
|
||||
<p style={{ color: '#888', marginBottom: '20px' }}>
|
||||
Configure permissions for each role. Only admins can edit roles.
|
||||
</p>
|
||||
|
||||
{message && (
|
||||
<div style={{
|
||||
padding: '10px',
|
||||
marginBottom: '20px',
|
||||
backgroundColor: message.includes('success') ? '#d4edda' : '#f8d7da',
|
||||
borderRadius: '4px'
|
||||
}}>
|
||||
{message}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div style={{ display: 'flex', gap: '20px' }}>
|
||||
{/* Role List */}
|
||||
<div style={{ width: '250px' }}>
|
||||
<h3>Roles</h3>
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: '8px' }}>
|
||||
{roles.map(role => (
|
||||
<div
|
||||
key={role.id}
|
||||
onClick={() => setSelectedRole({ ...role })}
|
||||
style={{
|
||||
padding: '12px',
|
||||
border: selectedRole?.id === role.id ? '2px solid #007bff' : '1px solid #ddd',
|
||||
borderRadius: '6px',
|
||||
cursor: 'pointer',
|
||||
backgroundColor: selectedRole?.id === role.id ? '#f0f8ff' : 'white'
|
||||
}}
|
||||
>
|
||||
<strong>{role.name}</strong>
|
||||
{role.is_global && <span style={{ fontSize: '12px', marginLeft: '8px', color: '#ff6b6b' }}>🌟</span>}
|
||||
<div style={{ fontSize: '12px', color: '#666' }}>{role.description}</div>
|
||||
<div style={{ fontSize: '11px', color: '#999', marginTop: '4px' }}>
|
||||
{role.permission_ids.length} permissions
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Permission Editor */}
|
||||
<div style={{ flex: 1 }}>
|
||||
{selectedRole ? (
|
||||
<>
|
||||
<h3>Permissions for: {selectedRole.name}</h3>
|
||||
<div style={{ display: 'flex', flexDirection: 'column', gap: '20px' }}>
|
||||
{Object.entries(groupedPermissions).map(([category, perms]) => (
|
||||
<div key={category} style={{
|
||||
border: '1px solid #eee',
|
||||
borderRadius: '8px',
|
||||
padding: '12px'
|
||||
}}>
|
||||
<h4 style={{ margin: '0 0 10px 0', textTransform: 'capitalize' }}>
|
||||
{category}
|
||||
</h4>
|
||||
<div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(200px, 1fr))', gap: '8px' }}>
|
||||
{perms.map(perm => (
|
||||
<label key={perm.id} style={{
|
||||
display: 'flex',
|
||||
alignItems: 'center',
|
||||
gap: '8px',
|
||||
cursor: 'pointer',
|
||||
padding: '6px',
|
||||
borderRadius: '4px',
|
||||
backgroundColor: selectedRole.permission_ids.includes(perm.id) ? '#e8f5e9' : 'transparent'
|
||||
}}>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={selectedRole.permission_ids.includes(perm.id)}
|
||||
onChange={() => handlePermissionToggle(perm.id)}
|
||||
/>
|
||||
<div>
|
||||
<div style={{ fontWeight: 500 }}>{perm.name}</div>
|
||||
<div style={{ fontSize: '11px', color: '#666' }}>{perm.description}</div>
|
||||
</div>
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
<button
|
||||
onClick={handleSave}
|
||||
disabled={saving}
|
||||
className="btn-primary"
|
||||
style={{ marginTop: '20px' }}
|
||||
>
|
||||
{saving ? 'Saving...' : 'Save Changes'}
|
||||
</button>
|
||||
</>
|
||||
) : (
|
||||
<div style={{ color: '#888', textAlign: 'center', marginTop: '40px' }}>
|
||||
Select a role to edit its permissions
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
@@ -11,8 +11,14 @@ export interface User {
|
||||
export interface Project {
|
||||
id: number
|
||||
name: string
|
||||
owner: string
|
||||
description: string | null
|
||||
owner_id: number
|
||||
owner_name: string | null
|
||||
project_code: string | null
|
||||
repo: string | null
|
||||
sub_projects: string[] | null
|
||||
related_projects: string[] | null
|
||||
created_at: string
|
||||
}
|
||||
|
||||
@@ -27,7 +33,8 @@ export interface Issue {
|
||||
id: number
|
||||
title: string
|
||||
description: string | null
|
||||
issue_type: 'task' | 'story' | 'test' | 'resolution'
|
||||
issue_type: 'meeting' | 'support' | 'issue' | 'maintenance' | 'research' | 'review' | 'story' | 'test' | 'resolution' | 'task'
|
||||
issue_subtype: string | null
|
||||
status: 'open' | 'in_progress' | 'resolved' | 'closed' | 'blocked'
|
||||
priority: 'low' | 'medium' | 'high' | 'critical'
|
||||
project_id: number
|
||||
|
||||
Reference in New Issue
Block a user