From 32ce555321291c5b22110d1b84a8db9280a0ff17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A7=80=EC=B2=A0?= Date: Tue, 12 Aug 2025 10:12:29 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=8B=A8=EC=9C=84=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cs/src/pages/image/ui/image-form.tsx | 13 ++++++++++--- apps/cs/src/pages/site/ui/modify-page.tsx | 7 +++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/apps/cs/src/pages/image/ui/image-form.tsx b/apps/cs/src/pages/image/ui/image-form.tsx index d4d213875..1de9a46a9 100644 --- a/apps/cs/src/pages/image/ui/image-form.tsx +++ b/apps/cs/src/pages/image/ui/image-form.tsx @@ -104,6 +104,7 @@ function ImageForm({ form, imgSn, ...props }: ImageFormProps) { value={field.value ?? ""} className="!text-[1.3rem]" placeholder="이미지명을 입력해주세요" + maxLength={100} /> @@ -126,11 +127,17 @@ function ImageForm({ form, imgSn, ...props }: ImageFormProps) { min={0} max={9999} value={field.value ?? ""} - onChange={(e) => - field.onChange(parseInt(e.target.value)) - } + onChange={(e) => { + const value = parseInt(e.target.value); + if (value > 9999) { + field.onChange(9999); + } else { + field.onChange(value); + } + }} className="w-[12rem] !text-[1.3rem]" placeholder="정렬순서 입력" + maxLength={4} /> diff --git a/apps/cs/src/pages/site/ui/modify-page.tsx b/apps/cs/src/pages/site/ui/modify-page.tsx index fdc40c477..39d69f9e7 100644 --- a/apps/cs/src/pages/site/ui/modify-page.tsx +++ b/apps/cs/src/pages/site/ui/modify-page.tsx @@ -4,6 +4,7 @@ import { useRouter } from "next/navigation"; import { useForm } from "react-hook-form"; import { zodResolver } from "@hookform/resolvers/zod"; import { useQuery, useQueryClient } from "@tanstack/react-query"; +import { useEffect } from "react"; import { SiteApi, siteFormSchema, type SiteFormData } from "@/entities/site"; import { useAlertStore, useMutationWrapper } from "@/shared/lib"; import { ENDPOINT } from "@/shared/config"; @@ -27,6 +28,12 @@ function ModifyPage({ siteId }: { siteId: string }) { enabled: !!siteId, }); + useEffect(() => { + if (siteDetail === undefined && siteId) { + alert("사이트 정보를 찾을 수 없습니다.", () => router.push("/site")); + } + }, [siteDetail, siteId]); + const { mutateAsync: updateSite } = useMutationWrapper({ mutationFn: (data: SiteFormData) => SiteApi.updateSite(siteId, data), onSuccess: () => { From 18ebfa1c795a90d99dfd28273913dfeaae826f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A7=80=EC=B2=A0?= Date: Tue, 12 Aug 2025 10:26:16 +0900 Subject: [PATCH 2/4] =?UTF-8?q?site=20ID=20=EB=B3=80=EA=B2=BD=EC=8B=9C=20?= =?UTF-8?q?=EA=B2=BD=EA=B3=A0=EB=A9=94=EC=84=B8=EC=A7=80=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cs/src/pages/site/ui/modify-page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/cs/src/pages/site/ui/modify-page.tsx b/apps/cs/src/pages/site/ui/modify-page.tsx index 39d69f9e7..4f0924a07 100644 --- a/apps/cs/src/pages/site/ui/modify-page.tsx +++ b/apps/cs/src/pages/site/ui/modify-page.tsx @@ -29,7 +29,7 @@ function ModifyPage({ siteId }: { siteId: string }) { }); useEffect(() => { - if (siteDetail === undefined && siteId) { + if (siteDetail === null && siteId) { alert("사이트 정보를 찾을 수 없습니다.", () => router.push("/site")); } }, [siteDetail, siteId]); From 8b404648de374beb8c3d8819f7a0925a62d4b2be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EC=A7=80=EC=B2=A0?= Date: Tue, 12 Aug 2025 10:56:53 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/cs/src/pages/site/ui/modify-page.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/cs/src/pages/site/ui/modify-page.tsx b/apps/cs/src/pages/site/ui/modify-page.tsx index 4f0924a07..87bf2a9a5 100644 --- a/apps/cs/src/pages/site/ui/modify-page.tsx +++ b/apps/cs/src/pages/site/ui/modify-page.tsx @@ -15,7 +15,7 @@ function ModifyPage({ siteId }: { siteId: string }) { const queryClient = useQueryClient(); const alert = useAlertStore((state) => state.setMessage); - const { data: siteDetail } = useQuery({ + const { data: siteDetail, error } = useQuery({ queryKey: [ENDPOINT.CMS_SERVICE.SITES, siteId], queryFn: () => SiteApi.siteDetail(siteId), select: (data) => { @@ -26,13 +26,14 @@ function ModifyPage({ siteId }: { siteId: string }) { }; }, enabled: !!siteId, + retry: false, }); useEffect(() => { - if (siteDetail === null && siteId) { + if (error && siteId) { alert("사이트 정보를 찾을 수 없습니다.", () => router.push("/site")); } - }, [siteDetail, siteId]); + }, [error, siteId]); const { mutateAsync: updateSite } = useMutationWrapper({ mutationFn: (data: SiteFormData) => SiteApi.updateSite(siteId, data), From f43e14f664d48bfeb88461fc9018009bba52a84a Mon Sep 17 00:00:00 2001 From: RSONE001 Date: Wed, 13 Aug 2025 11:18:41 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=97=B0=EA=B3=84=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EA=B2=80=EC=83=89=20=EC=A1=B0=EA=B1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/entities/link/model/link-interface.ts | 1 + apps/cs/src/pages/link/ui/link-page.tsx | 29 +++++++++++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/apps/cs/src/entities/link/model/link-interface.ts b/apps/cs/src/entities/link/model/link-interface.ts index 86960f195..f8cf82016 100644 --- a/apps/cs/src/entities/link/model/link-interface.ts +++ b/apps/cs/src/entities/link/model/link-interface.ts @@ -191,6 +191,7 @@ export interface LinkSearchParam extends PageableParams { startDate?: string; endDate?: string; isSucc?: string; + linkClfsCd?: string; } export type LinkFormData = z.infer; diff --git a/apps/cs/src/pages/link/ui/link-page.tsx b/apps/cs/src/pages/link/ui/link-page.tsx index 95a9cc043..9d21570b9 100644 --- a/apps/cs/src/pages/link/ui/link-page.tsx +++ b/apps/cs/src/pages/link/ui/link-page.tsx @@ -4,7 +4,7 @@ import "@common/assets/styles/grid.css"; import { useState } from "react"; import { useRouter } from "next/navigation"; -import { Button, Input, Label, LoadingWithAnimation } from "@common/components"; +import { Button, Input, Label, LoadingWithAnimation, Select, SelectTrigger, SelectContent, SelectItem, SelectValue } from "@common/components"; import { getCoreRowModel } from "@tanstack/react-table"; import { LinkApi, type Link, type LinkSearchParam } from "@/entities/link"; import { useQuery } from "@tanstack/react-query"; @@ -18,10 +18,12 @@ function LinkPage() { const [linkSn, setLinkSn] = useState(''); const [linkNm, setLinkNm] = useState(''); + const [linkClfsCd, setLinkClfsCd] = useState(''); const [linkSearchParam, setLinkSearchParam] = useState({ linkSn: '', - linkNm: '' + linkNm: '', + linkClfsCd: '', }); const query = useQuery({ @@ -32,10 +34,12 @@ function LinkPage() { const handleResetSearchParam = () => { setLinkSn(''); setLinkNm(''); + setLinkClfsCd('ALL'); setLinkSearchParam({ ...linkSearchParam, linkSn: '', linkNm: '', + linkClfsCd: 'ALL', }); }; @@ -44,7 +48,8 @@ function LinkPage() { setLinkSearchParam({ ...linkSearchParam, linkSn, - linkNm + linkNm, + linkClfsCd, }); }; @@ -100,6 +105,24 @@ function LinkPage() { onChange={(e) => setLinkNm(e.target.value)} autoComplete="off" /> + +