From 44bb96bfa6cd3401671294b3e47b981bbd14cca1 Mon Sep 17 00:00:00 2001 From: bicochan Date: Thu, 5 Jun 2025 15:51:51 +0900 Subject: [PATCH] =?UTF-8?q?WIP:=20=EC=84=A4=EB=AC=B8=20=EA=B2=B0=EA=B3=BC?= =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9E=91=EC=97=85=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user-survey-result/[srvySn]/page.tsx | 10 ++ apps/cs/src/entities/site/@x/posting.ts | 2 - apps/cs/src/entities/site/index.ts | 3 +- apps/cs/src/entities/site/ui/site-select.tsx | 14 ++- apps/cs/src/pages/code/ui/upcode-dialog.tsx | 1 - .../cs/src/pages/survey/api/survey-service.ts | 13 ++ apps/cs/src/pages/survey/index.ts | 1 + .../pages/survey/model/survey-interface.ts | 53 +++++++++ .../survey/model/survey-table-columns.tsx | 20 +++- .../pages/survey/ui/user-survey-result.tsx | 111 ++++++++++++++++++ 10 files changed, 217 insertions(+), 11 deletions(-) create mode 100644 apps/cs/app/(without-base-layout)/user-survey-result/[srvySn]/page.tsx create mode 100644 apps/cs/src/pages/survey/ui/user-survey-result.tsx diff --git a/apps/cs/app/(without-base-layout)/user-survey-result/[srvySn]/page.tsx b/apps/cs/app/(without-base-layout)/user-survey-result/[srvySn]/page.tsx new file mode 100644 index 000000000..017d469dd --- /dev/null +++ b/apps/cs/app/(without-base-layout)/user-survey-result/[srvySn]/page.tsx @@ -0,0 +1,10 @@ +import { UserSurveyResult } from "@/pages/survey"; + +export default async function UserSurveyResultPage({ + params, +}: { + params: Promise<{ srvySn: string }>; +}) { + const { srvySn } = await params; + return ; +} diff --git a/apps/cs/src/entities/site/@x/posting.ts b/apps/cs/src/entities/site/@x/posting.ts index b44c10445..6470b3cb2 100644 --- a/apps/cs/src/entities/site/@x/posting.ts +++ b/apps/cs/src/entities/site/@x/posting.ts @@ -1,4 +1,2 @@ export { SiteApi } from "../api/site-service"; export type { Site } from "../model/site-interface"; - -export { SiteSelect } from "../ui/site-select"; diff --git a/apps/cs/src/entities/site/index.ts b/apps/cs/src/entities/site/index.ts index 998c13625..95a3ead10 100644 --- a/apps/cs/src/entities/site/index.ts +++ b/apps/cs/src/entities/site/index.ts @@ -5,5 +5,4 @@ export { type Site, type SiteFormData, } from "./model/site-interface"; - -export { SiteSelect } from "./ui/site-select"; \ No newline at end of file +export { SiteSelect } from "./ui/site-select"; diff --git a/apps/cs/src/entities/site/ui/site-select.tsx b/apps/cs/src/entities/site/ui/site-select.tsx index 61f412b4d..6c5a0d005 100644 --- a/apps/cs/src/entities/site/ui/site-select.tsx +++ b/apps/cs/src/entities/site/ui/site-select.tsx @@ -10,23 +10,29 @@ import { ENDPOINT } from "@/shared/config"; import { SiteApi } from "../api/site-service"; type SiteSelectProps = { - siteId: string; placeholder?: string; + enabledAllSite?: boolean; } & React.ComponentPropsWithoutRef; function SiteSelect({ defaultValue, placeholder = "선택", + enabledAllSite, ...props }: SiteSelectProps) { const { data: sites } = useQuery({ queryKey: [ENDPOINT.CMS_SERVICE.SITES], queryFn: () => SiteApi.getSiteList(), - enabled: true, + select: (data) => { + if (enabledAllSite) { + return [{ siteId: "ALL", siteNm: "전체" }, ...data.content]; + } + return data.content; + }, }); const defaultValueText = - sites?.content.find((item) => item.siteId === defaultValue)?.siteNm ?? placeholder; + sites?.find((item) => item.siteId === defaultValue)?.siteNm ?? placeholder; return (