fix(admin): resolve white screen in task management modal and add pagination
This commit is contained in:
1 parent
98f9223798
commit
ccbc495900
1 file changed
+202
-96
@@ -1,20 +1,16 @@
|
||||
import React, { useState, useEffect } from 'react';
|
||||
import {
|
||||
CheckSquare,
|
||||
Search,
|
||||
Filter,
|
||||
RefreshCw,
|
||||
Clock,
|
||||
User,
|
||||
Plus,
|
||||
PlayCircle,
|
||||
CheckCircle2,
|
||||
AlertTriangle,
|
||||
ChevronDown,
|
||||
ArrowRight,
|
||||
ExternalLink,
|
||||
Bot,
|
||||
Briefcase
|
||||
Briefcase,
|
||||
ChevronDown,
|
||||
ChevronLeft,
|
||||
ChevronRight,
|
||||
Play,
|
||||
CheckCircle,
|
||||
Clock,
|
||||
Filter
|
||||
} from 'lucide-react';
|
||||
import api from '../services/api';
|
||||
import toast from 'react-hot-toast';
|
||||
@@ -25,11 +21,11 @@ interface DepartmentTask {
|
||||
department: string;
|
||||
title: string;
|
||||
description?: string;
|
||||
status: 'TODO' | 'IN_PROGRESS' | 'TEST' | 'DONE' | 'BACKLOG' | 'IN_REVIEW' | 'APPROVED' | 'DEPLOYING';
|
||||
priority: 'LOW' | 'MEDIUM' | 'HIGH' | 'CRITICAL';
|
||||
status: string;
|
||||
priority: string;
|
||||
assignee: string;
|
||||
acceptanceCriteria?: string;
|
||||
executionLogs?: Array<{ timestamp: string; status: string; note: string }>;
|
||||
acceptanceCriteria?: any;
|
||||
executionLogs?: any;
|
||||
deliverableUrl?: string;
|
||||
startedAt?: string;
|
||||
completedAt?: string;
|
||||
@@ -47,10 +43,14 @@ export default function TasksManagementPage() {
|
||||
const [logNote, setLogNote] = useState('');
|
||||
const [updating, setUpdating] = useState(false);
|
||||
|
||||
// Pagination states
|
||||
const [currentPage, setCurrentPage] = useState(1);
|
||||
const itemsPerPage = 10;
|
||||
|
||||
const fetchTasks = async () => {
|
||||
setLoading(true);
|
||||
try {
|
||||
const res = await api.get('/admin/department-tasks?limit=100');
|
||||
const res = await api.get('/admin/department-tasks?limit=200');
|
||||
if (res.data?.success) {
|
||||
setTasks(res.data.data);
|
||||
}
|
||||
@@ -99,18 +99,41 @@ export default function TasksManagementPage() {
|
||||
return matchesSearch && matchesDept && matchesStatus && matchesPriority;
|
||||
});
|
||||
|
||||
// Calculate pagination
|
||||
const totalPages = Math.ceil(filteredTasks.length / itemsPerPage) || 1;
|
||||
const paginatedTasks = filteredTasks.slice(
|
||||
(currentPage - 1) * itemsPerPage,
|
||||
currentPage * itemsPerPage
|
||||
);
|
||||
|
||||
const getStatusBadge = (status: string) => {
|
||||
switch (status) {
|
||||
case 'TODO':
|
||||
case 'BACKLOG':
|
||||
return <span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-gray-100 text-gray-700 border border-gray-200">۱. صف اقدام (TODO)</span>;
|
||||
return (
|
||||
<span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-gray-100 text-gray-700 border border-gray-200">
|
||||
۱. صف اقدام (TODO)
|
||||
</span>
|
||||
);
|
||||
case 'IN_PROGRESS':
|
||||
return <span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-blue-100 text-blue-800 border border-blue-200 animate-pulse">۲. در حال توسعه (IN_PROGRESS)</span>;
|
||||
return (
|
||||
<span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-blue-100 text-blue-800 border border-blue-200 animate-pulse">
|
||||
۲. در حال توسعه (IN_PROGRESS)
|
||||
</span>
|
||||
);
|
||||
case 'TEST':
|
||||
case 'IN_REVIEW':
|
||||
return <span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-amber-100 text-amber-800 border border-amber-200">۳. تست استیج و QA (TEST)</span>;
|
||||
return (
|
||||
<span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-amber-100 text-amber-800 border border-amber-200">
|
||||
۳. تست استیج و QA (TEST)
|
||||
</span>
|
||||
);
|
||||
case 'DONE':
|
||||
return <span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-emerald-100 text-emerald-800 border border-emerald-200">۴. مستقر پروداکشن (DONE)</span>;
|
||||
return (
|
||||
<span className="px-2 py-0.5 rounded-full text-[10px] font-black bg-emerald-100 text-emerald-800 border border-emerald-200">
|
||||
۴. مستقر پروداکشن (DONE)
|
||||
</span>
|
||||
);
|
||||
default:
|
||||
return <span>{status}</span>;
|
||||
}
|
||||
@@ -142,6 +165,35 @@ export default function TasksManagementPage() {
|
||||
return map[dept] || dept;
|
||||
};
|
||||
|
||||
const renderAcceptanceCriteria = (criteria: any) => {
|
||||
if (!criteria) return null;
|
||||
if (typeof criteria === 'string') return criteria;
|
||||
if (typeof criteria === 'object') {
|
||||
if (criteria.rule) return criteria.rule;
|
||||
try {
|
||||
return JSON.stringify(criteria, null, 2);
|
||||
} catch (e) {
|
||||
return String(criteria);
|
||||
}
|
||||
}
|
||||
return String(criteria);
|
||||
};
|
||||
|
||||
const renderExecutionLogs = (logs: any) => {
|
||||
if (!logs) return [];
|
||||
if (Array.isArray(logs)) return logs;
|
||||
if (typeof logs === 'object') {
|
||||
return [
|
||||
{
|
||||
note: logs.notes || logs.message || JSON.stringify(logs),
|
||||
timestamp: new Date().toISOString(),
|
||||
status: logs.status || 'LOG',
|
||||
},
|
||||
];
|
||||
}
|
||||
return [{ note: String(logs), timestamp: new Date().toISOString(), status: 'LOG' }];
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="space-y-6 font-vazir pb-12" dir="rtl">
|
||||
{/* Top Header */}
|
||||
@@ -177,7 +229,10 @@ export default function TasksManagementPage() {
|
||||
type="text"
|
||||
placeholder="جستجو بر اساس عنوان تسک، کد..."
|
||||
value={searchTerm}
|
||||
onChange={(e) => setSearchTerm(e.target.value)}
|
||||
onChange={(e) => {
|
||||
setSearchTerm(e.target.value);
|
||||
setCurrentPage(1);
|
||||
}}
|
||||
className="w-full pr-9 pl-3 py-2 text-xs bg-gray-50 border border-gray-200 rounded-xl focus:bg-white focus:outline-none focus:border-purple-500 font-medium"
|
||||
/>
|
||||
</div>
|
||||
@@ -185,7 +240,10 @@ export default function TasksManagementPage() {
|
||||
<div>
|
||||
<select
|
||||
value={selectedDept}
|
||||
onChange={(e) => setSelectedDept(e.target.value)}
|
||||
onChange={(e) => {
|
||||
setSelectedDept(e.target.value);
|
||||
setCurrentPage(1);
|
||||
}}
|
||||
className="w-full px-3 py-2 text-xs bg-gray-50 border border-gray-200 rounded-xl focus:bg-white focus:outline-none focus:border-purple-500 font-bold text-gray-700"
|
||||
>
|
||||
<option value="ALL">همه دپارتمانها</option>
|
||||
@@ -201,7 +259,10 @@ export default function TasksManagementPage() {
|
||||
<div>
|
||||
<select
|
||||
value={selectedStatus}
|
||||
onChange={(e) => setSelectedStatus(e.target.value)}
|
||||
onChange={(e) => {
|
||||
setSelectedStatus(e.target.value);
|
||||
setCurrentPage(1);
|
||||
}}
|
||||
className="w-full px-3 py-2 text-xs bg-gray-50 border border-gray-200 rounded-xl focus:bg-white focus:outline-none focus:border-purple-500 font-bold text-gray-700"
|
||||
>
|
||||
<option value="ALL">همه وضعیتها</option>
|
||||
@@ -209,18 +270,16 @@ export default function TasksManagementPage() {
|
||||
<option value="IN_PROGRESS">۲. در حال اجرا (IN_PROGRESS)</option>
|
||||
<option value="TEST">۳. تست و QA (TEST)</option>
|
||||
<option value="DONE">۴. تکمیل شده (DONE)</option>
|
||||
<option value="IN_PROGRESS">در حال انجام (In Progress)</option>
|
||||
<option value="IN_REVIEW">در انتظار بررسی (Review)</option>
|
||||
<option value="APPROVED">تایید شده (Approved)</option>
|
||||
<option value="DEPLOYING">در حال دپلوی (Deploying)</option>
|
||||
<option value="DONE">تکمیل شده (Done)</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<select
|
||||
value={selectedPriority}
|
||||
onChange={(e) => setSelectedPriority(e.target.value)}
|
||||
onChange={(e) => {
|
||||
setSelectedPriority(e.target.value);
|
||||
setCurrentPage(1);
|
||||
}}
|
||||
className="w-full px-3 py-2 text-xs bg-gray-50 border border-gray-200 rounded-xl focus:bg-white focus:outline-none focus:border-purple-500 font-bold text-gray-700"
|
||||
>
|
||||
<option value="ALL">همه اولویتها</option>
|
||||
@@ -245,63 +304,106 @@ export default function TasksManagementPage() {
|
||||
هیچ تسکی با این مشخصات یافت نشد.
|
||||
</div>
|
||||
) : (
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-right text-xs">
|
||||
<thead className="bg-gray-50/75 border-b border-gray-100 text-gray-500 font-black">
|
||||
<tr>
|
||||
<th className="py-3 px-4">کد تسک</th>
|
||||
<th className="py-3 px-4">عنوان و شرح وظیفه</th>
|
||||
<th className="py-3 px-4">دپارتمان</th>
|
||||
<th className="py-3 px-4">اولویت</th>
|
||||
<th className="py-3 px-4">مسئول اجرا (Agent)</th>
|
||||
<th className="py-3 px-4">وضعیت</th>
|
||||
<th className="py-3 px-4 text-center">اقدام و تغییر استیت</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-gray-100 font-medium text-gray-700">
|
||||
{filteredTasks.map((task) => (
|
||||
<tr key={task.id} className="hover:bg-purple-50/20 transition-colors">
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
<span className="font-mono font-bold text-gray-500 bg-gray-100 px-2 py-1 rounded">
|
||||
{task.code}
|
||||
</span>
|
||||
</td>
|
||||
<td className="py-3.5 px-4">
|
||||
<div className="font-black text-gray-900 text-xs mb-0.5">{task.title}</div>
|
||||
{task.description && (
|
||||
<div className="text-[11px] text-gray-500 line-clamp-1 max-w-sm">{task.description}</div>
|
||||
)}
|
||||
</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
<span className="text-[11px] font-bold text-purple-700 bg-purple-50 px-2.5 py-0.5 rounded-md border border-purple-100">
|
||||
{getDeptName(task.department)}
|
||||
</span>
|
||||
</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
{getPriorityBadge(task.priority)}
|
||||
</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
<div className="flex items-center gap-1.5 font-bold text-gray-800">
|
||||
<Bot className="w-4 h-4 text-indigo-600" />
|
||||
<span>{task.assignee}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
{getStatusBadge(task.status)}
|
||||
</td>
|
||||
<td className="py-3.5 px-4 text-center whitespace-nowrap">
|
||||
<button
|
||||
onClick={() => setActiveTaskModal(task)}
|
||||
className="inline-flex items-center gap-1 px-3 py-1.5 rounded-xl bg-purple-600 text-white font-bold text-[11px] hover:bg-purple-700 transition-colors shadow-sm cursor-pointer"
|
||||
>
|
||||
<span>مدیریت و استیت</span>
|
||||
<ChevronDown className="w-3.5 h-3.5" />
|
||||
</button>
|
||||
</td>
|
||||
<div>
|
||||
<div className="overflow-x-auto">
|
||||
<table className="w-full text-right text-xs">
|
||||
<thead className="bg-gray-50/75 border-b border-gray-100 text-gray-500 font-black">
|
||||
<tr>
|
||||
<th className="py-3 px-4">کد تسک</th>
|
||||
<th className="py-3 px-4">عنوان و شرح وظیفه</th>
|
||||
<th className="py-3 px-4">دپارتمان</th>
|
||||
<th className="py-3 px-4">اولویت</th>
|
||||
<th className="py-3 px-4">مسئول اجرا (Agent)</th>
|
||||
<th className="py-3 px-4">وضعیت</th>
|
||||
<th className="py-3 px-4 text-center">اقدام و تغییر استیت</th>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-gray-100 font-medium text-gray-700">
|
||||
{paginatedTasks.map((task) => (
|
||||
<tr key={task.id} className="hover:bg-purple-50/20 transition-colors">
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
<span className="font-mono font-bold text-gray-500 bg-gray-100 px-2 py-1 rounded">
|
||||
{task.code}
|
||||
</span>
|
||||
</td>
|
||||
<td className="py-3.5 px-4">
|
||||
<div className="font-black text-gray-900 text-xs mb-0.5">{task.title}</div>
|
||||
{task.description && (
|
||||
<div className="text-[11px] text-gray-500 line-clamp-1 max-w-sm">{task.description}</div>
|
||||
)}
|
||||
</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
<span className="text-[11px] font-bold text-purple-700 bg-purple-50 px-2.5 py-0.5 rounded-md border border-purple-100">
|
||||
{getDeptName(task.department)}
|
||||
</span>
|
||||
</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
{getPriorityBadge(task.priority)}
|
||||
</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
<div className="flex items-center gap-1.5 font-bold text-gray-800">
|
||||
<Bot className="w-4 h-4 text-indigo-600" />
|
||||
<span>{task.assignee}</span>
|
||||
</div>
|
||||
</td>
|
||||
<td className="py-3.5 px-4 whitespace-nowrap">
|
||||
{getStatusBadge(task.status)}
|
||||
</td>
|
||||
<td className="py-3.5 px-4 text-center whitespace-nowrap">
|
||||
<button
|
||||
onClick={() => setActiveTaskModal(task)}
|
||||
className="inline-flex items-center gap-1 px-3 py-1.5 rounded-xl bg-purple-600 text-white font-bold text-[11px] hover:bg-purple-700 transition-colors shadow-sm cursor-pointer"
|
||||
>
|
||||
<span>مدیریت و استیت</span>
|
||||
<ChevronDown className="w-3.5 h-3.5" />
|
||||
</button>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
{/* Pagination Controls */}
|
||||
<div className="p-4 border-t border-gray-100 flex items-center justify-between text-xs">
|
||||
<span className="text-gray-500 font-medium">
|
||||
نمایش {(currentPage - 1) * itemsPerPage + 1} تا {Math.min(currentPage * itemsPerPage, filteredTasks.length)} از کل {filteredTasks.length} تسک
|
||||
</span>
|
||||
|
||||
<div className="flex items-center gap-2">
|
||||
<button
|
||||
onClick={() => setCurrentPage((p) => Math.max(1, p - 1))}
|
||||
disabled={currentPage === 1}
|
||||
className="p-1.5 rounded-lg border border-gray-200 text-gray-600 hover:bg-gray-50 disabled:opacity-40 disabled:cursor-not-allowed cursor-pointer"
|
||||
>
|
||||
<ChevronRight className="w-4 h-4" />
|
||||
</button>
|
||||
|
||||
<div className="flex items-center gap-1">
|
||||
{Array.from({ length: totalPages }).map((_, i) => (
|
||||
<button
|
||||
key={i}
|
||||
onClick={() => setCurrentPage(i + 1)}
|
||||
className={`w-7 h-7 rounded-lg text-xs font-bold transition-colors cursor-pointer ${
|
||||
currentPage === i + 1
|
||||
? 'bg-purple-600 text-white shadow-sm'
|
||||
: 'text-gray-600 hover:bg-gray-100'
|
||||
}`}
|
||||
>
|
||||
{i + 1}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<button
|
||||
onClick={() => setCurrentPage((p) => Math.min(totalPages, p + 1))}
|
||||
disabled={currentPage === totalPages}
|
||||
className="p-1.5 rounded-lg border border-gray-200 text-gray-600 hover:bg-gray-50 disabled:opacity-40 disabled:cursor-not-allowed cursor-pointer"
|
||||
>
|
||||
<ChevronLeft className="w-4 h-4" />
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -332,21 +434,23 @@ export default function TasksManagementPage() {
|
||||
{activeTaskModal.acceptanceCriteria && (
|
||||
<div className="p-3 bg-indigo-50/50 rounded-xl space-y-1 border border-indigo-100">
|
||||
<div className="font-bold text-indigo-900">معیارهای پذیرش (Acceptance Criteria):</div>
|
||||
<div className="text-indigo-800 font-medium">{activeTaskModal.acceptanceCriteria}</div>
|
||||
<div className="text-indigo-800 font-medium whitespace-pre-wrap">
|
||||
{renderAcceptanceCriteria(activeTaskModal.acceptanceCriteria)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{/* Status Update Options */}
|
||||
<div className="pt-2">
|
||||
<label className="block text-xs font-black text-gray-700 mb-2">تغییر وضعیت تسک به:</label>
|
||||
<div className="grid grid-cols-3 gap-2">
|
||||
<div className="grid grid-cols-4 gap-2">
|
||||
{['TODO', 'IN_PROGRESS', 'TEST', 'DONE'].map((st) => (
|
||||
<button
|
||||
key={st}
|
||||
type="button"
|
||||
onClick={() => handleStatusChange(activeTaskModal.id, st)}
|
||||
disabled={updating || activeTaskModal.status === st}
|
||||
className={`py-2 px-2 text-[11px] font-bold rounded-xl border text-center transition-all ${
|
||||
className={`py-2 px-2 text-[11px] font-bold rounded-xl border text-center transition-all cursor-pointer ${
|
||||
activeTaskModal.status === st
|
||||
? 'bg-purple-600 text-white border-purple-600 shadow-sm'
|
||||
: 'bg-white hover:bg-gray-50 text-gray-700 border-gray-200'
|
||||
@@ -365,19 +469,21 @@ export default function TasksManagementPage() {
|
||||
placeholder="مثال: تستها پاس شد و کاتالوگ بهروز گردید..."
|
||||
value={logNote}
|
||||
onChange={(e) => setLogNote(e.target.value)}
|
||||
className="w-full px-3 py-2 text-xs bg-gray-50 border border-gray-200 rounded-xl focus:bg-white focus:outline-none focus:border-purple-500"
|
||||
className="w-full px-3 py-2 text-xs bg-gray-50 border border-gray-200 rounded-xl focus:bg-white focus:outline-none focus:border-purple-500 font-medium"
|
||||
/>
|
||||
</div>
|
||||
|
||||
{/* Execution Logs */}
|
||||
{activeTaskModal.executionLogs && activeTaskModal.executionLogs.length > 0 && (
|
||||
{activeTaskModal.executionLogs && (
|
||||
<div className="pt-2 space-y-1">
|
||||
<div className="font-bold text-gray-600 text-[11px]">تاریخچه اقدامات انجامشده روی این تسک:</div>
|
||||
<div className="space-y-1 max-h-36 overflow-y-auto">
|
||||
{activeTaskModal.executionLogs.map((lg, i) => (
|
||||
{renderExecutionLogs(activeTaskModal.executionLogs).map((lg: any, i: number) => (
|
||||
<div key={i} className="text-[10px] p-2 bg-gray-50 rounded-lg flex items-center justify-between">
|
||||
<span className="font-bold text-gray-800">{lg.note}</span>
|
||||
<span className="text-gray-400 font-mono">{new Date(lg.timestamp).toLocaleTimeString('fa-IR')}</span>
|
||||
<span className="font-bold text-gray-800">{lg.note || JSON.stringify(lg)}</span>
|
||||
<span className="text-gray-400 font-mono">
|
||||
{lg.timestamp ? new Date(lg.timestamp).toLocaleTimeString('fa-IR') : '-'}
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
@@ -389,7 +495,7 @@ export default function TasksManagementPage() {
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setActiveTaskModal(null)}
|
||||
className="px-4 py-2 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-xl text-xs font-bold transition-colors"
|
||||
className="px-4 py-2 bg-gray-100 hover:bg-gray-200 text-gray-700 rounded-xl text-xs font-bold transition-colors cursor-pointer"
|
||||
>
|
||||
انصراف
|
||||
</button>
|
||||
@@ -399,4 +505,4 @@ export default function TasksManagementPage() {
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user