diff --git a/frontend/admin-panel/src/components/HermesPagination.tsx b/frontend/admin-panel/src/components/HermesPagination.tsx new file mode 100644 index 00000000..3ff0fb5a --- /dev/null +++ b/frontend/admin-panel/src/components/HermesPagination.tsx @@ -0,0 +1,10 @@ +import type { PageMeta } from '../services/hermesApi'; +export default function HermesPagination({ meta, loading, onPage }: { meta: PageMeta | null; loading: boolean; onPage: (page: number) => void }) { + if (!meta) return null; + return ; +} diff --git a/frontend/admin-panel/src/components/HermesSource.test.tsx b/frontend/admin-panel/src/components/HermesSource.test.tsx new file mode 100644 index 00000000..aefb361b --- /dev/null +++ b/frontend/admin-panel/src/components/HermesSource.test.tsx @@ -0,0 +1,10 @@ +import { cleanup, render, screen } from '@testing-library/react'; +import { afterEach, expect, it } from 'vitest'; +import HermesSource, { safeHttpUrl } from './HermesSource'; +afterEach(cleanup); +it.each(['javascript:alert(1)', 'data:text/html,hi', 'canina://internal/1', 'not a URL'])('does not link unsafe/unavailable source %s', (source) => { + expect(safeHttpUrl(source)).toBeUndefined(); + render(); + expect(screen.queryByRole('link')).toBeNull(); + expect(screen.getByText(/پیوند منبع در دسترس نیست/)).toBeDefined(); +}); diff --git a/frontend/admin-panel/src/components/HermesSource.tsx b/frontend/admin-panel/src/components/HermesSource.tsx new file mode 100644 index 00000000..a38ce4e7 --- /dev/null +++ b/frontend/admin-panel/src/components/HermesSource.tsx @@ -0,0 +1,9 @@ +export function safeHttpUrl(value?: string): string | undefined { + if (!value) return undefined; + try { const url = new URL(value); return ['http:', 'https:'].includes(url.protocol) ? url.href : undefined; } + catch { return undefined; } +} +export default function HermesSource({ source }: { source?: string }) { + const url = safeHttpUrl(source); + return منبع داده: {source || 'ناموجود'} — {url ? مشاهده منبع : 'پیوند منبع در دسترس نیست'}; +} diff --git a/frontend/admin-panel/src/pages/CorporateTasksPage.test.tsx b/frontend/admin-panel/src/pages/CorporateTasksPage.test.tsx index 7f7e5d20..59766883 100644 --- a/frontend/admin-panel/src/pages/CorporateTasksPage.test.tsx +++ b/frontend/admin-panel/src/pages/CorporateTasksPage.test.tsx @@ -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(); + 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(); + 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(); expect(await screen.findByText('مدیریت و پایش وظایف دپارتمان‌ها')).toBeDefined(); diff --git a/frontend/admin-panel/src/pages/CorporateTasksPage.tsx b/frontend/admin-panel/src/pages/CorporateTasksPage.tsx index b3ee6df0..4afdaee2 100644 --- a/frontend/admin-panel/src/pages/CorporateTasksPage.tsx +++ b/frontend/admin-panel/src/pages/CorporateTasksPage.tsx @@ -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(null); + const [detailId, setDetailId] = useState(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() {
{cfg.label} (این صفحه) - {count} + {error || loading ? 'ناموجود' : count}
@@ -303,7 +320,7 @@ export default function CorporateTasksPage() { - {!loading && tasks.length === 0 && ( + {!loading && !error && tasks.length === 0 && (
@@ -416,7 +433,7 @@ export default function CorporateTasksPage() {
{/* صفحه‌بندی */} - + } + {detailLoading &&

در حال دریافت جزئیات تسک...

} + {detailError &&
جزئیات در دسترس نیست.
} {/* مودال جزئیات و ریز مکالمات ایجنت‌ها */} {selectedTask && createPortal( @@ -485,7 +504,7 @@ export default function CorporateTasksPage() { @@ -497,11 +516,11 @@ export default function CorporateTasksPage() {

هدف و شرح اقدام:

{selectedTask.description}

- {selectedTask.deliverableUrl && ( + {safeHttpUrl(selectedTask.deliverableUrl) && (
خروجی زنده:
- {createError &&

ثبت دستور ناموفق بود؛ ثبت در سرور تأیید نشد.

} -
+
{selectedTask.logs && selectedTask.logs.length > 0 ? ( selectedTask.logs.map((log, idx) => { const isCeo = log.speaker === 'CEO'; diff --git a/frontend/admin-panel/src/pages/HermesLists.test.tsx b/frontend/admin-panel/src/pages/HermesLists.test.tsx new file mode 100644 index 00000000..587a33b3 --- /dev/null +++ b/frontend/admin-panel/src/pages/HermesLists.test.tsx @@ -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(); + 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(); + 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(); + expect((await screen.findByRole('link', {name:'مشاهده منبع'})).getAttribute('href')).toBe('https://example.org/evidence'); +}); diff --git a/frontend/admin-panel/src/pages/MarketIntelligencePage.tsx b/frontend/admin-panel/src/pages/MarketIntelligencePage.tsx index 2425dd13..e8ab1730 100644 --- a/frontend/admin-panel/src/pages/MarketIntelligencePage.tsx +++ b/frontend/admin-panel/src/pages/MarketIntelligencePage.tsx @@ -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(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 (
@@ -84,19 +90,19 @@ export default function MarketIntelligencePage() { {/* فیلتر دسته‌بندی */}
{Object.entries(categoryLabels).map(([k, v]) => (
- منبع داده: {item.source} + ثبت: {date(item.createdAt)}
); })}
+
); } diff --git a/frontend/admin-panel/src/pages/MonthlyRoadmapPage.tsx b/frontend/admin-panel/src/pages/MonthlyRoadmapPage.tsx index 4572e630..1783ac3f 100644 --- a/frontend/admin-panel/src/pages/MonthlyRoadmapPage.tsx +++ b/frontend/admin-panel/src/pages/MonthlyRoadmapPage.tsx @@ -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(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 (
@@ -69,13 +74,14 @@ export default function MonthlyRoadmapPage() { {error &&

داده‌ها در دسترس نیست؛ دریافت از سرور ناموفق بود.

} {!loading && !error && roadmap.length === 0 &&

هنوز داده‌ای ثبت نشده است.

} + {roadmap.map((activePlan) =>
{/* بنر چرخه فعال */} {activePlan && (
- چرخه استراتژیک فعال: {activePlan.month} + چرخه استراتژیک {activePlan.isActive ? 'فعال' : 'بایگانی'}: {activePlan.month}

{activePlan.cycleName}

@@ -100,7 +106,7 @@ export default function MonthlyRoadmapPage() {
-
{activePlan.plannedArticlesCount} مقاله
+
{typeof activePlan.plannedArticlesCount === 'number' ? activePlan.plannedArticlesCount : 'ناموجود'} مقاله

هدف: روزانه یک مقاله جدید؛ بازنگری مقالات جایگزین این هدف نیست.

@@ -126,7 +132,7 @@ export default function MonthlyRoadmapPage() {
-
{activePlan.plannedCatalogEnrichments} محصول / ماده
+
{typeof activePlan.plannedCatalogEnrichments === 'number' ? activePlan.plannedCatalogEnrichments : 'ناموجود'} محصول / ماده

تکمیل ۵ تب مشخصات کالاها و لینک دوطرفه با دانشنامه ترکیبات کنینا.

@@ -157,6 +163,8 @@ export default function MonthlyRoadmapPage() { )} + )} + ); } diff --git a/frontend/admin-panel/src/services/hermesApi.test.ts b/frontend/admin-panel/src/services/hermesApi.test.ts index c42aede4..7db4ade3 100644 --- a/frontend/admin-panel/src/services/hermesApi.test.ts +++ b/frontend/admin-panel/src/services/hermesApi.test.ts @@ -4,11 +4,29 @@ import { hermesApi } from './hermesApi'; vi.mock('./api', () => ({ default: { get: vi.fn(), post: vi.fn() } })); beforeEach(() => vi.resetAllMocks()); describe('Hermes API honesty', () => { + it('preserves pagination in market envelopes', async () => { + const result = { data: [], meta: { total: 20, page: 2, limit: 10, totalPages: 2, hasNextPage: false, hasPrevPage: true } }; + vi.mocked(api.get).mockResolvedValue({ data: result }); + expect(await hermesApi.getMarketInsights({ page: 2, limit: 10 })).toEqual(result); + }); + it('rejects malformed successful create responses', async () => { + vi.mocked(api.post).mockResolvedValue({ data: { success: false } }); + await expect(hermesApi.createCeoTask({title:'test',description:'test',department:'CONTENT_SEO'})).rejects.toThrow(); + }); it.each(['getTasks', 'getTaskById', 'getMarketInsights', 'getMonthlyRoadmap'] as const)('%s rejects unavailable service', async (method) => { vi.mocked(api.get).mockRejectedValue(new Error('unavailable')); const result = method === 'getTaskById' ? hermesApi.getTaskById('real-id') : hermesApi[method](); await expect(result).rejects.toThrow('unavailable'); }); + it('supports service-unwrapped nested list envelopes', async () => { + const result = {data:[],meta:{total:0,page:1,limit:10,totalPages:0,hasNextPage:false,hasPrevPage:false}}; + vi.mocked(api.get).mockResolvedValue({data:{data:result}}); + expect(await hermesApi.getMonthlyRoadmap()).toEqual(result); + }); + it('rejects malformed lists rather than rendering measured zero', async () => { + vi.mocked(api.get).mockResolvedValue({data:{data:[]}}); + await expect(hermesApi.getTasks()).rejects.toThrow('پاسخ صفحه'); + }); it('never fabricates successful creation', async () => { vi.mocked(api.post).mockRejectedValue(new Error('not saved')); await expect(hermesApi.createCeoTask({ title: 'directive', description: 'acceptance', department: 'CONTENT_SEO' })).rejects.toThrow('not saved'); diff --git a/frontend/admin-panel/src/services/hermesApi.ts b/frontend/admin-panel/src/services/hermesApi.ts index 7afd4ad2..ee69c27d 100644 --- a/frontend/admin-panel/src/services/hermesApi.ts +++ b/frontend/admin-panel/src/services/hermesApi.ts @@ -89,10 +89,26 @@ export interface MonthlyRoadmapItem { createdAt: string; } +export type PageMeta = TasksResponse['meta']; +export interface PaginatedResponse { data: T[]; meta: PageMeta } +export interface ListParams { page?: number; limit?: number; category?: string } + +function pageResult(body: unknown): PaginatedResponse { + const outer = body as { data?: unknown; meta?: unknown } | null; + const result = (outer?.meta ? outer : outer?.data) as PaginatedResponse | undefined; + if (!Array.isArray(result?.data) || !result?.meta || + !Number.isFinite(result.meta.total) || !Number.isFinite(result.meta.page) || + !Number.isFinite(result.meta.totalPages) || !Number.isFinite(result.meta.limit) || + typeof result.meta.hasNextPage !== 'boolean' || typeof result.meta.hasPrevPage !== 'boolean') { + throw new Error('پاسخ صفحه‌بندی سرور معتبر نیست.'); + } + return result; +} + export const hermesApi = { getTasks: async (params: TaskFilterParams = {}, signal?: AbortSignal): Promise => { const response = await api.get('/admin/hermes/tasks', { params, signal }); - return response.data; + return pageResult(response.data); }, getTaskById: async (id: string, signal?: AbortSignal): Promise => { const response = await api.get(`/admin/hermes/tasks/${encodeURIComponent(id)}`, { signal }); @@ -104,12 +120,12 @@ export const hermesApi = { if (!item?.id || !item?.taskCode) throw new Error('پاسخ ثبت تسک معتبر نیست؛ ثبت تأیید نشد.'); return item; }, - getMarketInsights: async (signal?: AbortSignal): Promise => { - const response = await api.get('/admin/hermes/market-insights', { signal }); - return response.data?.data ?? response.data; + getMarketInsights: async (params: ListParams = {}, signal?: AbortSignal): Promise> => { + const response = await api.get('/admin/hermes/market-insights', { params, signal }); + return pageResult(response.data); }, - getMonthlyRoadmap: async (signal?: AbortSignal): Promise => { - const response = await api.get('/admin/hermes/monthly-roadmap', { signal }); - return response.data?.data ?? response.data; + getMonthlyRoadmap: async (params: ListParams = {}, signal?: AbortSignal): Promise> => { + const response = await api.get('/admin/hermes/monthly-roadmap', { params, signal }); + return pageResult(response.data); }, }; diff --git a/specs/corporate-ui/evidence.md b/specs/corporate-ui/evidence.md new file mode 100644 index 00000000..06d720ef --- /dev/null +++ b/specs/corporate-ui/evidence.md @@ -0,0 +1,5 @@ +# Local verification +Urgent commit 38efc97: six API tests RED (synthetic reads/create resolved and detail envelope wrong), then nine targeted tests GREEN; admin Vite build passed. +Integrated RED: four failures (server meta discarded; page crashes on envelope; no source link); detail test RED confirmed no detail request. Implemented pageResult envelope validation, server category/page/limit and metadata navigation, all roadmap cycles displayed, HTTP(S) source links, authenticated existing Axios create and independent detail fetch, unavailable/empty/loading separation. +Full admin suite before final extra edge-case tests: 56 files / 358 tests passed, typecheck passed, Vite build passed (2444 modules, 4.76s). Logs outside Git at /opt/data/cache/scratch/corporate-ui-admin-{tests,build}.log. Final full rerun: 57 files / 364 tests passed; typecheck and git diff --check passed. Final log /opt/data/cache/scratch/corporate-ui-admin-tests-final.log. Tests use mocked API contracts, not live backend or database; parent owns integrated Stage acceptance. No push/deployment/backend/runtime/cron changes. Shared dependency symlink is ignored. Graph cache query stamp is excluded from commits. +Limitations: roadmap persisted type has no source URL; no synthetic provenance field introduced. Market source links only when existing source contains HTTP(S). No clinical content, budget, quota or worker behavior changed. Daily one-new-article goal is explicit and refresh work is separately needs-based. No approvals modules. diff --git a/specs/corporate-ui/tasks.md b/specs/corporate-ui/tasks.md index c5b77350..dbc2362e 100644 --- a/specs/corporate-ui/tasks.md +++ b/specs/corporate-ui/tasks.md @@ -1,5 +1,5 @@ # Tasks -1. [ ] Write and run RED regression tests for failed API reads/create and page unavailable states. -2. [ ] Remove synthetic fallback/summaries, add explicit errors; run tests and build; urgent commit. -3. [ ] Implement paginated market/roadmap with API meta and source links; detail API read. -4. [ ] Run targeted/full admin tests and build; record exact results and local-only commits. +1. [x] Write and run RED regression tests for failed API reads/create and page unavailable states. +2. [x] Remove synthetic fallback/summaries, add explicit errors; run tests and build; urgent commit. +3. [x] Implement paginated market/roadmap with API meta and source links; detail API read. +4. [x] Run targeted/full admin tests and build; record exact results and local-only commits.