From 1cde3243377c7e3cdd83336871b91cd83eb5e87f Mon Sep 17 00:00:00 2001 From: Daseul Kim Date: Thu, 17 Oct 2024 17:35:09 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20canvas=20plan=20confirm=20=EB=A9=94?= =?UTF-8?q?=EC=84=B8=EC=A7=80=20=EB=8B=A4=EA=B5=AD=EC=96=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/floor-plan/CanvasLayout.jsx | 2 +- src/components/floor-plan/CanvasMenu.jsx | 16 ++++++++-------- src/hooks/usePlan.js | 19 +++++++------------ src/locales/ja.json | 5 +++++ src/locales/ko.json | 5 +++++ 5 files changed, 26 insertions(+), 21 deletions(-) diff --git a/src/components/floor-plan/CanvasLayout.jsx b/src/components/floor-plan/CanvasLayout.jsx index 3faf35d5..ee17af25 100644 --- a/src/components/floor-plan/CanvasLayout.jsx +++ b/src/components/floor-plan/CanvasLayout.jsx @@ -38,7 +38,7 @@ export default function CanvasLayout() { className="close" onClick={(e) => swalFire({ - html: getMessage('common.message.confirm.delete') + `
${plan.name}`, + text: `${plan.name} ` + getMessage('plan.message.confirm.delete'), type: 'confirm', confirmFn: () => { handleDeletePlan(e, plan.id) diff --git a/src/components/floor-plan/CanvasMenu.jsx b/src/components/floor-plan/CanvasMenu.jsx index 8669fcfe..c0cd09e5 100644 --- a/src/components/floor-plan/CanvasMenu.jsx +++ b/src/components/floor-plan/CanvasMenu.jsx @@ -123,14 +123,14 @@ export default function CanvasMenu(props) { }, [menuNumber, type]) // 저장버튼(btn08) 클릭 시 호출되는 함수 - const handleSaveCanvas = () => { - swalFire({ - html: getMessage('common.message.confirm.save') + `
${currentCanvasPlan.name}`, - type: 'confirm', - confirmFn: async () => { - await saveCanvas(sessionState.userId) - }, - }) + const handleSaveCanvas = async () => { + // swalFire({ + // text: `${currentCanvasPlan.name} ` + getMessage('plan.message.confirm.save'), + // type: 'confirm', + // confirmFn: async () => { + await saveCanvas(sessionState.userId) + // }, + // }) } const onClickPlacementInitialMenu = () => { diff --git a/src/hooks/usePlan.js b/src/hooks/usePlan.js index 6c67eaa4..8afb2060 100644 --- a/src/hooks/usePlan.js +++ b/src/hooks/usePlan.js @@ -124,12 +124,7 @@ export function usePlan() { } /** - * 페이지 내 캔버스를 저장하는 함수 - * - * 1. 신규 저장 : POST - * param(body) : userId, objectNo, canvasStatus - * 2. 수정 저장 : PUT - * param(body) : id, canvasStatus + * 페이지 내 캔버스를 저장 */ const saveCanvas = async (userId) => { const canvasStatus = currentCanvasData() @@ -166,7 +161,7 @@ export function usePlan() { } await promisePost({ url: '/api/canvas-management/canvas-statuses', data: planData }) .then((res) => { - swalFire({ text: getMessage('common.message.save') }) + swalFire({ text: getMessage('plan.message.save') }) setInitCanvasPlans((initCanvasPlans) => [...initCanvasPlans, { id: res.data, canvasStatus: canvasStatus }]) setPlans((plans) => plans.map((plan) => @@ -196,7 +191,7 @@ export function usePlan() { } await promisePut({ url: '/api/canvas-management/canvas-statuses', data: planData }) .then((res) => { - swalFire({ text: getMessage('common.message.save') }) + swalFire({ text: getMessage('plan.message.save') }) setInitCanvasPlans((initCanvasPlans) => initCanvasPlans.map((plan) => (plan.id === currentCanvasPlan.id ? { ...plan, canvasStatus: canvasStatus } : plan)), ) @@ -229,7 +224,7 @@ export function usePlan() { if (!currentCanvasPlan || currentCanvasPlan.id !== newCurrentId) { if (currentCanvasPlan?.id && checkModifiedCanvasPlan()) { swalFire({ - html: getMessage('common.message.confirm.save') + `
${currentCanvasPlan.name}`, + text: `${currentCanvasPlan.name} ` + getMessage('plan.message.confirm.save'), type: 'confirm', confirmFn: async () => { await saveCanvas(userId) @@ -262,7 +257,7 @@ export function usePlan() { const handleAddPlan = (userId, objectNo) => { JSON.parse(currentCanvasData()).objects.length > 0 ? swalFire({ - html: `${currentCanvasPlan.name} PLAN을 복사하시겠습니까?`, + text: `${currentCanvasPlan.name} ` + getMessage('plan.message.confirm.copy'), type: 'confirm', confirmFn: () => { addPlan(userId, objectNo, currentCanvasData()) @@ -295,7 +290,7 @@ export function usePlan() { if (initCanvasPlans.some((plan) => plan.id === id)) { delCanvasById(id) .then((res) => { - swalFire({ text: getMessage('common.message.delete') }) + swalFire({ text: getMessage('plan.message.delete') }) setInitCanvasPlans((initCanvasPlans) => initCanvasPlans.filter((plan) => plan.id !== id)) setPlans((plans) => plans.filter((plan) => plan.id !== id)) }) @@ -304,7 +299,7 @@ export function usePlan() { }) } else { setPlans((plans) => plans.filter((plan) => plan.id !== id)) - swalFire({ text: getMessage('common.message.delete') }) + swalFire({ text: getMessage('plan.message.delete') }) } // 삭제 후 last 데이터에 포커싱 diff --git a/src/locales/ja.json b/src/locales/ja.json index 71611af3..15cbe762 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -247,6 +247,11 @@ "modal.object.setting.direction.select": "方向の選択", "modal.placement.surface.setting.info": "ⓘ ①の長さ入力後に対角線の長さを入力すると、②の長さを自動計算します。", "modal.placement.surface.setting.diagonal.length": "斜めの長さ", + "plan.message.confirm.save": "PLAN을 저장하시겠습니까?", + "plan.message.confirm.copy": "PLAN을 복사하시겠습니까?", + "plan.message.confirm.delete": "PLAN을 삭제하시겠습니까?", + "plan.message.save": "저장되었습니다.", + "plan.message.delete": "삭제되었습니다.", "setting": "設定", "common.message.no.data": "No data", "common.message.no.dataDown": "ダウンロードするデータがありません", diff --git a/src/locales/ko.json b/src/locales/ko.json index 5f557e27..f3f3deea 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -252,6 +252,11 @@ "modal.object.setting.direction.select": "방향 선택", "modal.placement.surface.setting.info": "ⓘ ①의 길이 입력 후 대각선 길이를 입력하면 ②의 길이를 자동 계산합니다.", "modal.placement.surface.setting.diagonal.length": "대각선 길이", + "plan.message.confirm.save": "PLAN을 저장하시겠습니까?", + "plan.message.confirm.copy": "PLAN을 복사하시겠습니까?", + "plan.message.confirm.delete": "PLAN을 삭제하시겠습니까?", + "plan.message.save": "저장되었습니다.", + "plan.message.delete": "삭제되었습니다.", "setting": "설정", "common.message.no.data": "No data", "common.message.no.dataDown": "No data to download",