From 768ad001d2f7fabbd021edd8aeb64a1e3d87dd09 Mon Sep 17 00:00:00 2001
From: bicochan <chanii8@naver.com>
Date: Wed, 9 Sep 2026 10:30:29 +0900
Subject: [PATCH] =?UTF-8?q?[as]=20feat:=20=EC=9E=AC=EC=9B=90=ED=98=91?=
 =?UTF-8?q?=EC=9D=98=20=EC=BF=BC=EB=A6=AC=20=EB=AC=B4=ED=9A=A8=ED=99=94=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/as/src/pages/fnrs-cnsltn/ui/fnrs-detail-gate.tsx  |  8 ++++----
 apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx    | 10 +++++-----
 .../src/widgets/pbadms-sprt/ui/pbadms-detail-gate.tsx  |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-detail-gate.tsx b/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-detail-gate.tsx
index 153d491ff..55fbb04ad 100644
--- a/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-detail-gate.tsx
+++ b/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-detail-gate.tsx
@@ -12,8 +12,8 @@ interface FnrsDetailGateProps {
 
 function FnrsDetailGate({ id }: FnrsDetailGateProps) {
   const userInfo = useUserStore((state) => state.userInfo);
-  const { data, isLoading, isError } = useFnrsCnsltnMng(id);
-  const shouldRedirectToEdit = canEditPbadmsDoc({
+  const { data, isLoading, isFetching, isError } = useFnrsCnsltnMng(id);
+  const canEdit = canEditPbadmsDoc({
     docSeComCd: "FNRS",
     prgrsSttsComCd: data?.detDto?.prgrsSttsComCd,
     rgtr: data?.detDto?.rgtr,
@@ -22,9 +22,9 @@ function FnrsDetailGate({ id }: FnrsDetailGateProps) {
 
   return (
     <PbadmsDetailGate
-      isPending={!userInfo || isLoading}
+      isPending={!userInfo || isLoading || isFetching}
       isError={isError}
-      shouldRedirectToEdit={Boolean(userInfo) && shouldRedirectToEdit}
+      shouldRedirectToEdit={!isFetching && Boolean(userInfo) && canEdit}
       editHref={`/fnrs-cnsltn/${id}/edit`}
     >
       <FnrsViewPage id={id} />
diff --git a/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx b/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx
index c73a1aafc..671b70f98 100644
--- a/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx
+++ b/apps/as/src/pages/fnrs-cnsltn/ui/fnrs-form-page.tsx
@@ -145,7 +145,7 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps)
     const docNo = initialData?.detDto?.fnrsCnsltnDocNo;
     const payload = buildFormPayload(data, beforePrgrsSttsComCd);
     if (!docNo || !payload) return undefined;
-    debugger;
+
     return fnrsCnsltnMngService.submitSupplement(docNo, payload);
   }
 
@@ -172,7 +172,7 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps)
       if (!result) return;
 
       alert("보완완료 처리되었습니다.");
-      queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all });
+      await queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all });
       router.push(`/fnrs-cnsltn/${docNo}`);
     } catch (error) {
       console.error("보완완료 실패:", error);
@@ -191,7 +191,7 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps)
       if (!fnrsCnsltnDocNo) return;
 
       alert("저장되었습니다.");
-      queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all });
+      await queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all });
       router.push(`/fnrs-cnsltn/${fnrsCnsltnDocNo}/edit`);
     } catch (error) {
       console.error("저장 실패:", error);
@@ -220,7 +220,7 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps)
       if (!fnrsCnsltnDocNo) return;
 
       alert("신청 완료되었습니다.");
-      queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all });
+      await queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all });
       router.push(`/fnrs-cnsltn/${fnrsCnsltnDocNo}`);
     } catch (error) {
       console.error("신청 실패:", error);
@@ -249,7 +249,7 @@ function FnrsFormPage({ mode, initialData, createDefaults }: FnrsFormPageProps)
       setIsSubmitting(true);
       await fnrsCnsltnMngService.remove(docNo);
       alert("삭제되었습니다.");
-      queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all });
+      await queryClient.invalidateQueries({ queryKey: fnrsCnsltnKeys.all });
       router.push("/fnrs-cnsltn");
     } catch (error) {
       console.error("삭제 실패:", error);
diff --git a/apps/as/src/widgets/pbadms-sprt/ui/pbadms-detail-gate.tsx b/apps/as/src/widgets/pbadms-sprt/ui/pbadms-detail-gate.tsx
index 3d70d21c8..60d0fec3e 100644
--- a/apps/as/src/widgets/pbadms-sprt/ui/pbadms-detail-gate.tsx
+++ b/apps/as/src/widgets/pbadms-sprt/ui/pbadms-detail-gate.tsx
@@ -44,9 +44,9 @@ function PbadmsDetailGate({
   const router = useRouter();
 
   useEffect(() => {
-    if (!shouldRedirectToEdit) return;
+    if (isPending || !shouldRedirectToEdit) return;
     router.replace(editHref);
-  }, [editHref, router, shouldRedirectToEdit]);
+  }, [editHref, isPending, router, shouldRedirectToEdit]);
 
   if (isPending || shouldRedirectToEdit) return <DetailSkeleton />;