From 520c96eabf0bb82782a489bf47cc9e2c33809249 Mon Sep 17 00:00:00 2001
From: Daseul Kim <amekimm@gmail.com>
Date: Sat, 8 Feb 2025 21:44:22 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=20=EC=9D=B4=ED=9B=84=20=EC=BA=94=EB=B2=84=EC=8A=A4?=
 =?UTF-8?q?=EB=A1=9C=20=EB=8F=8C=EC=95=84=EC=99=94=EC=9D=84=20=EB=95=8C=20?=
 =?UTF-8?q?=EC=BA=94=EB=B2=84=EC=8A=A4=20=EC=82=AC=EB=9D=BC=EC=A7=80?=
 =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

resolves: #656, #677
---
 src/components/floor-plan/CanvasMenu.jsx | 14 ++++++++------
 src/hooks/usePlan.js                     | 21 +++++++++++++++++++--
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx
index db248f94..398797f8 100644
--- a/src/components/floor-plan/CanvasMenu.jsx
+++ b/src/components/floor-plan/CanvasMenu.jsx
@@ -74,7 +74,7 @@ export default function CanvasMenu(props) {
   const [estimateCopyPopupOpen, setEstimateCopyPopupOpen] = useState(false)
 
   const { getMessage } = useMessage()
-  const { saveCanvas } = usePlan()
+  const { saveCanvas, reloadCanvasStatus } = usePlan()
   const { swalFire } = useSwal()
   const { initEvent, addCanvasMouseEventListener, addDocumentEventListener } = useEvent()
   // const { initEvent, addCanvasMouseEventListener, addDocumentEventListener } = useContext(EventContext)
@@ -149,7 +149,7 @@ export default function CanvasMenu(props) {
     setIsGlobalLoading(false)
   }
 
-  const onClickNav = (menu) => {
+  const onClickNav = async (menu) => {
     switch (menu.index) {
       case 0:
         swalFire({
@@ -164,10 +164,11 @@ export default function CanvasMenu(props) {
       case 1:
         setType('placementShape')
         onClickPlacementInitialMenu()
-
+        await reloadCanvasStatus(objectNo, pid)
         break
       case 2:
         setType('outline')
+        await reloadCanvasStatus(objectNo, pid)
         break
       case 3:
         console.log('🚀 ~ onClickNav ~ menu:', menu)
@@ -199,6 +200,7 @@ export default function CanvasMenu(props) {
         } else {
           setType('surface')
         }
+        await reloadCanvasStatus(objectNo, pid)
         break
       case 4:
         if (menuNumber < menu.index) {
@@ -211,7 +213,7 @@ export default function CanvasMenu(props) {
         } else {
           router.push(`/floor-plan?pid=${pid}&objectNo=${objectNo}`)
         }
-
+        await reloadCanvasStatus(objectNo, pid)
         break
       case 5:
         setIsGlobalLoading(true)
@@ -617,10 +619,10 @@ export default function CanvasMenu(props) {
               <li
                 key={`canvas-menu-${menu.index}`}
                 className={`canvas-menu-item ${menuNumber === menu.index ? 'active' : ''}`}
-                onClick={() => {
+                onClick={async () => {
                   if (['2', '3'].includes(canvasSetting?.roofSizeSet) && menu.index === 2) return
                   if (menuNumber === 4 && [1, 2].includes(menu.index)) return
-                  onClickNav(menu)
+                  await onClickNav(menu)
                 }}
               >
                 <button className={checkMenuState(menu) ? 'no-click' : ''}>
diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js
index 70f7e0db..9db69642 100644
--- a/src/hooks/usePlan.js
+++ b/src/hooks/usePlan.js
@@ -134,7 +134,7 @@ export function usePlan(params = {}) {
   /**
    * objectNo에 해당하는 canvas 목록을 조회
    */
-  const getCanvasByObjectNo = async (userId, objectNo, planNo) => {
+  const getCanvasByObjectNo = async (objectNo, planNo) => {
     return await get({ url: `/api/canvas-management/canvas-statuses/by-object/${objectNo}` }).then((res) =>
       res.map((item) => ({
         id: item.id,
@@ -397,7 +397,7 @@ export function usePlan(params = {}) {
    */
   const loadCanvasPlanData = async (userId, objectNo, planNo) => {
     console.log('🚀 ~ loadCanvasPlanData ~ userId, objectNo, planNo:', userId, objectNo, planNo)
-    await getCanvasByObjectNo(userId, objectNo, planNo).then(async (res) => {
+    await getCanvasByObjectNo(objectNo, planNo).then(async (res) => {
       if (res.length > 0) {
         setCurrentCanvasPlan(res.find((plan) => plan.planNo === planNo))
         setPlans(res)
@@ -415,6 +415,22 @@ export function usePlan(params = {}) {
     setPlans((plans) => plans.map((plan) => ({ ...plan, canvasStatus: null })))
   }
 
+  /**
+   * plan canvasStatus 불러오기
+   *
+   * 견적서/발전시뮬레이션에서 플랜 이동 시 현재 플랜의 canvasStatus를 불러오기 위해 사용
+   */
+  const reloadCanvasStatus = async (objectNo, planNo) => {
+    if (pathname === '/floor-plan/estimate/5' || pathname === '/floor-plan/simulator/6') {
+      await getCanvasByObjectNo(objectNo, planNo).then((res) => {
+        if (res.length > 0) {
+          setCurrentCanvasPlan((prev) => ({ ...prev, canvasStatus: res.find((plan) => plan.planNo === planNo).canvasStatus }))
+          setPlans((plans) => plans.map((plan) => ({ ...plan, canvasStatus: res.find((plan) => plan.planNo === planNo).canvasStatus })))
+        }
+      })
+    }
+  }
+
   /**
    * 현재 plan 이동 -> 새로운 링크로 이동
    */
@@ -434,5 +450,6 @@ export function usePlan(params = {}) {
     handleDeletePlan,
     loadCanvasPlanData,
     resetCanvasStatus,
+    reloadCanvasStatus,
   }
 }