From ccbc495900cfc659da07fb5c036563c50bbca01e Mon Sep 17 00:00:00 2001 From: devops Date: Wed, 14 Oct 2026 17:03:15 +0000 Subject: [PATCH] fix(admin): resolve white screen in task management modal and add pagination --- .../src/pages/TasksManagementPage.tsx | 298 ++++++++++++------ 1 file changed, 202 insertions(+), 96 deletions(-) diff --git a/frontend/admin-panel/src/pages/TasksManagementPage.tsx b/frontend/admin-panel/src/pages/TasksManagementPage.tsx index 3996a94c..625ebf39 100644 --- a/frontend/admin-panel/src/pages/TasksManagementPage.tsx +++ b/frontend/admin-panel/src/pages/TasksManagementPage.tsx @@ -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 ۱. صف اقدام (TODO); + return ( + + ۱. صف اقدام (TODO) + + ); case 'IN_PROGRESS': - return ۲. در حال توسعه (IN_PROGRESS); + return ( + + ۲. در حال توسعه (IN_PROGRESS) + + ); case 'TEST': case 'IN_REVIEW': - return ۳. تست استیج و QA (TEST); + return ( + + ۳. تست استیج و QA (TEST) + + ); case 'DONE': - return ۴. مستقر پروداکشن (DONE); + return ( + + ۴. مستقر پروداکشن (DONE) + + ); default: return {status}; } @@ -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 (
{/* 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" />
@@ -185,7 +240,10 @@ export default function TasksManagementPage() {
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" > @@ -209,18 +270,16 @@ export default function TasksManagementPage() { - - - - -