refactor: canvas plan confirm 메세지 다국어 수정

This commit is contained in:
Daseul Kim 2024-10-17 17:35:09 +09:00
parent 30ad1850b6
commit 1cde324337
5 changed files with 26 additions and 21 deletions

View File

@ -38,7 +38,7 @@ export default function CanvasLayout() {
className="close" className="close"
onClick={(e) => onClick={(e) =>
swalFire({ swalFire({
html: getMessage('common.message.confirm.delete') + `</br>${plan.name}`, text: `${plan.name} ` + getMessage('plan.message.confirm.delete'),
type: 'confirm', type: 'confirm',
confirmFn: () => { confirmFn: () => {
handleDeletePlan(e, plan.id) handleDeletePlan(e, plan.id)

View File

@ -123,14 +123,14 @@ export default function CanvasMenu(props) {
}, [menuNumber, type]) }, [menuNumber, type])
// (btn08) // (btn08)
const handleSaveCanvas = () => { const handleSaveCanvas = async () => {
swalFire({ // swalFire({
html: getMessage('common.message.confirm.save') + `</br>${currentCanvasPlan.name}`, // text: `${currentCanvasPlan.name} ` + getMessage('plan.message.confirm.save'),
type: 'confirm', // type: 'confirm',
confirmFn: async () => { // confirmFn: async () => {
await saveCanvas(sessionState.userId) await saveCanvas(sessionState.userId)
}, // },
}) // })
} }
const onClickPlacementInitialMenu = () => { const onClickPlacementInitialMenu = () => {

View File

@ -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 saveCanvas = async (userId) => {
const canvasStatus = currentCanvasData() const canvasStatus = currentCanvasData()
@ -166,7 +161,7 @@ export function usePlan() {
} }
await promisePost({ url: '/api/canvas-management/canvas-statuses', data: planData }) await promisePost({ url: '/api/canvas-management/canvas-statuses', data: planData })
.then((res) => { .then((res) => {
swalFire({ text: getMessage('common.message.save') }) swalFire({ text: getMessage('plan.message.save') })
setInitCanvasPlans((initCanvasPlans) => [...initCanvasPlans, { id: res.data, canvasStatus: canvasStatus }]) setInitCanvasPlans((initCanvasPlans) => [...initCanvasPlans, { id: res.data, canvasStatus: canvasStatus }])
setPlans((plans) => setPlans((plans) =>
plans.map((plan) => plans.map((plan) =>
@ -196,7 +191,7 @@ export function usePlan() {
} }
await promisePut({ url: '/api/canvas-management/canvas-statuses', data: planData }) await promisePut({ url: '/api/canvas-management/canvas-statuses', data: planData })
.then((res) => { .then((res) => {
swalFire({ text: getMessage('common.message.save') }) swalFire({ text: getMessage('plan.message.save') })
setInitCanvasPlans((initCanvasPlans) => setInitCanvasPlans((initCanvasPlans) =>
initCanvasPlans.map((plan) => (plan.id === currentCanvasPlan.id ? { ...plan, canvasStatus: canvasStatus } : plan)), 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 || currentCanvasPlan.id !== newCurrentId) {
if (currentCanvasPlan?.id && checkModifiedCanvasPlan()) { if (currentCanvasPlan?.id && checkModifiedCanvasPlan()) {
swalFire({ swalFire({
html: getMessage('common.message.confirm.save') + `</br>${currentCanvasPlan.name}`, text: `${currentCanvasPlan.name} ` + getMessage('plan.message.confirm.save'),
type: 'confirm', type: 'confirm',
confirmFn: async () => { confirmFn: async () => {
await saveCanvas(userId) await saveCanvas(userId)
@ -262,7 +257,7 @@ export function usePlan() {
const handleAddPlan = (userId, objectNo) => { const handleAddPlan = (userId, objectNo) => {
JSON.parse(currentCanvasData()).objects.length > 0 JSON.parse(currentCanvasData()).objects.length > 0
? swalFire({ ? swalFire({
html: `${currentCanvasPlan.name} PLAN을 복사하시겠습니까?`, text: `${currentCanvasPlan.name} ` + getMessage('plan.message.confirm.copy'),
type: 'confirm', type: 'confirm',
confirmFn: () => { confirmFn: () => {
addPlan(userId, objectNo, currentCanvasData()) addPlan(userId, objectNo, currentCanvasData())
@ -295,7 +290,7 @@ export function usePlan() {
if (initCanvasPlans.some((plan) => plan.id === id)) { if (initCanvasPlans.some((plan) => plan.id === id)) {
delCanvasById(id) delCanvasById(id)
.then((res) => { .then((res) => {
swalFire({ text: getMessage('common.message.delete') }) swalFire({ text: getMessage('plan.message.delete') })
setInitCanvasPlans((initCanvasPlans) => initCanvasPlans.filter((plan) => plan.id !== id)) setInitCanvasPlans((initCanvasPlans) => initCanvasPlans.filter((plan) => plan.id !== id))
setPlans((plans) => plans.filter((plan) => plan.id !== id)) setPlans((plans) => plans.filter((plan) => plan.id !== id))
}) })
@ -304,7 +299,7 @@ export function usePlan() {
}) })
} else { } else {
setPlans((plans) => plans.filter((plan) => plan.id !== id)) setPlans((plans) => plans.filter((plan) => plan.id !== id))
swalFire({ text: getMessage('common.message.delete') }) swalFire({ text: getMessage('plan.message.delete') })
} }
// 삭제 후 last 데이터에 포커싱 // 삭제 후 last 데이터에 포커싱

View File

@ -247,6 +247,11 @@
"modal.object.setting.direction.select": "方向の選択", "modal.object.setting.direction.select": "方向の選択",
"modal.placement.surface.setting.info": "ⓘ ①の長さ入力後に対角線の長さを入力すると、②の長さを自動計算します。", "modal.placement.surface.setting.info": "ⓘ ①の長さ入力後に対角線の長さを入力すると、②の長さを自動計算します。",
"modal.placement.surface.setting.diagonal.length": "斜めの長さ", "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": "設定", "setting": "設定",
"common.message.no.data": "No data", "common.message.no.data": "No data",
"common.message.no.dataDown": "ダウンロードするデータがありません", "common.message.no.dataDown": "ダウンロードするデータがありません",

View File

@ -252,6 +252,11 @@
"modal.object.setting.direction.select": "방향 선택", "modal.object.setting.direction.select": "방향 선택",
"modal.placement.surface.setting.info": "ⓘ ①의 길이 입력 후 대각선 길이를 입력하면 ②의 길이를 자동 계산합니다.", "modal.placement.surface.setting.info": "ⓘ ①의 길이 입력 후 대각선 길이를 입력하면 ②의 길이를 자동 계산합니다.",
"modal.placement.surface.setting.diagonal.length": "대각선 길이", "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": "설정", "setting": "설정",
"common.message.no.data": "No data", "common.message.no.data": "No data",
"common.message.no.dataDown": "No data to download", "common.message.no.dataDown": "No data to download",