diff --git a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts index bca73fc0e..3d5649b7f 100644 --- a/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts +++ b/apps/sn/app/(map-layout)/map/components/fldngHstry/fldngHstryTypes.ts @@ -1,6 +1,7 @@ "use client"; import type { UiHeadProps } from "@common/business_components/ui"; +import { appendApiSearchParams } from "@/shared/util/util"; export const FLOOD_HISTORY_POPUP_KEY = "fldngHstryPopup"; export const FLDNG_HSTRY_ROW_SELECT_MESSAGE = "SN_FLOOD_HISTORY_ROW_SELECT"; @@ -419,17 +420,14 @@ export const buildFldngHstryListQueryString = ( size: String(size), }); - if (normalized.ctpvCd !== "0") - params.set("ctpvCd", normalized.ctpvCd.slice(0, 2)); - if (normalized.sggCd !== "0") - params.set("sggCd", normalized.sggCd.slice(0, 5)); - if (normalized.floodYear) params.set("fldngYr", normalized.floodYear); - if (normalized.disasterName) - params.set("fldngDstrNm", normalized.disasterName); - if (normalized.rainStartDate) - params.set("rainBgngTm", normalized.rainStartDate); - if (normalized.districtName) - params.set("fldngDstrctNm", normalized.districtName); + appendApiSearchParams(params, { + ctpvCd: normalized.ctpvCd === "0" ? "0" : normalized.ctpvCd.slice(0, 2), + sggCd: normalized.sggCd === "0" ? "0" : normalized.sggCd.slice(0, 5), + fldngYr: normalized.floodYear, + fldngDstrNm: normalized.disasterName, + rainBgngTm: normalized.rainStartDate, + fldngDstrctNm: normalized.districtName, + }); return params.toString(); }; diff --git a/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts b/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts index ab03f132d..1d4d2df65 100644 --- a/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts +++ b/apps/sn/app/(map-layout)/map/components/floodDngrMap/floodDngrMapTypes.ts @@ -1,6 +1,7 @@ "use client"; import type { UiHeadProps } from "@common/business_components/ui"; +import { appendApiSearchParams } from "@/shared/util/util"; export const FLOOD_DNGR_MAP_POPUP_KEY = "floodDngrMapPopup"; export const FLOOD_DNGR_MAP_LAYER_TYPE = "tb_ms_flood_dngr_map"; @@ -89,16 +90,12 @@ export const buildFloodDngrMapListQueryString = ( page: String(page), size: String(size), }); - if (filters.ctpvCd && filters.ctpvCd !== "0") - params.set("ctpvCd", filters.ctpvCd.slice(0, 2)); - if (filters.sggCd && filters.sggCd !== "0") - params.set("sggCd", filters.sggCd.slice(0, 5)); - if (filters.sbmrgDpthlCd && filters.sbmrgDpthlCd !== "0") { - params.set("sbmrgDpthlCd", filters.sbmrgDpthlCd); - } - if (filters.sbmrgFrqExpln && filters.sbmrgFrqExpln !== "0") { - params.set("sbmrgFrqExpln", filters.sbmrgFrqExpln); - } + appendApiSearchParams(params, { + ctpvCd: filters.ctpvCd === "0" ? "0" : filters.ctpvCd.slice(0, 2), + sggCd: filters.sggCd === "0" ? "0" : filters.sggCd.slice(0, 5), + sbmrgDpthlCd: filters.sbmrgDpthlCd, + sbmrgFrqExpln: filters.sbmrgFrqExpln, + }); return params.toString(); }; diff --git a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts index bf225784e..3d27a82c9 100644 --- a/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts +++ b/apps/sn/app/(map-layout)/map/components/sbmrgDngrMap/sbmrgDngrMapTypes.ts @@ -1,6 +1,7 @@ "use client"; import type { UiHeadProps } from "@common/business_components/ui"; +import { appendApiSearchParams } from "@/shared/util/util"; export const SBMRG_DNGR_MAP_POPUP_KEY = "sbmrgDngrMapPopup"; export const SBMRG_DNGR_MAP_LAYER_TYPE = "tb_ms_sbmrg_dngr_map"; @@ -74,13 +75,11 @@ export const buildSbmrgDngrMapListQueryString = ( page: String(page), size: String(size), }); - if (filters.ctpvCd && filters.ctpvCd !== "0") - params.set("ctpvCd", filters.ctpvCd.slice(0, 2)); - if (filters.sggCd && filters.sggCd !== "0") - params.set("sggCd", filters.sggCd.slice(0, 5)); - if (filters.floodWtlvFrqVl && filters.floodWtlvFrqVl !== "0") { - params.set("floodWtlvFrqVl", filters.floodWtlvFrqVl); - } + appendApiSearchParams(params, { + ctpvCd: filters.ctpvCd === "0" ? "0" : filters.ctpvCd.slice(0, 2), + sggCd: filters.sggCd === "0" ? "0" : filters.sggCd.slice(0, 5), + floodWtlvFrqVl: filters.floodWtlvFrqVl, + }); return params.toString(); }; diff --git a/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts b/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts index 401029745..e526ec992 100644 --- a/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts +++ b/apps/sn/app/(map-layout)/map/components/sinkhole/sinkholeTypes.ts @@ -2,6 +2,7 @@ import type { SelectDataType } from "@common/business_components"; import type { IUserInfo } from "@/shared/store"; +import { appendApiSearchParams } from "@/shared/util/util"; export const SINKHOLE_CONTROL_NODE_ID = "SN_SINKHOLE"; export const SINKHOLE_LAYER_TYPE = "tb_sn_sinkhole_info"; @@ -284,19 +285,16 @@ export const buildSinkholeListQueryString = ( size: String(size), }); - if (filters.startYmd) params.set("startYmd", filters.startYmd); - if (filters.endYmd) params.set("endYmd", filters.endYmd); - const ctpvNm = resolveRegionNameByCode(filters.ctpvCd, ctpvOptions, 2); const sggNm = resolveRegionNameByCode(filters.sggCd, sggOptions, 5); - if (ctpvNm) params.set("ctpvNm", ctpvNm); - if (sggNm) params.set("sggNm", sggNm); - if (filters.restoreStatus && filters.restoreStatus !== "0") { - params.set("restoreStatus", filters.restoreStatus); - } - if (filters.coordStatus && filters.coordStatus !== "0") { - params.set("coordStatus", filters.coordStatus); - } + appendApiSearchParams(params, { + startYmd: filters.startYmd, + endYmd: filters.endYmd, + ctpvNm, + sggNm, + restoreStatus: filters.restoreStatus, + coordStatus: filters.coordStatus, + }); if (options?.includeCoordStatus === false) { params.set("includeCoordStatus", "false"); } diff --git a/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx b/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx index 12666c3be..031511650 100644 --- a/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx +++ b/apps/sn/src/features/ctyFldngPrvtnBiz/ui/CtyFldngPrvtnBizListPage.tsx @@ -717,17 +717,19 @@ export function CtyFldngPrvtnBizListPage() { /> - - +
+ + +
{notice && ( diff --git a/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx b/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx index 214eca881..d27f76b49 100644 --- a/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx +++ b/apps/sn/src/features/obsltPpl/ui/ObsltPplListPage.tsx @@ -619,17 +619,19 @@ export function ObsltPplListPage() { /> - - +
+ + +