260702_01_ENH: 사업정보, 모니터링 배정의 datatable의 일부 컬럼 max width 지정 및 truncate 적용
This commit is contained in:
@@ -30,6 +30,7 @@ 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();
|
||||
@@ -46,8 +47,10 @@ const AssignPage = () => {
|
||||
monitoringDate: "",
|
||||
keyword: "",
|
||||
});
|
||||
const debouncedFilters = useDebouncedValue(filters);
|
||||
const [selected, setSelected] = useState<PerformanceFull | null>(null);
|
||||
const [assignSaveTargetIds, setAssignSaveTargetIds] = useState<string[]>([]);
|
||||
const filtersInitializedRef = useRef(false);
|
||||
|
||||
type SmsMode = "assignConfirm" | "normal";
|
||||
const [smsMode, setSmsMode] = useState<SmsMode>("assignConfirm");
|
||||
@@ -64,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");
|
||||
@@ -92,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;
|
||||
@@ -144,10 +155,36 @@ const AssignPage = () => {
|
||||
|
||||
const columns = useMemo<DataTableColumn<PerformanceFull>[]>(() => [
|
||||
{accessorKey: "id", header: PERFORMANCE_FIELD_LABELS.id, cell: ({row}) => row.original.id},
|
||||
{accessorKey: "performanceName", header: PERFORMANCE_FIELD_LABELS.performanceName},
|
||||
{
|
||||
accessorKey: "performanceName",
|
||||
header: PERFORMANCE_FIELD_LABELS.performanceName,
|
||||
cell: ({row}) => (
|
||||
<div className="max-w-[400px] truncate" title={row.original.performanceName}>
|
||||
{row.original.performanceName}
|
||||
</div>
|
||||
),
|
||||
},
|
||||
{id: "area", header: PERFORMANCE_FIELD_LABELS.performanceArea, cell: ({row}) => getCodeLabel(codes, "area", row.original.performanceArea)},
|
||||
{accessorKey: "performanceDtInfo", header: PERFORMANCE_FIELD_LABELS.performanceDtInfo, enableSorting: false},
|
||||
{accessorKey: "performanceTimeInfo", header: PERFORMANCE_FIELD_LABELS.performanceTimeInfo, enableSorting: false},
|
||||
{
|
||||
accessorKey: "performanceDtInfo",
|
||||
header: PERFORMANCE_FIELD_LABELS.performanceDtInfo,
|
||||
cell: ({row}) => (
|
||||
<div className="max-w-[250px] truncate" title={row.original.performanceDtInfo}>
|
||||
{row.original.performanceDtInfo}
|
||||
</div>
|
||||
),
|
||||
enableSorting: false
|
||||
},
|
||||
{
|
||||
accessorKey: "performanceTimeInfo",
|
||||
header: PERFORMANCE_FIELD_LABELS.performanceTimeInfo,
|
||||
cell: ({row}) => (
|
||||
<div className="max-w-[250px] truncate" title={row.original.performanceTimeInfo}>
|
||||
{row.original.performanceTimeInfo}
|
||||
</div>
|
||||
),
|
||||
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},
|
||||
|
||||
@@ -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";
|
||||
@@ -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,
|
||||
@@ -141,8 +142,10 @@ const PerformancePage = () => {
|
||||
writtenReviewStatus: [],
|
||||
keyword: "",
|
||||
});
|
||||
const debouncedFilters = useDebouncedValue(filters);
|
||||
const [selectedId, setSelectedId] = useState<number | null>(null);
|
||||
const lastSelectedRef = useRef<number | null>(null);
|
||||
const filtersInitializedRef = useRef(false);
|
||||
|
||||
const detailOpen = isDialogOpen("performanceDetailDialog");
|
||||
const performanceRegisterOpen = isDialogOpen("performanceExcelRegisterDialog");
|
||||
@@ -155,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");
|
||||
@@ -218,39 +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.monitoringAdd, item.id % 100 === 1 ? "0" : "1") &&
|
||||
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;
|
||||
@@ -444,14 +455,30 @@ const PerformancePage = () => {
|
||||
{row.original.performanceName}
|
||||
</div>
|
||||
),
|
||||
size: 300,
|
||||
maxSize: 300,
|
||||
},
|
||||
{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, enableSorting: false},
|
||||
{accessorKey: "performanceTimeInfo", header: PERFORMANCE_FIELD_LABELS.performanceTimeInfo, enableSorting: false},
|
||||
{
|
||||
accessorKey: "performanceDtInfo",
|
||||
header: PERFORMANCE_FIELD_LABELS.performanceDtInfo,
|
||||
cell: ({row}) => (
|
||||
<div className="max-w-[65px] truncate" title={row.original.performanceDtInfo}>
|
||||
{row.original.performanceDtInfo}
|
||||
</div>
|
||||
),
|
||||
enableSorting: false
|
||||
},
|
||||
{
|
||||
accessorKey: "performanceTimeInfo",
|
||||
header: PERFORMANCE_FIELD_LABELS.performanceTimeInfo,
|
||||
cell: ({row}) => (
|
||||
<div className="max-w-[65px] truncate" title={row.original.performanceTimeInfo}>
|
||||
{row.original.performanceTimeInfo}
|
||||
</div>
|
||||
),
|
||||
enableSorting: false
|
||||
},
|
||||
...(!isWrittenReviewer ? [
|
||||
{
|
||||
id: "monitoringDate",
|
||||
|
||||
@@ -30,6 +30,7 @@ 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};
|
||||
@@ -60,6 +61,8 @@ const UserPage = () => {
|
||||
const [, forceDraftRender] = useState(0);
|
||||
const draftRef = useRef<UserFull | null>(null);
|
||||
const [filters, setFilters] = useState<UserFilters>({area: [], gender: [], genre: [], keyword: ""});
|
||||
const debouncedFilters = useDebouncedValue(filters);
|
||||
const filtersInitializedRef = useRef(false);
|
||||
|
||||
const userRole = tabRole[tab];
|
||||
const {data = [], refetch: refetchUsers} = useUsersQuery(userRole);
|
||||
@@ -78,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);
|
||||
@@ -89,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]
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
export function useDebouncedValue<T>(value: T, delayMs = 1200) {
|
||||
export function useDebouncedValue<T>(value: T, delayMs = 500) {
|
||||
const [debounced, setDebounced] = useState(value);
|
||||
|
||||
useEffect(() => {
|
||||
|
||||
Reference in New Issue
Block a user