diff --git a/frontend/src/app/admin/milestone/list/[slug]/page.tsx b/frontend/src/app/admin/milestone/list/[slug]/page.tsx index cd6ebbe6..65d3073b 100644 --- a/frontend/src/app/admin/milestone/list/[slug]/page.tsx +++ b/frontend/src/app/admin/milestone/list/[slug]/page.tsx @@ -8,6 +8,8 @@ import { convertMilestoneHistoryStatus } from '@/lib/utils/utils'; import FilePreview from './components/FilePreview'; import MilestoneHistoryStatusChangeButton from './components/MilestoneHistoryStatusChangeButton'; import { notFound } from 'next/navigation'; +import { AuthSliceState } from '@/store/auth.slice'; +import { getAuthFromCookie } from '@/lib/utils/auth'; interface MilestoneHistoryDetailPageProps { params: { @@ -16,9 +18,10 @@ interface MilestoneHistoryDetailPageProps { } const Page = async ({ params: { slug } }: MilestoneHistoryDetailPageProps) => { + const auth: AuthSliceState = getAuthFromCookie(); let history; try { - history = await getMilestoneHistory(slug); + history = await getMilestoneHistory(slug, auth.token); } catch (e) { // TODO: server api error handling... } diff --git a/frontend/src/app/admin/milestone/list/page.tsx b/frontend/src/app/admin/milestone/list/page.tsx index b07d1af8..af521a30 100644 --- a/frontend/src/app/admin/milestone/list/page.tsx +++ b/frontend/src/app/admin/milestone/list/page.tsx @@ -8,16 +8,20 @@ import { getMilestoneHistories } from '@/lib/api/server.api'; import MilestoneHistoryTable from './components/MilestoneHistoryTable'; import MilestoneHistoryExcelFileDownloadButton from './components/MilestoneHistoryTable/MilestoneHistoryExcelFileDownloadButton.tsx'; +import { AuthSliceState } from '@/store/auth.slice'; +import { getAuthFromCookie } from '@/lib/utils/auth'; const Page = async ({ searchParams }: { searchParams?: { [key: string]: string | undefined } }) => { const headersList = headers(); const pathname = headersList.get('x-pathname') || ''; + const auth: AuthSliceState = getAuthFromCookie(); + const page = searchParams?.page ? parseInt(searchParams.page, 10) : 1; const field = searchParams?.field ? parseInt(searchParams.field, 10) : 0; const keyword = searchParams?.keyword ? searchParams.keyword : ''; - const milestoneHistories = await getMilestoneHistories(field, keyword, page - 1); + const milestoneHistories = await getMilestoneHistories(auth.token, field, keyword, page - 1); return (