From 88b36bf27dd3254c700fbe9f1a8673361f9e180c Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 19 Nov 2026 07:23:14 +0900 Subject: [PATCH 1/2] =?UTF-8?q?261119=5F01=5FENH:=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=ED=95=84=ED=84=B0=20=EB=8B=A4=EC=9D=B4=EC=96=BC?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=97=90=20=ED=95=84=ED=84=B0=20=EC=B4=88?= =?UTF-8?q?=EA=B8=B0=ED=99=94=20=EB=B2=84=ED=8A=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dialog/ListFilterDialog.tsx | 28 +++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/src/components/dialog/ListFilterDialog.tsx b/src/components/dialog/ListFilterDialog.tsx index 00a8816..4099638 100644 --- a/src/components/dialog/ListFilterDialog.tsx +++ b/src/components/dialog/ListFilterDialog.tsx @@ -1,6 +1,7 @@ 'use client' import { useEffect, useMemo, useState } from 'react' +import { RotateCcw } from 'lucide-react' import { KriDialog } from '@/components/common/KriDialog' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' @@ -107,6 +108,18 @@ const ListFilterDialog = ({ [rows, headerOptions], ) + // 잠긴 헤더는 조회 조건에 쓰이지 않으므로 초기화 필요 여부 판단에서 제외한다. + const isResettable = rows.some((row) => { + if (isDisabledHeader(row.headerId)) return false + const defaultOperator = getHeaderOption(row.headerId)?.defaultOperator ?? 'eq' + return row.operator !== defaultOperator || row.textValue !== '' || row.multiValues.length > 0 + }) + + // 다이얼로그 내 입력만 기본값으로 되돌린다. 실제 반영은 "적용"을 눌러야 이뤄진다. + const handleReset = () => { + setRows(headerOptions.map((option) => createFilterRow(option.id, headerOptions))) + } + const handleConfirm = async () => { setSubmitting(true) try { @@ -138,7 +151,20 @@ const ListFilterDialog = ({
헤더 비교 연산자 - 값 +
+ 값 + +
From 904bbd65099e00d9e6f48143d4ff687a618d442d Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 20 Nov 2026 15:49:06 +0900 Subject: [PATCH 2/2] =?UTF-8?q?261120=5F01=5FFIX:=20=EC=82=AD=EC=A0=9C?= =?UTF-8?q?=C2=B7=EA=B6=8C=ED=95=9C=20=EC=97=86=EB=8A=94=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=EC=A0=9D=ED=8A=B8=EC=9D=98=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=9E=91=EC=97=85=20=EA=B8=B0=EB=A1=9D=EC=9D=B4=20?= =?UTF-8?q?=EB=82=A8=EC=95=84=20403=EC=9D=B4=20=EB=B0=98=EB=B3=B5=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/list/ListJobGate.tsx | 5 ++--- src/components/list/ListJobWatcher.tsx | 5 ++--- src/query/auth.ts | 6 ++++++ src/query/list-job.ts | 8 ++++++++ src/store/list-job-tracker.ts | 10 +++++++++- 5 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/components/list/ListJobGate.tsx b/src/components/list/ListJobGate.tsx index 89b9e6a..3dd6a4e 100644 --- a/src/components/list/ListJobGate.tsx +++ b/src/components/list/ListJobGate.tsx @@ -2,11 +2,10 @@ import { useEffect } from 'react' import { useAtom } from 'jotai' -import { HttpError } from '@kri/common/http' import { Button } from '@/components/ui/button' import { ListJobProgress } from '@/components/list/ListJobProgress' import { useAuth } from '@/hooks/useAuth' -import { isAvailabilityUnsupported, useListJob, useListJobAvailability, useUploadResetActive } from '@/query/list-job' +import { isAvailabilityUnsupported, isListJobGone, useListJob, useListJobAvailability, useUploadResetActive } from '@/query/list-job' import { findTrackedListJob, trackListJob, untrackListJob, useTrackedListJobs } from '@/store/list-job-tracker' import { listJobLabel } from '@/const/listJobConst' import { blockerJobLabel, blockerPhaseLabel, blockerUserLabel, describeListJobAvailability } from '@/utils/listJobAvailability' @@ -45,7 +44,7 @@ export function useListJobGate({ prjctIdx, jobType, active, requestLabel, pollWh const detail = useListJob(prjctIdx, jobKey, active) const job = detail.data?.jobKey === jobKey ? detail.data : undefined const finishedJob = job && !isActiveListJob(job.jobStatus) ? job : undefined - const detailNotFound = detail.error instanceof HttpError && detail.error.status === 404 + const detailNotFound = isListJobGone(detail.error) useEffect(() => { if (!active && requestMatches && openRequest.opened) setOpenRequest(null) diff --git a/src/components/list/ListJobWatcher.tsx b/src/components/list/ListJobWatcher.tsx index 643f0c5..9984c58 100644 --- a/src/components/list/ListJobWatcher.tsx +++ b/src/components/list/ListJobWatcher.tsx @@ -4,10 +4,9 @@ import { useEffect } from 'react' import { usePathname, useRouter } from 'next/navigation' import { useAtom } from 'jotai' import { useQueries, useQueryClient } from '@tanstack/react-query' -import { HttpError } from '@kri/common/http' import { toast } from 'sonner' import { nextApi } from '@/lib/http-client' -import { listJobKeys, useMyActiveListJobs } from '@/query/list-job' +import { isListJobGone, listJobKeys, useMyActiveListJobs } from '@/query/list-job' import { listJobOpenRequestAtom } from '@/store/jotai/list-job' import { useSelectedProject } from '@/hooks/useSelectedProject' import { useDialog } from '@/hooks/useDialog' @@ -90,7 +89,7 @@ export function ListJobWatcher({ userId, prjctIdx }: { userId: string; prjctIdx: details.forEach((result, index) => { const tracked = trackedJobs[index] if (!tracked) return - if (result.error instanceof HttpError && result.error.status === 404) { + if (isListJobGone(result.error)) { untrackListJob(tracked.jobKey) return } diff --git a/src/query/auth.ts b/src/query/auth.ts index 7b45123..340344b 100644 --- a/src/query/auth.ts +++ b/src/query/auth.ts @@ -1,9 +1,12 @@ "use client"; import { useMutation, useQueryClient } from "@tanstack/react-query"; +import { useSetAtom } from "jotai"; import { nextApi } from "@/lib/http-client"; import { useAuth } from "@/hooks/useAuth"; import { useSelectedProject } from "@/hooks/useSelectedProject"; +import { clearTrackedListJobs } from "@/store/list-job-tracker"; +import { listJobOpenRequestAtom } from "@/store/jotai/list-job"; import type { LoginUser } from "@kri/common"; export const useLoginMutation = () => { @@ -31,6 +34,7 @@ export const useLogoutMutation = () => { const qc = useQueryClient(); const { auth, logout } = useAuth(); const { clearSelectedProject } = useSelectedProject(); + const setListJobOpenRequest = useSetAtom(listJobOpenRequestAtom); return useMutation({ mutationFn: async () => { @@ -49,6 +53,8 @@ export const useLogoutMutation = () => { }, onSettled: () => { clearSelectedProject(); + clearTrackedListJobs(); + setListJobOpenRequest(null); logout(); qc.clear(); // 다음 사용자/세션에 서버상태 남지 않게 }, diff --git a/src/query/list-job.ts b/src/query/list-job.ts index 21a737b..6c2af7e 100644 --- a/src/query/list-job.ts +++ b/src/query/list-job.ts @@ -38,6 +38,14 @@ const fetchAvailability = async (prjctIdx: number, jobType: ListJobType) => /** 신규 API 미배포·롤백 상태. 반복 호출하지 않고 사전 안내만 중단한다. */ export const isAvailabilityUnsupported = (error: unknown) => error instanceof HttpError && error.status === 404 +/** + * 작업을 더 이상 조회할 수 없는 경우. 기록을 지우고 반복 조회를 멈춘다. + * - 404: 작업이 만료됐거나 내 작업이 아니다. + * - 403 PROJECT_ACCESS_DENIED: 프로젝트가 삭제됐거나 접근 권한·배정·상태가 바뀌었다. + */ +export const isListJobGone = (error: unknown) => error instanceof HttpError + && (error.status === 404 || (error.status === 403 && apiError(error).code === 'PROJECT_ACCESS_DENIED')) + export function useSubmitListJob(prjctIdx: number) { const qc = useQueryClient() const { auth } = useAuth() diff --git a/src/store/list-job-tracker.ts b/src/store/list-job-tracker.ts index 845de29..457ac54 100644 --- a/src/store/list-job-tracker.ts +++ b/src/store/list-job-tracker.ts @@ -1,7 +1,7 @@ 'use client' import { useSyncExternalStore } from 'react' -import { getLocalStorage, setLocalStorage } from '@/store/storage/secure-storage' +import { getLocalStorage, removeLocalStorage, setLocalStorage } from '@/store/storage/secure-storage' import { StorageKeys } from '@/store/storage/storage-keys' import { isListJobType, type ListJobType } from '@/types/list-job' @@ -77,6 +77,14 @@ export const untrackListJob = (jobKey: string) => { write(jobs.filter((job) => job.jobKey !== jobKey)) } +/** 로그아웃 시 다음 사용자에게 기록이 남지 않게 모두 지운다. 진행 중인 작업은 재로그인 후 my-active 조회로 다시 채워진다. */ +export const clearTrackedListJobs = () => { + if (typeof window === 'undefined') return + removeLocalStorage(StorageKeys.ListJobs) + cache = EMPTY + window.dispatchEvent(new Event(CHANGE_EVENT)) +} + export const findTrackedListJob = (jobs: TrackedListJob[], userId: string, prjctIdx: number, jobType: ListJobType) => jobs.find((job) => job.userId === userId && job.prjctIdx === prjctIdx && job.jobType === jobType)