From 88113fca1c4623caf9728f6a2d3789824d19eb6e Mon Sep 17 00:00:00 2001 From: ljpark Date: Mon, 20 Jul 2026 14:52:48 +0900 Subject: [PATCH 01/40] =?UTF-8?q?wr:=20fo:=20sn:=20NEXT=5FPUBLIC=5FCOOKIE?= =?UTF-8?q?=5FCOMAIN=20=EA=B0=9C=EB=B0=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fo/.env.local | 3 +-- apps/fo/.env.mindone | 3 ++- apps/sn/.env.local | 2 ++ apps/sn/.env.mindone | 3 ++- apps/wr/.env.local | 1 + apps/wr/.env.mindone | 1 + 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/apps/fo/.env.local b/apps/fo/.env.local index e6349c58f..1d6e4893f 100644 --- a/apps/fo/.env.local +++ b/apps/fo/.env.local @@ -19,7 +19,6 @@ NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={x}&tilerow={y} # NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login NEXT_PUBLIC_CM_LOGIN_PAGE_URL = / - -#NEXT_PUBLIC_SERVER_API_URL = http://localhost:8883/operation-service +NEXT_PUBLIC_COOKIE_COMAIN=.mind-one.co.kr REACT_EDITOR=atom \ No newline at end of file diff --git a/apps/fo/.env.mindone b/apps/fo/.env.mindone index 1e7525b27..740770113 100644 --- a/apps/fo/.env.mindone +++ b/apps/fo/.env.mindone @@ -17,4 +17,5 @@ DC_URL = https://apigateway.apps.rsonesoft.com/dc-service SEWERAGE_API_URL = http://con.mind-one.co.kr:11083/sewerage-service NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={x}&tilerow={y} -NEXT_PUBLIC_CM_LOGIN_PAGE_URL = / \ No newline at end of file +NEXT_PUBLIC_CM_LOGIN_PAGE_URL = / +NEXT_PUBLIC_COOKIE_COMAIN=.mind-one.co.kr \ No newline at end of file diff --git a/apps/sn/.env.local b/apps/sn/.env.local index 337c819d2..c603cdbb6 100644 --- a/apps/sn/.env.local +++ b/apps/sn/.env.local @@ -17,3 +17,5 @@ SEWERAGE_API_URL = http://localhost:8883 DC_URL = https://apigateway.apps.rsonesoft.com # NEXT_PUBLIC_CM_LOGIN_PAGE_URL = http://dev.onasys.co.kr:3000/auth/login NEXT_PUBLIC_CM_LOGIN_PAGE_URL = /auth/login +# NEXT_PUBLIC_SEWERAGE_API_URL=http://192.168.1.66:8883 +NEXT_PUBLIC_COOKIE_COMAIN=.mind-one.co.kr \ No newline at end of file diff --git a/apps/sn/.env.mindone b/apps/sn/.env.mindone index 8a39a81a8..da2d0fd5c 100644 --- a/apps/sn/.env.mindone +++ b/apps/sn/.env.mindone @@ -13,4 +13,5 @@ NEXT_PUBLIC_NGII_URL = https://map.ngii.go.kr NEXT_PUBLIC_NGII_PARAM = 04trYP9_xwLAfALjwZ-B8g&service=WMTS&request=GetTile&version=1.0.0&format=image/png&layer=korean_map&style=korean&tilematrixset=korean&tilematrix={z}&tilecol={x}&tilerow={y} SEWERAGE_API_URL = http://con.mind-one.co.kr:11083 DC_URL = https://apigateway.apps.rsonesoft.com -NEXT_PUBLIC_CM_LOGIN_PAGE_URL = /auth/login \ No newline at end of file +NEXT_PUBLIC_CM_LOGIN_PAGE_URL = /auth/login +NEXT_PUBLIC_COOKIE_COMAIN=.mind-one.co.kr \ No newline at end of file diff --git a/apps/wr/.env.local b/apps/wr/.env.local index d60b49979..b123d7cc4 100644 --- a/apps/wr/.env.local +++ b/apps/wr/.env.local @@ -26,3 +26,4 @@ NEXT_PUBLIC_HASUDOINFO_IN = https://www.hasudoinfo.or.kr NEXT_PUBLIC_FINDADRESS_URL = https://business.juso.go.kr/addrlink/addrLinkApi.do NEXT_PRIVATE_WR_ADDRESS_KEY = devU01TX0FVVEgyMDI1MDgyNTEwMzkwNDExNjEwNTM= REACT_EDITOR = atom +NEXT_PUBLIC_COOKIE_COMAIN=.mind-one.co.kr \ No newline at end of file diff --git a/apps/wr/.env.mindone b/apps/wr/.env.mindone index d6ccb9621..a37bd3d2e 100644 --- a/apps/wr/.env.mindone +++ b/apps/wr/.env.mindone @@ -21,3 +21,4 @@ NEXT_PUBLIC_HASUDOINFO = https://www.hasudoinfo.or.kr NEXT_PUBLIC_HASUDOINFO_IN = https://www.hasudoinfo.or.kr NEXT_PUBLIC_FINDADRESS_URL=https://business.juso.go.kr/addrlink/addrLinkApi.do NEXT_PRIVATE_WR_ADDRESS_KEY = devU01TX0FVVEgyMDI1MDgyNTEwMzkwNDExNjEwNTM= +NEXT_PUBLIC_COOKIE_COMAIN=.mind-one.co.kr \ No newline at end of file From b41a317788f8b4d4b827f771d060c8619d0438d8 Mon Sep 17 00:00:00 2001 From: ljpark Date: Tue, 21 Jul 2026 17:59:15 +0900 Subject: [PATCH 02/40] =?UTF-8?q?wr:=20fo:=20sn:=20=EC=A7=80=EB=8F=84?= =?UTF-8?q?=ED=99=94=EB=A9=B4=20session=20confirm?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/fo/app/pages/(map-layout)/layout.tsx | 13 +++++++++++-- apps/sn/app/(map-layout)/layout.tsx | 2 ++ apps/wr/app/(map-layout)/layout.tsx | 10 +++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/apps/fo/app/pages/(map-layout)/layout.tsx b/apps/fo/app/pages/(map-layout)/layout.tsx index 9c45eabc8..11ca87e00 100644 --- a/apps/fo/app/pages/(map-layout)/layout.tsx +++ b/apps/fo/app/pages/(map-layout)/layout.tsx @@ -1,9 +1,10 @@ 'use client' import { NoFooterLayout } from "@common/components"; +import { useQueryClient } from "@tanstack/react-query"; import type { MenuItem } from "../../store/common"; import { useFoStore } from "../../store"; import { usePathname, useRouter } from "next/navigation"; -// import { authService } from "@/src/entities/auth"; +import { authService } from "@/src/entities/auth"; export default function RootLayout({ children, @@ -14,12 +15,20 @@ export default function RootLayout({ const { getMenuAuth } = useFoStore((state) => state); const pathname = usePathname(); const router = useRouter(); + const queryClient = useQueryClient(); const handleClick = (id: MenuItem) => { getMenuAuth(id.menuCd); router.push(id.urlPath); }; return ( - {children} + + {children} + ); } diff --git a/apps/sn/app/(map-layout)/layout.tsx b/apps/sn/app/(map-layout)/layout.tsx index f840fa131..40565fb97 100644 --- a/apps/sn/app/(map-layout)/layout.tsx +++ b/apps/sn/app/(map-layout)/layout.tsx @@ -20,6 +20,7 @@ import { NoFooterLayout } from "@common/components"; import type { MenuItem } from "@/entities/menu"; import { useMenuStore } from "@/shared/lib"; import useStore from '../store/useStore'; +import { authService } from "@/entities/auth"; export default function MapLayout({ children, @@ -57,6 +58,7 @@ export default function MapLayout({ return ( diff --git a/apps/wr/app/(map-layout)/layout.tsx b/apps/wr/app/(map-layout)/layout.tsx index b6f52c19c..ee7321d7b 100644 --- a/apps/wr/app/(map-layout)/layout.tsx +++ b/apps/wr/app/(map-layout)/layout.tsx @@ -1,9 +1,11 @@ "use client"; import type { MenuItem } from "@common/components/api"; import { NoFooterLayout } from "@common/components/ui"; +import { useQueryClient } from "@tanstack/react-query"; import { usePathname,useRouter } from "next/navigation"; import { useMenuStore } from "@/src/shared/lib"; import { useWrStore } from "../store"; +import { authService } from "@/src/entities/auth"; export default function MapLayout({ children, @@ -14,6 +16,7 @@ export default function MapLayout({ const setCurrentMenuInfo = useMenuStore((state) => state.setCurrentMenuInfo); const router = useRouter(); const pathname = usePathname(); + const queryClient = useQueryClient(); const changeMenu = (path: MenuItem) => { setCurrentMenuInfo(path); @@ -21,7 +24,12 @@ export default function MapLayout({ router.push(path.urlPath); }; return ( - + {children} ); From db7584cb016b0a4f871857d14a4211d339429467 Mon Sep 17 00:00:00 2001 From: rsone001 Date: Wed, 22 Jul 2026 13:38:58 +0900 Subject: [PATCH 03/40] =?UTF-8?q?[st]=20-=20fix:=20=EC=A7=91=EA=B3=8406.?= =?UTF-8?q?=EA=B3=B5=EA=B3=B5=ED=95=98=EC=88=98=EC=B2=98=EB=A6=AC=EC=8B=9C?= =?UTF-8?q?=EC=84=A4=20=EC=A1=B0=ED=9A=8C=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80,=20=EC=9E=85=EB=A0=A506.=EA=B3=B5=EA=B3=B5=ED=95=98?= =?UTF-8?q?=EC=88=98=EC=B2=98=EB=A6=AC=EC=8B=9C=EC=84=A4=20=EB=A7=A4?= =?UTF-8?q?=ED=95=91=20=EA=B3=84=EC=95=BD=EA=B8=B0=EA=B0=84=20DatePicker?= =?UTF-8?q?=20=EC=88=98=EC=A0=95,=20=EC=9E=85=EB=A0=A5=EC=9E=90=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=A0=9C=EC=B6=9C=20valuedation=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/st/src/components/module/SearchForm.tsx | 22 ++++ .../module/VerificationResultDialog.tsx | 17 ++- .../input/MainFacilityMappingSaveDialog.tsx | 100 +++++++++++++++++- .../total/PublicSewageFacilityTot.tsx | 4 +- .../st/src/components/type/SearchForm.type.ts | 3 + ...cs-sewage-pipe-maintain-total-interface.ts | 1 + 6 files changed, 139 insertions(+), 8 deletions(-) diff --git a/apps/st/src/components/module/SearchForm.tsx b/apps/st/src/components/module/SearchForm.tsx index ccc76bc3d..46c0b50d3 100644 --- a/apps/st/src/components/module/SearchForm.tsx +++ b/apps/st/src/components/module/SearchForm.tsx @@ -69,6 +69,7 @@ function buildSearchFormValues( isDetail: false, isSummary: d.isSummary || "", clsfCd: initialClsfCd, + capacityGbn: d.capacityGbn || "ALL", }; } @@ -85,6 +86,7 @@ function buildSearchFormValues( isDetail: false, isSummary: d?.isSummary || "", clsfCd: initialClsfCd, + capacityGbn: d?.capacityGbn || "ALL", }; } @@ -362,6 +364,26 @@ const SearchForm = (props: SearchFormProps = {}) => { /> )} + {mergedProps.capacityGbn && ( +
+ + +
+ )} {mergedProps.isDetail && (