feat(admin): integrate paginated Hermes records and authoritative task details
This commit is contained in:
1 parent
3b05fe2e85
commit
5550c80a75
12 files changed
+182
-36
No files matched your search
@@ -50,10 +50,28 @@ describe('CorporateTasksPage', () => {
|
||||
beforeEach(() => {
|
||||
vi.resetAllMocks();
|
||||
vi.mocked(hermesApi.getTasks).mockResolvedValue(mockTaskResponse);
|
||||
vi.mocked(hermesApi.getTaskById).mockResolvedValue(mockTaskResponse.data[0]);
|
||||
});
|
||||
|
||||
afterEach(cleanup);
|
||||
|
||||
it('loads authoritative task detail from the API', async () => {
|
||||
render(<CorporateTasksPage />);
|
||||
fireEvent.click(await screen.findByRole('button', { name: /جزئیات و مکالمات/ }));
|
||||
await waitFor(() => expect(hermesApi.getTaskById).toHaveBeenCalledWith('t-1', expect.any(AbortSignal)));
|
||||
});
|
||||
|
||||
it('shows creation failure and retains entered directive', async () => {
|
||||
vi.mocked(hermesApi.createCeoTask).mockRejectedValue(new Error('not saved'));
|
||||
render(<CorporateTasksPage />);
|
||||
fireEvent.click(await screen.findByRole('button', { name: /ثبت دستور فوری مدیرعامل/ }));
|
||||
fireEvent.change(screen.getByPlaceholderText(/مثال: آپدیت فوری/), {target:{value:'retained directive'}});
|
||||
fireEvent.change(screen.getByPlaceholderText(/دقیقاً چه کاری/), {target:{value:'acceptance'}});
|
||||
fireEvent.click(screen.getByRole('button', {name:/ثبت با اولویت فوری صف/}));
|
||||
expect(await screen.findByRole('alert')).toHaveTextContent('ثبت دستور ناموفق');
|
||||
expect(screen.getByPlaceholderText(/مثال: آپدیت فوری/)).toHaveValue('retained directive');
|
||||
});
|
||||
|
||||
it('renders task list with department badges, task codes, and filter elements', async () => {
|
||||
render(<CorporateTasksPage />);
|
||||
expect(await screen.findByText('مدیریت و پایش وظایف دپارتمانها')).toBeDefined();
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { createPortal } from 'react-dom';
|
||||
import { safeHttpUrl } from '../components/HermesSource';
|
||||
import {
|
||||
ListOrdered,
|
||||
Search,
|
||||
@@ -68,6 +69,22 @@ export default function CorporateTasksPage() {
|
||||
// Detail Modal
|
||||
const [selectedTask, setSelectedTask] = useState<CorporateTaskItem | null>(null);
|
||||
|
||||
const [detailId, setDetailId] = useState<string | null>(null);
|
||||
const [detailLoading, setDetailLoading] = useState(false);
|
||||
const [detailError, setDetailError] = useState(false);
|
||||
useEffect(() => {
|
||||
if (!detailId) return;
|
||||
const controller = new AbortController();
|
||||
setDetailLoading(true);
|
||||
setDetailError(false);
|
||||
setSelectedTask(null);
|
||||
hermesApi.getTaskById(detailId, controller.signal)
|
||||
.then((item) => { if (!controller.signal.aborted) setSelectedTask(item); })
|
||||
.catch(() => { if (!controller.signal.aborted) setDetailError(true); })
|
||||
.finally(() => { if (!controller.signal.aborted) setDetailLoading(false); });
|
||||
return () => controller.abort();
|
||||
}, [detailId]);
|
||||
|
||||
// Fast-track CEO Directive Modal
|
||||
const [ceoModalOpen, setCeoModalOpen] = useState(false);
|
||||
const [ceoTitle, setCeoTitle] = useState('');
|
||||
@@ -185,7 +202,7 @@ export default function CorporateTasksPage() {
|
||||
<div className="flex items-center justify-between">
|
||||
<span className="text-xs font-bold text-slate-600">{cfg.label} (این صفحه)</span>
|
||||
<span className={`text-xs px-2 py-0.5 rounded-md font-bold ${cfg.bg} ${cfg.text}`}>
|
||||
{count}
|
||||
{error || loading ? 'ناموجود' : count}
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -303,7 +320,7 @@ export default function CorporateTasksPage() {
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody className="divide-y divide-slate-100 block md:table-row-group">
|
||||
{!loading && tasks.length === 0 && (
|
||||
{!loading && !error && tasks.length === 0 && (
|
||||
<tr className="block md:table-row">
|
||||
<td colSpan={7} className="p-12 text-center text-slate-500 text-sm block md:table-cell">
|
||||
<div className="max-w-xs mx-auto space-y-2">
|
||||
@@ -416,7 +433,7 @@ export default function CorporateTasksPage() {
|
||||
<td className="block md:table-cell p-0 md:p-3.5 md:pl-5 pt-3 md:pt-3.5 align-top">
|
||||
<button
|
||||
className="w-full md:w-auto inline-flex items-center justify-center gap-2 px-3.5 py-2 rounded-xl text-xs sm:text-sm font-semibold text-slate-700 bg-slate-100 hover:bg-slate-200 border border-slate-200 shadow-sm active:scale-[0.98] transition-all cursor-pointer"
|
||||
onClick={() => setSelectedTask(task)}
|
||||
onClick={() => setDetailId(task.id)}
|
||||
>
|
||||
<Eye className="w-4 h-4 text-slate-600" />
|
||||
<span>جزئیات و مکالمات</span>
|
||||
@@ -430,7 +447,7 @@ export default function CorporateTasksPage() {
|
||||
</div>
|
||||
|
||||
{/* صفحهبندی */}
|
||||
<nav
|
||||
{!error && !loading && <nav
|
||||
aria-label="صفحهبندی"
|
||||
className="flex flex-col sm:flex-row items-center justify-between gap-4 p-4 bg-white rounded-2xl border border-slate-200/90 shadow-sm text-sm text-slate-600"
|
||||
>
|
||||
@@ -456,8 +473,10 @@ export default function CorporateTasksPage() {
|
||||
<ChevronLeft className="w-4 h-4" />
|
||||
</button>
|
||||
</div>
|
||||
</nav>
|
||||
</nav>}
|
||||
|
||||
{detailLoading && <p role="status">در حال دریافت جزئیات تسک...</p>}
|
||||
{detailError && <div role="alert">جزئیات در دسترس نیست. <button onClick={() => { setDetailId(null); setDetailError(false); }}>بستن</button></div>}
|
||||
{/* مودال جزئیات و ریز مکالمات ایجنتها */}
|
||||
{selectedTask &&
|
||||
createPortal(
|
||||
@@ -485,7 +504,7 @@ export default function CorporateTasksPage() {
|
||||
</div>
|
||||
<button
|
||||
className="p-2 rounded-xl text-slate-500 hover:text-slate-800 hover:bg-slate-200/80 transition-colors cursor-pointer"
|
||||
onClick={() => setSelectedTask(null)}
|
||||
onClick={() => { setSelectedTask(null); setDetailId(null); }}
|
||||
>
|
||||
<X className="w-5 h-5" />
|
||||
</button>
|
||||
@@ -497,11 +516,11 @@ export default function CorporateTasksPage() {
|
||||
<div className="bg-slate-50 rounded-2xl p-4 border border-slate-200 space-y-2">
|
||||
<h3 className="text-xs font-bold text-slate-600">هدف و شرح اقدام:</h3>
|
||||
<p className="text-sm text-slate-800 leading-relaxed">{selectedTask.description}</p>
|
||||
{selectedTask.deliverableUrl && (
|
||||
{safeHttpUrl(selectedTask.deliverableUrl) && (
|
||||
<div className="pt-2 border-t border-slate-200/60 flex items-center gap-2">
|
||||
<span className="text-xs font-bold text-slate-600">خروجی زنده:</span>
|
||||
<a
|
||||
href={selectedTask.deliverableUrl}
|
||||
href={safeHttpUrl(selectedTask.deliverableUrl)}
|
||||
target="_blank"
|
||||
rel="noopener noreferrer"
|
||||
className="inline-flex items-center gap-1 text-xs font-bold text-blue-700 underline"
|
||||
@@ -522,8 +541,7 @@ export default function CorporateTasksPage() {
|
||||
</h3>
|
||||
</div>
|
||||
|
||||
{createError && <p role="alert">ثبت دستور ناموفق بود؛ ثبت در سرور تأیید نشد.</p>}
|
||||
<div className="space-y-3">
|
||||
<div className="space-y-3">
|
||||
{selectedTask.logs && selectedTask.logs.length > 0 ? (
|
||||
selectedTask.logs.map((log, idx) => {
|
||||
const isCeo = log.speaker === 'CEO';
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
|
||||
import { afterEach, beforeEach, expect, it, vi } from 'vitest';
|
||||
import Market from './MarketIntelligencePage';
|
||||
import Roadmap from './MonthlyRoadmapPage';
|
||||
import { hermesApi } from '../services/hermesApi';
|
||||
vi.mock('../services/hermesApi', () => ({ hermesApi: { getMarketInsights: vi.fn(), getMonthlyRoadmap: vi.fn() } }));
|
||||
afterEach(cleanup);
|
||||
const meta = { total: 42, page: 1, limit: 10, totalPages: 5, hasNextPage: true, hasPrevPage: false };
|
||||
beforeEach(() => vi.resetAllMocks());
|
||||
it.each([{ Component: Market, method: 'getMarketInsights' as const }, { Component: Roadmap, method: 'getMonthlyRoadmap' as const }])('uses server metadata and requests next page for $method', async ({ Component, method }) => {
|
||||
vi.mocked(hermesApi[method]).mockResolvedValue({ data: [], meta });
|
||||
render(<Component />);
|
||||
expect(await screen.findByText(/تعداد کل: 42/)).toBeDefined();
|
||||
fireEvent.click(screen.getByRole('button', { name: 'بعدی' }));
|
||||
await waitFor(() => expect(hermesApi[method]).toHaveBeenLastCalledWith(expect.objectContaining({ page: 2, limit: 10 }), expect.any(AbortSignal)));
|
||||
});
|
||||
it('shows explicit unavailable state with no fake summary', async () => {
|
||||
vi.mocked(hermesApi.getMarketInsights).mockRejectedValue(new Error('offline'));
|
||||
render(<Market />);
|
||||
expect(await screen.findByRole('alert')).toBeDefined();
|
||||
expect(screen.queryByText('مکمل مفاصل و ضدآرتروز')).toBeNull();
|
||||
});
|
||||
it('links only a supplied HTTP source', async () => {
|
||||
vi.mocked(hermesApi.getMarketInsights).mockResolvedValue({data:[{id:'1',title:'real',category:'TREND',source:'https://example.org/evidence',opportunity:'evidence',impact:'HIGH',recommendedAction:'review',status:'DISCOVERED',createdAt:'2026-10-28'}],meta});
|
||||
render(<Market />);
|
||||
expect((await screen.findByRole('link', {name:'مشاهده منبع'})).getAttribute('href')).toBe('https://example.org/evidence');
|
||||
});
|
||||
@@ -1,4 +1,7 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import HermesPagination from '../components/HermesPagination';
|
||||
import type { PageMeta } from '../services/hermesApi';
|
||||
import HermesSource from '../components/HermesSource';
|
||||
import {
|
||||
Compass,
|
||||
RefreshCw,
|
||||
@@ -29,25 +32,28 @@ export default function MarketIntelligencePage() {
|
||||
const [error, setError] = useState(false);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [reload, setReload] = useState(0);
|
||||
const [page, setPage] = useState(1);
|
||||
const [meta, setMeta] = useState<PageMeta | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
const controller = new AbortController();
|
||||
setLoading(true);
|
||||
setError(false);
|
||||
setMeta(null);
|
||||
setInsights([]);
|
||||
hermesApi
|
||||
.getMarketInsights(controller.signal)
|
||||
.getMarketInsights({ page, limit: 10, category: category || undefined }, controller.signal)
|
||||
.then((data) => {
|
||||
if (!controller.signal.aborted) setInsights(data);
|
||||
if (!controller.signal.aborted) { setInsights(data.data); setMeta(data.meta); }
|
||||
})
|
||||
.catch(() => { if (!controller.signal.aborted) setError(true); })
|
||||
.finally(() => {
|
||||
if (!controller.signal.aborted) setLoading(false);
|
||||
});
|
||||
return () => controller.abort();
|
||||
}, [reload]);
|
||||
}, [reload, page, category]);
|
||||
|
||||
const filtered = category ? insights.filter((i) => i.category === category) : insights;
|
||||
const filtered = insights;
|
||||
|
||||
return (
|
||||
<div className="p-4 sm:p-6 lg:p-8 space-y-6 max-w-7xl mx-auto" dir="rtl">
|
||||
@@ -84,19 +90,19 @@ export default function MarketIntelligencePage() {
|
||||
{/* فیلتر دستهبندی */}
|
||||
<div className="flex flex-wrap gap-2">
|
||||
<button
|
||||
onClick={() => setCategory('')}
|
||||
onClick={() => { setCategory(''); setPage(1); }}
|
||||
className={`px-3 py-1.5 rounded-xl text-xs font-bold border transition-all cursor-pointer ${
|
||||
category === ''
|
||||
? 'bg-slate-900 text-white border-slate-900 shadow-xs'
|
||||
: 'bg-white text-slate-600 border-slate-200 hover:bg-slate-50'
|
||||
}`}
|
||||
>
|
||||
همه بینشها ({insights.length})
|
||||
همه بینشها
|
||||
</button>
|
||||
{Object.entries(categoryLabels).map(([k, v]) => (
|
||||
<button
|
||||
key={k}
|
||||
onClick={() => setCategory(k)}
|
||||
onClick={() => { setCategory(k); setPage(1); }}
|
||||
className={`px-3 py-1.5 rounded-xl text-xs font-bold border transition-all cursor-pointer ${
|
||||
category === k
|
||||
? 'bg-slate-900 text-white border-slate-900 shadow-xs'
|
||||
@@ -149,13 +155,14 @@ export default function MarketIntelligencePage() {
|
||||
</div>
|
||||
|
||||
<div className="pt-3 border-t border-slate-100 flex items-center justify-between text-[11px] text-slate-400">
|
||||
<span>منبع داده: {item.source}</span>
|
||||
<HermesSource source={item.source} />
|
||||
<span>ثبت: {date(item.createdAt)}</span>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
<HermesPagination meta={meta} loading={loading} onPage={setPage} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -1,4 +1,6 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import HermesPagination from '../components/HermesPagination';
|
||||
import type { PageMeta } from '../services/hermesApi';
|
||||
import {
|
||||
Calendar,
|
||||
CheckCircle2,
|
||||
@@ -17,25 +19,28 @@ export default function MonthlyRoadmapPage() {
|
||||
const [error, setError] = useState(false);
|
||||
const [loading, setLoading] = useState(true);
|
||||
const [reload, setReload] = useState(0);
|
||||
const [page, setPage] = useState(1);
|
||||
const [meta, setMeta] = useState<PageMeta | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
const controller = new AbortController();
|
||||
setLoading(true);
|
||||
setError(false);
|
||||
setMeta(null);
|
||||
setRoadmap([]);
|
||||
hermesApi
|
||||
.getMonthlyRoadmap(controller.signal)
|
||||
.getMonthlyRoadmap({ page, limit: 10 }, controller.signal)
|
||||
.then((data) => {
|
||||
if (!controller.signal.aborted) setRoadmap(data);
|
||||
if (!controller.signal.aborted) { setRoadmap(data.data); setMeta(data.meta); }
|
||||
})
|
||||
.catch(() => { if (!controller.signal.aborted) setError(true); })
|
||||
.finally(() => {
|
||||
if (!controller.signal.aborted) setLoading(false);
|
||||
});
|
||||
return () => controller.abort();
|
||||
}, [reload]);
|
||||
}, [reload, page]);
|
||||
|
||||
const activePlan = roadmap.find((item) => item.isActive);
|
||||
// Render every persisted cycle in the selected server page, not just the first.
|
||||
|
||||
return (
|
||||
<div className="p-4 sm:p-6 lg:p-8 space-y-6 max-w-7xl mx-auto" dir="rtl">
|
||||
@@ -69,13 +74,14 @@ export default function MonthlyRoadmapPage() {
|
||||
{error && <p role="alert">دادهها در دسترس نیست؛ دریافت از سرور ناموفق بود.</p>}
|
||||
{!loading && !error && roadmap.length === 0 && <p>هنوز دادهای ثبت نشده است.</p>}
|
||||
|
||||
{roadmap.map((activePlan) => <section key={activePlan.id} className="space-y-6">
|
||||
{/* بنر چرخه فعال */}
|
||||
{activePlan && (
|
||||
<div className="bg-gradient-to-l from-purple-900 to-indigo-900 text-white rounded-3xl p-6 sm:p-8 shadow-xl relative overflow-hidden">
|
||||
<div className="relative z-10 space-y-4 max-w-3xl">
|
||||
<div className="inline-flex items-center gap-2 px-3 py-1 rounded-full bg-white/10 backdrop-blur-md text-xs font-semibold text-purple-200 border border-white/15">
|
||||
<Sparkles className="w-3.5 h-3.5 text-amber-300" />
|
||||
<span>چرخه استراتژیک فعال: {activePlan.month}</span>
|
||||
<span>چرخه استراتژیک {activePlan.isActive ? 'فعال' : 'بایگانی'}: {activePlan.month}</span>
|
||||
</div>
|
||||
|
||||
<h2 className="text-2xl sm:text-3xl font-black tracking-tight">{activePlan.cycleName}</h2>
|
||||
@@ -100,7 +106,7 @@ export default function MonthlyRoadmapPage() {
|
||||
<FileText className="w-4 h-4" />
|
||||
</div>
|
||||
</div>
|
||||
<div className="text-3xl font-black text-slate-900">{activePlan.plannedArticlesCount} <span className="text-sm font-normal text-slate-500">مقاله</span></div>
|
||||
<div className="text-3xl font-black text-slate-900">{typeof activePlan.plannedArticlesCount === 'number' ? activePlan.plannedArticlesCount : 'ناموجود'} <span className="text-sm font-normal text-slate-500">مقاله</span></div>
|
||||
<p className="text-xs text-slate-500 leading-relaxed">
|
||||
هدف: روزانه یک مقاله جدید؛ بازنگری مقالات جایگزین این هدف نیست.
|
||||
</p>
|
||||
@@ -126,7 +132,7 @@ export default function MonthlyRoadmapPage() {
|
||||
<Package className="w-4 h-4" />
|
||||
</div>
|
||||
</div>
|
||||
<div className="text-3xl font-black text-slate-900">{activePlan.plannedCatalogEnrichments} <span className="text-sm font-normal text-slate-500">محصول / ماده</span></div>
|
||||
<div className="text-3xl font-black text-slate-900">{typeof activePlan.plannedCatalogEnrichments === 'number' ? activePlan.plannedCatalogEnrichments : 'ناموجود'} <span className="text-sm font-normal text-slate-500">محصول / ماده</span></div>
|
||||
<p className="text-xs text-slate-500 leading-relaxed">
|
||||
تکمیل ۵ تب مشخصات کالاها و لینک دوطرفه با دانشنامه ترکیبات کنینا.
|
||||
</p>
|
||||
@@ -157,6 +163,8 @@ export default function MonthlyRoadmapPage() {
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</section>)}
|
||||
<HermesPagination meta={meta} loading={loading} onPage={setPage} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user