diff --git a/src/app/(pages)/(main)/assign/page.tsx b/src/app/(pages)/(main)/assign/page.tsx index ef3f64d..3a4a595 100644 --- a/src/app/(pages)/(main)/assign/page.tsx +++ b/src/app/(pages)/(main)/assign/page.tsx @@ -11,20 +11,26 @@ import {DataTableColumn} from "@/components/data-table/DataTable.type"; import {SmsSendDialog} from "@/components/dialog/SmsSendDialog"; import {AssignMonitoringDialog} from "@/components/dialog/AssignMonitoringDialog"; import {useCodesQuery} from "@/query/code"; -import {usePerformanceListQuery} from "@/query/performance"; +import {usePerformanceDetailQuery, usePerformanceListQuery} from "@/query/performance"; import { useMonitoringApplyUserCountsQuery, useMonitoringApplyUsersQuery, useSaveMonitoringAssignMutation, } from "@/query/assign"; import {filterPerformance, getCodeLabel} from "@/lib/gwcf/view"; -import {MONITORING_ASSIGN_TYPE} from "@/lib/gwcf/performance-status"; +import { + isAssignConfirmed, + isAssignRejected, isAssignRequested, + MONITORING_ASSIGN_TYPE +} from "@/lib/gwcf/performance-status"; import {PerformanceAssign, PerformanceFull} from "@/types/gwcf"; import {useDialog} from "@/hooks/useDialog"; import {useMounted} from "@/hooks/useMounted"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {SMS_TEMPLATE_IDS} from "@/query/notification"; import {buildPerformanceSmsParams} from "@/lib/gwcf/notification"; +import {PERFORMANCE_FIELD_LABELS} from "@/lib/gwcf/field-labels"; +import {useDebouncedValue} from "@/hooks/useDebouncedValue"; const AssignPage = () => { const mounted = useMounted(); @@ -41,11 +47,18 @@ const AssignPage = () => { monitoringDate: "", keyword: "", }); + const debouncedFilters = useDebouncedValue(filters); const [selected, setSelected] = useState(null); - const smsAddParam = useMemo(() => selected ? buildPerformanceSmsParams(selected) : {}, [selected]); - const [assignSaveTargetIds, setAssignSaveTargetIds] = useState([]); + const filtersInitializedRef = useRef(false); + + type SmsMode = "assignConfirm" | "normal"; + const [smsMode, setSmsMode] = useState("assignConfirm"); const [smsTargetIds, setSmsTargetIds] = useState([]); + const [smsTemplateIdx, setSmsTemplateIdx] = useState([]); + const [smsDialogTitle, setSmsDialogTitle] = useState(""); + const [newSmsTemplateIdx, setNewSmsTemplateIdx] = useState(undefined); + const smsAddParam = useMemo(() => selected ? buildPerformanceSmsParams(selected) : {}, [selected]); const refreshAssignList = () => { void refetchPerformanceList(); @@ -54,9 +67,17 @@ const AssignPage = () => { const updateFilters = (updater: (prev: typeof filters) => typeof filters) => { setFilters(updater); - refreshAssignList(); }; + useEffect(() => { + if (!filtersInitializedRef.current) { + filtersInitializedRef.current = true; + return; + } + + refreshAssignList(); + }, [debouncedFilters, refetchApplyCounts, refetchPerformanceList]); + useEffect(() => { hideDialog("assignMonitoringDialog"); hideDialog("assignSmsSendDialog"); @@ -82,13 +103,13 @@ const AssignPage = () => { const filteredData = useMemo(() => { return data - .filter((item) => filterPerformance(item, filters)) + .filter((item) => filterPerformance(item, debouncedFilters)) .sort((a, b) => { const aDate = a.performanceMonitoringSchedule?.monitoringDate ?? ""; const bDate = b.performanceMonitoringSchedule?.monitoringDate ?? ""; return bDate.localeCompare(aDate); }); - }, [data, filters]); + }, [data, debouncedFilters]); const openAssign = (performance: PerformanceFull) => { suppressAssignCloseRef.current = false; @@ -114,29 +135,76 @@ const AssignPage = () => { return (performance.performanceAssignList ?? []).filter((assign) => assign.assignType === MONITORING_ASSIGN_TYPE); }; + const smsBeforeSendProps = + smsMode === "assignConfirm" + ? { + isBeforeSendPending: saveAssignMutation.isPending, + onBeforeDefaultTemplateSend: async () => { + if (!selected) throw new Error("공연 정보가 없습니다."); + + const monitoringAssigns = await saveAssignMutation.mutateAsync({ + performanceId: selected.id, + userIds: assignSaveTargetIds, + }); + + applySavedAssignsToSelected(selected.id, monitoringAssigns); + }, + onSent: refreshAssignList, + } + : {}; + const columns = useMemo[]>(() => [ - {accessorKey: "id", header: "연번", cell: ({row}) => row.original.id, enableSorting: true}, - {accessorKey: "performanceName", header: "사업명", enableSorting: true}, - {id: "area", header: "지역", cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)}, - {accessorKey: "performanceDtInfo", header: "사업 일정"}, - {accessorKey: "performanceTimeInfo", header: "운영 시간"}, - {id: "monitoringDate", header: "모니터링 일정", cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate ?? "", enableSorting: true}, - {id: "monitoringTime", header: "모니터링 시간", cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringTimeInfo ?? ""}, - {id: "applyCount", header: "신청자 수", cell: ({row}) => applyCountMap.get(String(row.original.id)) ?? 0, enableSorting: true}, - {id: "requestCount", header: "확정요청 수", cell: ({row}) => getMonitoringAssigns(row.original).length}, - {id: "confirmedCount", header: "확정인원 수", cell: ({row}) => getMonitoringAssigns(row.original).filter((assign) => assign.assignConfirm).length}, + {accessorKey: "id", header: PERFORMANCE_FIELD_LABELS.id, cell: ({row}) => row.original.id}, + { + accessorKey: "performanceName", + header: PERFORMANCE_FIELD_LABELS.performanceName, + cell: ({row}) => ( +
+ {row.original.performanceName} +
+ ), + }, + {id: "area", header: PERFORMANCE_FIELD_LABELS.performanceArea, cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)}, + { + accessorKey: "performanceDtInfo", + header: PERFORMANCE_FIELD_LABELS.performanceDtInfo, + cell: ({row}) => ( +
+ {row.original.performanceDtInfo} +
+ ), + enableSorting: false + }, + { + accessorKey: "performanceTimeInfo", + header: PERFORMANCE_FIELD_LABELS.performanceTimeInfo, + cell: ({row}) => ( +
+ {row.original.performanceTimeInfo} +
+ ), + enableSorting: false + }, + {id: "monitoringDate", header: PERFORMANCE_FIELD_LABELS.monitoringDate, accessorFn:(row) => row.performanceMonitoringSchedule?.monitoringDate ?? "", cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate ?? ""}, + {id: "monitoringTime", header: PERFORMANCE_FIELD_LABELS.monitoringTimeInfo, cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringTimeInfo ?? ""}, + {id: "applyCount", header: "신청자 수", accessorFn:((row) => applyCountMap.get(String(row.id)) ?? 0), cell: ({row}) => applyCountMap.get(String(row.original.id)) ?? 0}, + {id: "requestedCount", header: "확정요청 수", accessorFn:((row) => getMonitoringAssigns(row).filter(isAssignRequested).length), cell: ({row}) => getMonitoringAssigns(row.original).filter(isAssignRequested).length}, + {id: "rejectedCount", header: "포기인원 수", accessorFn:((row) => getMonitoringAssigns(row).filter(isAssignRejected).length), cell: ({row}) => getMonitoringAssigns(row.original).filter(isAssignRejected).length}, + {id: "confirmedCount", header: "확정인원 수", accessorFn:((row) => getMonitoringAssigns(row).filter(isAssignConfirmed).length), cell: ({row}) => getMonitoringAssigns(row.original).filter(isAssignConfirmed).length}, ], [applyCountMap, codes]); + const {data: detailData} = usePerformanceDetailQuery(selected?.id ?? 0, Boolean(selected?.id && assignOpen)); + if(!mounted) return return (
- updateFilters((prev) => ({...prev, businessType: value}))} options={codes.business_type} placeholder="사업 유형" /> - updateFilters((prev) => ({...prev, area: value}))} options={codes.area} placeholder="지역" /> + updateFilters((prev) => ({...prev, businessType: value}))} options={codes.business_type} placeholder={PERFORMANCE_FIELD_LABELS.businessType} /> + updateFilters((prev) => ({...prev, area: value}))} options={codes.area} placeholder={PERFORMANCE_FIELD_LABELS.performanceArea} /> updateFilters((prev) => ({...prev, monitoringDate: event.target.value}))} /> - updateFilters((prev) => ({...prev, keyword: event.target.value}))} placeholder="연번 or 사업명" /> + updateFilters((prev) => ({...prev, keyword: event.target.value}))} placeholder={`${PERFORMANCE_FIELD_LABELS.id} or ${PERFORMANCE_FIELD_LABELS.performanceName}`} />
); diff --git a/src/app/(pages)/(main)/monitoring/page.tsx b/src/app/(pages)/(main)/monitoring/page.tsx index 4f00699..f143a2a 100644 --- a/src/app/(pages)/(main)/monitoring/page.tsx +++ b/src/app/(pages)/(main)/monitoring/page.tsx @@ -17,13 +17,16 @@ import {useMounted} from "@/hooks/useMounted"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {toLocalDateString} from "@/lib/gwcf/date"; import { - getMonitoringDisplayRow, + getMonitoringDisplayRow, getMonitoringDisplayStatus, isAssignConfirmed, } from "@/lib/gwcf/performance-status"; +import {PERFORMANCE_FIELD_LABELS} from "@/lib/gwcf/field-labels"; +import {getCodeLabel} from "@/lib/gwcf/view"; +import {StatusPill} from "@/components/gwcf/StatusPill"; const today = toLocalDateString(); const todayTime = new Date(`${today}T00:00:00`).getTime(); -const toDateTime = (date?: string) => { +const toDateTime = (date?: string | null) => { if (!date) return Number.POSITIVE_INFINITY; const time = new Date(`${date}T00:00:00`).getTime(); return Number.isNaN(time) ? Number.POSITIVE_INFINITY : time; @@ -75,7 +78,6 @@ const MonitoringPage = () => { const userId = auth.user?.userId; const [selectedId, setSelectedId] = useState(null); - const [detailId, setDetailId] = useState(null); const [visitMode, setVisitMode] = useState<"departure" | "arrival">("departure"); const refreshMonitoringList = () => { @@ -85,7 +87,7 @@ const MonitoringPage = () => { const assignedItems = useMemo(() => { if (!userId) return []; return data.filter((item) => - item.performanceAssignList?.some((assign) => assign.assignUser === userId && assign.assignConfirm) + item.performanceAssignList?.some((assign) => assign.assignUser === userId && isAssignConfirmed(assign)) ); }, [data, userId]); @@ -97,11 +99,6 @@ const MonitoringPage = () => { return sortedItems.find((item) => item.id === selectedId) ?? sortedItems[0] ?? null; }, [selectedId, sortedItems]); - const detailSelected = useMemo(() => { - if (!detailId) return null; - return sortedItems.find((item) => item.id === detailId) ?? null; - }, [detailId, sortedItems]); - const selectedMonitoringRow = useMemo(() => { if (!selected || !userId) return undefined; return ([0, 1] as const) @@ -114,28 +111,45 @@ const MonitoringPage = () => { const columns = useMemo[]>(() => [ { accessorKey: "performanceName", - header: "사업명", - cell: ({row}) => ( -
- {row.original.performanceName} + header: PERFORMANCE_FIELD_LABELS.performanceName, + cell: ({row}) => { + if (!row.original || !userId) return undefined; + const prow = ([0, 1] as const) + .map((index) => getMonitoringDisplayRow(row.original, index)) + .find((item) => item.userId === userId); + + const latestVisit = prow?.slot.visit?.[0]; + const status = prow + ? getMonitoringDisplayStatus( + prow, + getCodeLabel(codes, "monitoring_visit_status", latestVisit?.monitoringVisitStatus), + getCodeLabel(codes, "review_status", prow?.review?.reviewStatus) + ) + : {label: "미배치", variant: "danger" as const}; + + return ( +
+ {row.original.performanceName}
+ {status.label}
- ), + ) + }, }, { id: "monitoringDate", - header: "일정", - cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate?.slice(5) || "-", + header: PERFORMANCE_FIELD_LABELS.monitoringDate, + cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate?.slice(5) ?? "", }, { id: "monitoringTime", - header: "시간", + header: PERFORMANCE_FIELD_LABELS.monitoringTimeInfo, cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringTimeInfo || "-", }, - ], []); + ], [codes]); const visitOpen = isDialogOpen("monitoringVisitDialog"); const detailOpen = isDialogOpen("monitoringDetailDialog"); - const {data: detailData} = usePerformanceDetailQuery(detailId ?? 0, Boolean(detailId && detailOpen)); + const {data: detailData} = usePerformanceDetailQuery(selectedId ?? 0, Boolean(selectedId && detailOpen)); const openVisit = (mode: "departure" | "arrival") => { setVisitMode(mode); @@ -239,14 +253,14 @@ const MonitoringPage = () => { {selected && (
- {selected.performanceMonitoringSchedule?.monitoringDate} {selected.performanceMonitoringSchedule?.monitoringTimeInfo} + {[selected.performanceMonitoringSchedule?.monitoringDate, selected.performanceMonitoringSchedule?.monitoringTimeInfo].filter(Boolean).join(" ")}
-
사업명
+
{PERFORMANCE_FIELD_LABELS.performanceName}
{selected.performanceName}
-
장소
+
{PERFORMANCE_FIELD_LABELS.monitoringAddress}
{selected.performanceMonitoringSchedule?.monitoringAddress}
@@ -270,7 +284,7 @@ const MonitoringPage = () => { getRowId={(row) => String(row.id)} selectMode="click-event" onRowClick={(item) => { - setDetailId(item.id); + setSelectedId(item.id); showDialog("monitoringDetailDialog"); }} highlightRowIds={selected ? [String(selected.id)] : []} @@ -307,10 +321,9 @@ const MonitoringPage = () => { } hideDialog("monitoringDetailDialog"); - setDetailId(null); refreshMonitoringList(); }} - performance={detailData ?? detailSelected} + performance={detailData ?? selected} codes={codes} userId={userId} /> diff --git a/src/app/(pages)/(main)/performance/page.tsx b/src/app/(pages)/(main)/performance/page.tsx index b37b7b0..e534d0f 100644 --- a/src/app/(pages)/(main)/performance/page.tsx +++ b/src/app/(pages)/(main)/performance/page.tsx @@ -1,6 +1,6 @@ "use client"; -import {useCallback, useMemo, useRef, useState} from "react"; +import {useCallback, useEffect, useMemo, useRef, useState} from "react"; import {Search, Upload} from "lucide-react"; import {Button} from "@/components/ui/button"; import {Input} from "@/components/ui/input"; @@ -23,7 +23,7 @@ import { useUploadPerformanceExcelMutation, } from "@/query/performance"; import {useUploadWrittenAssignExcelMutation} from "@/query/assign"; -import {useDownloadReviewOriginalMutation, useDownloadReviewPdfMutation} from "@/query/review"; +import {useDownloadReviewOriginalByPerformanceMutation, useDownloadReviewOriginalMutation, useDownloadReviewPdfMutation} from "@/query/review"; import {filterPerformance, getCodeLabel, isInternalRole, isWrittenReviewerRole} from "@/lib/gwcf/view"; import { getMonitoringDisplayRow, @@ -45,6 +45,7 @@ import {Code, PerformanceFull, PerformanceReview} from "@/types/gwcf"; import {useDialog} from "@/hooks/useDialog"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {useMounted} from "@/hooks/useMounted"; +import {useDebouncedValue} from "@/hooks/useDebouncedValue"; import { downloadBlob, downloadExcelBuffer, getReviewOriginalDownloadName, @@ -52,6 +53,7 @@ import { openWrittenReviewWindow, } from "@/lib/gwcf/file"; import ExcelDownloadButton from "@/components/common/ExcelDownloadButton"; +import {PERFORMANCE_FIELD_LABELS} from "@/lib/gwcf/field-labels"; type PerformanceFilters = { businessType: string[]; @@ -59,6 +61,7 @@ type PerformanceFilters = { area: string[]; startMonth: string[]; monitoringDate: string; + monitoringAdd: string[]; localReviewStatus: string[]; monitoring1Status: string[]; monitoring2Status: string[]; @@ -66,13 +69,44 @@ type PerformanceFilters = { keyword: string; }; -const monthOptions: Code[] = Array.from({length: 12}, (_, index) => ({ - codeGroup: "month", - codeValue: index + 1, - codeGroupLabel: "사업 수행 월", - codeLabel: `${index + 1}월`, - memo: "", -})); +const monthOptions: Code[] = [ + { + codeGroup: "month", + codeValue: 0, + codeGroupLabel: PERFORMANCE_FIELD_LABELS.performanceStartMonth, + codeLabel: `미정`, + memo: "", + }, + ...Array.from({length: 12}, (_, index) => ({ + codeGroup: "month", + codeValue: index + 1, + codeGroupLabel: PERFORMANCE_FIELD_LABELS.performanceStartMonth, + codeLabel: `${index + 1}월`, + memo: "", + })) +]; + +const monitoringAddOptions: Code[] = [ + { + codeGroup: "monitoring_add", + codeValue: 0, + codeGroupLabel: PERFORMANCE_FIELD_LABELS.monitoringAdd, + codeLabel: "추가 X", + memo: "", + }, + { + codeGroup: "monitoring_add", + codeValue: 1, + codeGroupLabel: PERFORMANCE_FIELD_LABELS.monitoringAdd, + codeLabel: "추가 O", + memo: "", + }, +]; + +const getPerformanceGroupKey = (performanceId: number) => { + const id = String(performanceId); + return id.length > 2 ? id.slice(0, -2) : id; +}; const PerformancePage = () => { const mounted = useMounted(); @@ -93,6 +127,7 @@ const PerformancePage = () => { const exportMutation = useExportPerformanceMutation(); const reviewPdfMutation = useDownloadReviewPdfMutation(); const reviewOriginalMutation = useDownloadReviewOriginalMutation(); + const reviewOriginalByPerformanceMutation = useDownloadReviewOriginalByPerformanceMutation(); const [filters, setFilters] = useState({ businessType: [], @@ -100,14 +135,17 @@ const PerformancePage = () => { area: [], startMonth: [], monitoringDate: "", + monitoringAdd: [], localReviewStatus: [], monitoring1Status: [], monitoring2Status: [], writtenReviewStatus: [], keyword: "", }); + const debouncedFilters = useDebouncedValue(filters); const [selectedId, setSelectedId] = useState(null); const lastSelectedRef = useRef(null); + const filtersInitializedRef = useRef(false); const detailOpen = isDialogOpen("performanceDetailDialog"); const performanceRegisterOpen = isDialogOpen("performanceExcelRegisterDialog"); @@ -120,9 +158,17 @@ const PerformancePage = () => { const updateFilters = (updater: (prev: PerformanceFilters) => PerformanceFilters) => { setFilters(updater); - refreshPerformanceList(); }; + useEffect(() => { + if (!filtersInitializedRef.current) { + filtersInitializedRef.current = true; + return; + } + + void refetchPerformanceList(); + }, [debouncedFilters, refetchPerformanceList]); + const handlePerformanceDetailOpenChange = (open: boolean) => { if (open) { showDialog("performanceDetailDialog"); @@ -183,38 +229,39 @@ const PerformancePage = () => { return ( filterPerformance(item, { - businessType: filters.businessType, - genre: filters.genre, - area: filters.area, - monitoringDate: filters.monitoringDate, - keyword: filters.keyword, + businessType: debouncedFilters.businessType, + genre: debouncedFilters.genre, + area: debouncedFilters.area, + monitoringDate: debouncedFilters.monitoringDate, + keyword: debouncedFilters.keyword, }) && - matchesStatus(filters.startMonth, String(item.performanceStartMonth)) && - matchesStatus(filters.localReviewStatus, getReviewStatusFilterValue( + matchesStatus(debouncedFilters.startMonth, String(item.performanceStartMonth)) && + matchesStatus(debouncedFilters.monitoringAdd, item.id % 100 === 1 ? "0" : "1") && + matchesStatus(debouncedFilters.localReviewStatus, getReviewStatusFilterValue( localReview, getCodeLabel(codes, "review_status", localReview?.reviewStatus), {isWrittenReviewer, alwaysAssigned: true} )) && - matchesStatus(filters.monitoring1Status, getMonitoringStatusFilterValue( + matchesStatus(debouncedFilters.monitoring1Status, getMonitoringStatusFilterValue( monitoring1Row, getCodeLabel(codes, "monitoring_visit_status", monitoring1LatestVisit?.monitoringVisitStatus), getCodeLabel(codes, "review_status", monitoring1Row.review?.reviewStatus), isWrittenReviewer )) && - matchesStatus(filters.monitoring2Status, getMonitoringStatusFilterValue( + matchesStatus(debouncedFilters.monitoring2Status, getMonitoringStatusFilterValue( monitoring2Row, getCodeLabel(codes, "monitoring_visit_status", monitoring2LatestVisit?.monitoringVisitStatus), getCodeLabel(codes, "review_status", monitoring2Row.review?.reviewStatus), isWrittenReviewer )) && - matchesStatus(filters.writtenReviewStatus, getReviewStatusFilterValue( + matchesStatus(debouncedFilters.writtenReviewStatus, getReviewStatusFilterValue( writtenReviewRow?.review, getCodeLabel(codes, "review_status", writtenReviewRow?.review?.reviewStatus), {isWrittenReviewer, allowInProgress: true, assigned: Boolean(writtenReviewRow?.assign)} )) ); }); - }, [codes, data, filters, getVisibleWrittenReviewRow, isWrittenReviewer]); + }, [codes, data, debouncedFilters, getVisibleWrittenReviewRow, isWrittenReviewer]); const openDetail = (performance: PerformanceFull) => { if (isWrittenReviewer) return; @@ -237,6 +284,16 @@ const PerformancePage = () => { downloadBlob(buffer, getReviewOriginalDownloadName(performanceId, review.reviewType, review.uploadFileName)); }; + const downloadMonitoringReviews = async (performanceId: number) => { + const reviewType = 1; + try { + const buffer = await reviewOriginalByPerformanceMutation.mutateAsync({performanceId, reviewType}); + downloadBlob(buffer, `모니터링-${performanceId}-${reviewType}.zip`, "application/zip"); + } catch { + alert("다운로드할 모니터링 파일을 찾을 수 없습니다."); + } + }; + const openWrittenReviewLink = (performanceId: number, userId?: string, complete = false) => { openWrittenReviewWindow(performanceId, userId, complete); }; @@ -268,7 +325,7 @@ const PerformancePage = () => { : undefined; return ( -
+
{ const visitUser = getMonitoringRecordedUser(latestVisit); return ( -
+
downloadReviewOriginal(performance.id, row.review) : undefined} @@ -317,26 +374,133 @@ const PerformancePage = () => { ); }; + const renderWrittenReviewerMonitoringStatus = (performance: PerformanceFull) => { + const groupKey = getPerformanceGroupKey(performance.id); + const monitoringRows = data + .filter((item) => getPerformanceGroupKey(item.id) === groupKey) + .flatMap((item) => ([0, 1] as const).map((index) => getMonitoringDisplayRow(item, index))); + + const completeCount = monitoringRows.filter((item) => isReviewComplete(item.review)).length; + const totalCount = monitoringRows.length; + const display = completeCount === 0 + ? {label: "미완료", variant: "pending" as const} + : completeCount === totalCount + ? {label: "완료", variant: "done" as const} + : {label: "일부 완료", variant: "inprogress" as const}; + const onClick = completeCount > 0 ? () => downloadMonitoringReviews(performance.id) : undefined; + + return ( +
+ +
완료: {completeCount}
+
전체: {totalCount}
+
+ )} + > + {display.label} +
+
+ ); + }; + const columns = useMemo[]>(() => [ - {accessorKey: "id", header: "연번", cell: ({row}) => row.original.id, enableSorting: true}, - {id: "businessType", header: "사업 유형", cell: ({row}) => getCodeLabel(codes, "business_type", row.original.businessType)}, - {id: "genre", header: "분야(장르)", cell: ({row}) => getCodeLabel(codes, "genre", row.original.performanceGenre)}, - {id: "area", header: "지역", cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)}, - {accessorKey: "artistName", header: "단체(인)명", enableSorting: true}, - {accessorKey: "performanceName", header: "사업명", enableSorting: true}, - {id: "startMonth", header: "사업 수행 월", cell: ({row}) => `${row.original.performanceStartMonth}월`, enableSorting: true}, - {accessorKey: "performanceDtInfo", header: "사업 일정"}, - {accessorKey: "performanceTimeInfo", header: "운영 시간"}, - ...(!isWrittenReviewer ? [{ - id: "monitoringDate", - header: "모니터링 일정", - cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate ?? "", - enableSorting: true, - } satisfies DataTableColumn] : []), + {accessorKey: "no", header: PERFORMANCE_FIELD_LABELS.no, + accessorFn: (row) => row.performanceDetail["performanceNo"] ?? "", + cell: ({row}) => row.original.performanceDetail["performanceNo"] ?? "", + }, + {accessorKey: "id", header: PERFORMANCE_FIELD_LABELS.id, cell: ({row}) => row.original.id}, + ...(!isWrittenReviewer ? [ + {accessorKey: "monitoringAdd", header: PERFORMANCE_FIELD_LABELS.monitoringAdd, + accessorFn: (row) => row.id % 100 !== 1? "추가" : "", + cell: ({row}) => row.original.id % 100 !== 1? "추가" : "", + enableSorting: false + }, + ]: []) as DataTableColumn[], + { + id: "businessType", + header: PERFORMANCE_FIELD_LABELS.businessType, + cell: ({row}) => { + const value = getCodeLabel(codes, "business_type", row.original.businessType); + return ( +
+ {value} +
+ ); + }, + size: 130, + maxSize: 130, + }, + {id: "genre", header: PERFORMANCE_FIELD_LABELS.performanceGenre, cell: ({row}) => getCodeLabel(codes, "genre", row.original.performanceGenre)}, + {id: "area", header: PERFORMANCE_FIELD_LABELS.performanceArea, cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)}, + { + accessorKey: "artistName", + header: PERFORMANCE_FIELD_LABELS.artistName, + cell: ({row}) => ( +
+ {row.original.artistName} +
+ ), + size: 120, + maxSize: 120, + }, + { + accessorKey: "performanceName", + header: PERFORMANCE_FIELD_LABELS.performanceName, + cell: ({row}) => ( +
+ {row.original.performanceName} +
+ ), + }, + {id: "startMonth", header: PERFORMANCE_FIELD_LABELS.performanceStartMonth, + accessorFn: (row) => row.performanceStartMonth ?? 0, + cell: ({row}) => row.original.performanceStartMonth === 0? "미정":`${row.original.performanceStartMonth}월`}, + { + accessorKey: "performanceDtInfo", + header: PERFORMANCE_FIELD_LABELS.performanceDtInfo, + cell: ({row}) => ( +
+ {row.original.performanceDtInfo} +
+ ), + enableSorting: false + }, + { + accessorKey: "performanceTimeInfo", + header: PERFORMANCE_FIELD_LABELS.performanceTimeInfo, + cell: ({row}) => ( +
+ {row.original.performanceTimeInfo} +
+ ), + enableSorting: false + }, + ...(!isWrittenReviewer ? [ + { + id: "monitoringDate", + header: PERFORMANCE_FIELD_LABELS.monitoringDate, + accessorFn: (row) => row.performanceMonitoringSchedule?.monitoringDate ?? "", + cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate ?? "", + }, + { + id: "timeTreeCheckDt", + header: PERFORMANCE_FIELD_LABELS.timeTreeCheckDt, + accessorFn: (row) => row.performanceDetail["timeTreeCheckDt"] ?? "", + cell: ({row}) => row.original.performanceDetail["timeTreeCheckDt"] ?? "", + } + ]: []) as DataTableColumn[], { id: "localReview", - header: "지자체 평가", + header: "자체 보고서", cell: ({row}) => { + if(row.original.id % 100 !== 1){ + return "-"; + } + const found = getReviewByType(row.original, LOCAL_GOVERNMENT_REVIEW_TYPE); return renderReviewStatus({ performance: row.original, @@ -346,13 +510,22 @@ const PerformancePage = () => { noTooltip: isWrittenReviewer, }); }, + size:40, }, - {id: "monitoring1", header: "모니터링 1", cell: ({row}) => renderMonitoringStatus(row.original, 0)}, - {id: "monitoring2", header: "모니터링 2", cell: ({row}) => renderMonitoringStatus(row.original, 1)}, + ...(!isWrittenReviewer ? [ + {id: "monitoring1", header: "모니터링 1", cell: ({row}) => renderMonitoringStatus(row.original, 0), size:40,}, + {id: "monitoring2", header: "모니터링 2", cell: ({row}) => renderMonitoringStatus(row.original, 1), size:40,}, + ] : [ + {id: "monitoring", header: "모니터링", cell: ({row}) => renderWrittenReviewerMonitoringStatus(row.original), size:40,} + ]) as DataTableColumn[], { id: "writtenReview", header: "서면 평가", cell: ({row}) => { + if(row.original.id % 100 !== 1){ + return "-"; + } + const found = getVisibleWrittenReviewRow(row.original); return renderReviewStatus({ performance: row.original, @@ -362,8 +535,9 @@ const PerformancePage = () => { alwaysAssigned: Boolean(found?.assign), }); }, + size:40, }, - ], [codes, getVisibleWrittenReviewRow, isWrittenReviewer]); + ], [codes, data, getVisibleWrittenReviewRow, isWrittenReviewer]); const downloadPerformanceTemplate = async () => { const buffer = await performanceTemplateMutation.mutateAsync(); @@ -394,21 +568,24 @@ const PerformancePage = () => {
- updateFilters((prev) => ({...prev, businessType: value}))} options={codes.business_type} placeholder="사업 유형" /> - updateFilters((prev) => ({...prev, genre: value}))} options={codes.genre} placeholder="분야(장르)" /> - updateFilters((prev) => ({...prev, area: value}))} options={codes.area} placeholder="지역" /> - updateFilters((prev) => ({...prev, startMonth: value}))} options={monthOptions} placeholder="사업 수행 월" /> + updateFilters((prev) => ({...prev, businessType: value}))} options={codes.business_type} placeholder={PERFORMANCE_FIELD_LABELS.businessType} /> + updateFilters((prev) => ({...prev, genre: value}))} options={codes.genre} placeholder={PERFORMANCE_FIELD_LABELS.performanceGenre} /> + updateFilters((prev) => ({...prev, area: value}))} options={codes.area} placeholder={PERFORMANCE_FIELD_LABELS.performanceArea} /> + updateFilters((prev) => ({...prev, startMonth: value}))} options={monthOptions} placeholder={PERFORMANCE_FIELD_LABELS.performanceStartMonth} /> {!isWrittenReviewer && ( - updateFilters((prev) => ({...prev, monitoringDate: value}))} placeholder="모니터링 일정" /> + updateFilters((prev) => ({...prev, monitoringDate: value}))} placeholder={PERFORMANCE_FIELD_LABELS.monitoringDate} /> )} - updateFilters((prev) => ({...prev, keyword: event.target.value}))} placeholder="연번 or 사업명" /> + updateFilters((prev) => ({...prev, keyword: event.target.value}))} placeholder={`${PERFORMANCE_FIELD_LABELS.id} or ${PERFORMANCE_FIELD_LABELS.performanceName}`} />
-
- updateFilters((prev) => ({...prev, localReviewStatus: value}))} options={localReviewStatusOptions} placeholder="지자체 평가 상태" /> +
+ {!isWrittenReviewer && ( + updateFilters((prev) => ({...prev, monitoringAdd: value}))} options={monitoringAddOptions} placeholder={PERFORMANCE_FIELD_LABELS.monitoringAdd} /> + )} + updateFilters((prev) => ({...prev, localReviewStatus: value}))} options={localReviewStatusOptions} placeholder="자체 보고서 상태" /> updateFilters((prev) => ({...prev, monitoring1Status: value}))} options={monitoringStatusOptions} placeholder="모니터링1 상태" /> updateFilters((prev) => ({...prev, monitoring2Status: value}))} options={monitoringStatusOptions} placeholder="모니터링2 상태" /> updateFilters((prev) => ({...prev, writtenReviewStatus: value}))} options={writtenReviewStatusOptions} placeholder="서면평가 상태" /> @@ -441,6 +618,8 @@ const PerformancePage = () => { selectMode={isWrittenReviewer ? "none" : "click-event"} onRowClick={isWrittenReviewer ? undefined : openDetail} defaultPageSize={10} + headerFontClass="content-text-base" + cellFontClass="content-text-sm" /> diff --git a/src/app/(pages)/(main)/user/page.tsx b/src/app/(pages)/(main)/user/page.tsx index cf31d34..e0cc782 100644 --- a/src/app/(pages)/(main)/user/page.tsx +++ b/src/app/(pages)/(main)/user/page.tsx @@ -29,6 +29,8 @@ import {useMounted} from "@/hooks/useMounted"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {downloadExcelBuffer} from "@/lib/gwcf/file"; import ExcelDownloadButton from "@/components/common/ExcelDownloadButton"; +import {USER_FIELD_LABELS} from "@/lib/gwcf/field-labels"; +import {useDebouncedValue} from "@/hooks/useDebouncedValue"; type UserTab = "monitoring" | "written"; type UserFilters = {area: string[]; gender: string[]; genre: string[]; keyword: string}; @@ -59,6 +61,8 @@ const UserPage = () => { const [, forceDraftRender] = useState(0); const draftRef = useRef(null); const [filters, setFilters] = useState({area: [], gender: [], genre: [], keyword: ""}); + const debouncedFilters = useDebouncedValue(filters); + const filtersInitializedRef = useRef(false); const userRole = tabRole[tab]; const {data = [], refetch: refetchUsers} = useUsersQuery(userRole); @@ -77,9 +81,17 @@ const UserPage = () => { const updateFilters = (updater: (prev: UserFilters) => UserFilters) => { setFilters(updater); - refreshUserList(); }; + useEffect(() => { + if (!filtersInitializedRef.current) { + filtersInitializedRef.current = true; + return; + } + + refreshUserList(); + }, [debouncedFilters, refetchAssignCounts, refetchUsers]); + useEffect(() => { setSelectedIds([]); setEditingId(null); @@ -88,7 +100,7 @@ const UserPage = () => { setFilters({area: [], gender: [], genre: [], keyword: ""}); }, [tab]); - const filteredData = useMemo(() => data.filter((user) => filterUser(user, filters)), [data, filters]); + const filteredData = useMemo(() => data.filter((user) => filterUser(user, debouncedFilters)), [data, debouncedFilters]); const smsTargetUsers = useMemo( () => data.filter((user) => selectedIds.includes(user.userId)), [data, selectedIds] @@ -146,11 +158,11 @@ const UserPage = () => { downloadExcelBuffer(buffer, tab === "monitoring" ? "모니터링 요원.xlsx" : "서면 평가위원.xlsx"); }; - const renderEditableCell = (user: UserFull, key: string, fallbackKeys: string[], type: "text" | "select" = "text", options: Code[] = []) => { + const renderEditableCell = (user: UserFull, key: string, type: "text" | "select" = "text", options: Code[] = []) => { const draft = draftRef.current; const isEditing = editingId === user.userId && draft; const source = isEditing ? draft.userDetail : user.userDetail; - const value = getDetailValue(source, [key, ...fallbackKeys]); + const value = getDetailValue(source, key); if (!isEditing) return type === "select" ? (getOptionLabel(options, value) || "-") : (value || "-"); @@ -171,30 +183,30 @@ const UserPage = () => { const columns = useMemo[]>(() => { const commonColumns: DataTableColumn[] = [ - {accessorKey: "userId", header: "ID", enableSorting: true}, + {accessorKey: "userId", header: USER_FIELD_LABELS.userId}, {id: "password", header: "PW", cell: () => "****"}, ]; const monitoringColumns: DataTableColumn[] = [ - {id: "participationCount", header: "참여 횟수", cell: ({row}) => assignCountMap.get(row.original.userId) ?? 0, enableSorting: true}, - {id: "area", header: "지역", cell: ({row}) => renderEditableCell(row.original, "area", ["userArea", "region"], "select", codes.area)}, - {id: "gender", header: "성별", cell: ({row}) => renderEditableCell(row.original, "gender", ["userGender"], "select", codes.gender)}, - {id: "age", header: "연령", cell: ({row}) => renderEditableCell(row.original, "age", ["userAge"])}, - {id: "tel", header: "연락처", cell: ({row}) => renderEditableCell(row.original, "tel", ["phone", "userTel"])}, - {id: "email", header: "이메일", cell: ({row}) => renderEditableCell(row.original, "email", ["userEmail"])}, - {id: "hasCar", header: "자차 여부", cell: ({row}) => renderEditableCell(row.original, "userHasCar", ["has_car", "hasCar"], "select", codes.has_car)}, + {id: "participationCount", header: "참여 횟수", accessorFn: (row) => assignCountMap.get(row.userId) ?? 0, cell: ({row}) => assignCountMap.get(row.original.userId) ?? 0}, + {id: "userArea", header: USER_FIELD_LABELS.userArea, cell: ({row}) => renderEditableCell(row.original, "userArea", "select", codes.area)}, + {id: "userGender", header: USER_FIELD_LABELS.gender, cell: ({row}) => renderEditableCell(row.original, "userGender", "select", codes.gender)}, + {id: "userAge", header: USER_FIELD_LABELS.userAge, cell: ({row}) => renderEditableCell(row.original, "userAge")}, + {id: "userTel", header: USER_FIELD_LABELS.userTel, cell: ({row}) => renderEditableCell(row.original, "userTel")}, + {id: "userEmail", header: USER_FIELD_LABELS.userEmail, cell: ({row}) => renderEditableCell(row.original, "userEmail")}, + {id: "userHasCar", header: USER_FIELD_LABELS.userHasCar, cell: ({row}) => renderEditableCell(row.original, "userHasCar", "select", codes.has_car)}, ]; const writtenColumns: DataTableColumn[] = [ - {id: "genre", header: "장르", cell: ({row}) => renderEditableCell(row.original, "userGenre", ["genre", "reviewGenre"], "select", codes.genre)}, - {id: "tel", header: "연락처", cell: ({row}) => renderEditableCell(row.original, "tel", ["phone", "userTel"])}, - {id: "email", header: "이메일", cell: ({row}) => renderEditableCell(row.original, "email", ["userEmail"])}, + {id: "userGenre", header: USER_FIELD_LABELS.userGenre, cell: ({row}) => renderEditableCell(row.original, "userGenre", "select", codes.genre)}, + {id: "userTel", header: USER_FIELD_LABELS.userTel, cell: ({row}) => renderEditableCell(row.original, "userTel")}, + {id: "userEmail", header: USER_FIELD_LABELS.userEmail, cell: ({row}) => renderEditableCell(row.original, "userEmail")}, ]; const actionColumns: DataTableColumn[] = [ { id: "memo", - header: "메모", + header: USER_FIELD_LABELS.memo, cell: ({row}) => { const draft = draftRef.current; return editingId === row.original.userId && draft ? ( @@ -310,10 +322,11 @@ const UserPage = () => { hideDialog("userSmsSendDialog"); refreshUserList(); }} - templateIdx={SMS_TEMPLATE_IDS.ACCOUNT_MONITORING} + templateIdx={[SMS_TEMPLATE_IDS.ACCOUNT_MONITORING]} newMessageTemplateIdx={SMS_TEMPLATE_IDS.CUSTOM} selectedUsers={smsTargetUsers} onSent={refreshUserList} + denyParamKeys={["userCmpn", "userTeam", "userRole"]} />
); diff --git a/src/app/(pages)/file-preview/page.tsx b/src/app/(pages)/file-preview/page.tsx index 8f59380..5748ba2 100644 --- a/src/app/(pages)/file-preview/page.tsx +++ b/src/app/(pages)/file-preview/page.tsx @@ -1,3 +1,6 @@ +import {headers} from "next/headers"; +import {getFileNameFromContentDisposition} from "@/lib/gwcf/file"; + type FilePreviewPageProps = { searchParams: Promise<{ src?: string; @@ -17,14 +20,56 @@ const parseImages = (images?: string) => { } }; -const isAllowedSrc = (src: string) => src.startsWith("/api/review/pdf/") || src.startsWith("/api/file/"); +const isAllowedSrc = (src: string) => + src.startsWith("/api/review/pdf/") || + src.startsWith("/api/review/template/pdf/") || + src.startsWith("/api/file/"); + +const getAbsoluteSrc = async (src: string) => { + const headersList = await headers(); + const host = headersList.get("x-forwarded-host") ?? headersList.get("host"); + if (!host) return undefined; + + const protocol = headersList.get("x-forwarded-proto") ?? "http"; + return new URL(src, `${protocol}://${host}`).toString(); +}; + +const getPdfTitleFromSrc = async (src: string) => { + if (!isAllowedSrc(src)) return undefined; + + try { + const headersList = await headers(); + const absoluteSrc = await getAbsoluteSrc(src); + if (!absoluteSrc) return undefined; + + const response = await fetch(absoluteSrc, { + headers: { + cookie: headersList.get("cookie") ?? "", + }, + cache: "no-store", + }); + const fileName = getFileNameFromContentDisposition(response.headers.get("content-disposition")); + await response.body?.cancel().catch(() => undefined); + return fileName; + } catch { + return undefined; + } +}; + +const getTitle = async (paramTitle: string, src: string, type: "image" | "pdf") => { + const defaultTitle = "파일 미리보기"; + + if(paramTitle) return paramTitle; + if(type === "pdf") return await getPdfTitleFromSrc(src) ?? defaultTitle; + return defaultTitle; +} export default async function FilePreviewPage({ searchParams }: FilePreviewPageProps) { const params = await searchParams; - const title = params.title ?? "파일 미리보기"; const images = parseImages(params.images); - const src = params.src ?? ""; const type = params.type ?? (images.length > 0 ? "image" : "pdf"); + const src = params.src ?? ""; + const title = await getTitle(params.title ?? "", src, type) ; return (
@@ -64,4 +109,4 @@ export default async function FilePreviewPage({ searchParams }: FilePreviewPageP )}
); -} \ No newline at end of file +} diff --git a/src/app/api/assign/[[...slug]]/route.ts b/src/app/api/assign/[[...slug]]/route.ts index 52f0713..0e72e19 100644 --- a/src/app/api/assign/[[...slug]]/route.ts +++ b/src/app/api/assign/[[...slug]]/route.ts @@ -57,6 +57,12 @@ export const POST = async ( ); return NextResponse.json(result, { status: 200 }); } + if (action === "reject" && second && third && slug.length === 3) { + const result = await backApi.post( + `/assign/reject/${encodeURIComponent(second)}/${encodeURIComponent(third)}` + ); + return NextResponse.json(result, { status: 200 }); + } if(action === "written" && second === "excel-template"){ const result = await backApi.post( diff --git a/src/app/api/kon/[[...slug]]/route.ts b/src/app/api/kon/[[...slug]]/route.ts index 4689a3b..2518607 100644 --- a/src/app/api/kon/[[...slug]]/route.ts +++ b/src/app/api/kon/[[...slug]]/route.ts @@ -2,7 +2,7 @@ import {NextRequest, NextResponse} from "next/server"; import {RouteContext} from "@/types/common"; import {errorToResponse} from "@/lib/http-util"; import {createBackApi} from "@/lib/server-api"; -import {PerformanceCompact} from "@/types/gwcf"; +import {Code, PerformanceCompact, PerformanceFull} from "@/types/gwcf"; const ALLOWED_ORIGIN = "https://kon.kric.com"; @@ -66,6 +66,11 @@ export const POST = async ( const [action] = slug; const backApi = await createBackApi(); + if(action === "code" && slug.length === 2) { + const result = await backApi.get(`/code/${encodeURIComponent(slug[1])}`) + return withCors(NextResponse.json(result, { status: 200 })); + } + if(action === "assign-confirm" && slug.length === 3) { const result = await backApi.post( `/assign/confirm/${encodeURIComponent(slug[1])}/${encodeURIComponent(slug[2])}` @@ -73,6 +78,18 @@ export const POST = async ( return withCors(NextResponse.json(result, { status: 200 })); } + if(action === "assign-reject" && slug.length === 3) { + const result = await backApi.post( + `/assign/reject/${encodeURIComponent(slug[1])}/${encodeURIComponent(slug[2])}` + ); + return withCors(NextResponse.json(result, { status: 200 })); + } + + if(action === "performance" && slug.length === 2) { + const result = await backApi.get(`/performance/${encodeURIComponent(slug[1])}`) + return withCors(NextResponse.json(result, { status: 200 })); + } + if(action === "performance-list") { const result = await backApi.get(`/performance/list/compact`) return withCors(NextResponse.json(result, { status: 200 })); diff --git a/src/app/api/review/[[...slug]]/route.ts b/src/app/api/review/[[...slug]]/route.ts index b65abd9..1b4eecb 100644 --- a/src/app/api/review/[[...slug]]/route.ts +++ b/src/app/api/review/[[...slug]]/route.ts @@ -10,6 +10,17 @@ import {CookieKeys} from "@/store/cookie/cookie-keys"; const reviewFileName = (prefix: string, performanceId: string, reviewType: string) => `${prefix}-${performanceId}-${reviewType}`; +const replaceContentDispositionType = ( + contentDisposition: string | null, + disposition: "inline" | "attachment", + fallbackFileName: string +) => { + const fileNamePart = contentDisposition?.split(";").slice(1).join(";"); + return fileNamePart + ? `${disposition};${fileNamePart}` + : `${disposition}; filename="${fallbackFileName}"`; +}; + export const GET = async ( req: NextRequest, context: RouteContext @@ -19,10 +30,10 @@ export const GET = async ( const [action, second, third, fourth] = slug; const backApi = await createBackApi(); - if (action === "template" && second === "download" && third && slug.length === 3) { + if (action === "template" && second === "download" && third && fourth && slug.length === 4) { const cookieStore = await cookies(); const accessToken = cookieStore.get(CookieKeys.AuthToken)?.value; - const response = await fetch(`${serverEnv.API_BACK_SERVER.replace(/\/+$/, "")}/review/template/download/${encodeURIComponent(third)}`, { + const response = await fetch(`${serverEnv.API_BACK_SERVER.replace(/\/+$/, "")}/review/template/download/${encodeURIComponent(third)}/${encodeURIComponent(fourth)}`, { headers: accessToken ? {authorization: `Bearer ${accessToken}`} : undefined, cache: "no-store", }); @@ -43,12 +54,54 @@ export const GET = async ( }); } + if (action === "template" && second === "pdf" && third && fourth && slug.length === 4) { + const cookieStore = await cookies(); + const accessToken = cookieStore.get(CookieKeys.AuthToken)?.value; + const response = await fetch(`${serverEnv.API_BACK_SERVER.replace(/\/+$/, "")}/review/template/pdf/${encodeURIComponent(third)}/${encodeURIComponent(fourth)}`, { + headers: accessToken ? {authorization: `Bearer ${accessToken}`} : undefined, + cache: "no-store", + }); + + if (!response.ok) { + return new NextResponse(await response.text().catch(() => ""), {status: response.status}); + } + + const result = await response.arrayBuffer(); + const disposition = req.nextUrl.searchParams.get("disposition") === "inline" ? "inline" : "attachment"; + return new NextResponse(result, { + status: 200, + headers: { + "Content-Type": "application/pdf", + "Content-Disposition": replaceContentDispositionType( + response.headers.get("content-disposition"), + disposition, + `review-template-${third}-${fourth}.pdf` + ), + }, + }); + } + if (action === "download" && second && third && fourth && slug.length === 4) { const result = await backApi.get( `/review/download/${encodeURIComponent(second)}/${encodeURIComponent(third)}/${encodeURIComponent(fourth)}`, { expectBinary: true } ); + return new NextResponse(result, { + status: 200, + headers: { + "Content-Type": "application/zip", + "Content-Disposition": `attachment; filename="${reviewFileName("review-original", second, third)}.zip"`, + }, + }); + } + + if (action === "download" && second && third && slug.length === 3) { + const result = await backApi.get( + `/review/download/${encodeURIComponent(second)}/${encodeURIComponent(third)}`, + { expectBinary: true } + ); + return new NextResponse(result, { status: 200, headers: { diff --git a/src/components/common/ReactQueryLoadingSync.tsx b/src/components/common/ReactQueryLoadingSync.tsx index 86487be..bdda5af 100644 --- a/src/components/common/ReactQueryLoadingSync.tsx +++ b/src/components/common/ReactQueryLoadingSync.tsx @@ -1,19 +1,20 @@ "use client"; -import {useIsFetching} from "@tanstack/react-query"; +import {useIsFetching, useIsMutating} from "@tanstack/react-query"; import {useLoading} from "@/hooks/useLoading"; import {useEffect} from "react"; const ReactQueryLoadingSync = () => { const fetching = useIsFetching(); + const mutating = useIsMutating(); const { showLoading, hideLoading } = useLoading(); useEffect(() => { - if (fetching > 0) showLoading(); + if (fetching > 0 || mutating > 0) showLoading(); else hideLoading(); - }, [fetching, showLoading, hideLoading]); + }, [fetching, mutating, showLoading, hideLoading]); return null; }; -export default ReactQueryLoadingSync; \ No newline at end of file +export default ReactQueryLoadingSync; diff --git a/src/components/data-table/DataTable.tsx b/src/components/data-table/DataTable.tsx index f13a726..bfc0eee 100644 --- a/src/components/data-table/DataTable.tsx +++ b/src/components/data-table/DataTable.tsx @@ -48,7 +48,9 @@ export function DataTable({ defaultPageSize = 10, pageSizeOptions = [5, 10, 25, 50], showPagination = true, - paginationItemsToDisplay = 5 + paginationItemsToDisplay = 5, + headerFontClass = 'content-text-lg', + cellFontClass = 'content-text-base', }: Readonly>) { // Pagination state const [pagination, setPagination] = useState({ @@ -200,7 +202,8 @@ export function DataTable({ ({