From 5a82fe6396e15212880df4e04869688dc530bf7c Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Mon, 2 Nov 2026 16:07:03 +0900 Subject: [PATCH] =?UTF-8?q?261102=5F04=5FENH:=20=EC=84=A4=EB=AC=B8?= =?UTF-8?q?=ED=98=84=ED=99=A9=20KON=C2=B7KIWI=20=EB=B0=94=EB=A1=9C?= =?UTF-8?q?=EA=B0=80=EA=B8=B0=EB=A5=BC=20=ED=99=98=EA=B2=BD=EB=B3=84=20KAR?= =?UTF-8?q?T=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20URL=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +- .env.local | 1 + .env.production | 1 + .../(pages)/(main)/progress/survey/page.tsx | 78 +++++-------------- src/app/api/kart/[[...slug]]/route.ts | 22 ------ src/lib/env.client.ts | 2 + src/query/key/keys.ts | 2 - src/query/project.ts | 13 ---- 8 files changed, 26 insertions(+), 96 deletions(-) diff --git a/.env.development b/.env.development index 0f8dbea..d907ffc 100644 --- a/.env.development +++ b/.env.development @@ -5,4 +5,5 @@ ENV=dev CONTACT_SERVER=http://127.0.0.1:4001 API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 -AUTH_COOKIE_DOMAIN=kric.com \ No newline at end of file +AUTH_COOKIE_DOMAIN=kric.com +NEXT_PUBLIC_KART_URL=https://test-kart.kric.com diff --git a/.env.local b/.env.local index 8cacaa8..df8d09e 100644 --- a/.env.local +++ b/.env.local @@ -5,3 +5,4 @@ ENV=local CONTACT_SERVER=http://localhost:4001 API_CONTACT_SERVER=http://localhost:4001/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 +NEXT_PUBLIC_KART_URL=https://test-kart.kric.com diff --git a/.env.production b/.env.production index 468263b..afd6cd1 100644 --- a/.env.production +++ b/.env.production @@ -6,3 +6,4 @@ CONTACT_SERVER=http://127.0.0.1:4001 API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 AUTH_COOKIE_DOMAIN=kric.com +NEXT_PUBLIC_KART_URL=https://kart.kric.com diff --git a/src/app/(pages)/(main)/progress/survey/page.tsx b/src/app/(pages)/(main)/progress/survey/page.tsx index e7d4063..aaf1167 100644 --- a/src/app/(pages)/(main)/progress/survey/page.tsx +++ b/src/app/(pages)/(main)/progress/survey/page.tsx @@ -1,19 +1,18 @@ 'use client' -import { useEffect, useRef, useState } from "react"; import { useMounted } from "@kri/common/hooks"; import AppPageTitle from "@/components/app-shell/AppPageTitle"; import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter"; import { Button } from "@/components/ui/button"; import { useSelectedProject } from "@/hooks/useSelectedProject"; -import { useProjectInfoQuery, useSurveyRedirectUrlQuery } from "@/query/project"; +import { useProjectInfoQuery } from "@/query/project"; +import { clientEnv } from "@/lib/env.client"; import { SurveyType } from "@/types/project"; import { SURVEY_TYPE_LABEL } from "@/const/projectConst"; const SurveyProgressPage = () => { const mounted = useMounted(); const { selectedProject } = useSelectedProject(); - const openedForRef = useRef(null); const prjctIdx = selectedProject?.prjctIdx ?? 0; const enabled = mounted && prjctIdx > 0; @@ -21,35 +20,7 @@ const SurveyProgressPage = () => { const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled); const surveys = projectInfoQuery.data?.surveys ?? []; - const [activeSurveyIdx, setActiveSurveyIdx] = useState(null); - const [openedUrl, setOpenedUrl] = useState(null); - - const selectedSurvey = surveys.find((s) => s.prjctSurveyIdx === activeSurveyIdx) ?? null; - const surveyTy = selectedSurvey?.surveyTy ?? SurveyType.NONE; - - const isKonKiwi = surveyTy === SurveyType.KON || surveyTy === SurveyType.KIWI; - const isKiwi = surveyTy === SurveyType.KIWI ? 1 : 0; - const pkey = selectedSurvey?.surveyPrjctCd ?? ""; - - const redirectUrlEnabled = enabled && !!selectedSurvey && isKonKiwi && !!pkey; - const redirectUrlQuery = useSurveyRedirectUrlQuery(isKiwi, pkey, redirectUrlEnabled); - - const targetUrl = !selectedSurvey - ? null - : isKonKiwi - ? (redirectUrlQuery.data ?? null) - : surveyTy === SurveyType.EXTERNAL - ? (selectedSurvey.surveyDashboardUrl || null) - : null; - - useEffect(() => { - if (!targetUrl || openedForRef.current === targetUrl) return; - openedForRef.current = targetUrl; - window.open(targetUrl, "_blank"); - setOpenedUrl(targetUrl); - }, [targetUrl]); - - const isLoading = !mounted || projectInfoQuery.isLoading || (redirectUrlEnabled && redirectUrlQuery.isLoading); + const isLoading = !mounted || projectInfoQuery.isLoading; if (isLoading) return ; @@ -62,7 +33,14 @@ const SurveyProgressPage = () => { ) : (
{surveys.map((survey) => { - const hasReport = survey.surveyTy !== SurveyType.NONE; + const isKonKiwi = survey.surveyTy === SurveyType.KON || survey.surveyTy === SurveyType.KIWI; + let targetUrl: string | null = null; + if (isKonKiwi && survey.surveyPrjctCd) { + const projectType = survey.surveyTy === SurveyType.KIWI ? 1 : 0; + targetUrl = `${clientEnv.KART_URL}/Report/Current?projectType=${projectType}&pkey=${encodeURIComponent(survey.surveyPrjctCd)}`; + } else if (survey.surveyTy === SurveyType.EXTERNAL) { + targetUrl = survey.surveyDashboardUrl || null; + } return (
{

{survey.surveyName}

{SURVEY_TYPE_LABEL[survey.surveyTy]}

- + {targetUrl ? ( + + ) : ( + + )}
); })} )} - {redirectUrlEnabled && redirectUrlQuery.isError ? ( -
- 설문 현황 링크를 불러오지 못했습니다. - -
- ) : null} - - {openedUrl ? ( -

- 새 창에서 열립니다. 열리지 않았다면{" "} - - 여기 - - 를 클릭해 주세요. -

- ) : null} ); }; diff --git a/src/app/api/kart/[[...slug]]/route.ts b/src/app/api/kart/[[...slug]]/route.ts index 5cb7db0..0360160 100644 --- a/src/app/api/kart/[[...slug]]/route.ts +++ b/src/app/api/kart/[[...slug]]/route.ts @@ -24,28 +24,6 @@ export const GET = async (req: NextRequest, context: RouteContext) => { return NextResponse.json(result, { status: 200 }); } - if(action === "survey-redirect-url" && slug.length === 3){ - const [, isKiwi, pkey] = slug; - if (!["0", "1"].includes(isKiwi)) { - return NextResponse.json({ message: "프로젝트 정보를 확인해 주세요." }, { status: 400 }); - } - - // Contact backend를 거쳐 KON/KIWI 현황 공유 링크를 발급한다. - const result = await contactApi.post( - `/kart/project/${isKiwi}/${encodeURIComponent(pkey)}/share`, - {}, - { expectText: true }, - ); - const shortUrl = typeof result === "string" && /^https?:\/\//.test(result) - ? result - : null; - if (!shortUrl) { - return NextResponse.json({ message: "KART 공유 링크 응답을 확인해 주세요." }, { status: 502 }); - } - - return NextResponse.json(shortUrl, { status: 200 }); - } - return NextResponse.json({ message: "Not found" }, { status: 404 }); } catch (error: unknown) { return errorToResponse(error); diff --git a/src/lib/env.client.ts b/src/lib/env.client.ts index eabf169..545985c 100644 --- a/src/lib/env.client.ts +++ b/src/lib/env.client.ts @@ -3,6 +3,8 @@ import { createEnv, env } from "@kri/common/config"; export const clientEnv = createEnv({ ENV: env.required("NEXT_PUBLIC_ENV", process.env.NEXT_PUBLIC_ENV), + KART_URL: env.required("NEXT_PUBLIC_KART_URL", process.env.NEXT_PUBLIC_KART_URL), + API_BASE: env.required("NEXT_PUBLIC_API_BASE", process.env.NEXT_PUBLIC_API_BASE), API_INTERNAL: env.required("NEXT_PUBLIC_API_INTERNAL", process.env.NEXT_PUBLIC_API_INTERNAL), diff --git a/src/query/key/keys.ts b/src/query/key/keys.ts index 6f43e80..c044d46 100644 --- a/src/query/key/keys.ts +++ b/src/query/key/keys.ts @@ -38,8 +38,6 @@ export const qk = { /********** KON, KIWI 프로젝트 관련 KART에서 받아옴 **********/ kartProjectList: (itrntPrjctCd: string, userTeam: string, isKiwi: number, keyword: string) => ["kart", "project-list", itrntPrjctCd, userTeam, isKiwi, keyword] as const, - surveyRedirectUrl: (isKiwi: number, pkey: string) => - ["kart", "survey-redirect-url", isKiwi, pkey] as const, /********** KON, KIWI 프로젝트 관련 KART에서 받아옴 **********/ /********** 찐 인트라넷 관련 **********/ diff --git a/src/query/project.ts b/src/query/project.ts index 18ad9fb..e76c9ae 100644 --- a/src/query/project.ts +++ b/src/query/project.ts @@ -131,19 +131,6 @@ export function useKartProjectListQuery(args: { }); } -/** - * KON/KIWI 설문 현황(리포트) 바로가기 URL - */ -export function useSurveyRedirectUrlQuery(isKiwi: number, pkey: string, enabled: boolean) { - return useQuery({ - queryKey: qk.surveyRedirectUrl(isKiwi, pkey), - queryFn: () => nextApi.get(`/kart/survey-redirect-url/${isKiwi}/${encodeURIComponent(pkey)}`, { skipForbiddenHandler: true }), - enabled: enabled && !!pkey, - staleTime: 0, - meta: { ignoreGlobalLoading: true }, - }); -} - /** * 프로젝트에 배정된 회사 ID 목록 */