-
+
{ cellClick(index ?? undefined) }}
onPageChange={setPageNation}
resetPageNo={resetPage}
+ widthFixed={true}
/>
@@ -277,7 +278,9 @@ export default function LdrmntCoSttn() {
setDetailModal({ ...detailModal, isOpen: false });
ldrmntSearch(false, pageNation, '20', computeCityNm(), searchTxt || "");
};
- confirmToast(t('isUpdateMsg'), handleConfirm);
+ if (await confirm(t("isUpdateMsg"))) {
+ await handleConfirm();
+ }
}} />}
/>
@@ -289,7 +292,6 @@ export default function LdrmntCoSttn() {
bodyClass={"w-[40vw] max-w-none"}
body={
setIsExcelOpen({ isModal: isOpen })} />}
/>
-
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx
index acc44571f..d8f52297c 100644
--- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx
+++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/htdflReg/page.tsx
@@ -18,7 +18,6 @@ import {
import ListDiv from "@common/business_components/ui/list_div";
import { Button } from "@common/components";
import { useEffect, useRef, useState } from "react";
-import { Toaster } from "react-hot-toast";
export default function Home() {
const {
@@ -183,7 +182,6 @@ export default function Home() {
}}
/>
-
);
diff --git a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/pbnstReg/page.tsx b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/pbnstReg/page.tsx
index 87dff04fd..0a243a41f 100644
--- a/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/pbnstReg/page.tsx
+++ b/apps/wr/app/(with-layout)/ruseFcltMng/fcltReg/pbnstReg/page.tsx
@@ -30,7 +30,7 @@ import { btnClass } from "@/app/store/common/code";
import { Tabs, TabsList, TabsTrigger, TabsContent } from "@common/components";
import { useCallback, useEffect, useRef, useState } from "react";
import ListDiv from "@common/business_components/ui/list_div";
-import { confirmToast, tableData } from "@/components/lib/func/common";
+import { tableData } from "@/components/lib/func/common";
import type {
customPbnst,
fcBizType,
@@ -44,13 +44,13 @@ import {
import { PbnstMngForm } from "@/components/ui/form/fcltReg/pbnstReg/mngReg/mngRegForm";
import { PbnstBuseForm } from "@/components/ui/form/fcltReg/pbnstReg/buseReg/bugRegForm";
import { PbnstRegModal } from "@/components/ui/modal/fcltReg/pbnstRegModal/pbnstRegModal";
-import { Toaster } from "react-hot-toast";
import { writeRgtrAndMdfr } from "@/app/store/ruseFcltMng/fcltReg/pbnstReg";
import { useFieldArray, useForm, type FieldErrors } from "react-hook-form"; // FieldErrors 타입 추가
import { zodResolver } from "@hookform/resolvers/zod";
import { z } from "zod";
import { createDefaultPbnstItem } from "./utilsZod";
import { useTranslation } from "react-i18next";
+import { useConfirm } from "@frontend-opensource/use-react-hooks";
import { useAlertStore } from "@/src/shared/lib";
export default function PublicReuseFaciltyInsert() {
const {
@@ -67,6 +67,7 @@ export default function PublicReuseFaciltyInsert() {
} = useWrStore((state) => state);
const { t } = useTranslation("base");
+ const { confirm } = useConfirm();
const alert = useAlertStore((state) => state.setMessage);
const { pubFacHeadList, pbnstHasuResCount, pbnstHasuRes, pbnstRes } = pbnst;
const { regAuthrtYn, mdfcnAuthrtYn, laeSeCd } = auth;
@@ -137,30 +138,29 @@ export default function PublicReuseFaciltyInsert() {
});
const handleConfirm = async () => {
- Promise.allSettled([
+ const [resFclt, resBiz] = await Promise.allSettled([
pbnstRuseFcltUpdate(pbnst as customPbnst[]),
pbnstRuseBizUpdate(bizs),
- ]).then(([resFclt, resBiz]) => {
- const isFcltSuccess = resFclt.status === "fulfilled";
- const isBizSuccess = resBiz.status === "fulfilled";
- if (isFcltSuccess && isBizSuccess) {
- alert("하수 재이용 시설 및 사업이 수정되었습니다.");
- // 메시지 표시, 페이지 이동 등
- } else {
- let message = "";
- // ✅ 각각 어떤 항목이 실패했는지도 로그/알림 처리
- if (!isFcltSuccess) {
- message = "하수재이용 시설 ";
- }
- if (!isBizSuccess) {
- message += "하수재이용 시설 사업 ";
- }
- alert(message + "오류 입니다 ");
- pubHasuInit("1", laeSeCd);
+ ]);
+ const isFcltSuccess = resFclt.status === "fulfilled";
+ const isBizSuccess = resBiz.status === "fulfilled";
+ if (isFcltSuccess && isBizSuccess) {
+ alert("하수 재이용 시설 및 사업이 수정되었습니다.");
+ } else {
+ let message = "";
+ if (!isFcltSuccess) {
+ message = "하수재이용 시설 ";
}
- });
+ if (!isBizSuccess) {
+ message += "하수재이용 시설 사업 ";
+ }
+ alert(message + "오류 입니다 ");
+ pubHasuInit("1", laeSeCd);
+ }
};
- confirmToast(t("isUpdatetMsg"), handleConfirm);
+ if (await confirm(t("isUpdatetMsg"))) {
+ await handleConfirm();
+ }
};
// 폼 유효성 검사 실패 시 호출될 함수
@@ -330,9 +330,7 @@ export default function PublicReuseFaciltyInsert() {
onClick={() => {
// pbnstMngData([] as customPbnst[]);
if (!selectRow) {
- alert(
- "재시용시설을 등록할 하수리시시설을 테이블에서 선택하고 등록버튼을 눌러주세요"
- );
+ alert("재시용시설을 등록할 하수처리시설을 목록에서 선택하고\n 등록버튼을 눌러주세요");
return;
} else {
appendPbnstRuseFclt();
@@ -433,9 +431,7 @@ export default function PublicReuseFaciltyInsert() {
onClick={() => {
// pbnstMngData([] as customPbnst[]);
if (!selectRow) {
- alert(
- "하수리시시설을 테이블을 선택하고 등록버튼을 눌러주세요"
- );
+ alert("하수처리시설을 목록에서 선택하고\n 등록버튼을 눌러주세요");
return;
} else {
appendPbnstRuseFclt();
@@ -454,7 +450,10 @@ export default function PublicReuseFaciltyInsert() {
form={form} // form prop 전달
setPbnstInsert={(data) => {
if (data) {
- pbnstInsert(data); // pbnstInsert 함수 호출
+ void (async () => {
+ const message = await pbnstInsert(data);
+ alert(message);
+ })();
setIsRuseReg({ isModal: false });
}
}}
@@ -470,7 +469,6 @@ export default function PublicReuseFaciltyInsert() {
}}
/>
-