diff --git a/src/hooks/common/useCanvasPopupStatusController.js b/src/hooks/common/useCanvasPopupStatusController.js index d7845362..c6be7f9c 100644 --- a/src/hooks/common/useCanvasPopupStatusController.js +++ b/src/hooks/common/useCanvasPopupStatusController.js @@ -17,7 +17,7 @@ export function useCanvasPopupStatusController(param = 1) { const [compasDeg, setCompasDeg] = useRecoilState(compasDegAtom) const [moduleSelectionDataStore, setModuleSelectionDataStore] = useRecoilState(moduleSelectionDataState) const [selectedModules, setSelectedModules] = useRecoilState(selectedModuleState) - const { get, getFetcher, postFetcher } = useAxios() + const { get, promiseGet, getFetcher, postFetcher } = useAxios() const canvas = useRecoilValue(canvasState) const currentCanvasPlan = useRecoilValue(currentCanvasPlanState) // console.log('🚀 ~ Orientation ~ currentCanvasPlan:', currentCanvasPlan) @@ -37,11 +37,18 @@ export function useCanvasPopupStatusController(param = 1) { // getFetcher, // ) - const res = await get({ + const result = await promiseGet({ url: `/api/v1/canvas-popup-status?objectNo=${currentCanvasPlan.objectNo}&planNo=${currentCanvasPlan.planNo}&popupType=${popupTypeParam}`, }) + .then((res) => { + return res + }) + .catch((err) => { + console.log('🚀 ~ getModuleSelection ~ err:', err) + return null + }) - return res + return result.data } /** @@ -51,8 +58,9 @@ export function useCanvasPopupStatusController(param = 1) { const handleModuleSelectionTotal = async () => { for (let i = 1; i < 3; i++) { const result = await getModuleSelection(i) + console.log('🚀 ~ handleModuleSelectionTotal ~ result:', result) // setModuleSelectionTotal((prev) => ({ ...prev, [i]: JSON.parse(unescapeString(result.popupStatus)) })) - if (!result) return + if (!result.objectNo) return if (i === 1) { setCompasDeg(result.popupStatus) } else if (i === 2) {