From 17ad56939c812e852aca21ce6885cf638646b2c8 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 22 Oct 2026 16:59:04 +0900 Subject: [PATCH] =?UTF-8?q?261022=5F05=5FENH:=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=B4=88=EA=B8=B0=ED=99=94=20=EB=B2=94=EC=9C=84=20?= =?UTF-8?q?=EC=84=B8=EB=B6=84=ED=99=94=20=EB=B0=8F=20=EC=84=A4=EB=AC=B8?= =?UTF-8?q?=EB=B3=84=20=EC=83=81=ED=83=9C=EC=9D=B4=EB=A0=A5=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/(main)/list/manage/page.tsx | 15 +- src/components/dialog/ListResetDialog.tsx | 152 +++++++++++++++++--- src/components/list/ListJobGate.tsx | 4 +- src/types/list.ts | 15 +- 4 files changed, 153 insertions(+), 33 deletions(-) diff --git a/src/app/(pages)/(main)/list/manage/page.tsx b/src/app/(pages)/(main)/list/manage/page.tsx index 13e5059..870d52d 100644 --- a/src/app/(pages)/(main)/list/manage/page.tsx +++ b/src/app/(pages)/(main)/list/manage/page.tsx @@ -44,8 +44,8 @@ import { type ListFilterTarget, type listHeader, type ListSearchUiState, - ListResetMode, - type ListResetScope, + type ListResetRequest, + type ListResetSelection, type ListUploadRequest, } from '@/types/list' import { type ResultCode, ResultCodeType } from '@/types/project' @@ -264,11 +264,12 @@ const ListManagePage = () => { showDialog('messageSendDialog') } - const handleResetConfirm = async (payload: { target: ListFilterTarget; scope: ListResetScope }) => { - await submitJob.mutateAsync({ jobType: 'LIST_RESET', path: 'reset', body: { - resetMode: payload.scope === 'result-and-history' ? ListResetMode.HIST : ListResetMode.ALL, + const handleResetConfirm = async (payload: { target: ListFilterTarget; selection: ListResetSelection }) => { + const body: ListResetRequest = { + ...payload.selection, listFilter: buildTargetFilter(payload.target), - } }) + } + await submitJob.mutateAsync({ jobType: 'LIST_RESET', path: 'reset', body }) } const handleUploadConfirm = async (file: File, request: ListUploadRequest) => { @@ -375,7 +376,9 @@ const ListManagePage = () => { {isInternal && ( <> void selectedSids: string[] filterSummary?: string[] - onConfirm: (payload: { target: ListFilterTarget; scope: ListResetScope }) => void | Promise + onConfirm: (payload: { target: ListFilterTarget; selection: ListResetSelection }) => void | Promise +} + +type ResetSurveyOption = { prjctSurveyIdx: number; surveyName: string } + +const toResetSurveyOptions = (surveys: ProjectSurvey[]): ResetSurveyOption[] => { + const seen = new Set() + return [...surveys] + .sort((a, b) => a.surveyOrder - b.surveyOrder) + .flatMap((survey) => { + const id = survey.prjctSurveyIdx + if (id == null || seen.has(id)) return [] + seen.add(id) + return [{ prjctSurveyIdx: id, surveyName: survey.surveyName }] + }) } const ListResetDialog = ({ prjctIdx, + surveys, dialogId = 'listResetDialog', open, onOpenChange, @@ -32,12 +50,39 @@ const ListResetDialog = ({ }: ListResetDialogProps) => { const { isDialogOpen, showDialog, hideDialog } = useDialog() const [target, setTarget] = useState('selected') - const [scope, setScope] = useState('result-and-history') + const [resetList, setResetList] = useState(false) + const [resetContactHistory, setResetContactHistory] = useState(false) + const [resetInterviewHistory, setResetInterviewHistory] = useState(false) + const [selectedSurveyIds, setSelectedSurveyIds] = useState([]) const [submitting, setSubmitting] = useState(false) const resolvedOpen = open ?? isDialogOpen(dialogId) const gate = useListJobGate({ prjctIdx, jobType: 'LIST_RESET', active: resolvedOpen }) + const surveysReady = surveys !== undefined + const surveyOptions = toResetSurveyOptions(surveys ?? []) + const allSurveyIds = surveyOptions.map((survey) => survey.prjctSurveyIdx) + // 설문 목록이 다시 조회되어 빠진 설문이 있으면 요청에서 제외한다. + const checkedSurveyIds = allSurveyIds.filter((id) => selectedSurveyIds.includes(id)) + const hasSelection = resetList || resetContactHistory || resetInterviewHistory || checkedSurveyIds.length > 0 + + // 리스트 초기화는 모든 이력을 포함해야 하므로 이력을 전부 선택하고 잠근다. + // 해제 시에는 잠금 중 화면에 보이던 전체 선택 상태를 그대로 유지한다(잠금 중 로드된 설문 포함). + const handleResetListChange = (checked: boolean) => { + setResetList(checked) + setResetContactHistory(true) + setResetInterviewHistory(true) + setSelectedSurveyIds(allSurveyIds) + } + + const handleSurveyChange = (id: number, checked: boolean) => { + setSelectedSurveyIds((prev) => (checked ? [...prev.filter((v) => v !== id), id] : prev.filter((v) => v !== id))) + } + + const buildSelection = (): ListResetSelection => resetList + ? { resetList: true, resetContactHistory: true, resetInterviewHistory: true, resetSurveyIds: allSurveyIds } + : { resetList: false, resetContactHistory, resetInterviewHistory, resetSurveyIds: checkedSurveyIds } + const handleOpenChange = (nextOpen: boolean) => { onOpenChange?.(nextOpen) if (nextOpen) { @@ -47,14 +92,33 @@ const ListResetDialog = ({ hideDialog(dialogId) } + // '새 작업'(완료 확인)을 누르면 이전 작업의 대상·범위를 이어 쓰지 않도록 초기값으로 되돌린다. + const gatePanel = { + ...gate, + acknowledge: () => { + gate.acknowledge() + setTarget('selected') + setResetList(false) + setResetContactHistory(false) + setResetInterviewHistory(false) + setSelectedSurveyIds([]) + }, + } + + // 전체 대상은 선택 시점에도 한 번 확인한다. 취소하면 기존 대상을 유지한다. + const handleTargetChange = (next: ListFilterTarget) => { + if (next === 'all' && target !== 'all' && !confirm('전체 대상을 선택하면 프로젝트의 모든 리스트가 초기화 대상이 됩니다. 선택하시겠습니까?')) return + setTarget(next) + } + const handleConfirm = async () => { - if (gate.submitBlocked || submitting) return + if (gate.submitBlocked || submitting || !surveysReady || !hasSelection) return if (!validateApplyFilterTarget(target, { selectedCount: selectedSids.length, filterSummary })) return if (target === 'all' && !confirm('전체 리스트가 초기화 됩니다. 진행하시겠습니까?')) return setSubmitting(true) try { - await onConfirm({ target, scope }) + await onConfirm({ target, selection: buildSelection() }) } finally { setSubmitting(false) } @@ -73,20 +137,25 @@ const ListResetDialog = ({ {gate.hasCurrentJob ? '닫기' : '취소'} {!gate.hasCurrentJob && ( - )} } > - + {!gate.hasCurrentJob && <>

초기화 대상

setTarget(v)} + onValueChange={handleTargetChange} idPrefix="list-reset-target" selectedSids={selectedSids} filterSummary={filterSummary} @@ -95,16 +164,63 @@ const ListResetDialog = ({

초기화 범위

- setScope(v as ListResetScope)} className="space-y-2"> -
- - +
+
+
+ handleResetListChange(checked === true)} + /> + +
+
+ setResetContactHistory(checked === true)} + /> + +
+
+ setResetInterviewHistory(checked === true)} + /> + +
-
- - -
- + {(!surveysReady || surveyOptions.length > 0) && ( +
+

설문 상태이력

+ {!surveysReady &&

설문 목록을 불러오는 중입니다.

} +
+ {surveyOptions.map((survey) => { + const id = `list-reset-scope-survey-${survey.prjctSurveyIdx}` + return ( +
+ handleSurveyChange(survey.prjctSurveyIdx, checked === true)} + /> + +
+ ) + })} +
+
+ )} +
+
    +
  • 선택한 이력은 해당 유형의 이력과 최신 상태가 함께 초기화되며, 선택하지 않은 이력은 유지됩니다.
  • +
  • 리스트를 선택하면 리스트와 모든 이력이 함께 초기화됩니다.
  • +
  • 설문 상태이력 초기화는 외부 설문 시스템의 실제 응답 데이터를 삭제하지 않습니다.
  • +
} diff --git a/src/components/list/ListJobGate.tsx b/src/components/list/ListJobGate.tsx index d55542c..89b9e6a 100644 --- a/src/components/list/ListJobGate.tsx +++ b/src/components/list/ListJobGate.tsx @@ -61,7 +61,9 @@ export function useListJobGate({ prjctIdx, jobType, active, requestLabel, pollWh const status: ListJobGateStatus = !active ? 'idle' : isAvailabilityUnsupported(availability.error) ? 'unsupported' : availability.isError ? 'error' - : !availability.data || (!pollWhileIdle && availability.isFetching && availability.data.allowed) ? 'checking' + // 재조회 중에는 직전 결과를 유지한다. 같은 쿼리를 페이지가 주기적으로 재조회하므로 isFetching을 '확인 중'으로 + // 보면 그때마다 다이얼로그가 깜빡인다. 접수 직전에는 useSubmitListJob이 다시 확인한다. + : !availability.data ? 'checking' : availability.data.allowed ? 'allowed' : 'blocked' return { diff --git a/src/types/list.ts b/src/types/list.ts index 7b63e0b..ccdb1ba 100644 --- a/src/types/list.ts +++ b/src/types/list.ts @@ -36,11 +36,6 @@ export enum ListUploadMode { ADD_AND_CHANGE = 1, } -export enum ListResetMode { - ALL = 0, - HIST = 1, -} - export enum ListEventHistoryBase { ALL = 1, LATEST = 2, @@ -90,7 +85,12 @@ export type ListDownloadPayload = { historyOrder?: ListEventHistoryOrder; }; -export type ListResetScope = 'result-and-history' | 'list-only'; +export type ListResetSelection = { + resetList: boolean; + resetContactHistory: boolean; + resetInterviewHistory: boolean; + resetSurveyIds: number[]; +}; export type ListFilterCondition = { operator: ListFilterOperator; @@ -353,8 +353,7 @@ export type ProjectFieldworkAssignSummary = { assignees: FieldworkAssignSummaryItem[]; }; -export type ListResetRequest = { - resetMode: ListResetMode; +export type ListResetRequest = ListResetSelection & { listFilter: ListFilter; };