260722_01_ENH: 버그 수정 및 개선 사항 수정

This commit is contained in:
2026-07-22 16:53:00 +09:00
parent d8b565276d
commit 2dd5b88c6f
67 changed files with 1925 additions and 736 deletions

21
.idea/claudeCodeEditorTabs.xml generated Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ClaudeCodeEditorTabs">
<option name="activeSessionId" value="d8691301-ce06-449d-9b1c-6360a510507b" />
<option name="openSessionIds">
<list>
<option value="d8691301-ce06-449d-9b1c-6360a510507b" />
</list>
</option>
<option name="sessionPaths">
<map>
<entry key="d8691301-ce06-449d-9b1c-6360a510507b" value="/sessions/4861f13b-20e7-4229-9754-1933b83c9805" />
</map>
</option>
<option name="sessionTitles">
<map>
<entry key="d8691301-ce06-449d-9b1c-6360a510507b" value="api가 호출될 때 자동으로 loading을 띄우는데 호출 api가 여러개인경우 제일 빠른" />
</map>
</option>
</component>
</project>

View File

@@ -11,7 +11,7 @@ import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'
import { KriMultiSelect } from '@/components/common/KriAutoComplete' import { KriMultiSelect } from '@/components/common/KriAutoComplete'
import { AssignTargetList, useAssignTargetRows } from '@/components/assign/AssignTargetList' import { AssignTargetList, useAssignTargetRows } from '@/components/assign/AssignTargetList'
import { ListSearchTable } from '@/components/list/ListSearchTable' import { ListSearchTable } from '@/components/list/ListSearchTable'
import { useResultCodesQuery } from '@/query/project' import { useProjectInfoQuery, useResultCodesQuery } from '@/query/project'
import { useListHeaderQuery } from '@/query/list' import { useListHeaderQuery } from '@/query/list'
import { useResetListAssignMutation, useUpsertListAssignMutation } from '@/query/assign' import { useResetListAssignMutation, useUpsertListAssignMutation } from '@/query/assign'
import { ListHeaderAssignConst, LIST_HEADER_TYPE_LABEL } from '@/const/listConst' import { ListHeaderAssignConst, LIST_HEADER_TYPE_LABEL } from '@/const/listConst'
@@ -42,14 +42,17 @@ const ListAssignPage = () => {
const [assignFilterIds, setAssignFilterIds] = useState<string[]>([]) const [assignFilterIds, setAssignFilterIds] = useState<string[]>([])
const [transferResve, setTransferResve] = useState(false) const [transferResve, setTransferResve] = useState(false)
const [currentListFilter, setCurrentListFilter] = useState<ListFilter>(() => createEmptyListFilter()) const [currentListFilter, setCurrentListFilter] = useState<ListFilter>(() => createEmptyListFilter())
const [filterSummary, setFilterSummary] = useState<string[]>([])
const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled) const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled)
const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled)
const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled) const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled)
const upsertListAssignMutation = useUpsertListAssignMutation(prjctIdx) const upsertListAssignMutation = useUpsertListAssignMutation(prjctIdx)
const resetListAssignMutation = useResetListAssignMutation(prjctIdx) const resetListAssignMutation = useResetListAssignMutation(prjctIdx)
const assignTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType }) const assignTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType })
const resultCodeArray = useMemo<ResultCode[]>(() => resultCodesQuery.data ?? [], [resultCodesQuery.data]) const resultCodeArray = useMemo<ResultCode[]>(() => resultCodesQuery.data ?? [], [resultCodesQuery.data])
const surveyArray = useMemo(() => projectInfoQuery.data?.surveys ?? [], [projectInfoQuery.data])
const listHeaders = useMemo<listHeader[]>(() => listHeaderQuery.data ?? [], [listHeaderQuery.data]) const listHeaders = useMemo<listHeader[]>(() => listHeaderQuery.data ?? [], [listHeaderQuery.data])
const handleTabChange = (value: string) => { const handleTabChange = (value: string) => {
@@ -91,12 +94,16 @@ const ListAssignPage = () => {
return { type: assignType, values: assignFilterIds } return { type: assignType, values: assignFilterIds }
}, [assignType, assignFilterIds]) }, [assignType, assignFilterIds])
const hasNoAppliedFilter = () => filterSummary.length === 0 && assignFilterIds.length === 0
const handleAssign = async () => { const handleAssign = async () => {
if (!selectedAssignId) { if (!selectedAssignId) {
alert('배정할 대상을 선택해주세요.') alert('배정할 대상을 선택해주세요.')
return return
} }
if (hasNoAppliedFilter() && !confirm('적용된 필터가 없습니다. 전체 리스트를 대상으로 진행 하시겠습니까?')) {
return
}
await upsertListAssignMutation.mutateAsync({ await upsertListAssignMutation.mutateAsync({
assignId: selectedAssignId, assignId: selectedAssignId,
@@ -110,6 +117,9 @@ const ListAssignPage = () => {
} }
const handleResetAssign = async () => { const handleResetAssign = async () => {
if (hasNoAppliedFilter() && !confirm('적용된 필터가 없습니다. 전체 리스트를 대상으로 진행 하시겠습니까?')) {
return
}
if (!confirm('정말 배정을 초기화 하시겠습니까?')) return if (!confirm('정말 배정을 초기화 하시겠습니까?')) return
await resetListAssignMutation.mutateAsync({ await resetListAssignMutation.mutateAsync({
@@ -151,9 +161,11 @@ const ListAssignPage = () => {
userId={auth?.user?.userId ?? ''} userId={auth?.user?.userId ?? ''}
userCmpn={auth?.user?.userCmpn ?? ''} userCmpn={auth?.user?.userCmpn ?? ''}
resultCodes={resultCodeArray} resultCodes={resultCodeArray}
surveys={surveyArray}
listHeaders={listHeaders} listHeaders={listHeaders}
selectMode="none" selectMode="none"
onCurrentFilterChange={setCurrentListFilter} onCurrentFilterChange={setCurrentListFilter}
onFilterSummaryChange={setFilterSummary}
excludeFilterHeaderTypes={[assignType]} excludeFilterHeaderTypes={[assignType]}
externalAssignFilter={externalAssignFilter} externalAssignFilter={externalAssignFilter}
filterActions={ filterActions={

View File

@@ -141,9 +141,7 @@ const ProjectAssignPage = () => {
}; };
const { const {
assignBase,
assignView, assignView,
ableBase,
ableView, ableView,
} = useMemo(() => { } = useMemo(() => {
const roleVal = roleFilter?.value; const roleVal = roleFilter?.value;
@@ -168,9 +166,7 @@ const ProjectAssignPage = () => {
const _ableView = kAble ? _ableBase0.filter((u) => kwFilter(u, kAble)) : _ableBase0; const _ableView = kAble ? _ableBase0.filter((u) => kwFilter(u, kAble)) : _ableBase0;
return { return {
assignBase: _assignBase,
assignView: _assignView, assignView: _assignView,
ableBase: _ableBase0,
ableView: _ableView, ableView: _ableView,
}; };
}, [ }, [
@@ -218,18 +214,21 @@ const ProjectAssignPage = () => {
alert("저장되었습니다."); alert("저장되었습니다.");
}; };
// 로그인 계정의 소속 회사를 기본 선택하되, 매치되는 게 없으면 자사(ownCmpn) 중 가장 상단 1개로 대체한다.
useEffect(() => { useEffect(() => {
const cmpn = auth.user?.userCmpn ?? ""; const cmpn = auth.user?.userCmpn ?? "";
const hasAuthCmpn = companyArray.some((company) => company.cmpnId === cmpn); if (cmpn && companyArray.some((company) => company.cmpnId === cmpn)) {
if (cmpn && hasAuthCmpn) {
setCompanyFilter(cmpn); setCompanyFilter(cmpn);
return; return;
} }
if (companyFilter && !companyArray.some((company) => company.cmpnId === companyFilter)) { // 이미 유효한 값이 선택돼 있으면(사용자가 직접 고른 값 포함) 그대로 둔다.
setCompanyFilter(""); if (companyFilter && companyArray.some((company) => company.cmpnId === companyFilter)) {
return;
} }
const ownCmpn = companyArray.find((company) => company.ownCmpn);
setCompanyFilter(ownCmpn?.cmpnId ?? "");
}, [auth.user?.userCmpn, companyArray, companyFilter]); }, [auth.user?.userCmpn, companyArray, companyFilter]);
useEffect(() => { useEffect(() => {
@@ -331,7 +330,7 @@ const ProjectAssignPage = () => {
/> />
</th> </th>
<th className="p-2 text-left text-base font-medium"> <th className="p-2 text-left text-base font-medium">
배정된 {roleFilter?.label} ( {assignBase.length}명 ) 배정된 {roleFilter?.label} ( {assignView.length}명 )
</th> </th>
</tr> </tr>
</thead> </thead>
@@ -424,7 +423,7 @@ const ProjectAssignPage = () => {
/> />
</th> </th>
<th className="p-2 text-left text-base font-medium"> <th className="p-2 text-left text-base font-medium">
배정 가능 {roleFilter?.label} ({ableBase.length}명 ) 배정 가능 {roleFilter?.label} ({ableView.length}명 )
</th> </th>
</tr> </tr>
</thead> </thead>

View File

@@ -2,7 +2,7 @@
import { Suspense, useEffect, useMemo, useState } from "react"; import { Suspense, useEffect, useMemo, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation"; import { useRouter, useSearchParams } from "next/navigation";
import { ArrowLeft, CalendarClock } from "lucide-react"; import { ArrowLeft, CalendarClock, RefreshCw } from "lucide-react";
import { useMounted } from "@kri/common/hooks"; import { useMounted } from "@kri/common/hooks";
import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter"; import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
@@ -93,7 +93,6 @@ const ListContactPageContent = () => {
listDetailQuery.refetch(); listDetailQuery.refetch();
} catch (e) { } catch (e) {
console.error(e); console.error(e);
alert("저장 중 오류가 발생했습니다.");
} }
}; };
@@ -108,6 +107,17 @@ const ListContactPageContent = () => {
</Button> </Button>
<h1 className="text-2xl font-bold tracking-tight">컨택 진행</h1> <h1 className="text-2xl font-bold tracking-tight">컨택 진행</h1>
<span className="text-2xl font-bold tracking-tight">SID: {sid}</span> <span className="text-2xl font-bold tracking-tight">SID: {sid}</span>
<Button
type="button"
variant="ghost"
size="icon-sm"
disabled={listDetailQuery.isFetching}
aria-label="리스트 정보 새로고침"
title="리스트 정보 새로고침"
onClick={() => listDetailQuery.refetch()}
>
<RefreshCw className={`h-4 w-4 ${listDetailQuery.isFetching ? "animate-spin" : ""}`} />
</Button>
<div className="ml-auto flex items-center gap-2"> <div className="ml-auto flex items-center gap-2">
<Button type="button" variant="outline" className="gap-2" onClick={() => showDialog('reservationListDialog')}> <Button type="button" variant="outline" className="gap-2" onClick={() => showDialog('reservationListDialog')}>
<CalendarClock className="h-4 w-4" /> <CalendarClock className="h-4 w-4" />
@@ -129,7 +139,7 @@ const ListContactPageContent = () => {
isEditing={isEditing} isEditing={isEditing}
listHeaders={listHeaders} listHeaders={listHeaders}
detail={listDetailQuery.data} detail={listDetailQuery.data}
surveyUrl={projectInfoQuery.data?.surveyUrl} surveys={projectInfoQuery.data?.surveys ?? []}
callerTelNum={projectInfoQuery.data?.callerTelNum} callerTelNum={projectInfoQuery.data?.callerTelNum}
resultCodes={resultCodeArray} resultCodes={resultCodeArray}
formValues={formValues} formValues={formValues}
@@ -149,6 +159,7 @@ const ListContactPageContent = () => {
userId={userId} userId={userId}
userRole={userRole} userRole={userRole}
resultCodes={resultCodeArray} resultCodes={resultCodeArray}
useFF={projectInfoQuery.data?.ff ?? false}
useContactSenario={projectInfoQuery.data?.useContactSenario ?? false} useContactSenario={projectInfoQuery.data?.useContactSenario ?? false}
contactSenario={projectInfoQuery.data?.contactSenario} contactSenario={projectInfoQuery.data?.contactSenario}
/> />

View File

@@ -25,7 +25,7 @@ import {
useUpdateListHeaderMutation, useUpdateListHeaderMutation,
useUploadListExcelMutation, useUploadListExcelMutation,
} from '@/query/list' } from '@/query/list'
import { useResultCodesQuery } from '@/query/project' import { useProjectInfoQuery, useResultCodesQuery } from '@/query/project'
import type { ListTableRow } from '@/components/table-column/ListTableColumn' import type { ListTableRow } from '@/components/table-column/ListTableColumn'
import { import {
createEmptyListFilter, createEmptyListFilter,
@@ -69,7 +69,7 @@ const createEmptySearchUiState = (): ListSearchUiState => ({
searchText: '', searchText: '',
searchContactResult: [], searchContactResult: [],
searchInterviewResult: [], searchInterviewResult: [],
searchSurveyResult: [], surveyResultSelections: {},
filterRows: [], filterRows: [],
sorting: [], sorting: [],
}) })
@@ -107,6 +107,7 @@ const ListManagePage = () => {
const isInternal = isInternalManager(userRole); const isInternal = isInternalManager(userRole);
const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled) const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled)
const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled)
const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled) const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled)
const uploadHistoryQuery = useListUploadHistoryQuery(prjctIdx, enabled) const uploadHistoryQuery = useListUploadHistoryQuery(prjctIdx, enabled)
const downloadListExcelTemplateMutation = useDownloadListExcelTemplateMutation() const downloadListExcelTemplateMutation = useDownloadListExcelTemplateMutation()
@@ -120,6 +121,7 @@ const ListManagePage = () => {
const downloadUploadHistoryFileMutation = useDownloadUploadHistoryFileMutation(prjctIdx) const downloadUploadHistoryFileMutation = useDownloadUploadHistoryFileMutation(prjctIdx)
const resultCodeArray = useMemo<ResultCode[]>(() => resultCodesQuery.data ?? [], [resultCodesQuery.data]) const resultCodeArray = useMemo<ResultCode[]>(() => resultCodesQuery.data ?? [], [resultCodesQuery.data])
const surveyArray = useMemo(() => projectInfoQuery.data?.surveys ?? [], [projectInfoQuery.data])
const headerManageRows = useMemo<listHeader[]>(() => listHeaderQuery.data ?? [], [listHeaderQuery.data]) const headerManageRows = useMemo<listHeader[]>(() => listHeaderQuery.data ?? [], [listHeaderQuery.data])
// 컨택 진행 화면에서 돌아왔을 때 1회만 복원하고, 재방문 시 다시 나타나지 않도록 즉시 지운다. // 컨택 진행 화면에서 돌아왔을 때 1회만 복원하고, 재방문 시 다시 나타나지 않도록 즉시 지운다.
@@ -280,6 +282,7 @@ const ListManagePage = () => {
userId={userId} userId={userId}
userCmpn={userCmpn} userCmpn={userCmpn}
resultCodes={resultCodeArray} resultCodes={resultCodeArray}
surveys={surveyArray}
listHeaders={headerManageRows} listHeaders={headerManageRows}
enableBatchEdit={canManageList} enableBatchEdit={canManageList}
refreshKey={listRefreshKey} refreshKey={listRefreshKey}

View File

@@ -16,7 +16,6 @@ import {useAuth} from "@/hooks/useAuth";
import type { MultiSelectOption } from "@/components/common/KriAutoComplete"; import type { MultiSelectOption } from "@/components/common/KriAutoComplete";
import { useMounted } from "@kri/common/hooks"; import { useMounted } from "@kri/common/hooks";
import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter"; import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter";
import {DEFAULT_COMPANY_NAME} from "@/const/userConst";
import {Upload} from "lucide-react"; import {Upload} from "lucide-react";
import { import {
useRoleListQuery, useRoleListQuery,
@@ -160,7 +159,15 @@ const UserManagePage = () => {
mounted && mounted &&
isInternalManager(auth.user?.userRole) isInternalManager(auth.user?.userRole)
const userCmpn = auth.user?.userCmpn ?? DEFAULT_COMPANY_NAME; // 로그인 계정의 소속 회사를 기본 선택하되, 회사 목록에 매치되는 게 없으면 자사(ownCmpn) 중 가장 상단 1개로 대체한다.
const userCmpn = useMemo(() => {
const currentCmpnId = auth.user?.userCmpn;
const matched = userCmpnArray.find((c) => c.cmpnId === currentCmpnId);
if (matched) return matched.cmpnId;
const fallback = userCmpnArray.find((c) => c.ownCmpn);
return fallback?.cmpnId ?? currentCmpnId ?? '';
}, [auth.user?.userCmpn, userCmpnArray]);
if (!mounted) return <LoadingOverlayAdapter force />; if (!mounted) return <LoadingOverlayAdapter force />;

View File

@@ -24,6 +24,7 @@ import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdap
import {useItrntUserList} from "@/hooks/useItrntUserList"; import {useItrntUserList} from "@/hooks/useItrntUserList";
import {useRouter} from "next/navigation"; import {useRouter} from "next/navigation";
import {useCreateProjectMutation, useProjectListQuery, useProjectOwnerListQuery} from "@/query/project"; import {useCreateProjectMutation, useProjectListQuery, useProjectOwnerListQuery} from "@/query/project";
import {useGroupCodeListQuery} from "@/query/intranet";
import {PROJECT_STATUS_LABEL} from "@/const/projectConst"; import {PROJECT_STATUS_LABEL} from "@/const/projectConst";
import {isManager} from "@/utils/userRole"; import {isManager} from "@/utils/userRole";
@@ -52,8 +53,21 @@ const MainPage = () => {
const enabled = mounted && !isLoading; // intranet user list 준비된 뒤에만 호출 const enabled = mounted && !isLoading; // intranet user list 준비된 뒤에만 호출
const ownerQuery = useProjectOwnerListQuery(enabled); const ownerQuery = useProjectOwnerListQuery(enabled);
const groupCodeListQuery = useGroupCodeListQuery(enabled);
const groupCodeLabelMap = useMemo(() => {
return new Map((groupCodeListQuery.data ?? []).map((g) => [g.groupCode, g.groupCodeLabel]));
}, [groupCodeListQuery.data]);
const deptArray = useMemo(() => {
const ownerDeptList = ownerQuery.data?.ownerDeptList ?? [];
return ownerDeptList.map((code) => ({
value: code,
label: groupCodeLabelMap.get(code) ?? code,
}));
}, [ownerQuery.data?.ownerDeptList, groupCodeLabelMap]);
const deptArray = ownerQuery.data?.ownerDeptList ?? [];
const fwArray = useMemo(() => { const fwArray = useMemo(() => {
const ownerFwIDList = ownerQuery.data?.ownerFwList ?? []; const ownerFwIDList = ownerQuery.data?.ownerFwList ?? [];
@@ -86,7 +100,7 @@ const MainPage = () => {
const [searchDept, setSearchDept] = useState<string[]>([]); const [searchDept, setSearchDept] = useState<string[]>([]);
const [searchFw, setSearchFw] = useState<string[]>([]); const [searchFw, setSearchFw] = useState<string[]>([]);
const columns = getProjectColumns(users); const columns = getProjectColumns(users, groupCodeLabelMap);
const userId = auth.user?.userId ?? ""; const userId = auth.user?.userId ?? "";
const userRole = auth.user?.userRole; const userRole = auth.user?.userRole;
@@ -119,7 +133,6 @@ const MainPage = () => {
itrntPrjctCd: projectInfo.itrntPrjctCd, itrntPrjctCd: projectInfo.itrntPrjctCd,
ownerDept: projectInfo.ownerDept, ownerDept: projectInfo.ownerDept,
ownerFw: projectInfo.ownerFw, ownerFw: projectInfo.ownerFw,
surveyTy: projectInfo.surveyTy,
ff: projectInfo.ff ff: projectInfo.ff
} as SelectedProject); } as SelectedProject);
@@ -134,7 +147,6 @@ const MainPage = () => {
itrntPrjctCd: projectInfo.itrntPrjctCd, itrntPrjctCd: projectInfo.itrntPrjctCd,
ownerDept: projectInfo.ownerDept, ownerDept: projectInfo.ownerDept,
ownerFw: projectInfo.ownerFw, ownerFw: projectInfo.ownerFw,
surveyTy: projectInfo.surveyTy,
ff: projectInfo.ff ff: projectInfo.ff
} as SelectedProject); } as SelectedProject);
@@ -177,6 +189,8 @@ const MainPage = () => {
items={deptArray} items={deptArray}
value={searchDept} value={searchDept}
onChange={setSearchDept} onChange={setSearchDept}
getValue={(item) => item.value}
getLabel={(item) => item.label}
placeholder="담당 그룹" placeholder="담당 그룹"
widthClassName="w-60" widthClassName="w-60"
heightClassName="h-9" heightClassName="h-9"

View File

@@ -1,66 +1,99 @@
'use client' 'use client'
import { useEffect, useRef } from "react"; import { useEffect, useRef, useState } from "react";
import { useMounted } from "@kri/common/hooks"; import { useMounted } from "@kri/common/hooks";
import AppPageTitle from "@/components/app-shell/AppPageTitle"; import AppPageTitle from "@/components/app-shell/AppPageTitle";
import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter"; import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter";
import { Button } from "@/components/ui/button";
import { useSelectedProject } from "@/hooks/useSelectedProject"; import { useSelectedProject } from "@/hooks/useSelectedProject";
import { useProjectInfoQuery, useSurveyRedirectUrlQuery } from "@/query/project"; import { useProjectInfoQuery, useSurveyRedirectUrlQuery } from "@/query/project";
import { SurveyType } from "@/types/project"; import { SurveyType } from "@/types/project";
import { SURVEY_TYPE_LABEL } from "@/const/projectConst";
const SurveyProgressPage = () => { const SurveyProgressPage = () => {
const mounted = useMounted(); const mounted = useMounted();
const { selectedProject } = useSelectedProject(); const { selectedProject } = useSelectedProject();
const openedRef = useRef(false); const openedForRef = useRef<string | null>(null);
const prjctIdx = selectedProject?.prjctIdx ?? 0; const prjctIdx = selectedProject?.prjctIdx ?? 0;
const enabled = mounted && prjctIdx > 0; const enabled = mounted && prjctIdx > 0;
const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled); const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled);
const projectInfo = projectInfoQuery.data; const surveys = projectInfoQuery.data?.surveys ?? [];
const surveyTy = projectInfo?.surveyTy ?? SurveyType.NONE;
const [activeSurveyIdx, setActiveSurveyIdx] = useState<number | null>(null);
const [openedUrl, setOpenedUrl] = useState<string | null>(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 isKonKiwi = surveyTy === SurveyType.KON || surveyTy === SurveyType.KIWI;
const isKiwi = surveyTy === SurveyType.KIWI ? 1 : 0; const isKiwi = surveyTy === SurveyType.KIWI ? 1 : 0;
const pkey = projectInfo?.surveyPrjctCd ?? ""; const pkey = selectedSurvey?.surveyPrjctCd ?? "";
const redirectUrlEnabled = enabled && !!projectInfo && isKonKiwi && !!pkey; const redirectUrlEnabled = enabled && !!selectedSurvey && isKonKiwi && !!pkey;
const redirectUrlQuery = useSurveyRedirectUrlQuery(isKiwi, pkey, redirectUrlEnabled); const redirectUrlQuery = useSurveyRedirectUrlQuery(isKiwi, pkey, redirectUrlEnabled);
const targetUrl = isKonKiwi const targetUrl = !selectedSurvey
? null
: isKonKiwi
? (redirectUrlQuery.data ?? null) ? (redirectUrlQuery.data ?? null)
: surveyTy === SurveyType.EXTERNAL : surveyTy === SurveyType.EXTERNAL
? (projectInfo?.surveyDashboardUrl || null) ? (selectedSurvey.surveyDashboardUrl || null)
: null; : null;
useEffect(() => { useEffect(() => {
if (openedRef.current || !targetUrl) return; if (!targetUrl || openedForRef.current === targetUrl) return;
openedRef.current = true; openedForRef.current = targetUrl;
window.open(targetUrl, "_blank"); window.open(targetUrl, "_blank");
setOpenedUrl(targetUrl);
}, [targetUrl]); }, [targetUrl]);
const isLoading = !mounted || projectInfoQuery.isLoading || (redirectUrlEnabled && redirectUrlQuery.isLoading); const isLoading = !mounted || projectInfoQuery.isLoading || (redirectUrlEnabled && redirectUrlQuery.isLoading);
if (isLoading) return <LoadingOverlayAdapter force />; if (isLoading) return <LoadingOverlayAdapter force />;
if (targetUrl) {
return ( return (
<div className="space-y-6 text-sm"> <div className="space-y-6 text-sm">
<AppPageTitle titleText="설문 현황" /> <AppPageTitle titleText="설문 현황" />
{surveys.length === 0 ? (
<p className="text-muted-foreground">연결된 설문이 없습니다.</p>
) : (
<div className="max-w-[600px] space-y-2">
{surveys.map((survey) => {
const hasReport = survey.surveyTy !== SurveyType.NONE;
return (
<div
key={survey.prjctSurveyIdx ?? survey.surveyOrder}
className="flex items-center justify-between rounded-lg border bg-white p-4"
>
<div>
<p className="font-semibold">{survey.surveyName}</p>
<p className="text-xs text-muted-foreground">{SURVEY_TYPE_LABEL[survey.surveyTy]}</p>
</div>
<Button
type="button"
disabled={!hasReport}
onClick={() => setActiveSurveyIdx(survey.prjctSurveyIdx ?? null)}
>
바로가기
</Button>
</div>
);
})}
</div>
)}
{openedUrl ? (
<p> <p>
새 창에서 열립니다. 열리지 않았다면{" "} 새 창에서 열립니다. 열리지 않았다면{" "}
<a href={targetUrl} target="_blank" rel="noreferrer" className="text-blue-600 underline"> <a href={openedUrl} target="_blank" rel="noreferrer" className="text-blue-600 underline">
여기 여기
</a> </a>
를 클릭해 주세요. 를 클릭해 주세요.
</p> </p>
</div> ) : null}
);
}
return (
<div className="space-y-6 text-sm">
<AppPageTitle titleText="연결 가능한 현황이 없습니다." />
</div> </div>
); );
}; };

View File

@@ -13,8 +13,9 @@ import {useDialog} from '@/hooks/useDialog'
import ResultCodeDialog from '@/components/dialog/ResultCodeDialog' import ResultCodeDialog from '@/components/dialog/ResultCodeDialog'
import { useDebouncedValue, useMounted } from "@kri/common/hooks"; import { useDebouncedValue, useMounted } from "@kri/common/hooks";
import { LoadingOverlayAdapter } from '@/components/app-shell/LoadingOverlayAdapter' import { LoadingOverlayAdapter } from '@/components/app-shell/LoadingOverlayAdapter'
import { X } from 'lucide-react'
import { import {
ProjectInfo, ProjectUpdateRequest, ResultCode, ProjectInfo, ProjectSurvey, ProjectUpdateRequest, ResultCode,
ProjectStatus, ResultCodeType, SurveyType ProjectStatus, ResultCodeType, SurveyType
} from "@/types/project"; } from "@/types/project";
import { import {
@@ -25,10 +26,12 @@ import {
} from "@/const/projectConst"; } from "@/const/projectConst";
import type { MultiSelectOption } from "@/components/common/KriAutoComplete"; import type { MultiSelectOption } from "@/components/common/KriAutoComplete";
import {FW_TEAM} from "@/const/userConst"; import {FW_TEAM} from "@/const/userConst";
import {COMMON_TEXT_REGEX} from "@/const/validationConst";
import {validateValue} from "@/utils/validation";
import {useItrntUserList} from "@/hooks/useItrntUserList"; import {useItrntUserList} from "@/hooks/useItrntUserList";
import {useSelectedProject} from "@/hooks/useSelectedProject"; import {useSelectedProject} from "@/hooks/useSelectedProject";
import {useAuth} from "@/hooks/useAuth"; import {useAuth} from "@/hooks/useAuth";
import {KriEditor} from "@/components/kri-editor"; import {KriEditor, type KriEditorCommand} from "@/components/kri-editor";
import {useRouter} from "next/navigation"; import {useRouter} from "next/navigation";
import { import {
useProjectInfoQuery, useProjectInfoQuery,
@@ -39,8 +42,10 @@ import {
useUploadScenarioImageMutation, useKartProjectListQuery, useUploadScenarioImageMutation, useKartProjectListQuery,
} from "@/query/project"; } from "@/query/project";
import { useCmpnListQuery } from "@/query/cmpn"; import { useCmpnListQuery } from "@/query/cmpn";
import { useCallerTelNumListQuery } from "@/query/intranet"; import { useCallerTelNumListQuery, useGroupCodeListQuery } from "@/query/intranet";
import { formatKoreanPhoneNumber } from "@/utils/phone"; import { formatKoreanPhoneNumber } from "@/utils/phone";
import { useListHeaderQuery } from "@/query/list";
import { MessageVariableList } from "@/components/message-template/MessageVariableList";
const defaultProjectInfo: ProjectInfo = { const defaultProjectInfo: ProjectInfo = {
prjctIdx: 0, prjctIdx: 0,
@@ -51,10 +56,7 @@ const defaultProjectInfo: ProjectInfo = {
ownerDept: '', ownerDept: '',
ownerFw: '', ownerFw: '',
callerTelNum: '', callerTelNum: '',
surveyTy: SurveyType.NONE, surveys: [],
surveyPrjctCd: '',
surveyUrl: '',
surveyDashboardUrl: '',
ff: false, ff: false,
useContactSenario: false, useContactSenario: false,
contactSenario: '', contactSenario: '',
@@ -63,27 +65,270 @@ const defaultProjectInfo: ProjectInfo = {
} }
type ExternalTab = 'redirect' | 'api' type ExternalTab = 'redirect' | 'api'
type SurveyDraft = ProjectSurvey & { uiKey: string }
const baseUrl = 'https://contact.kric.com' const baseUrl = 'https://contact.kric.com'
const sidParam = 'sid=[$SID]' const sidParam = 'sid=[$SID]'
const externalPidParamBase = 'contact-pid=[$prjctIdx]' const surveyIdxParam = 'psidx=[$prjctSurveyIdx]'
const internalPidParamBase = 'pid=[$prjctIdx]'
const externalUrls = { const externalUrls = {
redirect: { redirect: {
complete: `${baseUrl}/redirect/complete?${internalPidParamBase}&${sidParam}`, complete: `${baseUrl}/redirect/complete?${surveyIdxParam}&${sidParam}`,
screen: `${baseUrl}/redirect/screen?${internalPidParamBase}&${sidParam}`, screen: `${baseUrl}/redirect/screen?${surveyIdxParam}&${sidParam}`,
quota: `${baseUrl}/redirect/quota?${internalPidParamBase}&${sidParam}`, quota: `${baseUrl}/redirect/quota?${surveyIdxParam}&${sidParam}`,
}, },
api: { api: {
start: `${baseUrl}/api/external/start?${internalPidParamBase}&${sidParam}`, start: `${baseUrl}/api/external/start?${surveyIdxParam}&${sidParam}`,
complete: `${baseUrl}/api/external/complete?${internalPidParamBase}&${sidParam}`, complete: `${baseUrl}/api/external/complete?${surveyIdxParam}&${sidParam}`,
screen: `${baseUrl}/api/external/screen?${internalPidParamBase}&${sidParam}`, screen: `${baseUrl}/api/external/screen?${surveyIdxParam}&${sidParam}`,
quota: `${baseUrl}/api/external/quota?${internalPidParamBase}&${sidParam}`, quota: `${baseUrl}/api/external/quota?${surveyIdxParam}&${sidParam}`,
}, },
} as const } as const
const internalSurvey = new Set([SurveyType.KON, SurveyType.KIWI]); const buildKonKiwiSurveyUrl = (surveyTy: SurveyType) =>
surveyTy === SurveyType.KON ? 'https://[$KON-URL]?sid=[$SID]' : 'https://[$KIWI-URL]?sid=[$SID]'
const isValidHttpUrl = (value: string) => {
try {
const url = new URL(value)
return url.protocol === 'http:' || url.protocol === 'https:'
} catch {
return false
}
}
const isValidSurveyUrl = (value: string) => {
const konToken = '[$KON-URL]'
const kiwiToken = '[$KIWI-URL]'
const hasKonToken = value.includes(konToken)
const hasKiwiToken = value.includes(kiwiToken)
if (hasKonToken && hasKiwiToken) return false
const placeholderHost = hasKonToken ? 'kon-url.invalid' : hasKiwiToken ? 'kiwi-url.invalid' : null
const normalized = placeholderHost
? value.replace(hasKonToken ? konToken : kiwiToken, placeholderHost)
: value
if (normalized.includes(konToken) || normalized.includes(kiwiToken)) return false
if (!isValidHttpUrl(normalized)) return false
return placeholderHost === null || new URL(normalized).hostname === placeholderHost
}
const createSurveyDraft = (surveyOrder: number): SurveyDraft => ({
uiKey: crypto.randomUUID(),
prjctSurveyIdx: null,
surveyOrder,
surveyName: '',
surveyTy: SurveyType.KON,
surveyPrjctCd: '',
surveyUrl: '',
surveyFullUrl: null,
surveyShortUrl: null,
surveyDashboardUrl: '',
})
type SurveyInvalidField = 'surveyName' | 'surveyUrl' | 'surveyDashboardUrl'
type SurveyCardProps = {
survey: SurveyDraft
index: number
itrntPrjctCd: string
userTeam: string
invalidField: SurveyInvalidField | null
onRegisterFieldRef: (uiKey: string, field: SurveyInvalidField) => (el: HTMLInputElement | null) => void
onChange: (uiKey: string, patch: Partial<ProjectSurvey>) => void
onRemove: (uiKey: string) => void
}
const SurveyCard = ({ survey, index, itrntPrjctCd, userTeam, invalidField, onRegisterFieldRef, onChange, onRemove }: SurveyCardProps) => {
const [externalTab, setExternalTab] = useState<ExternalTab>('redirect')
const [surveyKeyword, setSurveyKeyword] = useState('')
const debouncedKeyword = useDebouncedValue(surveyKeyword, 500)
const isKonKiwi = survey.surveyTy === SurveyType.KON || survey.surveyTy === SurveyType.KIWI
const isKiwi = survey.surveyTy === SurveyType.KIWI ? 1 : 0
const kartEnabled = !!itrntPrjctCd && !!userTeam && isKonKiwi
const kartProjectListQuery = useKartProjectListQuery({
itrntPrjctCd,
userTeam,
isKiwi,
keyword: debouncedKeyword,
enabled: kartEnabled,
})
const surveyProjectArray = kartProjectListQuery.data ?? []
const replaceParams = (url: string) =>
survey.prjctSurveyIdx != null ? url.replace('[$prjctSurveyIdx]', String(survey.prjctSurveyIdx)) : url
const handleTypeChange = (value: string) => {
const nextTy = Number(value) as SurveyType
onChange(survey.uiKey, {
surveyTy: nextTy,
surveyPrjctCd: '',
surveyUrl: '',
surveyFullUrl: null,
surveyShortUrl: null,
surveyDashboardUrl: '',
})
}
const handleKartSelect = (value: string) => {
onChange(survey.uiKey, {
surveyPrjctCd: value,
surveyUrl: buildKonKiwiSurveyUrl(survey.surveyTy),
surveyFullUrl: null,
surveyShortUrl: null,
})
}
return (
<div className="space-y-3 rounded-lg border p-4">
<div className="flex items-center justify-between">
<p className="text-base font-semibold">설문 {index + 1}</p>
<Button type="button" variant="ghost" size="icon-sm" onClick={() => onRemove(survey.uiKey)} aria-label="설문 삭제">
<X className="h-4 w-4" />
</Button>
</div>
<div className="grid grid-cols-2 gap-4">
<div className="space-y-2">
<Label className="text-base">
설문명<span className="text-red-500 ml-1">*</span>
</Label>
<Input
ref={onRegisterFieldRef(survey.uiKey, 'surveyName')}
value={survey.surveyName}
onChange={(e) => onChange(survey.uiKey, { surveyName: e.target.value })}
placeholder="설문명을 입력하세요"
className="h-9"
aria-invalid={invalidField === 'surveyName'}
/>
</div>
<div className="space-y-2">
<Label className="text-base">설문 타입</Label>
<RadioGroup value={String(survey.surveyTy)} onValueChange={handleTypeChange} className="flex h-9 items-center gap-4">
{SURVEY_TYPE_ORDER.map((t) => {
const id = `survey-${survey.uiKey}-${t}`
return (
<div key={t} className="flex items-center space-x-2">
<RadioGroupItem value={String(t)} id={id} />
<Label htmlFor={id} className="font-normal cursor-pointer text-base">
{SURVEY_TYPE_LABEL[t]}
</Label>
</div>
)
})}
</RadioGroup>
</div>
</div>
{isKonKiwi && (
<div className="space-y-2">
<Label className="text-base">{SURVEY_TYPE_LABEL[survey.surveyTy]} 프로젝트</Label>
<KriSingleSelect
items={surveyProjectArray}
value={survey.surveyPrjctCd || ''}
onChange={handleKartSelect}
getValue={(item) => item.pkey}
getLabel={(item) => `[${item.pkey}] ${item.title}`}
searchMode={"inputOnly"}
onSearchValueChange={setSurveyKeyword}
placeholder="프로젝트를 선택하세요"
heightClassName="h-9"
widthClassName="w-full"
/>
</div>
)}
<div className="space-y-2">
<Label className="text-base">설문 URL</Label>
<Input
ref={onRegisterFieldRef(survey.uiKey, 'surveyUrl')}
value={survey.surveyUrl || ''}
onChange={(e) => onChange(survey.uiKey, {
surveyUrl: e.target.value,
surveyFullUrl: null,
surveyShortUrl: null,
})}
placeholder="https://"
className="h-9"
aria-invalid={invalidField === 'surveyUrl'}
/>
</div>
{survey.surveyTy === SurveyType.EXTERNAL && (
<div className="space-y-2">
<Label className="text-base">설문 대시보드 URL</Label>
<Input
ref={onRegisterFieldRef(survey.uiKey, 'surveyDashboardUrl')}
value={survey.surveyDashboardUrl || ''}
onChange={(e) => onChange(survey.uiKey, { surveyDashboardUrl: e.target.value })}
placeholder="https://"
className="h-9"
aria-invalid={invalidField === 'surveyDashboardUrl'}
/>
</div>
)}
{survey.surveyTy === SurveyType.EXTERNAL && (
<div className="space-y-2">
<Tabs value={externalTab} onValueChange={(v) => setExternalTab(v as ExternalTab)} className="w-full">
<TabsList className="grid w-full grid-cols-2">
<TabsTrigger value="redirect">리다이렉트</TabsTrigger>
<TabsTrigger value="api">API</TabsTrigger>
</TabsList>
<TabsContent value="redirect" className="mt-4">
<div className="border rounded-lg p-4 space-y-3 bg-gray-50">
<div className="font-semibold">리다이렉트 URL</div>
<div className="grid gap-2">
<div className="flex items-center gap-2">
<Label className="w-24 text-base">완료:</Label>
<Input value={replaceParams(externalUrls.redirect.complete)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">스크린 아웃:</Label>
<Input value={replaceParams(externalUrls.redirect.screen)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">쿼터 풀:</Label>
<Input value={replaceParams(externalUrls.redirect.quota)} readOnly className="bg-white h-9" />
</div>
</div>
</div>
</TabsContent>
<TabsContent value="api" className="mt-4">
<div className="border rounded-lg p-4 space-y-3 bg-gray-50">
<div className="font-semibold">API URL</div>
<div className="grid gap-2">
<div className="flex items-center gap-2">
<Label className="w-24 text-base">시작 API:</Label>
<Input value={replaceParams(externalUrls.api.start)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">완료 API:</Label>
<Input value={replaceParams(externalUrls.api.complete)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">스크린 API:</Label>
<Input value={replaceParams(externalUrls.api.screen)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">쿼터 API:</Label>
<Input value={replaceParams(externalUrls.api.quota)} readOnly className="bg-white h-9" />
</div>
</div>
<p className="text-xs text-muted-foreground">API Method는 Post를 사용하시면 됩니다.</p>
</div>
</TabsContent>
</Tabs>
</div>
)}
</div>
)
}
const ProjectInfoPage = () => { const ProjectInfoPage = () => {
const router = useRouter(); const router = useRouter();
@@ -94,42 +339,38 @@ const ProjectInfoPage = () => {
const {auth} = useAuth(); const {auth} = useAuth();
const [projectInfo, setProjectInfo] = useState<ProjectInfo>(defaultProjectInfo); const [projectInfo, setProjectInfo] = useState<ProjectInfo>(defaultProjectInfo);
const [surveyKeyword, setSurveyKeyword] = useState(''); const [surveys, setSurveys] = useState<SurveyDraft[]>([]);
const debouncedKeyword = useDebouncedValue(surveyKeyword, 500);
const [externalTab, setExternalTab] = useState<ExternalTab>('redirect')
const sessionTempUrlsRef = useRef<Set<string>>(new Set()); const sessionTempUrlsRef = useRef<Set<string>>(new Set());
const initialProjectInfoRef = useRef<ProjectInfo | null>(null); const initialProjectInfoRef = useRef<ProjectInfo | null>(null);
const scenarioEditorCmdRef = useRef<KriEditorCommand | null>(null);
const [invalidField, setInvalidField] = useState<'prjctName' | null>(null);
const [invalidSurveyField, setInvalidSurveyField] = useState<{ uiKey: string; field: SurveyInvalidField } | null>(null);
const prjctNameRef = useRef<HTMLInputElement>(null);
const surveyFieldRefs = useRef<Map<string, HTMLInputElement>>(new Map());
const registerSurveyFieldRef = useCallback(
(uiKey: string, field: SurveyInvalidField) => (el: HTMLInputElement | null) => {
const key = `${uiKey}:${field}`;
if (el) surveyFieldRefs.current.set(key, el);
else surveyFieldRefs.current.delete(key);
},
[]
);
const userTeam = auth.user?.userTeam ?? ""; const userTeam = auth.user?.userTeam ?? "";
const prjctIdx = selectedProject?.prjctIdx ?? 0; const prjctIdx = selectedProject?.prjctIdx ?? 0;
const enabled = mounted && prjctIdx > 0; const enabled = mounted && prjctIdx > 0;
// 조회 쿼리들
const surveyTy = projectInfo.surveyTy ?? SurveyType.NONE;
const isInternalSurvey = internalSurvey.has(surveyTy);
const isKiwi = surveyTy === SurveyType.KON ? 0 : surveyTy === SurveyType.KIWI ? 1 : 0;
// 조회 쿼리들
const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled); const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled);
const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled); const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled);
const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled);
const cmpnListQuery = useCmpnListQuery(); const cmpnListQuery = useCmpnListQuery();
const assignedCmpnQuery = useAssignedCmpnIdsQuery(prjctIdx, enabled); const assignedCmpnQuery = useAssignedCmpnIdsQuery(prjctIdx, enabled);
const callerTelNumListQuery = useCallerTelNumListQuery(mounted); const callerTelNumListQuery = useCallerTelNumListQuery(mounted);
const groupCodeListQuery = useGroupCodeListQuery(mounted);
const kartEnabled =
mounted &&
!!projectInfo.itrntPrjctCd &&
!!userTeam &&
isInternalSurvey;
const kartProjectListQuery = useKartProjectListQuery({
itrntPrjctCd: projectInfo.itrntPrjctCd,
userTeam,
isKiwi,
keyword: debouncedKeyword,
enabled: kartEnabled,
});
const updateMutation = useUpdateProjectMutation(prjctIdx); const updateMutation = useUpdateProjectMutation(prjctIdx);
const deleteMutation = useDeleteProjectMutation(prjctIdx); const deleteMutation = useDeleteProjectMutation(prjctIdx);
@@ -147,17 +388,22 @@ const ProjectInfoPage = () => {
})); }));
}, [cmpnListQuery.data]); }, [cmpnListQuery.data]);
const surveyProjectArray = kartProjectListQuery.data ?? [];
const callerTelNumArray = callerTelNumListQuery.data ?? []; const callerTelNumArray = callerTelNumListQuery.data ?? [];
const deptArray = useMemo(() => { const groupCodeLabelMap = useMemo(
() => new Map((groupCodeListQuery.data ?? []).map((g) => [g.groupCode, g.groupCodeLabel])),
[groupCodeListQuery.data]
);
const deptArray: MultiSelectOption[] = useMemo(() => {
const teams = Array.from(new Set((users ?? []).map((u) => u.userTeam).filter(Boolean))); const teams = Array.from(new Set((users ?? []).map((u) => u.userTeam).filter(Boolean)));
if (!teams.includes("T900")) teams.push("T900"); // TFT if (!teams.includes("T900")) teams.push("T900"); // TFT
return teams.sort((a, b) => a.localeCompare(b, "ko")); return teams
}, [users]); .sort((a, b) => a.localeCompare(b, "ko"))
.map((code) => ({ value: code, label: groupCodeLabelMap.get(code) ?? code }));
}, [users, groupCodeLabelMap]);
const fwArray: MultiSelectOption[] = useMemo(() => { const fwArray: MultiSelectOption[] = useMemo(() => {
return (users ?? []) return (users ?? [])
@@ -169,6 +415,19 @@ const ProjectInfoPage = () => {
setProjectInfo((prev) => ({...prev, [field]: value})) setProjectInfo((prev) => ({...prev, [field]: value}))
} }
const handleAddSurvey = () => {
setSurveys((prev) => [...prev, createSurveyDraft(prev.length + 1)])
}
const handleRemoveSurvey = (uiKey: string) => {
if (!confirm('삭제 후 저장하면 이 설문은 영구적으로 삭제됩니다. 삭제하시겠습니까?')) return
setSurveys((prev) => prev.filter((s) => s.uiKey !== uiKey))
}
const handleSurveyChange = (uiKey: string, patch: Partial<ProjectSurvey>) => {
setSurveys((prev) => prev.map((s) => (s.uiKey === uiKey ? { ...s, ...patch } : s)))
}
const handleImageUpload = useCallback( const handleImageUpload = useCallback(
async (file: File): Promise<string> => { async (file: File): Promise<string> => {
if (!projectInfo.prjctCd) { if (!projectInfo.prjctCd) {
@@ -188,17 +447,98 @@ const ProjectInfoPage = () => {
} }
const handleSubmit = async () => { const handleSubmit = async () => {
if (!projectInfo.prjctName) { setInvalidField(null);
alert('프로젝트명을 입력해주세요.') setInvalidSurveyField(null);
const prjctNameCheck = validateValue(projectInfo.prjctName, {
required: true,
requiredMessage: '프로젝트명을 입력해주세요.',
maxLength: 128,
pattern: COMMON_TEXT_REGEX,
patternMessage: '프로젝트명에 허용되지 않는 문자가 포함되어 있습니다.',
});
if (!prjctNameCheck.valid) {
alert(prjctNameCheck.message)
setInvalidField('prjctName')
prjctNameRef.current?.focus()
return return
} }
for (const survey of surveys) {
const label = survey.surveyName || `설문 ${survey.surveyOrder}`
const nameCheck = validateValue(survey.surveyName, {
required: true,
requiredMessage: `${label}: 설문명을 입력해주세요.`,
maxLength: 32,
pattern: COMMON_TEXT_REGEX,
patternMessage: `${label}: 설문명에 허용되지 않는 문자가 포함되어 있습니다.`,
})
if (!nameCheck.valid) {
alert(nameCheck.message)
setInvalidSurveyField({ uiKey: survey.uiKey, field: 'surveyName' })
surveyFieldRefs.current.get(`${survey.uiKey}:surveyName`)?.focus()
return
}
if (survey.surveyTy === SurveyType.KON || survey.surveyTy === SurveyType.KIWI) {
if (!survey.surveyPrjctCd?.trim()) {
alert(`${label}: 연동할 프로젝트를 선택해주세요.`)
return
}
}
const urlCheck = validateValue(survey.surveyUrl ?? '', {
required: true,
requiredMessage: `${label}: 설문 URL을 입력해주세요.`,
maxLength: 1024,
pattern: COMMON_TEXT_REGEX,
patternMessage: `${label}: 설문 URL에 허용되지 않는 문자가 포함되어 있습니다.`,
})
if (!urlCheck.valid) {
alert(urlCheck.message)
setInvalidSurveyField({ uiKey: survey.uiKey, field: 'surveyUrl' })
surveyFieldRefs.current.get(`${survey.uiKey}:surveyUrl`)?.focus()
return
}
if (!isValidSurveyUrl(survey.surveyUrl ?? '')) {
alert(`${label}: 올바른 HTTP(S) 설문 URL을 입력해 주세요.`)
setInvalidSurveyField({ uiKey: survey.uiKey, field: 'surveyUrl' })
surveyFieldRefs.current.get(`${survey.uiKey}:surveyUrl`)?.focus()
return
}
const dashCheck = validateValue(survey.surveyDashboardUrl ?? '', {
maxLength: 1024,
pattern: COMMON_TEXT_REGEX,
patternMessage: `${label}: 설문 대시보드 URL에 허용되지 않는 문자가 포함되어 있습니다.`,
})
if (!dashCheck.valid) {
alert(dashCheck.message)
setInvalidSurveyField({ uiKey: survey.uiKey, field: 'surveyDashboardUrl' })
surveyFieldRefs.current.get(`${survey.uiKey}:surveyDashboardUrl`)?.focus()
return
}
const dashboardUrl = survey.surveyDashboardUrl?.trim() ?? ''
if (survey.surveyTy === SurveyType.EXTERNAL && dashboardUrl && !isValidHttpUrl(dashboardUrl)) {
alert(`${label}: 올바른 HTTP(S) 설문 대시보드 URL을 입력해 주세요.`)
setInvalidSurveyField({ uiKey: survey.uiKey, field: 'surveyDashboardUrl' })
surveyFieldRefs.current.get(`${survey.uiKey}:surveyDashboardUrl`)?.focus()
return
}
}
const updateCodeArray = structuredClone( const updateCodeArray = structuredClone(
resultCodeArray.filter((rc) => changeResultCodeType.includes(rc.resultCdTy)) resultCodeArray.filter((rc) => changeResultCodeType.includes(rc.resultCdTy))
); );
const requestUpdateProject: ProjectUpdateRequest = { const requestUpdateProject: ProjectUpdateRequest = {
projectInfo: projectInfo, projectInfo: {
...projectInfo,
surveys: surveys.map(({ uiKey, ...rest }) => rest),
},
resultCodeList: updateCodeArray, resultCodeList: updateCodeArray,
assignCmpnIdList: assignCmpnIdArray, assignCmpnIdList: assignCmpnIdArray,
} }
@@ -222,6 +562,7 @@ const ProjectInfoPage = () => {
useEffect(() => { useEffect(() => {
if (projectInfoQuery.data) { if (projectInfoQuery.data) {
setProjectInfo(projectInfoQuery.data); setProjectInfo(projectInfoQuery.data);
setSurveys(projectInfoQuery.data.surveys.map((s) => ({ ...s, uiKey: crypto.randomUUID() })));
initialProjectInfoRef.current = projectInfoQuery.data; initialProjectInfoRef.current = projectInfoQuery.data;
} }
}, [projectInfoQuery.data]); }, [projectInfoQuery.data]);
@@ -238,52 +579,6 @@ const ProjectInfoPage = () => {
} }
}, [assignedCmpnQuery.data]); }, [assignedCmpnQuery.data]);
useEffect(() => {
if (projectInfo.surveyTy !== SurveyType.EXTERNAL) {
setExternalTab('redirect')
}
}, [projectInfo.surveyTy]);
// KON/KIWI 프로젝트 "선택"을 사용자가 직접 바꿨을 때만 surveyUrl을 자동 생성한다.
// 저장된 프로젝트를 불러오는 경우(조회) 등에는 저장돼 있는 surveyUrl을 그대로 보여줘야 한다.
const handleSurveyPrjctCdChange = (value: string) => {
setProjectInfo((prev) => {
const next = {...prev, surveyPrjctCd: value};
if (value && internalSurvey.has(prev.surveyTy || SurveyType.NONE)) {
const pidParam = externalPidParamBase.replace('[$prjctIdx]', String(prev.prjctIdx));
let surveyUrl = `/project/${value}/INDEX.asp?${pidParam}&${sidParam}`;
if (prev.surveyTy === SurveyType.KON) {
surveyUrl = `https://kon.kric.com` + surveyUrl
} else if (prev.surveyTy === SurveyType.KIWI) {
surveyUrl = `https://kon.kiwisurvey.kr` + surveyUrl
}
next.surveyUrl = surveyUrl;
}
return next;
})
}
// 설문 연동(surveyTy)을 바꾸면 선택된 KON/KIWI 프로젝트, 설문 URL, 설문 대시보드 URL을 초기화한다.
// 단, 최초 조회 시점의 surveyTy로 다시 돌아오면 그때 저장돼 있던 값을 복원한다.
const handleSurveyTyChange = (value: string) => {
const nextSurveyTy = Number(value) as SurveyType;
const initial = initialProjectInfoRef.current;
const backToInitial = !!initial && initial.surveyTy === nextSurveyTy;
setProjectInfo((prev) => ({
...prev,
surveyTy: nextSurveyTy,
surveyPrjctCd: backToInitial ? (initial!.surveyPrjctCd ?? '') : '',
surveyUrl: backToInitial ? (initial!.surveyUrl ?? '') : '',
surveyDashboardUrl: backToInitial ? (initial!.surveyDashboardUrl ?? '') : '',
}))
}
const replacePrjctIdx = (url: string) => url.replace('[$prjctIdx]', String(projectInfo.prjctIdx));
if (!mounted) return <LoadingOverlayAdapter force /> if (!mounted) return <LoadingOverlayAdapter force />
return ( return (
@@ -333,10 +628,12 @@ const ProjectInfoPage = () => {
프로젝트 명<span className="text-red-500 ml-1">*</span> 프로젝트 명<span className="text-red-500 ml-1">*</span>
</Label> </Label>
<Input <Input
ref={prjctNameRef}
value={projectInfo.prjctName || ''} value={projectInfo.prjctName || ''}
onChange={(e) => handleChange('prjctName', e.target.value)} onChange={(e) => handleChange('prjctName', e.target.value)}
placeholder="프로젝트명을 입력하세요" placeholder="프로젝트명을 입력하세요"
className="h-9" className="h-9"
aria-invalid={invalidField === 'prjctName'}
/> />
</div> </div>
@@ -347,6 +644,8 @@ const ProjectInfoPage = () => {
items={deptArray} items={deptArray}
value={projectInfo.ownerDept || ''} value={projectInfo.ownerDept || ''}
onChange={(value) => handleChange('ownerDept', value)} onChange={(value) => handleChange('ownerDept', value)}
getValue={(item) => item.value}
getLabel={(item) => item.label}
placeholder="담당 그룹을 선택하세요" placeholder="담당 그룹을 선택하세요"
heightClassName="h-9" heightClassName="h-9"
widthClassName="w-full" widthClassName="w-full"
@@ -400,123 +699,30 @@ const ProjectInfoPage = () => {
</div> </div>
<div className="border rounded-lg p-6 space-y-4 bg-white mt-3"> <div className="border rounded-lg p-6 space-y-4 bg-white mt-3">
<div className="flex items-center justify-between">
<h3 className="text-xl font-semibold">설문 연동</h3> <h3 className="text-xl font-semibold">설문 연동</h3>
<Button type="button" variant="outline" onClick={handleAddSurvey}>
<RadioGroup 설문 추가
value={String(projectInfo.surveyTy ?? SurveyType.NONE)} </Button>
onValueChange={handleSurveyTyChange}
className="flex gap-4"
>
{SURVEY_TYPE_ORDER.map((t) => {
const id = `survey-${t}`; // 유니크 보장
return (
<div key={t} className="flex items-center space-x-2">
<RadioGroupItem value={String(t)} id={id} />
<Label htmlFor={id} className="font-normal cursor-pointer text-base">
{SURVEY_TYPE_LABEL[t]}
</Label>
</div> </div>
);
})}
</RadioGroup>
{(projectInfo.surveyTy === SurveyType.KON || projectInfo.surveyTy === SurveyType.KIWI) && ( {surveys.length === 0 ? (
<div className="space-y-2"> <p className="text-sm text-muted-foreground">연결된 설문이 없습니다. &quot;설문 추가&quot;로 등록해주세요.</p>
<Label className="text-base">{SURVEY_TYPE_LABEL[projectInfo.surveyTy]} 프로젝트</Label> ) : (
<KriSingleSelect <div className="space-y-4">
items={surveyProjectArray} {surveys.map((survey, index) => (
value={projectInfo.surveyPrjctCd || ''} <SurveyCard
onChange={handleSurveyPrjctCdChange} key={survey.uiKey}
getValue={(item) => item.pkey} survey={survey}
getLabel={(item) => `[${item.pkey}] ${item.title}`} index={index}
searchMode={"inputOnly"} itrntPrjctCd={projectInfo.itrntPrjctCd}
onSearchValueChange={setSurveyKeyword} userTeam={userTeam}
placeholder="프로젝트를 선택하세요" invalidField={invalidSurveyField?.uiKey === survey.uiKey ? invalidSurveyField.field : null}
heightClassName="h-9" onRegisterFieldRef={registerSurveyFieldRef}
widthClassName="w-full" onChange={handleSurveyChange}
onRemove={handleRemoveSurvey}
/> />
</div> ))}
)}
{projectInfo.surveyTy !== SurveyType.NONE && (
<div className="space-y-2">
<Label className="text-base">설문 URL</Label>
<Input
value={projectInfo.surveyUrl || ''}
onChange={(e) => handleChange('surveyUrl', e.target.value)}
placeholder="https://"
className="h-9"
/>
</div>
)}
{projectInfo.surveyTy === SurveyType.EXTERNAL && (
<div className="space-y-2">
<Label className="text-base">설문 대시보드 URL</Label>
<Input
value={projectInfo.surveyDashboardUrl || ''}
onChange={(e) => handleChange('surveyDashboardUrl', e.target.value)}
placeholder="https://"
className="h-9"
/>
</div>
)}
{projectInfo.surveyTy === SurveyType.EXTERNAL && (
<div className="space-y-2">
<Tabs value={externalTab} onValueChange={(v) => setExternalTab(v as ExternalTab)} className="w-full">
<TabsList className="grid w-full grid-cols-2">
<TabsTrigger value="redirect">리다이렉트</TabsTrigger>
<TabsTrigger value="api">API</TabsTrigger>
</TabsList>
<TabsContent value="redirect" className="mt-4">
<div className="border rounded-lg p-4 space-y-3 bg-gray-50">
<div className="font-semibold">리다이렉트 URL</div>
<div className="grid gap-2">
<div className="flex items-center gap-2">
<Label className="w-24 text-base">완료:</Label>
<Input value={replacePrjctIdx(externalUrls.redirect.complete)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">스크린 아웃:</Label>
<Input value={replacePrjctIdx(externalUrls.redirect.screen)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">쿼터 풀:</Label>
<Input value={replacePrjctIdx(externalUrls.redirect.quota)} readOnly className="bg-white h-9" />
</div>
</div>
</div>
</TabsContent>
<TabsContent value="api" className="mt-4">
<div className="border rounded-lg p-4 space-y-3 bg-gray-50">
<div className="font-semibold">API URL</div>
<div className="grid gap-2">
<div className="flex items-center gap-2">
<Label className="w-24 text-base">시작 API:</Label>
<Input value={replacePrjctIdx(externalUrls.api.start)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">완료 API:</Label>
<Input value={replacePrjctIdx(externalUrls.api.complete)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">스크린 API:</Label>
<Input value={replacePrjctIdx(externalUrls.api.screen)} readOnly className="bg-white h-9" />
</div>
<div className="flex items-center gap-2">
<Label className="w-24 text-base">쿼터 API:</Label>
<Input value={replacePrjctIdx(externalUrls.api.quota)} readOnly className="bg-white h-9" />
</div>
</div>
<p className="text-xs text-muted-foreground">API Method는 Post를 사용하시면 됩니다.</p>
</div>
</TabsContent>
</Tabs>
</div> </div>
)} )}
</div> </div>
@@ -549,11 +755,17 @@ const ProjectInfoPage = () => {
{projectInfo.useContactSenario && ( {projectInfo.useContactSenario && (
<div className="ml-6 border rounded p-4 bg-gray-50 text-sm text-gray-600"> <div className="ml-6 border rounded p-4 bg-gray-50 text-sm text-gray-600">
<MessageVariableList
listHeaders={listHeaderQuery.data ?? []}
surveys={surveys}
onInsert={(value) => scenarioEditorCmdRef.current?.insertText(value)}
/>
<KriEditor <KriEditor
value={projectInfo.contactSenario ?? "<p></p>"} value={projectInfo.contactSenario ?? "<p></p>"}
onChange={(html: string) => handleChange("contactSenario", html)} onChange={(html: string) => handleChange("contactSenario", html)}
onCommandReady={(command) => { scenarioEditorCmdRef.current = command }}
placeholder="컨택 시나리오를 작성해 주세요" placeholder="컨택 시나리오를 작성해 주세요"
className="w-full" className="mt-4 w-full"
debounceMs={600} // 기본 400ms, 원하면 늘리세요(예: 600~1000) debounceMs={600} // 기본 400ms, 원하면 늘리세요(예: 600~1000)
onImageUpload={async (file) => await handleImageUpload(file)} // 사용 시만 onImageUpload={async (file) => await handleImageUpload(file)} // 사용 시만
/> />

View File

@@ -23,15 +23,15 @@ const LoginPage = () => {
const passwordInputRef = useRef<HTMLInputElement | null>(null); const passwordInputRef = useRef<HTMLInputElement | null>(null);
const tryLogin = async () => { const tryLogin = async () => {
if (!userId) return alert("Please enter ID."); if (!userId) return alert("아이디를 입력해주세요.");
if (!userPw) return alert("Please enter password."); if (!userPw) return alert("비밀번호를 입력해주세요.");
setError(null); setError(null);
try { try {
await loginMutation.mutateAsync({ userId, userPw }); await loginMutation.mutateAsync({ userId, userPw });
} catch (e) { } catch (e) {
const err = apiError(e, { const err = apiError(e, {
fallbackMessage: "Login failed.", fallbackMessage: "로그인에 실패했습니다.",
}); });
if (err.status === 401 || err.status === 403) setError("아이디 또는 비밀번호를 다시 확인해주세요."); if (err.status === 401 || err.status === 403) setError("아이디 또는 비밀번호를 다시 확인해주세요.");
else if (err.code === NONE_HTTP_ERROR) setError("알 수 없는 오류가 발생했습니다. 잠시 후 다시 시도해주세요."); else if (err.code === NONE_HTTP_ERROR) setError("알 수 없는 오류가 발생했습니다. 잠시 후 다시 시도해주세요.");
@@ -100,7 +100,7 @@ const LoginPage = () => {
type="password" type="password"
autoComplete="current-password" autoComplete="current-password"
required required
placeholder="password" placeholder="Password"
value={userPw} value={userPw}
onChange={(e) => setUserPw(e.currentTarget.value)} onChange={(e) => setUserPw(e.currentTarget.value)}
onKeyDown={handlePwKeyDown} onKeyDown={handlePwKeyDown}

View File

@@ -36,7 +36,7 @@ const toRequiredNumber = (value: string): number | null => {
const buildExternalEventBody = ( const buildExternalEventBody = (
req: NextRequest, req: NextRequest,
action: ExternalAction, action: ExternalAction,
prjctIdx: number, prjctSurveyIdx: number,
sid: number, sid: number,
): ExternalEventBody => { ): ExternalEventBody => {
const pathname = req.nextUrl.pathname; const pathname = req.nextUrl.pathname;
@@ -45,12 +45,12 @@ const buildExternalEventBody = (
return { return {
action: actionCode, action: actionCode,
prjctIdx, prjctSurveyIdx,
sid, sid,
meta: { meta: {
entryType: getEntryTypeCode(h), entryType: getEntryTypeCode(h),
action: actionCode, action: actionCode,
pid: String(prjctIdx), psidx: String(prjctSurveyIdx),
sid: String(sid), sid: String(sid),
remoteAddr: getHeader(h, "x-orig-ip") || getClientIp(req), remoteAddr: getHeader(h, "x-orig-ip") || getClientIp(req),
uri: getHeader(h, "x-orig-uri") || pathname, uri: getHeader(h, "x-orig-uri") || pathname,
@@ -74,14 +74,14 @@ const handleExternalEvent = async (req: NextRequest, context: RouteContext) => {
return NextResponse.json({ message: "Not found" }, { status: 404 }); return NextResponse.json({ message: "Not found" }, { status: 404 });
} }
const prjctIdx = toRequiredNumber((searchParams.get("pid") ?? "").trim()); const prjctSurveyIdx = toRequiredNumber((searchParams.get("psidx") ?? "").trim());
const sid = toRequiredNumber((searchParams.get("sid") ?? "").trim()); const sid = toRequiredNumber((searchParams.get("sid") ?? "").trim());
if (!prjctIdx || !sid) { if (!prjctSurveyIdx || !sid) {
return NextResponse.json({ message: "pid와 sid는 필수입니다." }, { status: 400 }); return NextResponse.json({ message: "psidx, sid는 필수입니다." }, { status: 400 });
} }
const body = buildExternalEventBody(req, action, prjctIdx, sid); const body = buildExternalEventBody(req, action, prjctSurveyIdx, sid);
const contactApi = await createContactApi(); const contactApi = await createContactApi();
await contactApi.post(`/list-hist/survey`, body); await contactApi.post(`/list-hist/survey`, body);

View File

@@ -3,7 +3,7 @@ import {RouteContext} from "@/types/common";
import {createIntranetApi} from "@/lib/http-server"; import {createIntranetApi} from "@/lib/http-server";
import {CallerTelNumInfo, IntranetProjectSearchResponse} from "@/types/project"; import {CallerTelNumInfo, IntranetProjectSearchResponse} from "@/types/project";
import {errorToResponse} from "@kri/common/http"; import {errorToResponse} from "@kri/common/http";
import {ItrntUserInfo} from "@/types/user"; import {GroupCodeInfo, ItrntUserInfo} from "@/types/user";
export const GET = async (req: NextRequest, context: RouteContext) => { export const GET = async (req: NextRequest, context: RouteContext) => {
try { try {
@@ -34,6 +34,12 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
return NextResponse.json(result, { status: 200 }); return NextResponse.json(result, { status: 200 });
} }
if(action === "group-code-list"){
const result = await itrntApi.get<GroupCodeInfo[]>(`/user/group-code-list`);
return NextResponse.json(result, { status: 200 });
}
return NextResponse.json({ message: "Not found" }, { status: 404 }); return NextResponse.json({ message: "Not found" }, { status: 404 });
} catch (error: unknown) { } catch (error: unknown) {
return errorToResponse(error); return errorToResponse(error);

View File

@@ -2,6 +2,25 @@ import {NextRequest, NextResponse} from "next/server";
import {RouteContext} from "@/types/common"; import {RouteContext} from "@/types/common";
import {createContactApi} from "@/lib/http-server"; import {createContactApi} from "@/lib/http-server";
import {errorToResponse} from "@kri/common/http"; import {errorToResponse} from "@kri/common/http";
import type {ListCallHistSession} from "@/types/list";
export const GET = async (_req: NextRequest, context: RouteContext) => {
try {
const { slug = [] } = await context.params;
const [action, agentSessionId] = slug;
if (action !== "session" || !agentSessionId) {
return NextResponse.json({ message: "Not found" }, { status: 404 });
}
const contactApi = await createContactApi();
const result = await contactApi.get<ListCallHistSession>(
`/list-call-hist/session/${encodeURIComponent(agentSessionId)}`,
);
return NextResponse.json(result, { status: 200 });
} catch (error: unknown) {
return errorToResponse(error);
}
};
export const PUT = async (req: NextRequest, context: RouteContext) => { export const PUT = async (req: NextRequest, context: RouteContext) => {
try { try {

View File

@@ -32,6 +32,17 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
return NextResponse.json(result, { status: 200 }); return NextResponse.json(result, { status: 200 });
} }
if (action === "item-file-download" && slug.length === 4) {
const result = await contactApi.get<ArrayBuffer>(
`/list/item-file/download/${slug[1]}/${slug[2]}/${slug[3]}`,
{ expectBinary: true },
);
return new NextResponse(result, {
status: 200,
headers: { "Content-Type": "application/octet-stream" },
});
}
return NextResponse.json({ message: "Not found" }, { status: 404 }); return NextResponse.json({ message: "Not found" }, { status: 404 });
} catch (error: unknown) { } catch (error: unknown) {
return errorToResponse(error); return errorToResponse(error);

View File

@@ -18,11 +18,13 @@ export interface KriAutoCompleteBaseProps<T> {
heightClassName?: string heightClassName?: string
spanClassName?: string spanClassName?: string
badgeClassName?: string badgeClassName?: string
badgeLabelClassName?: string
className?: string className?: string
getValue?: (item: T) => string getValue?: (item: T) => string
getLabel?: (item: T) => string getLabel?: (item: T) => string
withInfo?: boolean withInfo?: boolean
disabled?: boolean disabled?: boolean
'aria-invalid'?: boolean
} }
export interface KriMultiSelectProps<T = unknown> extends KriAutoCompleteBaseProps<T> { export interface KriMultiSelectProps<T = unknown> extends KriAutoCompleteBaseProps<T> {
@@ -59,11 +61,12 @@ export function KriMultiSelect<T = unknown>({
maxCount = 1, maxCount = 1,
maxSelected, maxSelected,
hideSelectAll = false, hideSelectAll = false,
placeholder = 'Select options', placeholder = '옵션을 선택하세요',
widthClassName, widthClassName,
heightClassName, heightClassName,
spanClassName = 'text-base', spanClassName = 'text-base',
badgeClassName = 'text-base', badgeClassName = 'text-base',
badgeLabelClassName,
className, className,
getValue, getValue,
getLabel, getLabel,
@@ -71,6 +74,7 @@ export function KriMultiSelect<T = unknown>({
onItemsChange, onItemsChange,
onOptionsChange, onOptionsChange,
disabled, disabled,
'aria-invalid': ariaInvalid,
}: KriMultiSelectProps<T>) { }: KriMultiSelectProps<T>) {
const options = React.useMemo( const options = React.useMemo(
() => toOptions(items, getValue, getLabel, withInfo), () => toOptions(items, getValue, getLabel, withInfo),
@@ -78,7 +82,7 @@ export function KriMultiSelect<T = unknown>({
) )
return ( return (
<div className={cn('flex-none', widthClassName, heightClassName)}> <div className={cn('flex-none min-w-0', widthClassName, heightClassName)}>
<MultiSelect<T> <MultiSelect<T>
options={options} options={options}
defaultValue={value} defaultValue={value}
@@ -90,6 +94,7 @@ export function KriMultiSelect<T = unknown>({
className={cn('bg-background text-base', !widthClassName && 'w-auto', className)} className={cn('bg-background text-base', !widthClassName && 'w-auto', className)}
spanClassName={spanClassName} spanClassName={spanClassName}
badgeClassName={badgeClassName} badgeClassName={badgeClassName}
badgeLabelClassName={badgeLabelClassName}
searchable={searchable} searchable={searchable}
searchMode={searchMode} searchMode={searchMode}
defaultSearchValue={defaultSearchValue} defaultSearchValue={defaultSearchValue}
@@ -100,6 +105,7 @@ export function KriMultiSelect<T = unknown>({
resetOnDefaultValueChange resetOnDefaultValueChange
deduplicateOptions deduplicateOptions
disabled={disabled} disabled={disabled}
aria-invalid={ariaInvalid}
/> />
</div> </div>
) )
@@ -118,7 +124,8 @@ export interface KriSingleSelectProps<T = unknown> extends KriAutoCompleteBasePr
showSelectedTooltip?: boolean showSelectedTooltip?: boolean
} }
export function KriSingleSelect<T = unknown>({ function KriSingleSelectInner<T>(
{
items, items,
value, value,
onChange, onChange,
@@ -126,11 +133,12 @@ export function KriSingleSelect<T = unknown>({
searchMode = 'filter', searchMode = 'filter',
defaultSearchValue = '', defaultSearchValue = '',
onSearchValueChange, onSearchValueChange,
placeholder = 'Select an option', placeholder = '옵션을 선택하세요',
heightClassName, heightClassName,
widthClassName, widthClassName,
spanClassName = 'text-base', spanClassName = 'text-base',
badgeClassName = 'text-base', badgeClassName = 'text-base',
badgeLabelClassName,
className, className,
getValue, getValue,
getLabel, getLabel,
@@ -144,8 +152,22 @@ export function KriSingleSelect<T = unknown>({
clearLabel = '선택 해제', clearLabel = '선택 해제',
clearValue = '__CLEAR__', clearValue = '__CLEAR__',
disabled, disabled,
}: KriSingleSelectProps<T>) { 'aria-invalid': ariaInvalid,
}: KriSingleSelectProps<T>,
forwardedRef: React.ForwardedRef<MultiSelectRef>,
) {
const ref = React.useRef<MultiSelectRef>(null) const ref = React.useRef<MultiSelectRef>(null)
React.useImperativeHandle(
forwardedRef,
() => ({
reset: () => ref.current?.reset(),
getSelectedValues: () => ref.current?.getSelectedValues() ?? [],
setSelectedValues: (values) => ref.current?.setSelectedValues(values),
clear: () => ref.current?.clear(),
focus: () => ref.current?.focus(),
}),
[],
)
const options = React.useMemo(() => { const options = React.useMemo(() => {
const normal = toOptions(items, getValue, getLabel, withInfo) const normal = toOptions(items, getValue, getLabel, withInfo)
return useClear ? [{ value: clearValue, label: clearLabel }, ...normal] : normal return useClear ? [{ value: clearValue, label: clearLabel }, ...normal] : normal
@@ -153,7 +175,7 @@ export function KriSingleSelect<T = unknown>({
const selectedLabel = options.find((option) => option.value === value)?.label const selectedLabel = options.find((option) => option.value === value)?.label
return ( return (
<div className={cn('flex-none', widthClassName, heightClassName)}> <div className={cn('flex-none min-w-0', widthClassName, heightClassName)}>
<MultiSelect<T> <MultiSelect<T>
ref={ref} ref={ref}
options={options} options={options}
@@ -186,6 +208,7 @@ export function KriSingleSelect<T = unknown>({
className={cn('bg-background text-base', !widthClassName && 'w-auto', className)} className={cn('bg-background text-base', !widthClassName && 'w-auto', className)}
spanClassName={spanClassName} spanClassName={spanClassName}
badgeClassName={badgeClassName} badgeClassName={badgeClassName}
badgeLabelClassName={badgeLabelClassName ?? 'min-w-0 flex-1'}
searchable={searchable} searchable={searchable}
searchMode={searchMode} searchMode={searchMode}
defaultSearchValue={defaultSearchValue} defaultSearchValue={defaultSearchValue}
@@ -199,7 +222,12 @@ export function KriSingleSelect<T = unknown>({
deduplicateOptions deduplicateOptions
disabled={disabled} disabled={disabled}
title={showSelectedTooltip ? selectedLabel ?? value : undefined} title={showSelectedTooltip ? selectedLabel ?? value : undefined}
aria-invalid={ariaInvalid}
/> />
</div> </div>
) )
} }
export const KriSingleSelect = React.forwardRef(KriSingleSelectInner) as <T = unknown>(
props: KriSingleSelectProps<T> & { ref?: React.ForwardedRef<MultiSelectRef> },
) => React.ReactElement

View File

@@ -1,23 +1,24 @@
'use client' 'use client'
import { useId, useMemo, useState } from 'react' import { forwardRef, useId, useImperativeHandle, useMemo, useRef, useState } from 'react'
import { CheckIcon, EyeIcon, EyeOffIcon, XIcon } from 'lucide-react' import { CheckIcon, EyeIcon, EyeOffIcon, XIcon } from 'lucide-react'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input' import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label' import { Label } from '@/components/ui/label'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import { KRI_PW_REGEX, ONLY_ALLOWED_PW_REGEX } from '@/const/validationConst'
export const ALLOWED_SPECIALS_TEXT = `! @ # $ % ^ & * ( ) _ + - = { } [ ] : ; " ' < > , . ? /`
export const ONLY_ALLOWED_REGEX = /^[A-Za-z\d!@#$%^&*()_+\-={}\[\]:;"'<>,.?/]+$/
export const KRI_PW_REGEX = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d!@#$%^&*()_+\-={}\[\]:;"'<>,.?/]{8,20}$/
const requirements = [ const requirements = [
{ test: (value: string) => /[A-Za-z]/.test(value), text: '영문 1개 이상' }, { test: (value: string) => /[A-Za-z]/.test(value), text: '영문 1개 이상' },
{ test: (value: string) => /\d/.test(value), text: '숫자 1개 이상' }, { test: (value: string) => /\d/.test(value), text: '숫자 1개 이상' },
{ test: (value: string) => value.length >= 8 && value.length <= 20, text: '8~20자' }, { test: (value: string) => value.length >= 8 && value.length <= 20, text: '8~20자' },
{ test: (value: string) => !value || ONLY_ALLOWED_REGEX.test(value), text: '허용 문자만 사용' }, { test: (value: string) => !value || ONLY_ALLOWED_PW_REGEX.test(value), text: '허용 문자만 사용' },
] ]
export type KriPasswordRef = {
focus: () => void
}
export interface KriPasswordProps { export interface KriPasswordProps {
value: string value: string
onChange: (value: string) => void onChange: (value: string) => void
@@ -27,9 +28,10 @@ export interface KriPasswordProps {
disabled?: boolean disabled?: boolean
className?: string className?: string
showStrength?: boolean showStrength?: boolean
'aria-invalid'?: boolean
} }
export function KriPassword({ export const KriPassword = forwardRef<KriPasswordRef, KriPasswordProps>(function KriPassword({
value, value,
onChange, onChange,
id, id,
@@ -38,12 +40,17 @@ export function KriPassword({
disabled, disabled,
className, className,
showStrength = true, showStrength = true,
}: KriPasswordProps) { 'aria-invalid': ariaInvalid,
}, forwardedRef) {
const inputRef = useRef<HTMLInputElement>(null)
useImperativeHandle(forwardedRef, () => ({
focus: () => inputRef.current?.focus(),
}), [])
const [isVisible, setIsVisible] = useState(false) const [isVisible, setIsVisible] = useState(false)
const autoId = useId() const autoId = useId()
const inputId = id ?? autoId const inputId = id ?? autoId
const isValid = useMemo(() => KRI_PW_REGEX.test(value), [value]) const isValid = useMemo(() => KRI_PW_REGEX.test(value), [value])
const hasOnlyAllowedChars = useMemo(() => (value ? ONLY_ALLOWED_REGEX.test(value) : true), [value]) const hasOnlyAllowedChars = useMemo(() => (value ? ONLY_ALLOWED_PW_REGEX.test(value) : true), [value])
const checks = useMemo(() => requirements.map((item) => ({ met: item.test(value), text: item.text })), [value]) const checks = useMemo(() => requirements.map((item) => ({ met: item.test(value), text: item.text })), [value])
const score = checks.filter((item) => item.met).length const score = checks.filter((item) => item.met).length
@@ -60,6 +67,7 @@ export function KriPassword({
{label ? <Label htmlFor={inputId}>{label}</Label> : null} {label ? <Label htmlFor={inputId}>{label}</Label> : null}
<div className="relative"> <div className="relative">
<Input <Input
ref={inputRef}
id={inputId} id={inputId}
type={isVisible ? 'text' : 'password'} type={isVisible ? 'text' : 'password'}
placeholder={placeholder} placeholder={placeholder}
@@ -68,6 +76,7 @@ export function KriPassword({
className="pr-9" className="pr-9"
disabled={disabled} disabled={disabled}
autoComplete="new-password" autoComplete="new-password"
aria-invalid={ariaInvalid}
/> />
<Button <Button
type="button" type="button"
@@ -113,6 +122,6 @@ export function KriPassword({
) : null} ) : null}
</div> </div>
) )
} })
export default KriPassword export default KriPassword

View File

@@ -1,5 +1,6 @@
'use client' 'use client'
import * as React from 'react'
import type { CSSProperties } from 'react' import type { CSSProperties } from 'react'
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select' import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
@@ -9,6 +10,10 @@ export type KriSelectItem = {
label: string label: string
} }
export type KriSelectRef = {
focus: () => void
}
export type KriSelectProps<T> = { export type KriSelectProps<T> = {
items: T[] items: T[]
value: string value: string
@@ -24,6 +29,7 @@ export type KriSelectProps<T> = {
getLabel?: (item: T) => string getLabel?: (item: T) => string
useAll?: boolean useAll?: boolean
disabled?: boolean disabled?: boolean
'aria-invalid'?: boolean
} }
const HEIGHT_CLASS_VALUE: Record<string, CSSProperties['height']> = { const HEIGHT_CLASS_VALUE: Record<string, CSSProperties['height']> = {
@@ -34,7 +40,8 @@ const HEIGHT_CLASS_VALUE: Record<string, CSSProperties['height']> = {
'h-10': '2.5rem', 'h-10': '2.5rem',
} }
export function KriSelect<T>({ function KriSelectInner<T>(
{
items, items,
value, value,
onChange, onChange,
@@ -49,7 +56,18 @@ export function KriSelect<T>({
getLabel, getLabel,
useAll = true, useAll = true,
disabled, disabled,
}: KriSelectProps<T>) { 'aria-invalid': ariaInvalid,
}: KriSelectProps<T>,
forwardedRef: React.ForwardedRef<KriSelectRef>,
) {
const triggerRef = React.useRef<HTMLButtonElement>(null)
React.useImperativeHandle(
forwardedRef,
() => ({
focus: () => triggerRef.current?.focus(),
}),
[],
)
const extractValue = (item: T) => (getValue ? getValue(item) : String(item)) const extractValue = (item: T) => (getValue ? getValue(item) : String(item))
const extractLabel = (item: T) => (getLabel ? getLabel(item) : String(item)) const extractLabel = (item: T) => (getLabel ? getLabel(item) : String(item))
const triggerStyle: CSSProperties | undefined = heightClassName const triggerStyle: CSSProperties | undefined = heightClassName
@@ -70,9 +88,11 @@ export function KriSelect<T>({
}} }}
> >
<SelectTrigger <SelectTrigger
ref={triggerRef}
className={cn('w-fit whitespace-nowrap bg-white', triggerTextClassName, heightClassName, className)} className={cn('w-fit whitespace-nowrap bg-white', triggerTextClassName, heightClassName, className)}
style={triggerStyle} style={triggerStyle}
aria-label={placeholder ?? 'select'} aria-label={placeholder ?? 'select'}
aria-invalid={ariaInvalid}
> >
<SelectValue placeholder={placeholder} /> <SelectValue placeholder={placeholder} />
</SelectTrigger> </SelectTrigger>
@@ -96,3 +116,7 @@ export function KriSelect<T>({
</Select> </Select>
) )
} }
export const KriSelect = React.forwardRef(KriSelectInner) as <T = unknown>(
props: KriSelectProps<T> & { ref?: React.ForwardedRef<KriSelectRef> },
) => React.ReactElement

View File

@@ -18,7 +18,7 @@ function MultiSelectInner<T>(
defaultValue = [], defaultValue = [],
stickySelectedOptions = [], stickySelectedOptions = [],
onStickySelectedOptionsChange, onStickySelectedOptionsChange,
placeholder = 'Select options', placeholder = '옵션을 선택하세요',
maxCount = 3, maxCount = 3,
maxSelected, maxSelected,
selectionMode = 'multiple', selectionMode = 'multiple',
@@ -27,6 +27,7 @@ function MultiSelectInner<T>(
className, className,
spanClassName, spanClassName,
badgeClassName, badgeClassName,
badgeLabelClassName,
hideSelectAll = false, hideSelectAll = false,
searchable = true, searchable = true,
searchMode = 'filter', searchMode = 'filter',
@@ -181,6 +182,7 @@ function MultiSelectInner<T>(
variant={variant} variant={variant}
spanClassName={spanClassName} spanClassName={spanClassName}
badgeClassName={badgeClassName} badgeClassName={badgeClassName}
badgeLabelClassName={badgeLabelClassName}
onRemove={(value) => emit(selectedValues.filter((selected) => selected !== value))} onRemove={(value) => emit(selectedValues.filter((selected) => selected !== value))}
onClear={() => emit([])} onClear={() => emit([])}
className={cn(autoSize && 'w-auto', className)} className={cn(autoSize && 'w-auto', className)}

View File

@@ -19,6 +19,7 @@ interface MultiSelectTriggerProps<T> extends Omit<React.ButtonHTMLAttributes<HTM
variant: MultiSelectVariant variant: MultiSelectVariant
spanClassName?: string spanClassName?: string
badgeClassName?: string badgeClassName?: string
badgeLabelClassName?: string
onRemove: (value: string) => void onRemove: (value: string) => void
onClear: () => void onClear: () => void
} }
@@ -35,6 +36,7 @@ export const MultiSelectTrigger = React.forwardRef(function MultiSelectTriggerIn
variant, variant,
spanClassName, spanClassName,
badgeClassName, badgeClassName,
badgeLabelClassName,
className, className,
disabled, disabled,
onRemove, onRemove,
@@ -84,7 +86,7 @@ export const MultiSelectTrigger = React.forwardRef(function MultiSelectTriggerIn
style={{ background: option.style?.gradient ?? option.style?.badgeColor }} style={{ background: option.style?.gradient ?? option.style?.badgeColor }}
> >
{!hideIcons && Icon ? <Icon className="size-3.5" /> : null} {!hideIcons && Icon ? <Icon className="size-3.5" /> : null}
<span className="max-w-48 truncate">{option.label}</span> <span className={cn('truncate', badgeLabelClassName ?? 'max-w-48')}>{option.label}</span>
{!preventDeselect ? ( {!preventDeselect ? (
<span <span
role="button" role="button"

View File

@@ -61,6 +61,7 @@ export interface MultiSelectProps<T = unknown>
variant?: MultiSelectVariant variant?: MultiSelectVariant
spanClassName?: string spanClassName?: string
badgeClassName?: string badgeClassName?: string
badgeLabelClassName?: string
hideSelectAll?: boolean hideSelectAll?: boolean
searchable?: boolean searchable?: boolean
searchMode?: 'filter' | 'inputOnly' searchMode?: 'filter' | 'inputOnly'

View File

@@ -165,12 +165,20 @@ export function DataTable<TData, TValue = unknown>({
const column = header.column const column = header.column
const sorted = column.getIsSorted() const sorted = column.getIsSorted()
const content = header.isPlaceholder ? null : flexRender(column.columnDef.header, header.getContext()) const content = header.isPlaceholder ? null : flexRender(column.columnDef.header, header.getContext())
const maxWidth = column.columnDef.meta?.maxWidth
return ( return (
<TableHead <TableHead
key={header.id} key={header.id}
className={cn('text-base font-semibold text-foreground', column.id === 'actions' && 'w-[140px] text-center')} className={cn(
style={{ width: header.getSize() !== 150 ? header.getSize() : undefined }} 'text-base font-semibold text-foreground',
column.id === 'actions' && 'w-[140px] text-center',
maxWidth && 'overflow-hidden text-ellipsis',
)}
style={{
width: header.getSize() !== 150 ? header.getSize() : undefined,
maxWidth,
}}
> >
{!header.isPlaceholder && column.getCanSort() ? ( {!header.isPlaceholder && column.getCanSort() ? (
<Button type="button" variant="ghost" className="flex gap-1 px-0 text-base font-semibold" onClick={column.getToggleSortingHandler()}> <Button type="button" variant="ghost" className="flex gap-1 px-0 text-base font-semibold" onClick={column.getToggleSortingHandler()}>
@@ -204,7 +212,18 @@ export function DataTable<TData, TValue = unknown>({
row.id === focusRowId && 'bg-accent', row.id === focusRowId && 'bg-accent',
)} )}
> >
{row.getVisibleCells().map((cell) => <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>)} {row.getVisibleCells().map((cell) => {
const maxWidth = cell.column.columnDef.meta?.maxWidth
return (
<TableCell
key={cell.id}
className={cn(maxWidth && 'overflow-hidden text-ellipsis')}
style={maxWidth ? { maxWidth } : undefined}
>
{flexRender(cell.column.columnDef.cell, cell.getContext())}
</TableCell>
)
})}
</TableRow> </TableRow>
)) : ( )) : (
<TableRow><TableCell colSpan={enhancedColumns.length} className="h-24 text-center">{emptyText}</TableCell></TableRow> <TableRow><TableCell colSpan={enhancedColumns.length} className="h-24 text-center">{emptyText}</TableCell></TableRow>

View File

@@ -1,4 +1,11 @@
import type { ColumnDef, PaginationState, SortingState, Updater } from '@tanstack/react-table' import type { ColumnDef, PaginationState, RowData, SortingState, Updater } from '@tanstack/react-table'
// 컬럼별 meta.maxWidth를 지정하면 DataTable이 헤더/셀 너비를 그 값으로 제한하고 넘치는 내용은 ...으로 표시한다.
declare module '@tanstack/react-table' {
interface ColumnMeta<TData extends RowData, TValue> {
maxWidth?: number | string
}
}
export type SelectMode = 'none' | 'click-event' | 'single' | 'multi' export type SelectMode = 'none' | 'click-event' | 'single' | 'multi'
export type DataTableColumn<TData, TValue = unknown> = ColumnDef<TData, TValue> export type DataTableColumn<TData, TValue = unknown> = ColumnDef<TData, TValue>

View File

@@ -1,6 +1,6 @@
'use client' 'use client'
import { useEffect, useState } from 'react' import { useEffect, useRef, useState } from 'react'
import { KriDialog } from '@/components/common/KriDialog' import { KriDialog } from '@/components/common/KriDialog'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input' import { Input } from '@/components/ui/input'
@@ -9,7 +9,9 @@ import { useDialog } from '@/hooks/useDialog'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import type { CmpnInfoSaveRequest } from '@/types/cmpn' import type { CmpnInfoSaveRequest } from '@/types/cmpn'
import type { DataVerification } from "@kri/common"; import type { DataVerification } from "@kri/common";
import { apiError, NONE_HTTP_ERROR, UNKNOWN_HTTP_ERROR } from "@kri/common/http"; import { COMMON_TEXT_REGEX } from "@/const/validationConst";
import { validateValue } from "@/utils/validation";
import { formatKoreanPhoneNumber } from "@/utils/phone";
export type CmpnUpsertDialogProps = { export type CmpnUpsertDialogProps = {
dialogId?: DialogId dialogId?: DialogId
@@ -43,6 +45,12 @@ const CmpnUpsertDialog = ({
const [formData, setFormData] = useState<CmpnInfoSaveRequest>(createDefaultCmpnInfo); const [formData, setFormData] = useState<CmpnInfoSaveRequest>(createDefaultCmpnInfo);
const [isCheckedDuplicate, setIsCheckedDuplicate] = useState(false); const [isCheckedDuplicate, setIsCheckedDuplicate] = useState(false);
const [isSubmitting, setIsSubmitting] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false);
const [invalidField, setInvalidField] = useState<'cmpnId' | 'cmpnAlias' | 'cmpnTel' | 'memo' | null>(null);
const cmpnIdRef = useRef<HTMLInputElement>(null);
const cmpnAliasRef = useRef<HTMLInputElement>(null);
const cmpnTelRef = useRef<HTMLInputElement>(null);
const memoRef = useRef<HTMLTextAreaElement>(null);
const resolvedOpen = open ?? isDialogOpen(dialogId); const resolvedOpen = open ?? isDialogOpen(dialogId);
@@ -57,6 +65,7 @@ const CmpnUpsertDialog = ({
} }
useEffect(() => { useEffect(() => {
setInvalidField(null);
if (initialData) { if (initialData) {
setFormData({ setFormData({
...createDefaultCmpnInfo(), ...createDefaultCmpnInfo(),
@@ -87,6 +96,8 @@ const CmpnUpsertDialog = ({
const cmpnId = formData.cmpnId.trim(); const cmpnId = formData.cmpnId.trim();
if (!cmpnId) { if (!cmpnId) {
alert("회사 ID를 입력해주세요."); alert("회사 ID를 입력해주세요.");
setInvalidField('cmpnId');
cmpnIdRef.current?.focus();
return; return;
} }
@@ -105,18 +116,53 @@ const CmpnUpsertDialog = ({
} }
const handleSubmit = async () => { const handleSubmit = async () => {
setInvalidField(null);
if (!formData.cmpnId.trim()) { if (!formData.cmpnId.trim()) {
alert("회사 ID를 입력해주세요."); alert("회사 ID를 입력해주세요.");
setInvalidField('cmpnId');
cmpnIdRef.current?.focus();
return; return;
} }
if (mode === 'create' && !isCheckedDuplicate) { if (mode === 'create' && !isCheckedDuplicate) {
alert("회사 ID 중복체크를 해주세요."); alert("회사 ID 중복체크를 해주세요.");
setInvalidField('cmpnId');
cmpnIdRef.current?.focus();
return; return;
} }
if (!formData.cmpnAlias.trim()) { const cmpnAliasCheck = validateValue(formData.cmpnAlias, {
alert("별칭을 입력해주세요."); required: true,
requiredMessage: "별칭을 입력해주세요.",
maxLength: 32,
pattern: COMMON_TEXT_REGEX,
patternMessage: "별칭에 허용되지 않는 문자가 포함되어 있습니다.",
});
if (!cmpnAliasCheck.valid) {
alert(cmpnAliasCheck.message);
setInvalidField('cmpnAlias');
cmpnAliasRef.current?.focus();
return;
}
const cmpnTelCheck = validateValue(formData.cmpnTel ?? '', {
maxLength: 16,
pattern: COMMON_TEXT_REGEX,
patternMessage: "전화번호에 허용되지 않는 문자가 포함되어 있습니다.",
});
if (!cmpnTelCheck.valid) {
alert(cmpnTelCheck.message);
setInvalidField('cmpnTel');
cmpnTelRef.current?.focus();
return;
}
const memoCheck = validateValue(formData.memo ?? '', { maxLength: 2048 });
if (!memoCheck.valid) {
alert(memoCheck.message);
setInvalidField('memo');
memoRef.current?.focus();
return; return;
} }
@@ -133,15 +179,7 @@ const CmpnUpsertDialog = ({
}); });
handleOpenChange(false); handleOpenChange(false);
} catch (e) { } catch (e) {
const err = apiError(e, { console.error(e);
fallbackMessage: "Save failed.",
});
console.error(err.status, err.code, err.message);
if (err.code !== NONE_HTTP_ERROR && err.code !== UNKNOWN_HTTP_ERROR) {
alert(err.message);
} else {
alert("저장에 실패했습니다.");
}
} finally { } finally {
setIsSubmitting(false); setIsSubmitting(false);
} }
@@ -180,11 +218,13 @@ const CmpnUpsertDialog = ({
</Label> </Label>
<div className="flex gap-2"> <div className="flex gap-2">
<Input <Input
ref={cmpnIdRef}
id="cmpnId" id="cmpnId"
placeholder="Enter company ID" placeholder="회사 ID를 입력하세요"
value={formData.cmpnId} value={formData.cmpnId}
onChange={(e) => handleInputChange('cmpnId', e.target.value)} onChange={(e) => handleInputChange('cmpnId', e.target.value)}
disabled={mode === 'edit'} disabled={mode === 'edit'}
aria-invalid={invalidField === 'cmpnId'}
/> />
{mode === 'create' && ( {mode === 'create' && (
<Button <Button
@@ -200,30 +240,36 @@ const CmpnUpsertDialog = ({
<div className="grid gap-2"> <div className="grid gap-2">
<Label htmlFor="cmpnAlias">별칭</Label> <Label htmlFor="cmpnAlias">별칭</Label>
<Input <Input
ref={cmpnAliasRef}
id="cmpnAlias" id="cmpnAlias"
placeholder="Enter alias" placeholder="별칭을 입력하세요"
value={formData.cmpnAlias ?? ''} value={formData.cmpnAlias ?? ''}
onChange={(e) => handleInputChange('cmpnAlias', e.target.value)} onChange={(e) => handleInputChange('cmpnAlias', e.target.value)}
aria-invalid={invalidField === 'cmpnAlias'}
/> />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
<Label htmlFor="cmpnTel">전화번호</Label> <Label htmlFor="cmpnTel">전화번호</Label>
<Input <Input
ref={cmpnTelRef}
id="cmpnTel" id="cmpnTel"
placeholder="Enter tel" placeholder="전화번호를 입력하세요"
value={formData.cmpnTel ?? ''} value={formatKoreanPhoneNumber(formData.cmpnTel ?? '')}
onChange={(e) => handleInputChange('cmpnTel', e.target.value)} onChange={(e) => handleInputChange('cmpnTel', e.target.value.replace(/\D/g, ''))}
aria-invalid={invalidField === 'cmpnTel'}
/> />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
<Label htmlFor="memo">메모</Label> <Label htmlFor="memo">메모</Label>
<textarea <textarea
ref={memoRef}
id="memo" id="memo"
className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50" className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20"
rows={3} rows={3}
placeholder="Enter memo" placeholder="메모를 입력하세요"
value={formData.memo ?? ''} value={formData.memo ?? ''}
onChange={(e) => handleInputChange('memo', e.target.value)} onChange={(e) => handleInputChange('memo', e.target.value)}
aria-invalid={invalidField === 'memo'}
/> />
</div> </div>
</KriDialog> </KriDialog>

View File

@@ -1,6 +1,6 @@
'use client' 'use client'
import { useEffect, useState } from 'react' import { useEffect, useRef, useState } from 'react'
import { Plus, X } from 'lucide-react' import { Plus, X } from 'lucide-react'
import { KriDialog } from '@/components/common/KriDialog' import { KriDialog } from '@/components/common/KriDialog'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
@@ -13,12 +13,15 @@ import {
SelectValue, SelectValue,
} from '@/components/ui/select' } from '@/components/ui/select'
import { KriSingleSelect } from '@/components/common/KriAutoComplete' import { KriSingleSelect } from '@/components/common/KriAutoComplete'
import ApplyFilterOption from './ListDialogOption/ApplyFilterOption' import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import type { FilterValueOption, ListFilterTarget } from '@/types/list' import type { FilterValueOption, ListFilterTarget } from '@/types/list'
import { type ResultCode, ResultCodeType } from '@/types/project' import { type ProjectSurvey, type ResultCode, ResultCodeType } from '@/types/project'
import { ListHeaderConst, LIST_BATCH_EDIT_FILE_DELETE_VALUE } from '@/const/listConst' import { ListHeaderConst, LIST_BATCH_EDIT_FILE_DELETE_VALUE } from '@/const/listConst'
import { COMMON_TEXT_REGEX } from '@/const/validationConst'
import { validateValue } from '@/utils/validation'
import { formatKoreanPhoneNumber } from '@/utils/phone'
export type BatchEditOption = { export type BatchEditOption = {
id: number id: number
@@ -33,11 +36,13 @@ export type BatchEditRow = {
value: string value: string
} }
export type BatchEditResultCodes = Partial<Record<ResultCodeType, number>> export type BatchEditResultCodes = Partial<Record<Exclude<ResultCodeType, ResultCodeType.SURVEY>, number>>
export type BatchEditSurveyResultCodes = Record<number, number>
export type BatchEditPayload = { export type BatchEditPayload = {
rows: BatchEditRow[] rows: BatchEditRow[]
resultCodes: BatchEditResultCodes resultCodes: BatchEditResultCodes
surveyResultCodes: { prjctSurveyIdx: number; resultCd: number }[]
target: ListFilterTarget target: ListFilterTarget
} }
@@ -47,9 +52,11 @@ export type ListBatchEditDialogProps = {
onOpenChange?: (open: boolean) => void onOpenChange?: (open: boolean) => void
headerOptions: BatchEditOption[] headerOptions: BatchEditOption[]
resultCodes: ResultCode[] resultCodes: ResultCode[]
surveys: ProjectSurvey[]
filterSummary?: string[] filterSummary?: string[]
initialRows?: BatchEditRow[] initialRows?: BatchEditRow[]
initialResultCodes?: BatchEditResultCodes initialResultCodes?: BatchEditResultCodes
initialSurveyResultCodes?: BatchEditSurveyResultCodes
onConfirm: (payload: BatchEditPayload) => void | Promise<void> onConfirm: (payload: BatchEditPayload) => void | Promise<void>
} }
@@ -61,10 +68,9 @@ const createRow = (headerId: number, value = ''): BatchEditRow => ({
const NO_CHANGE = '__no_change__' const NO_CHANGE = '__no_change__'
const resultCodeGroups: { type: ResultCodeType; label: string }[] = [ const resultCodeGroups: { type: Exclude<ResultCodeType, ResultCodeType.SURVEY>; label: string }[] = [
{ type: ResultCodeType.CONTACT, label: '컨택 결과' }, { type: ResultCodeType.CONTACT, label: '컨택 결과' },
{ type: ResultCodeType.INTERVIEW, label: '면접 결과' }, { type: ResultCodeType.INTERVIEW, label: '면접 결과' },
{ type: ResultCodeType.SURVEY, label: '설문 결과' },
] ]
const ListBatchEditDialog = ({ const ListBatchEditDialog = ({
@@ -73,21 +79,27 @@ const ListBatchEditDialog = ({
onOpenChange, onOpenChange,
headerOptions, headerOptions,
resultCodes, resultCodes,
surveys,
filterSummary, filterSummary,
initialRows = [], initialRows = [],
initialResultCodes = {}, initialResultCodes = {},
initialSurveyResultCodes = {},
onConfirm, onConfirm,
}: ListBatchEditDialogProps) => { }: ListBatchEditDialogProps) => {
const { isDialogOpen, showDialog, hideDialog } = useDialog() const { isDialogOpen, showDialog, hideDialog } = useDialog()
const [rows, setRows] = useState<BatchEditRow[]>([]) const [rows, setRows] = useState<BatchEditRow[]>([])
const [resultCodeSelections, setResultCodeSelections] = useState<BatchEditResultCodes>({}) const [resultCodeSelections, setResultCodeSelections] = useState<BatchEditResultCodes>({})
const [surveyResultSelections, setSurveyResultSelections] = useState<BatchEditSurveyResultCodes>({})
const [target, setTarget] = useState<ListFilterTarget>('filtered') const [target, setTarget] = useState<ListFilterTarget>('filtered')
const [submitting, setSubmitting] = useState(false) const [submitting, setSubmitting] = useState(false)
const [invalidRowId, setInvalidRowId] = useState<string | null>(null)
const rowInputRefs = useRef<Map<string, HTMLInputElement>>(new Map())
const resolvedOpen = open ?? isDialogOpen(dialogId) const resolvedOpen = open ?? isDialogOpen(dialogId)
const defaultHeaderId = headerOptions[0]?.id ?? 0 const defaultHeaderId = headerOptions[0]?.id ?? 0
const isFileHeader = (headerId: number) => headerOptions.find((option) => option.id === headerId)?.listHderTy === ListHeaderConst.FILE const isFileHeader = (headerId: number) => headerOptions.find((option) => option.id === headerId)?.listHderTy === ListHeaderConst.FILE
const isTelHeader = (headerId: number) => headerOptions.find((option) => option.id === headerId)?.listHderTy === ListHeaderConst.TEL_NUM
useEffect(() => { useEffect(() => {
if (!resolvedOpen) return if (!resolvedOpen) return
@@ -99,8 +111,10 @@ const ListBatchEditDialog = ({
setRows([]) setRows([])
} }
setResultCodeSelections({ ...initialResultCodes }) setResultCodeSelections({ ...initialResultCodes })
setSurveyResultSelections({ ...initialSurveyResultCodes })
setTarget('filtered') setTarget('filtered')
}, [resolvedOpen, initialRows, initialResultCodes, defaultHeaderId]) setInvalidRowId(null)
}, [resolvedOpen, initialRows, initialResultCodes, initialSurveyResultCodes, defaultHeaderId])
const handleOpenChange = (nextOpen: boolean) => { const handleOpenChange = (nextOpen: boolean) => {
onOpenChange?.(nextOpen) onOpenChange?.(nextOpen)
@@ -131,7 +145,7 @@ const ListBatchEditDialog = ({
setRows((prev) => prev.map((row) => (row.id === id ? { ...row, value } : row))) setRows((prev) => prev.map((row) => (row.id === id ? { ...row, value } : row)))
} }
const handleChangeResultCode = (type: ResultCodeType, value: string) => { const handleChangeResultCode = (type: Exclude<ResultCodeType, ResultCodeType.SURVEY>, value: string) => {
setResultCodeSelections((prev) => { setResultCodeSelections((prev) => {
if (value === NO_CHANGE) { if (value === NO_CHANGE) {
const next = { ...prev } const next = { ...prev }
@@ -142,17 +156,53 @@ const ListBatchEditDialog = ({
}) })
} }
const handleChangeSurveyResultCode = (prjctSurveyIdx: number, value: string) => {
setSurveyResultSelections((prev) => {
if (value === NO_CHANGE) {
const next = { ...prev }
delete next[prjctSurveyIdx]
return next
}
return { ...prev, [prjctSurveyIdx]: Number(value) }
})
}
const handleConfirm = async () => { const handleConfirm = async () => {
setInvalidRowId(null)
if (!validateApplyFilterTarget(target, filterSummary)) return
const normalized = rows.filter((row) => row.headerId > 0 && row.value.trim().length > 0) const normalized = rows.filter((row) => row.headerId > 0 && row.value.trim().length > 0)
const hasResultCodeChange = Object.keys(resultCodeSelections).length > 0 const surveyResultCodes = Object.entries(surveyResultSelections).map(([prjctSurveyIdx, resultCd]) => ({
prjctSurveyIdx: Number(prjctSurveyIdx),
resultCd,
}))
const hasResultCodeChange = Object.keys(resultCodeSelections).length > 0 || surveyResultCodes.length > 0
if (normalized.length === 0 && !hasResultCodeChange) { if (normalized.length === 0 && !hasResultCodeChange) {
alert('일괄 수정할 항목을 입력해주세요.') alert('일괄 수정할 항목을 입력해주세요.')
return return
} }
// 직접 값을 타이핑하는 행(선택형/파일 삭제가 아닌 행)만 형식을 검증한다.
for (const row of normalized) {
const isFreeTextRow = !isFileHeader(row.headerId) && getValueOptions(row.headerId) === undefined
if (!isFreeTextRow) continue
const valueCheck = validateValue(row.value, {
maxLength: 2048,
pattern: COMMON_TEXT_REGEX,
patternMessage: '수정 값에 허용되지 않는 문자가 포함되어 있습니다.',
})
if (!valueCheck.valid) {
alert(valueCheck.message)
setInvalidRowId(row.id)
rowInputRefs.current.get(row.id)?.focus()
return
}
}
setSubmitting(true) setSubmitting(true)
try { try {
await onConfirm({ rows: normalized, resultCodes: resultCodeSelections, target }) await onConfirm({ rows: normalized, resultCodes: resultCodeSelections, surveyResultCodes, target })
handleOpenChange(false) handleOpenChange(false)
} finally { } finally {
setSubmitting(false) setSubmitting(false)
@@ -215,6 +265,41 @@ const ListBatchEditDialog = ({
</div> </div>
</div> </div>
{surveys.length > 0 ? (
<div className="rounded-md border p-4 space-y-3">
<p className="font-semibold text-sm">설문별 결과 수정</p>
<div className="grid grid-cols-1 sm:grid-cols-3 gap-2">
{surveys.map((survey) => (
<div key={survey.prjctSurveyIdx} className="space-y-1">
<p className="text-sm text-muted-foreground">{survey.surveyName}</p>
<Select
value={
survey.prjctSurveyIdx != null && surveyResultSelections[survey.prjctSurveyIdx] !== undefined
? String(surveyResultSelections[survey.prjctSurveyIdx])
: NO_CHANGE
}
onValueChange={(v) => survey.prjctSurveyIdx != null && handleChangeSurveyResultCode(survey.prjctSurveyIdx, v)}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="변경 안함" />
</SelectTrigger>
<SelectContent>
<SelectItem value={NO_CHANGE}>변경 안함</SelectItem>
{resultCodes
.filter((code) => code.resultCdTy === ResultCodeType.SURVEY && code.resultCd !== 0)
.map((code) => (
<SelectItem key={code.resultCdUUID} value={String(code.resultCd)}>
{code.resultCdLbl}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
))}
</div>
</div>
) : null}
<p className="font-semibold text-sm">항목값 수정</p> <p className="font-semibold text-sm">항목값 수정</p>
<div className="rounded-md border overflow-hidden"> <div className="rounded-md border overflow-hidden">
<div className="h-11 px-4 border-b bg-muted grid grid-cols-[1fr_2fr_64px] items-center text-sm font-semibold"> <div className="h-11 px-4 border-b bg-muted grid grid-cols-[1fr_2fr_64px] items-center text-sm font-semibold">
@@ -263,11 +348,27 @@ const ListBatchEditDialog = ({
widthClassName="w-full" widthClassName="w-full"
className="w-full" className="w-full"
/> />
) : isTelHeader(row.headerId) ? (
<Input
ref={(el) => {
if (el) rowInputRefs.current.set(row.id, el)
else rowInputRefs.current.delete(row.id)
}}
value={formatKoreanPhoneNumber(row.value)}
onChange={(e) => handleChangeValue(row.id, e.target.value.replace(/\D/g, ''))}
placeholder="수정할 값을 입력해주세요"
aria-invalid={invalidRowId === row.id}
/>
) : ( ) : (
<Input <Input
ref={(el) => {
if (el) rowInputRefs.current.set(row.id, el)
else rowInputRefs.current.delete(row.id)
}}
value={row.value} value={row.value}
onChange={(e) => handleChangeValue(row.id, e.target.value)} onChange={(e) => handleChangeValue(row.id, e.target.value)}
placeholder="수정할 값을 입력해주세요" placeholder="수정할 값을 입력해주세요"
aria-invalid={invalidRowId === row.id}
/> />
)} )}

View File

@@ -7,6 +7,18 @@ import type { ListFilterTarget } from "@/types/list";
export type ApplyFilterOptionValue = ListFilterTarget export type ApplyFilterOptionValue = ListFilterTarget
/**
* "필터 적용 대상만"을 선택했는데 실제로 적용된 필터가 없는 경우를 검사한다.
* alert 후 진행을 막아야 하는 호출부에서 공통으로 사용한다.
*/
export const validateApplyFilterTarget = (value: ApplyFilterOptionValue, filterSummary?: string[]): boolean => {
if (value === 'filtered' && (filterSummary?.length ?? 0) === 0) {
alert('적용된 필터가 없습니다. 필터를 적용해 주세요.')
return false
}
return true
}
type ApplyFilterGroupProps = { type ApplyFilterGroupProps = {
value: ApplyFilterOptionValue value: ApplyFilterOptionValue
onValueChange: (value: ApplyFilterOptionValue) => void onValueChange: (value: ApplyFilterOptionValue) => void

View File

@@ -8,7 +8,7 @@ import { Label } from '@/components/ui/label'
import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group' import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import ApplyFilterOption from './ListDialogOption/ApplyFilterOption' import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption'
import KriDateRangePicker from '@/components/common/KriDateRangePicker' import KriDateRangePicker from '@/components/common/KriDateRangePicker'
import type { ContactHistoryDownloadType, ListDownloadMode, ListDownloadPayload, ListFilterTarget } from '@/types/list' import type { ContactHistoryDownloadType, ListDownloadMode, ListDownloadPayload, ListFilterTarget } from '@/types/list'
@@ -55,6 +55,8 @@ const ListDownloadDialog = ({
} }
const handleDownload = async () => { const handleDownload = async () => {
if (!validateApplyFilterTarget(target, filterSummary)) return
if (mode === 'contact-history') { if (mode === 'contact-history') {
const hasFrom = contactHistoryDateFrom.length > 0 const hasFrom = contactHistoryDateFrom.length > 0
const hasTo = contactHistoryDateTo.length > 0 const hasTo = contactHistoryDateTo.length > 0

View File

@@ -7,7 +7,7 @@ import { Label } from '@/components/ui/label'
import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group' import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import ApplyFilterOption from './ListDialogOption/ApplyFilterOption' import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption'
import type { ListFilterTarget, ListResetScope } from '@/types/list' import type { ListFilterTarget, ListResetScope } from '@/types/list'
export type ListResetDialogProps = { export type ListResetDialogProps = {
@@ -42,6 +42,9 @@ const ListResetDialog = ({
} }
const handleConfirm = async () => { const handleConfirm = async () => {
if (!validateApplyFilterTarget(target, filterSummary)) return
if (target === 'all' && !confirm('전체 리스트가 초기화 됩니다. 진행하시겠습니까?')) return
setSubmitting(true) setSubmitting(true)
try { try {
await onConfirm({ target, scope }) await onConfirm({ target, scope })

View File

@@ -189,8 +189,8 @@ const ListUploadDialog = ({
}) })
resetState() resetState()
handleOpenChange(false) handleOpenChange(false)
} catch { } catch (e) {
alert('리스트 업로드 중 오류가 발생했습니다.') console.error(e)
} finally { } finally {
setSubmitting(false) setSubmitting(false)
} }
@@ -314,6 +314,9 @@ const ListUploadDialog = ({
</Button> </Button>
<input ref={fileInputRef} type="file" accept={ACCEPT_EXTENSIONS.join(',')} className="hidden" onChange={handleSelectFile} /> <input ref={fileInputRef} type="file" accept={ACCEPT_EXTENSIONS.join(',')} className="hidden" onChange={handleSelectFile} />
</div> </div>
<p className="text-sm text-red-600 font-medium">
⚠️ 해당 파일의 내용대로 배정도 수정됩니다.
</p>
</div> </div>
{selectedFile && excelHeaders.length > 0 && compareRows.length > 0 && ( {selectedFile && excelHeaders.length > 0 && compareRows.length > 0 && (

View File

@@ -16,6 +16,7 @@ import type { DialogId } from '@/store/jotai/dialog'
import type { BulkSendInfo } from '@kri/common/noti-hub' import type { BulkSendInfo } from '@kri/common/noti-hub'
import type { SendResultInfo } from '@/types/message' import type { SendResultInfo } from '@/types/message'
import {clientEnv} from "@/lib/env.client"; import {clientEnv} from "@/lib/env.client";
import { formatKoreanPhoneNumber } from "@/utils/phone";
export type MessageHistoryType = 'sms' | 'email' export type MessageHistoryType = 'sms' | 'email'
@@ -43,9 +44,9 @@ const historyColumns: DataTableColumn<BulkSendInfo>[] = [
] ]
const detailColumns: DataTableColumn<SendResultInfo>[] = [ const detailColumns: DataTableColumn<SendResultInfo>[] = [
{ id: 'destTo', header: '수신처', accessorFn: (row) => row.destEml || row.destTel || '-' }, { id: 'destTo', header: '수신처', accessorFn: (row) => row.destEml || (row.destTel ? formatKoreanPhoneNumber(row.destTel) : '') || '-' },
{ id: 'destNm', header: '수신자명', accessorFn: (row) => row.destNm ?? '-' }, { id: 'destNm', header: '수신자명', accessorFn: (row) => row.destNm ?? '-' },
{ id: 'sendFrom', header: '발신지', accessorFn: (row) => row.sendEml || row.sendTel || '-' }, { id: 'sendFrom', header: '발신지', accessorFn: (row) => row.sendEml || (row.sendTel ? formatKoreanPhoneNumber(row.sendTel) : '') || '-' },
{ id: 'resultViewLabel', header: '결과', accessorFn: (row) => row.resultViewLabel || row.resultLabel || String(row.resultCode) }, { id: 'resultViewLabel', header: '결과', accessorFn: (row) => row.resultViewLabel || row.resultLabel || String(row.resultCode) },
{ id: 'sendDt', header: '발송 일시', accessorFn: (row) => (row.sendDt ? formatKst(row.sendDt, 'dateTime') : '-') }, { id: 'sendDt', header: '발송 일시', accessorFn: (row) => (row.sendDt ? formatKst(row.sendDt, 'dateTime') : '-') },
{ id: 'regDt', header: '등록 일시', accessorFn: (row) => (row.regDt ? formatKst(row.regDt, 'dateTime') : '-') }, { id: 'regDt', header: '등록 일시', accessorFn: (row) => (row.regDt ? formatKst(row.regDt, 'dateTime') : '-') },

View File

@@ -23,7 +23,7 @@ import type { DialogId } from '@/store/jotai/dialog'
import { createEmptyListFilter, type ListFilter, type ListFilterTarget, type listHeader } from '@/types/list' import { createEmptyListFilter, type ListFilter, type ListFilterTarget, type listHeader } from '@/types/list'
import { ListHeaderConst } from '@/const/listConst' import { ListHeaderConst } from '@/const/listConst'
import type { ListTableRow } from '@/components/table-column/ListTableColumn' import type { ListTableRow } from '@/components/table-column/ListTableColumn'
import ApplyFilterOption from './ListDialogOption/ApplyFilterOption' import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption'
import { KriEditor } from '@/components/kri-editor' import { KriEditor } from '@/components/kri-editor'
export type MessageSendMode = 'email' | 'sms' export type MessageSendMode = 'email' | 'sms'
@@ -151,6 +151,7 @@ const MessageSendDialog = ({
} }
const handleConfirm = async () => { const handleConfirm = async () => {
if (!validateApplyFilterTarget(target, filterSummary)) return
if (!selectedTemplate || !templateIdx) { if (!selectedTemplate || !templateIdx) {
alert('템플릿을 선택해 주세요.') alert('템플릿을 선택해 주세요.')
return return
@@ -196,7 +197,6 @@ const MessageSendDialog = ({
handleOpenChange(false) handleOpenChange(false)
} catch (e) { } catch (e) {
console.error(e) console.error(e)
alert('발송 중 오류가 발생했습니다.')
} finally { } finally {
setSubmitting(false) setSubmitting(false)
} }

View File

@@ -1,22 +1,22 @@
'use client' 'use client'
import {useState, useEffect, useMemo} from 'react' import {useState, useEffect, useMemo, useRef} from 'react'
import { KriDialog } from "@/components/common/KriDialog"; import { KriDialog } from "@/components/common/KriDialog";
import {Label} from "@/components/ui/label"; import {Label} from "@/components/ui/label";
import {Input} from "@/components/ui/input"; import {Input} from "@/components/ui/input";
import {Button} from "@/components/ui/button"; import {Button} from "@/components/ui/button";
import {KriSingleSelect} from "@/components/common/KriAutoComplete"; import {KriSingleSelect} from "@/components/common/KriAutoComplete";
import type {MultiSelectRef} from "@/components/common/KriAutoComplete";
import {useDialog} from "@/hooks/useDialog"; import {useDialog} from "@/hooks/useDialog";
import type {DialogId} from "@/store/jotai/dialog"; import type {DialogId} from "@/store/jotai/dialog";
import {NONE_HTTP_ERROR, UNKNOWN_HTTP_ERROR} from "@kri/common/http";
import {apiError} from "@kri/common/http";
import {ProjectCreateRequest} from "@/types/project"; import {ProjectCreateRequest} from "@/types/project";
import { useDebouncedValue } from "@kri/common/hooks"; import { useDebouncedValue } from "@kri/common/hooks";
import {PROJECT_NAME_REGEX} from "@/const/projectConst"; import {FW_TEAM} from "@/const/userConst";
import {FW_TEAM, USER_NAME_REGEX} from "@/const/userConst"; import {COMMON_TEXT_REGEX, USER_NAME_REGEX} from "@/const/validationConst";
import { validateValue } from "@/utils/validation";
import type { MultiSelectOption } from "@/components/common/KriAutoComplete"; import type { MultiSelectOption } from "@/components/common/KriAutoComplete";
import {ItrntUserInfo} from "@/types/user"; import {ItrntUserInfo} from "@/types/user";
import {useIntranetProjectListQuery} from "@/query/intranet"; import {useGroupCodeListQuery, useIntranetProjectListQuery} from "@/query/intranet";
export type ProjectCreateDialogProps = { export type ProjectCreateDialogProps = {
/** Jotai로 관리할 다이얼로그 ID */ /** Jotai로 관리할 다이얼로그 ID */
@@ -45,10 +45,11 @@ const ProjectCreateDialog = ({
ownerFw: ownerFw, ownerFw: ownerFw,
} }
const { isDialogOpen, showDialog, hideDialog } = useDialog(); const { isDialogOpen, showDialog, hideDialog } = useDialog();
const [deptArray, setDeptArray] = useState<string[]>([]); const [deptArray, setDeptArray] = useState<MultiSelectOption[]>([]);
const [fwArray, setFwArray] = useState<MultiSelectOption[]>([]); const [fwArray, setFwArray] = useState<MultiSelectOption[]>([]);
const [isSubmitting, setIsSubmitting] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false);
const [formData, setFormData] = useState<ProjectCreateRequest>(defaultProjectInfo); const [formData, setFormData] = useState<ProjectCreateRequest>(defaultProjectInfo);
const [invalidField, setInvalidField] = useState<'itrntPrjctCd' | 'prjctName' | 'ownerDept' | 'ownerFw' | null>(null);
// 실제 Dialog에 전달할 open 값 // 실제 Dialog에 전달할 open 값
const resolvedOpen = open ?? isDialogOpen(dialogId); const resolvedOpen = open ?? isDialogOpen(dialogId);
@@ -56,9 +57,20 @@ const ProjectCreateDialog = ({
const [itrntKeyword, setItrntKeyword] = useState(''); const [itrntKeyword, setItrntKeyword] = useState('');
const debouncedKeyword = useDebouncedValue(itrntKeyword, 500); const debouncedKeyword = useDebouncedValue(itrntKeyword, 500);
const itrntPrjctRef = useRef<MultiSelectRef>(null);
const prjctNameRef = useRef<HTMLInputElement>(null);
const ownerDeptRef = useRef<MultiSelectRef>(null);
const ownerFwRef = useRef<MultiSelectRef>(null);
const itrntPrjctListQuery = useIntranetProjectListQuery(debouncedKeyword, resolvedOpen); const itrntPrjctListQuery = useIntranetProjectListQuery(debouncedKeyword, resolvedOpen);
const itrntPrjctArray = useMemo(() => itrntPrjctListQuery.data ?? [] ,[itrntPrjctListQuery.data]); const itrntPrjctArray = useMemo(() => itrntPrjctListQuery.data ?? [] ,[itrntPrjctListQuery.data]);
const groupCodeListQuery = useGroupCodeListQuery(resolvedOpen);
const groupCodeLabelMap = useMemo(
() => new Map((groupCodeListQuery.data ?? []).map((g) => [g.groupCode, g.groupCodeLabel])),
[groupCodeListQuery.data]
);
// 부모 콜백과 jotai 상태를 함께 처리 // 부모 콜백과 jotai 상태를 함께 처리
const handleOpenChange = (nextOpen: boolean) => { const handleOpenChange = (nextOpen: boolean) => {
onOpenChange?.(nextOpen); onOpenChange?.(nextOpen);
@@ -88,32 +100,51 @@ const ProjectCreateDialog = ({
} }
const handleSubmit = async () => { const handleSubmit = async () => {
if(!formData.itrntPrjctCd.trim()){ setInvalidField(null);
alert("Please select an intranet project.");
const itrntPrjctCheck = validateValue(formData.itrntPrjctCd, {
required: true,
requiredMessage: "인트라넷 프로젝트를 선택해주세요.",
});
if (!itrntPrjctCheck.valid) {
alert(itrntPrjctCheck.message);
setInvalidField('itrntPrjctCd');
itrntPrjctRef.current?.focus();
return; return;
} }
if (!formData.prjctName.trim()) { const prjctNameCheck = validateValue(formData.prjctName, {
alert("Please enter project name."); required: true,
requiredMessage: "프로젝트명을 입력해주세요.",
maxLength: 128,
pattern: COMMON_TEXT_REGEX,
patternMessage: "프로젝트명에 허용되지 않는 문자가 포함되어 있습니다.",
});
if (!prjctNameCheck.valid) {
alert(prjctNameCheck.message);
setInvalidField('prjctName');
prjctNameRef.current?.focus();
return; return;
} }
if (!PROJECT_NAME_REGEX.test(formData.prjctName)) { const ownerDeptCheck = validateValue(formData.ownerDept, {
alert("프로젝트명에 허용되지 않는 문자가 포함되어 있습니다."); required: true,
requiredMessage: "담당 그룹을 입력해주세요.",
pattern: USER_NAME_REGEX,
patternMessage: "해당 그룹이 올바르지 않습니다.",
});
if (!ownerDeptCheck.valid) {
alert(ownerDeptCheck.message);
setInvalidField('ownerDept');
ownerDeptRef.current?.focus();
return; return;
} }
if(!formData.ownerDept.trim()){ const ownerFwCheck = validateValue(formData.ownerFw, {
alert("Please enter owner department."); required: true,
return; requiredMessage: "담당 실사(SV)를 입력해주세요.",
} });
if(!USER_NAME_REGEX.test(formData.ownerDept)){ if (!ownerFwCheck.valid) {
alert("해당 그룹이 올바르지 않습니다."); alert(ownerFwCheck.message);
return; setInvalidField('ownerFw');
} ownerFwRef.current?.focus();
if(!formData.ownerFw.trim()){
alert("Please enter owner department.");
return;
}
if(!USER_NAME_REGEX.test(formData.ownerDept)){
alert("해당 SV가 올바르지 않습니다.");
return; return;
} }
@@ -122,15 +153,7 @@ const ProjectCreateDialog = ({
await onSubmit(formData as ProjectCreateRequest); await onSubmit(formData as ProjectCreateRequest);
handleOpenChange(false); handleOpenChange(false);
} catch (e) { } catch (e) {
const err = apiError(e, { console.error(e);
fallbackMessage: "Save failed.",
});
if(err.code !== NONE_HTTP_ERROR && err.code !== UNKNOWN_HTTP_ERROR){
alert(err.message);
}
else{
alert("저장에 실패했습니다.");
}
} finally { } finally {
setIsSubmitting(false); setIsSubmitting(false);
} }
@@ -138,6 +161,7 @@ const ProjectCreateDialog = ({
useEffect(() => { useEffect(() => {
setFormData(defaultProjectInfo); setFormData(defaultProjectInfo);
setInvalidField(null);
}, [resolvedOpen]) }, [resolvedOpen])
useEffect(() => { useEffect(() => {
@@ -146,7 +170,10 @@ const ProjectCreateDialog = ({
userTeams.push("T900"); userTeams.push("T900");
} }
userTeams = userTeams.sort((a, b) => a.localeCompare(b, "ko")); userTeams = userTeams.sort((a, b) => a.localeCompare(b, "ko"));
setDeptArray(userTeams); setDeptArray(userTeams.map((code) => ({
value: code,
label: groupCodeLabelMap.get(code) ?? code,
})));
const userOptions: MultiSelectOption[] = users const userOptions: MultiSelectOption[] = users
.filter(u => u.userId == ownerFw || u.userTeam == FW_TEAM) .filter(u => u.userId == ownerFw || u.userTeam == FW_TEAM)
@@ -155,7 +182,7 @@ const ProjectCreateDialog = ({
label: u.userNm, label: u.userNm,
})); }));
setFwArray(userOptions); setFwArray(userOptions);
}, [users]); }, [users, groupCodeLabelMap]);
return ( return (
<KriDialog <KriDialog
@@ -189,6 +216,7 @@ const ProjectCreateDialog = ({
인트라넷 프로젝트<span className="text-red-500 ml-1">*</span> 인트라넷 프로젝트<span className="text-red-500 ml-1">*</span>
</Label> </Label>
<KriSingleSelect <KriSingleSelect
ref={itrntPrjctRef}
items={itrntPrjctArray} items={itrntPrjctArray}
value={String(formData.itrntPrjctCd)} value={String(formData.itrntPrjctCd)}
onChange={(e) => handleInputChange('itrntPrjctCd', e)} onChange={(e) => handleInputChange('itrntPrjctCd', e)}
@@ -199,17 +227,20 @@ const ProjectCreateDialog = ({
placeholder="인트라넷 프로젝트" placeholder="인트라넷 프로젝트"
widthClassName="w-full" widthClassName="w-full"
heightClassName="h-9" heightClassName="h-9"
aria-invalid={invalidField === 'itrntPrjctCd'}
/> />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
<Label htmlFor="prjctName"> <Label htmlFor="prjctName">
Project name<span className="text-red-500 ml-1">*</span> 프로젝트명<span className="text-red-500 ml-1">*</span>
</Label> </Label>
<Input <Input
ref={prjctNameRef}
id="prjctName" id="prjctName"
placeholder="Enter project name" placeholder="프로젝트명을 입력하세요"
value={formData.prjctName} value={formData.prjctName}
onChange={(e) => handleInputChange('prjctName', e.target.value)} onChange={(e) => handleInputChange('prjctName', e.target.value)}
aria-invalid={invalidField === 'prjctName'}
/> />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
@@ -217,12 +248,16 @@ const ProjectCreateDialog = ({
담당 그룹<span className="text-red-500 ml-1">*</span> 담당 그룹<span className="text-red-500 ml-1">*</span>
</Label> </Label>
<KriSingleSelect <KriSingleSelect
ref={ownerDeptRef}
items={deptArray} items={deptArray}
value={formData.ownerDept || ''} value={formData.ownerDept || ''}
onChange={(value) => handleInputChange('ownerDept', value)} onChange={(value) => handleInputChange('ownerDept', value)}
placeholder="Select owner department" getValue={(item) => item.value}
getLabel={(item) => item.label}
placeholder="담당 그룹을 선택하세요"
heightClassName="h-9" heightClassName="h-9"
widthClassName="w-full" widthClassName="w-full"
aria-invalid={invalidField === 'ownerDept'}
/> />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
@@ -230,14 +265,16 @@ const ProjectCreateDialog = ({
담당 실사<span className="text-red-500 ml-1">*</span> 담당 실사<span className="text-red-500 ml-1">*</span>
</Label> </Label>
<KriSingleSelect <KriSingleSelect
ref={ownerFwRef}
items={fwArray} items={fwArray}
value={formData.ownerFw || ''} value={formData.ownerFw || ''}
onChange={(value) => handleInputChange('ownerFw', value)} onChange={(value) => handleInputChange('ownerFw', value)}
getValue={(item) => item.value} getValue={(item) => item.value}
getLabel={(item) => item.label} getLabel={(item) => item.label}
placeholder="Select owner department" placeholder="담당 실사를 선택하세요"
heightClassName="h-9" heightClassName="h-9"
widthClassName="w-full" widthClassName="w-full"
aria-invalid={invalidField === 'ownerFw'}
/> />
</div> </div>
</KriDialog> </KriDialog>

View File

@@ -132,7 +132,6 @@ const SingleMessageSendDialog = ({
handleOpenChange(false) handleOpenChange(false)
} catch (e) { } catch (e) {
console.error(e) console.error(e)
alert('발송 중 오류가 발생했습니다.')
} finally { } finally {
setSubmitting(false) setSubmitting(false)
} }

View File

@@ -6,7 +6,6 @@ import { useState, useRef } from 'react'
import {Download, Upload, X} from 'lucide-react' import {Download, Upload, X} from 'lucide-react'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import {apiError} from "@kri/common/http";
export type UserUploadDialogProps = { export type UserUploadDialogProps = {
/** jotai로 관리할 dialog id */ /** jotai로 관리할 dialog id */
@@ -92,11 +91,7 @@ const UserUploadDialog = ({
handleRemoveFile(); handleRemoveFile();
handleOpenChange(false); handleOpenChange(false);
} catch (e) { } catch (e) {
const err = apiError(e, { console.error(e);
fallbackMessage: "File upload failed.",
});
console.error(err.status, err.code, err.message);
alert("업로드에 실패했습니다.");
} finally { } finally {
setSubmitting(false); setSubmitting(false);
} }

View File

@@ -1,6 +1,6 @@
'use client' 'use client'
import { useEffect, useMemo, useState } from 'react' import { useEffect, useMemo, useRef, useState } from 'react'
import { KriDialog } from '@/components/common/KriDialog' import { KriDialog } from '@/components/common/KriDialog'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input' import { Input } from '@/components/ui/input'
@@ -8,14 +8,14 @@ import { Label } from '@/components/ui/label'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import { UserInfoSaveRequest } from '@/types/user' import { UserInfoSaveRequest } from '@/types/user'
import KriPassword, { KRI_PW_REGEX } from "@/components/common/KriPassword"; import KriPassword, { type KriPasswordRef } from "@/components/common/KriPassword";
import {KriSelect, KriSelectItem} from "@/components/common/KriSelect"; import {KriSelect, KriSelectItem, type KriSelectRef} from "@/components/common/KriSelect";
import type { DataVerification } from "@kri/common"; import type { DataVerification } from "@kri/common";
import {apiError} from "@kri/common/http"; import {CONTACT_INTERVIEWER_ROLE, FW_TEAM} from "@/const/userConst";
import {CONTACT_INTERVIEWER_ROLE, FW_TEAM, USER_NAME_REGEX} from "@/const/userConst"; import {KRI_PW_REGEX, USER_NAME_REGEX} from "@/const/validationConst";
import {NONE_HTTP_ERROR, UNKNOWN_HTTP_ERROR} from "@kri/common/http";
import type { CmpnInfo } from "@/types/cmpn"; import type { CmpnInfo } from "@/types/cmpn";
import { isExternalManager, isFieldWorkUser } from "@/utils/userRole"; import { isExternalManager, isFieldWorkUser } from "@/utils/userRole";
import { validateValue } from "@/utils/validation";
// 외주사(EXTERNAL_USER_ROLE_GROUP)와 콜센터/컨택원/면접원(FW_USER_ROLE_GROUP)은 배정 체계가 완전히 달라 // 외주사(EXTERNAL_USER_ROLE_GROUP)와 콜센터/컨택원/면접원(FW_USER_ROLE_GROUP)은 배정 체계가 완전히 달라
// 서로 넘나드는 권한 수정을 지원하지 않는다. 하나 새로 만들어서 넘기는 게 맞다. // 서로 넘나드는 권한 수정을 지원하지 않는다. 하나 새로 만들어서 넘기는 게 맞다.
@@ -69,6 +69,13 @@ const UserUpsertDialog = ({
const [isCheckedDuplicate, setIsCheckedDuplicate] = useState(false); const [isCheckedDuplicate, setIsCheckedDuplicate] = useState(false);
const [isSubmitting, setIsSubmitting] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false);
const [invalidField, setInvalidField] = useState<'userId' | 'userPw' | 'userName' | 'userCmpn' | 'memo' | null>(null);
const userIdRef = useRef<HTMLInputElement>(null);
const userPwRef = useRef<KriPasswordRef>(null);
const userNameRef = useRef<HTMLInputElement>(null);
const userCmpnRef = useRef<KriSelectRef>(null);
const memoRef = useRef<HTMLTextAreaElement>(null);
// 실제 Dialog에 전달할 open 값 // 실제 Dialog에 전달할 open 값
const resolvedOpen = open ?? isDialogOpen(dialogId); const resolvedOpen = open ?? isDialogOpen(dialogId);
@@ -86,6 +93,7 @@ const UserUpsertDialog = ({
// initialData / mode / open 변경 시 폼 세팅 // initialData / mode / open 변경 시 폼 세팅
useEffect(() => { useEffect(() => {
setInvalidField(null);
if (initialData) { if (initialData) {
setFormData(prev => ({ setFormData(prev => ({
...prev, ...prev,
@@ -108,6 +116,12 @@ const UserUpsertDialog = ({
return userRoleArray.filter((item) => !isCrossExternalFwRoleChange(initialRole, Number(item.value))) return userRoleArray.filter((item) => !isCrossExternalFwRoleChange(initialRole, Number(item.value)))
}, [mode, initialData?.userRole, userRoleArray]) }, [mode, initialData?.userRole, userRoleArray])
// 외주 실사(외주사) 권한은 자사 소속을 가질 수 없으므로 회사 선택지에서 제외한다.
const availableCmpnArray = useMemo(() => {
if (!isExternalManager(formData.userRole)) return userCmpnArray
return userCmpnArray.filter((c) => !c.ownCmpn)
}, [userCmpnArray, formData.userRole])
const handleInputChange = <K extends keyof UserInfoSaveRequest>(field: K, value: UserInfoSaveRequest[K]) => { const handleInputChange = <K extends keyof UserInfoSaveRequest>(field: K, value: UserInfoSaveRequest[K]) => {
setFormData(prev => ({ setFormData(prev => ({
...prev, ...prev,
@@ -120,8 +134,11 @@ const UserUpsertDialog = ({
} }
const handleCheckDuplicate = async () => { const handleCheckDuplicate = async () => {
if (!formData.userId.trim()) { const userIdCheck = validateValue(formData.userId, { required: true, requiredMessage: "아이디를 입력해주세요." });
alert("아이디를 입력해주세요."); if (!userIdCheck.valid) {
alert(userIdCheck.message);
setInvalidField('userId');
userIdRef.current?.focus();
return return
} }
@@ -140,28 +157,73 @@ const UserUpsertDialog = ({
} }
const handleSubmit = async () => { const handleSubmit = async () => {
if (!formData.userId.trim()) { setInvalidField(null);
alert("아이디를 입력해주세요.");
const userIdCheck = validateValue(formData.userId, { required: true, requiredMessage: "아이디를 입력해주세요." });
if (!userIdCheck.valid) {
alert(userIdCheck.message);
setInvalidField('userId');
userIdRef.current?.focus();
return; return;
} }
if (mode === 'create' && !isCheckedDuplicate) { if (mode === 'create' && !isCheckedDuplicate) {
alert("아이디 중복체크를 해주세요."); alert("아이디 중복체크를 해주세요.");
setInvalidField('userId');
userIdRef.current?.focus();
return; return;
} }
if (!formData.userPw.trim()) { const userPwCheck = validateValue(formData.userPw, {
alert("비밀번호를 입력해주세요."); required: true,
requiredMessage: "비밀번호를 입력해주세요.",
pattern: KRI_PW_REGEX,
patternMessage: "비밀번호는 영문과 숫자를 포함한 8~20자로 입력해주세요.",
});
if (!userPwCheck.valid) {
alert(userPwCheck.message);
setInvalidField('userPw');
userPwRef.current?.focus();
return; return;
} }
if (!KRI_PW_REGEX.test(formData.userPw)) { const userNameCheck = validateValue(formData.userName, {
alert("비밀번호는 영문과 숫자를 포함한 8~20자로 입력해주세요."); required: true,
requiredMessage: "이름을 입력해주세요.",
maxLength: 32,
pattern: USER_NAME_REGEX,
patternMessage: "이름에 허용되지 않는 문자가 포함되어 있습니다.",
});
if (!userNameCheck.valid) {
alert(userNameCheck.message);
setInvalidField('userName');
userNameRef.current?.focus();
return; return;
} }
if (!formData.userName.trim()) {
alert("이름을 입력해주세요."); const userCmpnCheck = validateValue(formData.userCmpn, {
required: true,
requiredMessage: "회사를 선택해주세요.",
});
if (!userCmpnCheck.valid) {
alert(userCmpnCheck.message);
setInvalidField('userCmpn');
userCmpnRef.current?.focus();
return; return;
} }
if(!USER_NAME_REGEX.test(formData.userName)){
alert("올바르지 않은 이름입니다."); if (isExternalManager(formData.userRole)) {
const selectedCmpn = userCmpnArray.find((c) => c.cmpnId === formData.userCmpn);
if (selectedCmpn?.ownCmpn) {
alert("외주 실사 권한은 자사를 소속 회사로 선택할 수 없습니다.");
setInvalidField('userCmpn');
userCmpnRef.current?.focus();
return;
}
}
const memoCheck = validateValue(formData.memo ?? '', { maxLength: 2048 });
if (!memoCheck.valid) {
alert(memoCheck.message);
setInvalidField('memo');
memoRef.current?.focus();
return; return;
} }
@@ -173,16 +235,7 @@ const UserUpsertDialog = ({
await onSubmit(formData as UserInfoSaveRequest); await onSubmit(formData as UserInfoSaveRequest);
handleOpenChange(false); handleOpenChange(false);
} catch (e) { } catch (e) {
const err = apiError(e, { console.error(e);
fallbackMessage: "Save failed.",
});
console.error(err.status, err.code, err.message);
if(err.code !== NONE_HTTP_ERROR && err.code !== UNKNOWN_HTTP_ERROR){
alert(err.message);
}
else{
alert("저장에 실패했습니다.");
}
} finally { } finally {
setIsSubmitting(false); setIsSubmitting(false);
} }
@@ -221,11 +274,13 @@ const UserUpsertDialog = ({
</Label> </Label>
<div className="flex gap-2"> <div className="flex gap-2">
<Input <Input
ref={userIdRef}
id="userId" id="userId"
placeholder="Enter ID" placeholder="아이디를 입력하세요"
value={formData.userId} value={formData.userId}
onChange={(e) => handleInputChange('userId', e.target.value)} onChange={(e) => handleInputChange('userId', e.target.value)}
disabled={mode === 'edit'} disabled={mode === 'edit'}
aria-invalid={invalidField === 'userId'}
/> />
{mode === 'create' && ( {mode === 'create' && (
<Button <Button
@@ -240,14 +295,16 @@ const UserUpsertDialog = ({
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
<Label htmlFor="password"> <Label htmlFor="password">
PW<span className="text-red-500 ml-1">*</span> Password<span className="text-red-500 ml-1">*</span>
</Label> </Label>
<KriPassword <KriPassword
ref={userPwRef}
id="password" id="password"
label="" label=""
value={formData.userPw} value={formData.userPw}
onChange={(v) => handleInputChange('userPw', v)} onChange={(v) => handleInputChange('userPw', v)}
placeholder="Enter password" placeholder="비밀번호를 입력하세요"
aria-invalid={invalidField === 'userPw'}
/> />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
@@ -255,14 +312,18 @@ const UserUpsertDialog = ({
이름<span className="text-red-500 ml-1">*</span> 이름<span className="text-red-500 ml-1">*</span>
</Label> </Label>
<Input <Input
ref={userNameRef}
id="userName" id="userName"
placeholder="Enter name" placeholder="이름을 입력하세요"
value={formData.userName} value={formData.userName}
onChange={(e) => handleInputChange('userName', e.target.value)} onChange={(e) => handleInputChange('userName', e.target.value)}
aria-invalid={invalidField === 'userName'}
/> />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
<Label>계정 권한</Label> <Label>
계정 권한 <span className="text-red-500 ml-1">*</span>
</Label>
<KriSelect <KriSelect
items={availableRoleArray} items={availableRoleArray}
value={String(formData.userRole)} value={String(formData.userRole)}
@@ -272,7 +333,15 @@ const UserUpsertDialog = ({
if(mode !== 'create'){ if(mode !== 'create'){
alert("권한이 변경되면 해당 계정에 배정된 리스트 정보가 초기화됩니다."); alert("권한이 변경되면 해당 계정에 배정된 리스트 정보가 초기화됩니다.");
} }
handleInputChange('userRole', Number(e)); const nextRole = Number(e);
handleInputChange('userRole', nextRole);
if (isExternalManager(nextRole)) {
const currentCmpn = userCmpnArray.find((c) => c.cmpnId === formData.userCmpn);
if (currentCmpn?.ownCmpn) {
handleInputChange('userCmpn', '');
}
}
}} }}
useAll={false} useAll={false}
className="w-full min-w-0 overflow-hidden [&>span]:truncate" className="w-full min-w-0 overflow-hidden [&>span]:truncate"
@@ -280,9 +349,12 @@ const UserUpsertDialog = ({
/> />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
<Label>소속 회사</Label> <Label>
소속 회사 <span className="text-red-500 ml-1">*</span>
</Label>
<KriSelect <KriSelect
items={userCmpnArray} ref={userCmpnRef}
items={availableCmpnArray}
value={formData.userCmpn} value={formData.userCmpn}
getValue={(item) => item.cmpnId} getValue={(item) => item.cmpnId}
getLabel={(item) => item.cmpnAlias || item.cmpnId} getLabel={(item) => item.cmpnAlias || item.cmpnId}
@@ -291,15 +363,17 @@ const UserUpsertDialog = ({
disabled={mode !== 'create'} disabled={mode !== 'create'}
className="w-full min-w-0 overflow-hidden [&>span]:truncate" className="w-full min-w-0 overflow-hidden [&>span]:truncate"
heightClassName="h-9" heightClassName="h-9"
aria-invalid={invalidField === 'userCmpn'}
/> />
</div> </div>
<div className="grid gap-2"> <div className="grid gap-2">
<Label htmlFor="memo">메모</Label> <Label htmlFor="memo">메모</Label>
<textarea id="memo" className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50" <textarea ref={memoRef} id="memo" className="flex min-h-[80px] w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:cursor-not-allowed disabled:opacity-50 aria-invalid:border-destructive aria-invalid:ring-destructive/20"
rows={3} rows={3}
placeholder="Enter memo" placeholder="메모를 입력하세요"
value={formData.memo} value={formData.memo}
onChange={(e) => handleInputChange('memo', e.target.value)} onChange={(e) => handleInputChange('memo', e.target.value)}
aria-invalid={invalidField === 'memo'}
/> />
</div> </div>
</KriDialog> </KriDialog>

View File

@@ -117,7 +117,7 @@ export function KriEditorHtmlOnly({
}) })
} catch (error) { } catch (error) {
if (onImageUploadError) onImageUploadError(error) if (onImageUploadError) onImageUploadError(error)
else toast.error('이미지 업로드에 실패했습니다.') else console.error(error)
} }
} }

View File

@@ -79,7 +79,6 @@ export function KriEditorSms({
return ( return (
<div className={cn('mx-auto w-full max-w-[320px]', className)}> <div className={cn('mx-auto w-full max-w-[320px]', className)}>
{label ? <div className="mb-2 text-sm font-semibold">{label}</div> : null}
<div className="relative h-[600px] w-full overflow-hidden rounded-[40px] border-8 border-gray-800 bg-white shadow-2xl"> <div className="relative h-[600px] w-full overflow-hidden rounded-[40px] border-8 border-gray-800 bg-white shadow-2xl">
<div className="absolute top-0 left-1/2 z-10 h-6 w-32 -translate-x-1/2 rounded-b-2xl bg-gray-800" /> <div className="absolute top-0 left-1/2 z-10 h-6 w-32 -translate-x-1/2 rounded-b-2xl bg-gray-800" />
<div className="flex h-full flex-col bg-gray-50 px-4 pt-8 pb-4"> <div className="flex h-full flex-col bg-gray-50 px-4 pt-8 pb-4">
@@ -106,6 +105,7 @@ export function KriEditorSms({
{...textareaInsert.bindSelectionHandlers} {...textareaInsert.bindSelectionHandlers}
/> />
</div> </div>
{label ? <div className="my-2 text-sm font-semibold text-red-600">{label}</div> : null}
{byteSize > maxBytes ? ( {byteSize > maxBytes ? (
<p className="mt-2 px-2 text-center text-xs font-medium text-red-600"> <p className="mt-2 px-2 text-center text-xs font-medium text-red-600">
최대 용량을 {byteSize - maxBytes}byte 초과했습니다. 최대 용량을 {byteSize - maxBytes}byte 초과했습니다.

View File

@@ -193,7 +193,7 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
editorProps: { editorProps: {
attributes: { attributes: {
class: cn( class: cn(
"min-h-[180px] px-3 py-2 focus:outline-none", "min-h-[180px] max-h-[420px] overflow-y-auto px-3 py-2 focus:outline-none",
"[&_p]:my-2 [&_p:first-child]:mt-0 [&_p:last-child]:mb-0", "[&_p]:my-2 [&_p:first-child]:mt-0 [&_p:last-child]:mb-0",
"[&_ul]:list-disc [&_ul]:pl-6 [&_ol]:list-decimal [&_ol]:pl-6", "[&_ul]:list-disc [&_ul]:pl-6 [&_ol]:list-decimal [&_ol]:pl-6",
"[&_li]:my-1", "[&_li]:my-1",
@@ -408,7 +408,6 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
if(onImageUploadError){ if(onImageUploadError){
onImageUploadError(err); onImageUploadError(err);
}else{ }else{
toast.error("이미지 업로드에 실패했습니다.");
console.error(err); console.error(err);
} }
} }
@@ -477,11 +476,14 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
if (viewRef.current === "html") return; if (viewRef.current === "html") return;
if (value == null) return; if (value == null) return;
// 빈 문자열("")은 ProseMirror 스키마상 유효한 문서가 아니라 setContent가 조용히 실패해
// 이전 템플릿 본문이 그대로 남는 문제가 있었음 -> 빈 값은 빈 문단으로 정규화해서 비교/설정.
const normalizedValue = value || "<p></p>";
const current = editor.getHTML(); const current = editor.getHTML();
if (value !== current && value !== optimisticHtmlRef.current) { if (normalizedValue !== current && normalizedValue !== optimisticHtmlRef.current) {
// 이미지가 포함된 HTML 업데이트면, 아예 editor를 새로 생성 // 이미지가 포함된 HTML 업데이트면, 아예 editor를 새로 생성
editor.commands.setContent(value, { editor.commands.setContent(normalizedValue, {
emitUpdate: false, emitUpdate: false,
parseOptions: {preserveWhitespace: "full"}, parseOptions: {preserveWhitespace: "full"},
}); });

View File

@@ -124,7 +124,7 @@ const ContactEventSection = ({
const isContactType = resultCodeType === ResultCodeType.CONTACT const isContactType = resultCodeType === ResultCodeType.CONTACT
const historyQuery = useListEventHistoryQuery(prjctIdx, sid, true) const historyQuery = useListEventHistoryQuery(prjctIdx, sid, true)
const ctiLastCallHistId = useCtiLastCallHistId() const ctiLastCallHistId = useCtiLastCallHistId(prjctIdx, Number(sid))
const listCallHistIdx = isContactType ? ctiLastCallHistId : null const listCallHistIdx = isContactType ? ctiLastCallHistId : null
const handleResultCdChange = (next: string) => { const handleResultCdChange = (next: string) => {
@@ -280,6 +280,7 @@ export type ListContactEventPanelProps = {
userId: string userId: string
userRole: number userRole: number
resultCodes: ResultCode[] resultCodes: ResultCode[]
useFF: boolean
useContactSenario: boolean useContactSenario: boolean
contactSenario?: string contactSenario?: string
} }
@@ -291,6 +292,7 @@ const ListContactEventPanel = ({
userId, userId,
userRole, userRole,
resultCodes, resultCodes,
useFF,
useContactSenario, useContactSenario,
contactSenario, contactSenario,
}: ListContactEventPanelProps) => { }: ListContactEventPanelProps) => {
@@ -341,6 +343,7 @@ const ListContactEventPanel = ({
<SendResultHistory sid={sid} prjctCd={prjctCd} /> <SendResultHistory sid={sid} prjctCd={prjctCd} />
{useFF &&
<ContactEventSection <ContactEventSection
title="인터뷰 요원 확인사항" title="인터뷰 요원 확인사항"
prjctIdx={prjctIdx} prjctIdx={prjctIdx}
@@ -351,6 +354,8 @@ const ListContactEventPanel = ({
submitting={addListEventMutation.isPending} submitting={addListEventMutation.isPending}
onSubmit={handleAddEvent(ResultCodeType.INTERVIEW)} onSubmit={handleAddEvent(ResultCodeType.INTERVIEW)}
/> />
}
{useContactSenario && contactSenario ? ( {useContactSenario && contactSenario ? (
<div className="space-y-2 rounded-lg border bg-white p-4"> <div className="space-y-2 rounded-lg border bg-white p-4">

View File

@@ -1,20 +1,21 @@
'use client' 'use client'
import { useRef, useState, type ReactNode } from 'react' import { useEffect, useRef, useState, type ReactNode } from 'react'
import { Mail, MessageSquare, Paperclip, Phone, QrCode } from 'lucide-react' import { Mail, MessageSquare, Paperclip, Phone, QrCode } from 'lucide-react'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input' import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label' import { Label } from '@/components/ui/label'
import { KriSingleSelect } from '@/components/common/KriAutoComplete' import { KriSingleSelect } from '@/components/common/KriAutoComplete'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import { useUploadListItemFileMutation } from '@/query/list' import { useDownloadListItemFileByHeaderMutation, useUploadListItemFileMutation } from '@/query/list'
import { ListHeaderConst } from '@/const/listConst' import { ListHeaderConst } from '@/const/listConst'
import type { listHeader, ListSearchWithFullResult } from '@/types/list' import type { listHeader, ListSearchWithFullResult } from '@/types/list'
import type { MessageSendChannel } from '@/types/message' import type { MessageSendChannel } from '@/types/message'
import { type ResultCode, ResultCodeType } from '@/types/project' import { type ProjectSurvey, type ResultCode, ResultCodeType } from '@/types/project'
import { formatKst } from '@kri/common' import { formatKst } from '@kri/common'
import { isListFieldEditableForContact, isListFieldVisibleForContact } from '@/utils/listAccess' import { isListFieldEditableForContact, isListFieldVisibleForContact } from '@/utils/listAccess'
import { substituteSurveyUrl } from '@/lib/surveyUrl' import { substituteSurveyUrl } from '@/lib/surveyUrl'
import { formatKoreanPhoneNumber } from '@/utils/phone'
import SurveyQrDialog from '@/components/dialog/SurveyQrDialog' import SurveyQrDialog from '@/components/dialog/SurveyQrDialog'
import SingleMessageSendDialog from '@/components/dialog/SingleMessageSendDialog' import SingleMessageSendDialog from '@/components/dialog/SingleMessageSendDialog'
import { ctiClient } from '@/lib/cti/ctiClient' import { ctiClient } from '@/lib/cti/ctiClient'
@@ -22,6 +23,7 @@ import { useCtiConnectionStatus } from '@/hooks/useCtiConnectionStatus'
import { useCtiAgentStatus } from '@/hooks/useCtiAgentStatus' import { useCtiAgentStatus } from '@/hooks/useCtiAgentStatus'
import { CTI_ON_CALL_STATUSES } from '@/const/ctiConst' import { CTI_ON_CALL_STATUSES } from '@/const/ctiConst'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import { downloadFile } from '@kri/common/browser'
export type ListContactInfoPanelProps = { export type ListContactInfoPanelProps = {
prjctIdx: number prjctIdx: number
@@ -31,7 +33,7 @@ export type ListContactInfoPanelProps = {
isEditing: boolean isEditing: boolean
listHeaders: listHeader[] listHeaders: listHeader[]
detail?: ListSearchWithFullResult detail?: ListSearchWithFullResult
surveyUrl?: string surveys: ProjectSurvey[]
callerTelNum?: string callerTelNum?: string
resultCodes: ResultCode[] resultCodes: ResultCode[]
formValues: Record<number, string> formValues: Record<number, string>
@@ -72,7 +74,7 @@ const ListContactInfoPanel = ({
isEditing, isEditing,
listHeaders, listHeaders,
detail, detail,
surveyUrl, surveys,
callerTelNum, callerTelNum,
resultCodes, resultCodes,
formValues, formValues,
@@ -81,29 +83,47 @@ const ListContactInfoPanel = ({
}: ListContactInfoPanelProps) => { }: ListContactInfoPanelProps) => {
const { showDialog } = useDialog() const { showDialog } = useDialog()
const uploadItemFileMutation = useUploadListItemFileMutation(prjctIdx, sid) const uploadItemFileMutation = useUploadListItemFileMutation(prjctIdx, sid)
const downloadItemFileMutation = useDownloadListItemFileByHeaderMutation(prjctIdx, sid)
const fileInputRef = useRef<HTMLInputElement | null>(null) const fileInputRef = useRef<HTMLInputElement | null>(null)
const [uploadingHeaderId, setUploadingHeaderId] = useState<number | null>(null) const [uploadingHeaderId, setUploadingHeaderId] = useState<number | null>(null)
const [sendTarget, setSendTarget] = useState<{ channel: MessageSendChannel; headerId: number } | null>(null) const [sendTarget, setSendTarget] = useState<{ channel: MessageSendChannel; headerId: number } | null>(null)
const [qrTargetUrl, setQrTargetUrl] = useState('')
const ctiConnectionStatus = useCtiConnectionStatus() const ctiConnectionStatus = useCtiConnectionStatus()
const isCtiReady = ctiConnectionStatus === 'open' const isCtiReady = ctiConnectionStatus === 'open'
const ctiAgentStatus = useCtiAgentStatus() const ctiAgentStatus = useCtiAgentStatus()
const isOnCall = ctiAgentStatus !== null && (CTI_ON_CALL_STATUSES as readonly string[]).includes(ctiAgentStatus) const isOnCall = ctiAgentStatus !== null && (CTI_ON_CALL_STATUSES as readonly string[]).includes(ctiAgentStatus)
useEffect(() => {
if (!isOnCall) return
const handleBeforeUnload = (event: BeforeUnloadEvent) => {
event.preventDefault()
event.returnValue = true
}
window.addEventListener('beforeunload', handleBeforeUnload)
return () => window.removeEventListener('beforeunload', handleBeforeUnload)
}, [isOnCall])
const visibleHeaders = listHeaders const visibleHeaders = listHeaders
.filter((header) => isListFieldVisibleForContact(header)) .filter((header) => isListFieldVisibleForContact(header))
.sort((a, b) => a.listHderOrder - b.listHderOrder) .sort((a, b) => {
if (a.listHderTy === ListHeaderConst.MEMO) return 1
if (b.listHderTy === ListHeaderConst.MEMO) return -1
return a.listHderOrder - b.listHderOrder
})
const substitutedSurveyUrl = surveyUrl ? substituteSurveyUrl(surveyUrl, sid) : '' const surveyResultByIdx = new Map((detail?.surveyResults ?? []).map((result) => [result.prjctSurveyIdx, result]))
const surveyResult = detail?.surveyResult
const hasSurveyResponse = surveyResult?.lastResultCd !== undefined
const surveyResultLabel = hasSurveyResponse
? resultCodes.find((rc) => rc.resultCdTy === ResultCodeType.SURVEY && rc.resultCd === surveyResult?.lastResultCd)
?.resultCdLbl ?? String(surveyResult?.lastResultCd)
: ''
const handleStartSurvey = () => { const handleStartSurvey = (survey: ProjectSurvey) => {
if (!substitutedSurveyUrl) return if (!survey.surveyUrl) return
window.open(substitutedSurveyUrl, '_blank', 'noopener,noreferrer') window.open(substituteSurveyUrl(survey.surveyUrl, sid), '_blank', 'noopener,noreferrer')
}
const handleShowQr = (survey: ProjectSurvey) => {
if (!survey.surveyUrl) return
setQrTargetUrl(substituteSurveyUrl(survey.surveyUrl, sid))
showDialog('surveyQrDialog')
} }
const handleSend = (channel: MessageSendChannel, headerId: number) => { const handleSend = (channel: MessageSendChannel, headerId: number) => {
@@ -112,7 +132,13 @@ const ListContactInfoPanel = ({
} }
const handleCall = (telNum: string, listHderId: number) => { const handleCall = (telNum: string, listHderId: number) => {
if (!telNum || !isCtiReady || isOnCall) return if (!isCtiReady) return
// CTI_HANGUP_PENDING_VENDOR: 외주사 Hangup 명령 동작 확인 후 통화 중 버튼을 활성화하면 즉시 사용할 수 있다.
if (isOnCall) {
ctiClient.hangup()
return
}
if (!telNum) return
ctiClient.makeCall({ dialNumber: telNum, prjctIdx, sid: Number(sid), listHderId, aniNumber: callerTelNum ?? '' }) ctiClient.makeCall({ dialNumber: telNum, prjctIdx, sid: Number(sid), listHderId, aniNumber: callerTelNum ?? '' })
} }
@@ -121,6 +147,11 @@ const ListContactInfoPanel = ({
fileInputRef.current?.click() fileInputRef.current?.click()
} }
const handleDownloadFile = async (listHderId: number, fileName: string) => {
const buffer = await downloadItemFileMutation.mutateAsync(listHderId)
downloadFile(new Blob([buffer], { type: 'application/octet-stream' }), fileName)
}
const handleFileSelected = async (e: React.ChangeEvent<HTMLInputElement>) => { const handleFileSelected = async (e: React.ChangeEvent<HTMLInputElement>) => {
const file = e.target.files?.[0] const file = e.target.files?.[0]
e.target.value = '' e.target.value = ''
@@ -136,11 +167,11 @@ const ListContactInfoPanel = ({
<div className="space-y-4 rounded-lg border bg-white p-4"> <div className="space-y-4 rounded-lg border bg-white p-4">
<h2 className="text-lg font-bold">리스트 정보</h2> <h2 className="text-lg font-bold">리스트 정보</h2>
<input type="file" ref={fileInputRef} className="hidden" onChange={handleFileSelected} /> <input type="file" ref={fileInputRef} className="hidden" onChange={handleFileSelected} />
{visibleHeaders.map((header) => { {visibleHeaders.map((header) => {
if (header.listHderTy === ListHeaderConst.SID) return null if (header.listHderTy === ListHeaderConst.SID) return null
const editable = isEditing && isListFieldEditableForContact(header, userRole) const canEditField = isListFieldEditableForContact(header, userRole)
const editable = isEditing && canEditField
const value = formValues[header.listHderId] ?? '' const value = formValues[header.listHderId] ?? ''
const onChange = (next: string) => onFieldChange(header.listHderId, next) const onChange = (next: string) => onFieldChange(header.listHderId, next)
@@ -162,9 +193,9 @@ const ListContactInfoPanel = ({
<FieldRow key={header.listHderId} label={header.listHderNm}> <FieldRow key={header.listHderId} label={header.listHderNm}>
<div className="flex gap-2"> <div className="flex gap-2">
<Input <Input
value={value} value={formatKoreanPhoneNumber(value)}
disabled={!editable} disabled={!editable}
onChange={(e) => onChange(e.target.value)} onChange={(e) => onChange(e.target.value.replace(/\D/g, ''))}
className={disabledContrastClass} className={disabledContrastClass}
/> />
<Button <Button
@@ -220,17 +251,38 @@ const ListContactInfoPanel = ({
return ( return (
<FieldRow key={header.listHderId} label={header.listHderNm}> <FieldRow key={header.listHderId} label={header.listHderNm}>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<span className="min-w-0 flex-1 truncate text-sm">{value || '업로드된 파일 없음'}</span> <div className="min-w-0 flex-1 truncate text-sm">
{value ? (
<button
type="button"
className="max-w-full cursor-pointer text-left text-primary hover:text-primary/80 disabled:cursor-wait disabled:opacity-60"
disabled={downloadItemFileMutation.isPending}
title={value}
onClick={() => handleDownloadFile(header.listHderId, value)}
>
<span
className="block truncate"
style={{ textDecorationLine: 'underline', textUnderlineOffset: '3px' }}
>
{value}
</span>
</button>
) : (
<span>업로드된 파일 없음</span>
)}
</div>
{canEditField ? (
<Button <Button
type="button" type="button"
variant="outline" variant="outline"
className="shrink-0 gap-2" className="shrink-0 gap-2"
disabled={!editable || uploadItemFileMutation.isPending} disabled={uploadItemFileMutation.isPending}
onClick={() => handlePickFile(header.listHderId)} onClick={() => handlePickFile(header.listHderId)}
> >
<Paperclip className="h-4 w-4" /> <Paperclip className="h-4 w-4" />
업로드 업로드
</Button> </Button>
) : null}
</div> </div>
</FieldRow> </FieldRow>
) )
@@ -266,31 +318,37 @@ const ListContactInfoPanel = ({
) )
})} })}
{surveyUrl ? ( {surveys
<FieldRow label="Web"> .filter((survey) => !!survey.surveyUrl)
.map((survey) => {
const result = survey.prjctSurveyIdx != null ? surveyResultByIdx.get(survey.prjctSurveyIdx) : undefined
const hasSurveyResponse = result !== undefined
return (
<FieldRow key={survey.prjctSurveyIdx ?? survey.surveyOrder} label={survey.surveyName || 'Web'}>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Button type="button" className="gap-2" onClick={handleStartSurvey}> <Button type="button" className="gap-2" onClick={() => handleStartSurvey(survey)}>
조사 시작 조사 시작
</Button> </Button>
<Button type="button" variant="outline" className="gap-2" onClick={() => showDialog('surveyQrDialog')}> <Button type="button" variant="outline" className="gap-2" onClick={() => handleShowQr(survey)}>
<QrCode className="h-4 w-4" /> <QrCode className="h-4 w-4" />
QR QR
</Button> </Button>
{hasSurveyResponse ? ( {hasSurveyResponse ? (
<span className="text-sm"> <span className="text-sm">
[{surveyResultLabel}]{' '} [{resultCodes.find((rc) => rc.resultCdTy === ResultCodeType.SURVEY && rc.resultCd === result.lastResultCd)
<span className="text-muted-foreground"> ?.resultCdLbl ?? String(result.lastResultCd)}]{' '}
({formatKst(surveyResult?.lastResultDt ?? '', 'dateHourMin')}) <span className="text-muted-foreground">({formatKst(result.lastResultDt, 'dateHourMin')})</span>
</span>
</span> </span>
) : ( ) : (
<span className="text-sm text-muted-foreground">[응답없음]</span> <span className="text-sm text-muted-foreground">[응답없음]</span>
)} )}
</div> </div>
</FieldRow> </FieldRow>
) : null} )
})}
<SurveyQrDialog url={substitutedSurveyUrl} /> <SurveyQrDialog url={qrTargetUrl} />
<SingleMessageSendDialog <SingleMessageSendDialog
channel={sendTarget?.channel ?? 'sms'} channel={sendTarget?.channel ?? 'sms'}
prjctIdx={prjctIdx} prjctIdx={prjctIdx}

View File

@@ -8,7 +8,7 @@ import { Input } from '@/components/ui/input'
import { DataTable } from '@/components/data-table/DataTable' import { DataTable } from '@/components/data-table/DataTable'
import type { DataTableColumn, SelectMode } from '@/components/data-table/DataTable.type' import type { DataTableColumn, SelectMode } from '@/components/data-table/DataTable.type'
import { KriMultiSelect } from '@/components/common/KriAutoComplete' import { KriMultiSelect } from '@/components/common/KriAutoComplete'
import ListBatchEditDialog, { type BatchEditPayload, type BatchEditResultCodes, type BatchEditRow } from '@/components/dialog/ListBatchEditDialog' import ListBatchEditDialog, { type BatchEditPayload, type BatchEditResultCodes, type BatchEditRow, type BatchEditSurveyResultCodes } from '@/components/dialog/ListBatchEditDialog'
import ListFilterDialog, { operatorLabel } from '@/components/dialog/ListFilterDialog' import ListFilterDialog, { operatorLabel } from '@/components/dialog/ListFilterDialog'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import { useListSearchQuery, useUpdateListMutation } from '@/query/list' import { useListSearchQuery, useUpdateListMutation } from '@/query/list'
@@ -30,8 +30,9 @@ import {
type ListOtherItemFilterCondition, type ListOtherItemFilterCondition,
type ListSearchRequest, type ListSearchRequest,
type ListSearchUiState, type ListSearchUiState,
type SurveyResultSelections,
} from '@/types/list' } from '@/types/list'
import { type ResultCode, ResultCodeType } from '@/types/project' import { type ProjectSurvey, type ResultCode, ResultCodeType } from '@/types/project'
import { import {
applyListAccessFilter, applyListAccessFilter,
getLockedListFilterHeaderTypes, getLockedListFilterHeaderTypes,
@@ -46,6 +47,7 @@ export type ListSearchTableProps = {
userId: string userId: string
userCmpn: string userCmpn: string
resultCodes: ResultCode[] resultCodes: ResultCode[]
surveys: ProjectSurvey[]
listHeaders: listHeader[] listHeaders: listHeader[]
enableBatchEdit?: boolean enableBatchEdit?: boolean
refreshKey?: number refreshKey?: number
@@ -154,6 +156,7 @@ export function ListSearchTable({
userId, userId,
userCmpn, userCmpn,
resultCodes, resultCodes,
surveys,
listHeaders, listHeaders,
enableBatchEdit = false, enableBatchEdit = false,
refreshKey = 0, refreshKey = 0,
@@ -178,12 +181,13 @@ export function ListSearchTable({
const [searchText, setSearchText] = useState(initialSearchState?.searchText ?? '') const [searchText, setSearchText] = useState(initialSearchState?.searchText ?? '')
const [searchContactResult, setSearchContactResult] = useState<string[]>(initialSearchState?.searchContactResult ?? []) const [searchContactResult, setSearchContactResult] = useState<string[]>(initialSearchState?.searchContactResult ?? [])
const [searchInterviewResult, setSearchInterviewResult] = useState<string[]>(initialSearchState?.searchInterviewResult ?? []) const [searchInterviewResult, setSearchInterviewResult] = useState<string[]>(initialSearchState?.searchInterviewResult ?? [])
const [searchSurveyResult, setSearchSurveyResult] = useState<string[]>(initialSearchState?.searchSurveyResult ?? []) const [surveyResultSelections, setSurveyResultSelections] = useState<SurveyResultSelections>(initialSearchState?.surveyResultSelections ?? {})
const [pagination, setPagination] = useState<PaginationState>(initialPagination ?? { pageIndex: 0, pageSize: 25 }) const [pagination, setPagination] = useState<PaginationState>(initialPagination ?? { pageIndex: 0, pageSize: 25 })
const [sorting, setSorting] = useState<SortingState>(initialSearchState?.sorting ?? []) const [sorting, setSorting] = useState<SortingState>(initialSearchState?.sorting ?? [])
const [filterRows, setFilterRows] = useState<FilterRow[]>(initialSearchState?.filterRows ?? []) const [filterRows, setFilterRows] = useState<FilterRow[]>(initialSearchState?.filterRows ?? [])
const [batchRows, setBatchRows] = useState<BatchEditRow[]>([]) const [batchRows, setBatchRows] = useState<BatchEditRow[]>([])
const [batchResultCodes, setBatchResultCodes] = useState<BatchEditResultCodes>({}) const [batchResultCodes, setBatchResultCodes] = useState<BatchEditResultCodes>({})
const [batchSurveyResultCodes, setBatchSurveyResultCodes] = useState<BatchEditSurveyResultCodes>({})
const [selectedRows, setSelectedRows] = useState<ListTableRow[]>([]) const [selectedRows, setSelectedRows] = useState<ListTableRow[]>([])
const updateListMutation = useUpdateListMutation(prjctIdx) const updateListMutation = useUpdateListMutation(prjctIdx)
@@ -247,8 +251,13 @@ export function ListSearchTable({
listFilter.resultCodeMap = { listFilter.resultCodeMap = {
[ResultCodeType.CONTACT]: searchContactResult.map(Number), [ResultCodeType.CONTACT]: searchContactResult.map(Number),
[ResultCodeType.INTERVIEW]: searchInterviewResult.map(Number), [ResultCodeType.INTERVIEW]: searchInterviewResult.map(Number),
[ResultCodeType.SURVEY]: searchSurveyResult.map(Number),
} }
listFilter.surveyResultConditions = Object.entries(surveyResultSelections)
.filter(([, codes]) => codes.length > 0)
.map(([prjctSurveyIdx, codes]) => ({
prjctSurveyIdx: Number(prjctSurveyIdx),
resultCodes: codes.map(Number),
}))
filterRows.forEach((row) => { filterRows.forEach((row) => {
const header = accessibleFilterHeaderById.get(row.headerId) const header = accessibleFilterHeaderById.get(row.headerId)
@@ -320,7 +329,7 @@ export function ListSearchTable({
pagination.pageSize, pagination.pageSize,
searchContactResult, searchContactResult,
searchInterviewResult, searchInterviewResult,
searchSurveyResult, surveyResultSelections,
searchText, searchText,
sorting, sorting,
userCmpn, userCmpn,
@@ -334,6 +343,12 @@ export function ListSearchTable({
[resultCodes], [resultCodes],
) )
const surveyResultCodeLabel = useCallback(
(code: string) =>
resultCodes.find((item) => item.resultCdTy === ResultCodeType.SURVEY && String(item.resultCd) === code)?.resultCdLbl ?? code,
[resultCodes],
)
// ApplyFilterOption의 "필터 적용 대상만"을 고를 때 보여줄, 사람이 읽을 수 있는 현재 필터 조건 요약. // ApplyFilterOption의 "필터 적용 대상만"을 고를 때 보여줄, 사람이 읽을 수 있는 현재 필터 조건 요약.
// 실제 서버로 보내는 listSearchRequest와 같은 유효성 조건(잠긴 헤더 제외, 빈 값 제외 등)을 따라간다. // 실제 서버로 보내는 listSearchRequest와 같은 유효성 조건(잠긴 헤더 제외, 빈 값 제외 등)을 따라간다.
const filterSummaryLines = useMemo<string[]>(() => { const filterSummaryLines = useMemo<string[]>(() => {
@@ -347,13 +362,19 @@ export function ListSearchTable({
const resultSummaryGroups: { label: string; type: ResultCodeType; values: string[] }[] = [ const resultSummaryGroups: { label: string; type: ResultCodeType; values: string[] }[] = [
{ label: '컨택 결과', type: ResultCodeType.CONTACT, values: searchContactResult }, { label: '컨택 결과', type: ResultCodeType.CONTACT, values: searchContactResult },
{ label: '면접 결과', type: ResultCodeType.INTERVIEW, values: searchInterviewResult }, { label: '면접 결과', type: ResultCodeType.INTERVIEW, values: searchInterviewResult },
{ label: '설문 결과', type: ResultCodeType.SURVEY, values: searchSurveyResult },
] ]
resultSummaryGroups.forEach(({ label, type, values }) => { resultSummaryGroups.forEach(({ label, type, values }) => {
if (values.length === 0) return if (values.length === 0) return
lines.push(`${label}: ${values.map((value) => resultCodeLabel(type, value)).join(', ')}`) lines.push(`${label}: ${values.map((value) => resultCodeLabel(type, value)).join(', ')}`)
}) })
surveys.forEach((survey) => {
if (survey.prjctSurveyIdx == null) return
const codes = surveyResultSelections[survey.prjctSurveyIdx] ?? []
if (codes.length === 0) return
lines.push(`${survey.surveyName} 결과: ${codes.map(surveyResultCodeLabel).join(', ')}`)
})
filterRows.forEach((row) => { filterRows.forEach((row) => {
const header = accessibleFilterHeaderById.get(row.headerId) const header = accessibleFilterHeaderById.get(row.headerId)
if (!header || lockedListFilterHeaderTypes.has(header.listHderTy)) return if (!header || lockedListFilterHeaderTypes.has(header.listHderTy)) return
@@ -386,7 +407,9 @@ export function ListSearchTable({
resultCodeLabel, resultCodeLabel,
searchContactResult, searchContactResult,
searchInterviewResult, searchInterviewResult,
searchSurveyResult, surveys,
surveyResultSelections,
surveyResultCodeLabel,
searchText, searchText,
]) ])
@@ -422,8 +445,8 @@ export function ListSearchTable({
const columns = useMemo<DataTableColumn<ListTableRow, unknown>[]>(() => { const columns = useMemo<DataTableColumn<ListTableRow, unknown>[]>(() => {
if (!listHeaders.length) return [] if (!listHeaders.length) return []
return getListColumns(listHeaders, resultCodes, userRole) return getListColumns(listHeaders, resultCodes, userRole, surveys)
}, [listHeaders, resultCodes, userRole]) }, [listHeaders, resultCodes, userRole, surveys])
const viewList = useMemo<ListTableRow[]>( const viewList = useMemo<ListTableRow[]>(
() => (listSearchQuery.data?.content ?? []).map((row) => ({ ...row, ...row.itemList })), () => (listSearchQuery.data?.content ?? []).map((row) => ({ ...row, ...row.itemList })),
@@ -467,13 +490,21 @@ export function ListSearchTable({
setPagination((prev) => ({ ...prev, pageIndex: 0 })) setPagination((prev) => ({ ...prev, pageIndex: 0 }))
} }
const handleBatchConfirm = async ({ rows, resultCodes: resultCodeSelections, target }: BatchEditPayload) => { const handleChangeSurveyResult = (prjctSurveyIdx: number, codes: string[]) => {
setSurveyResultSelections((prev) => ({ ...prev, [prjctSurveyIdx]: codes }))
}
const surveyResultCodeOptions = resultCodes.filter((item) => item.resultCdTy === ResultCodeType.SURVEY)
const handleBatchConfirm = async ({ rows, resultCodes: resultCodeSelections, surveyResultCodes, target }: BatchEditPayload) => {
setBatchRows(rows) setBatchRows(rows)
setBatchResultCodes(resultCodeSelections) setBatchResultCodes(resultCodeSelections)
setBatchSurveyResultCodes(Object.fromEntries(surveyResultCodes.map((item) => [item.prjctSurveyIdx, item.resultCd])))
const updateContents = Object.fromEntries(rows.map((row) => [String(row.headerId), row.value])) const updateContents = Object.fromEntries(rows.map((row) => [String(row.headerId), row.value]))
await updateListMutation.mutateAsync({ await updateListMutation.mutateAsync({
updateContents, updateContents,
updateResultCodes: resultCodeSelections, updateResultCodes: resultCodeSelections,
updateSurveyResultCodes: surveyResultCodes,
listFilter: buildTargetFilter(target), listFilter: buildTargetFilter(target),
}) })
await listSearchQuery.refetch() await listSearchQuery.refetch()
@@ -492,7 +523,7 @@ export function ListSearchTable({
searchText, searchText,
searchContactResult, searchContactResult,
searchInterviewResult, searchInterviewResult,
searchSurveyResult, surveyResultSelections,
filterRows, filterRows,
sorting, sorting,
}) })
@@ -500,7 +531,7 @@ export function ListSearchTable({
searchText, searchText,
searchContactResult, searchContactResult,
searchInterviewResult, searchInterviewResult,
searchSurveyResult, surveyResultSelections,
filterRows, filterRows,
sorting, sorting,
onSearchStateChange, onSearchStateChange,
@@ -530,12 +561,12 @@ export function ListSearchTable({
<div className="space-y-2"> <div className="space-y-2">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<Input <Input
placeholder="Search SID" placeholder="SID 검색"
className="h-9 bg-white flex-1 min-w-0" className="h-9 bg-white flex-1 min-w-0 max-w-xs"
value={searchText} value={searchText}
onChange={(e) => setSearchText(sanitizeSidInput(e.target.value))} onChange={(e) => setSearchText(sanitizeSidInput(e.target.value))}
/> />
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0 max-w-xs">
<KriMultiSelect <KriMultiSelect
items={resultCodes.filter((item) => item.resultCdTy === ResultCodeType.CONTACT)} items={resultCodes.filter((item) => item.resultCdTy === ResultCodeType.CONTACT)}
value={searchContactResult} value={searchContactResult}
@@ -547,7 +578,7 @@ export function ListSearchTable({
heightClassName="h-9" heightClassName="h-9"
/> />
</div> </div>
<div className="flex-1 min-w-0"> <div className="flex-1 min-w-0 max-w-xs">
<KriMultiSelect <KriMultiSelect
items={resultCodes.filter((item) => item.resultCdTy === ResultCodeType.INTERVIEW)} items={resultCodes.filter((item) => item.resultCdTy === ResultCodeType.INTERVIEW)}
value={searchInterviewResult} value={searchInterviewResult}
@@ -559,22 +590,28 @@ export function ListSearchTable({
heightClassName="h-9" heightClassName="h-9"
/> />
</div> </div>
<div className="flex-1 min-w-0"> </div>
{surveys.length > 0 ? (
<div className="flex items-center gap-2 flex-wrap">
{surveys
.filter((survey) => survey.prjctSurveyIdx != null)
.map((survey) => (
<div key={survey.prjctSurveyIdx} className="flex-1 min-w-[180px] max-w-xs">
<KriMultiSelect <KriMultiSelect
items={resultCodes.filter((item) => item.resultCdTy === ResultCodeType.SURVEY)} items={surveyResultCodeOptions}
value={searchSurveyResult} value={surveyResultSelections[survey.prjctSurveyIdx as number] ?? []}
onChange={setSearchSurveyResult} onChange={(value) => handleChangeSurveyResult(survey.prjctSurveyIdx as number, value)}
getValue={(item) => String(item.resultCd)} getValue={(item) => String(item.resultCd)}
getLabel={(item) => item.resultCdLbl} getLabel={(item) => item.resultCdLbl}
placeholder="설문 결과" placeholder={`${survey.surveyName} 결과`}
widthClassName="w-full" widthClassName="w-full"
heightClassName="h-9" heightClassName="h-9"
/> />
</div> </div>
<Button className="text-lg shrink-0" onClick={handleSearchClick}> ))}
검색
</Button>
</div> </div>
) : null}
<div className="flex items-center gap-2 flex-wrap justify-between"> <div className="flex items-center gap-2 flex-wrap justify-between">
<div className="flex items-center gap-2 flex-wrap"> <div className="flex items-center gap-2 flex-wrap">
@@ -620,9 +657,11 @@ export function ListSearchTable({
<ListBatchEditDialog <ListBatchEditDialog
headerOptions={headerOptions} headerOptions={headerOptions}
resultCodes={resultCodes} resultCodes={resultCodes}
surveys={surveys}
filterSummary={filterSummaryLines} filterSummary={filterSummaryLines}
initialRows={batchRows} initialRows={batchRows}
initialResultCodes={batchResultCodes} initialResultCodes={batchResultCodes}
initialSurveyResultCodes={batchSurveyResultCodes}
onConfirm={handleBatchConfirm} onConfirm={handleBatchConfirm}
/> />
) : null} ) : null}

View File

@@ -20,8 +20,10 @@ import {KriEditor, KriEditorCommand} from "@/components/kri-editor";
import {Button} from "@/components/ui/button"; import {Button} from "@/components/ui/button";
import { isBlank } from "@kri/common"; import { isBlank } from "@kri/common";
import {cn} from "@/lib/utils"; import {cn} from "@/lib/utils";
import {ProjectMainTemplateUpdateRequest} from "@/types/project"; import {ProjectMainTemplateUpdateRequest, ProjectSurvey} from "@/types/project";
import type { DataVerification } from "@kri/common"; import type { DataVerification } from "@kri/common";
import {COMMON_TEXT_REGEX} from "@/const/validationConst";
import {formatKoreanPhoneNumber} from "@/utils/phone";
import { import {
useTemplateListQuery, useTemplateListQuery,
useMainTemplateIdxQuery, useMainTemplateIdxQuery,
@@ -32,6 +34,8 @@ import {
} from "@/query/message"; } from "@/query/message";
import {listHeader} from "@/types/list"; import {listHeader} from "@/types/list";
import {useListHeaderQuery} from "@/query/list"; import {useListHeaderQuery} from "@/query/list";
import {useProjectInfoQuery} from "@/query/project";
import {MessageVariableList} from "@/components/message-template/MessageVariableList";
interface MessageTemplateProps { interface MessageTemplateProps {
pageTitle: string; pageTitle: string;
@@ -68,10 +72,12 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
const mainTemplateQuery = useMainTemplateIdxQuery(prjctIdx, chnnlTy, enabled); const mainTemplateQuery = useMainTemplateIdxQuery(prjctIdx, chnnlTy, enabled);
const templateDetailQuery = useTemplateQuery(selectedTemplateIdx ?? 0, enabled && !!selectedTemplateIdx); const templateDetailQuery = useTemplateQuery(selectedTemplateIdx ?? 0, enabled && !!selectedTemplateIdx);
const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled) const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled)
const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled)
const templateList = useMemo<TemplateSummary[]>(() => templateListQuery.data ?? [], [templateListQuery.data]); const templateList = useMemo<TemplateSummary[]>(() => templateListQuery.data ?? [], [templateListQuery.data]);
const mainTemplateIdx = useMemo<number | null>(() => mainTemplateQuery.data ?? null, [mainTemplateQuery.data]); const mainTemplateIdx = useMemo<number | null>(() => mainTemplateQuery.data ?? null, [mainTemplateQuery.data]);
const listHderList = useMemo<listHeader[]>(() => listHeaderQuery.data ?? [], [listHeaderQuery.data]) const listHderList = useMemo<listHeader[]>(() => listHeaderQuery.data ?? [], [listHeaderQuery.data])
const surveys = useMemo<ProjectSurvey[]>(() => projectInfoQuery.data?.surveys ?? [], [projectInfoQuery.data?.surveys])
// Mutations // Mutations
const saveTemplateMutation = useSaveTemplateMutation(chnnlTy, itrntPrjctCd); const saveTemplateMutation = useSaveTemplateMutation(chnnlTy, itrntPrjctCd);
@@ -155,16 +161,29 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
if (isBlank(tpl.itrntPrjctCd)) return fail("itrntPrjctCd", "인트라넷 프로젝트 코드가 없습니다."); if (isBlank(tpl.itrntPrjctCd)) return fail("itrntPrjctCd", "인트라넷 프로젝트 코드가 없습니다.");
if (isBlank(tpl.tmplatNm)) return fail("tmplatNm", "템플릿명을 입력해 주세요."); if (isBlank(tpl.tmplatNm)) return fail("tmplatNm", "템플릿명을 입력해 주세요.");
if (tpl.tmplatNm.length > 32) return fail("tmplatNm", "템플릿명은 32자 이하로 입력해주세요.");
if (!COMMON_TEXT_REGEX.test(tpl.tmplatNm)) return fail("tmplatNm", "템플릿명에 허용되지 않는 문자가 포함되어 있습니다.");
if (isBlank(tpl.tmplatBody)) return fail("tmplatBody", "본문을 입력해 주세요."); if (isBlank(tpl.tmplatBody)) return fail("tmplatBody", "본문을 입력해 주세요.");
if (isBlank(tpl.sendNm)) return fail("sendNm", "발신자명을 입력해 주세요."); if (isBlank(tpl.sendNm)) return fail("sendNm", "발신자명을 입력해 주세요.");
if (tpl.sendNm.length > 32) return fail("sendNm", "발신자명은 32자 이하로 입력해주세요.");
if (!COMMON_TEXT_REGEX.test(tpl.sendNm)) return fail("sendNm", "발신자명에 허용되지 않는 문자가 포함되어 있습니다.");
if (!isBlank(tpl.tmplatTitle)) {
if (tpl.tmplatTitle!.length > 128) return fail("tmplatTitle", "제목은 128자 이하로 입력해주세요.");
if (!COMMON_TEXT_REGEX.test(tpl.tmplatTitle!)) return fail("tmplatTitle", "제목에 허용되지 않는 문자가 포함되어 있습니다.");
}
if (tpl.tmplatTy === MessageType.EMAIL) { if (tpl.tmplatTy === MessageType.EMAIL) {
if (isBlank(tpl.tmplatTitle)) return fail("tmplatTitle", "이메일 제목을 입력해 주세요."); if (isBlank(tpl.tmplatTitle)) return fail("tmplatTitle", "이메일 제목을 입력해 주세요.");
if (isBlank(tpl.sendEml)) return fail("sendEml", "발신 이메일을 입력해 주세요."); if (isBlank(tpl.sendEml)) return fail("sendEml", "발신 이메일을 입력해 주세요.");
if (tpl.sendEml.length > 64) return fail("sendEml", "발신 이메일은 64자 이하로 입력해주세요.");
if (!COMMON_TEXT_REGEX.test(tpl.sendEml)) return fail("sendEml", "발신 이메일에 허용되지 않는 문자가 포함되어 있습니다.");
return ok(); return ok();
} }
if (isBlank(tpl.sendTel)) return fail("sendTel", "발신 전화번호를 입력해 주세요."); if (isBlank(tpl.sendTel)) return fail("sendTel", "발신 전화번호를 입력해 주세요.");
if (tpl.sendTel.length > 16) return fail("sendTel", "발신 전화번호는 16자 이하로 입력해주세요.");
if (!COMMON_TEXT_REGEX.test(tpl.sendTel)) return fail("sendTel", "발신 전화번호에 허용되지 않는 문자가 포함되어 있습니다.");
return ok(); return ok();
}; };
@@ -253,7 +272,6 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
alert(method === "put" ? "저장되었습니다." : "수정되었습니다."); alert(method === "put" ? "저장되었습니다." : "수정되었습니다.");
} catch (e) { } catch (e) {
console.log(e); console.log(e);
alert(method === "put" ? "저장에 실패했습니다." : "수정에 실패했습니다.");
} }
}; };
@@ -319,23 +337,6 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
clearLabel="새 테플릿 생성" clearLabel="새 테플릿 생성"
/> />
</div> </div>
{isSms && (
<div className="space-y-2">
<Label className="text-base">타입</Label>
<KriSingleSelect
items={[...SMS_TYPE_OPTIONS]}
value={String(selectedTemplate.tmplatTy || MessageType.SMS)}
onChange={(value) => handleChange("tmplatTy", Number(value) as any)}
placeholder="템플릿 타입을 선택해 주세요"
heightClassName="h-9"
widthClassName="w-full"
getLabel={(item) => item.label}
getValue={(item) => String(item.value)}
/>
</div>
)}
<div className="space-y-2"> <div className="space-y-2">
<Label htmlFor="tmplatNm" className="text-base"> <Label htmlFor="tmplatNm" className="text-base">
템플릿 명 템플릿 명
@@ -358,47 +359,14 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
value={selectedTemplate.tmplatTitle || ""} value={selectedTemplate.tmplatTitle || ""}
onChange={(e) => handleChange("tmplatTitle", e.target.value as any)} onChange={(e) => handleChange("tmplatTitle", e.target.value as any)}
/> />
{isSmsTemplate(selectedTemplate) &&
<p className="text-sm text-red-600 font-medium">
⚠️ 제목이 있으면 본문 길이와 상관없이 LMS로 발송 됩니다.
</p>
}
</div> </div>
<div className="space-y-3"> <MessageVariableList listHeaders={listHderList} surveys={surveys} onInsert={handleVariableClick} />
<div className="flex items-center">
<Label className="text-base">변수 리스트</Label>
</div>
<div className="border rounded-md overflow-hidden">
<div className="bg-blue-100 grid grid-cols-2 border-b">
<div className="py-2 px-3 text-center font-medium border-r text-base">
리스트 헤더명
</div>
<div className="py-2 px-3 text-center font-medium text-base">
치환 문자
</div>
</div>
<div className="max-h-50 overflow-y-auto">
{listHderList.map((h) => {
const placeholder = `[\$${h.listHderNm}]`;
return (
<div
key={h.listHderId}
className="grid grid-cols-2 border-b last:border-b-0 hover:bg-blue-50 cursor-pointer transition-colors"
onPointerDown={(e) => {
e.preventDefault();
handleVariableClick(placeholder);
}}
>
<div className="py-2 px-3 text-center border-r text-sm">
{h.listHderNm}
</div>
<div className="py-2 px-3 text-center text-sm">
{placeholder}
</div>
</div>
);
})}
</div>
</div>
</div>
{selectedTemplate ? ( {selectedTemplate ? (
isSmsTemplate(selectedTemplate) ? ( isSmsTemplate(selectedTemplate) ? (
@@ -408,8 +376,8 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
</Label> </Label>
<Input <Input
id="sendTel" id="sendTel"
value={selectedTemplate.sendTel} value={formatKoreanPhoneNumber(selectedTemplate.sendTel)}
onChange={(e) => handleChange("sendTel", e.target.value as any)} onChange={(e) => handleChange("sendTel", e.target.value.replace(/\D/g, '') as any)}
placeholder="발신 번호를 입력하세요" placeholder="발신 번호를 입력하세요"
className="w-full" className="w-full"
/> />
@@ -467,6 +435,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
<div className="mt-6 lg:mt-0 lg:border-l lg:pl-6"> <div className="mt-6 lg:mt-0 lg:border-l lg:pl-6">
<KriEditor <KriEditor
mode="sms" mode="sms"
label={selectedTemplate.tmplatTy === MessageType.SMS ? "️️* 발송 시 길이에 따라 LMS로 발송 될 수 있음" : undefined}
value={(selectedTemplate as TemplateSms).tmplatBody ?? ""} value={(selectedTemplate as TemplateSms).tmplatBody ?? ""}
onChange={(html: string) => setTemplateBody(html)} onChange={(html: string) => setTemplateBody(html)}
placeholder="문자 내용을 입력해 주세요" placeholder="문자 내용을 입력해 주세요"

View File

@@ -0,0 +1,78 @@
import { Label } from "@/components/ui/label";
import type { listHeader } from "@/types/list";
import type { ProjectSurvey } from "@/types/project";
type MessageVariableListProps = {
listHeaders: listHeader[];
surveys: ProjectSurvey[];
onInsert: (value: string) => void;
};
type VariableRowProps = {
id: string;
name: string;
value: string;
onInsert: (value: string) => void;
};
const VariableRow = ({ id, name, value, onInsert }: VariableRowProps) => (
<div
key={id}
className="grid cursor-pointer grid-cols-2 border-b transition-colors last:border-b-0 hover:bg-blue-50"
onPointerDown={(event) => {
event.preventDefault();
onInsert(value);
}}
>
<div className="px-3 py-2 text-center text-sm border-r">{name}</div>
<div className="min-w-0 break-all px-3 py-2 text-center text-sm" title={value}>
{value}
</div>
</div>
);
export const MessageVariableList = ({ listHeaders, surveys, onInsert }: MessageVariableListProps) => {
const availableSurveys = surveys.filter((survey) => survey.surveyUrl?.trim());
return (
<div className="space-y-3">
<div className="flex items-center">
<Label className="text-base">변수 리스트</Label>
</div>
<div className="overflow-hidden rounded-md border">
<div className="grid grid-cols-2 border-b bg-blue-100">
<div className="border-r px-3 py-2 text-center text-base font-medium">리스트 헤더명</div>
<div className="px-3 py-2 text-center text-base font-medium">치환 문자</div>
</div>
<div className="max-h-50 overflow-y-auto">
{listHeaders.map((header) => {
const placeholder = `[$${header.listHderNm}]`;
return (
<VariableRow
key={`header-${header.listHderId}`}
id={`header-${header.listHderId}`}
name={header.listHderNm}
value={placeholder}
onInsert={onInsert}
/>
);
})}
{availableSurveys.map((survey) => {
const surveyUrl = survey.surveyUrl?.trim() ?? "";
return (
<VariableRow
key={`survey-${survey.prjctSurveyIdx ?? survey.surveyOrder}`}
id={`survey-${survey.prjctSurveyIdx ?? survey.surveyOrder}`}
name={survey.surveyName}
value={surveyUrl}
onInsert={onInsert}
/>
);
})}
</div>
</div>
</div>
);
};

View File

@@ -9,7 +9,18 @@ import { CtiConnectionSync } from "./CtiConnectionSync";
export function AppProvider({ children }: { children: React.ReactNode }) { export function AppProvider({ children }: { children: React.ReactNode }) {
return ( return (
<JotaiProvider> <JotaiProvider>
<QueryProvider> <QueryProvider
clientConfig={{
defaultOptions: {
// 개별 쿼리/뮤테이션에서 meta를 지정하지 않았을 때 적용되는 기본값.
// 조회(GET)는 기본적으로 전역 로딩에서 제외하고, 화면을 막아야 하는
// 실제 액션인 뮤테이션만 기본적으로 전역 로딩에 포함시킨다.
// 전역 로딩이 필요한 조회는 해당 훅에서 meta: { ignoreGlobalLoading: false }로 opt-in한다.
queries: { meta: { ignoreGlobalLoading: true } },
mutations: { meta: { ignoreGlobalLoading: false } },
},
}}
>
<QueryLoadingSync /> <QueryLoadingSync />
<CtiConnectionSync /> <CtiConnectionSync />
<LoadingOverlayAdapter /> <LoadingOverlayAdapter />

View File

@@ -2,6 +2,7 @@ import { ColumnDef } from "@tanstack/react-table";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Pencil } from "lucide-react"; import { Pencil } from "lucide-react";
import type { CmpnInfo } from "@/types/cmpn"; import type { CmpnInfo } from "@/types/cmpn";
import { formatKoreanPhoneNumber } from "@/utils/phone";
export type CmpnColumnsActions = { export type CmpnColumnsActions = {
onEdit: (cmpnId: string) => void onEdit: (cmpnId: string) => void
@@ -21,6 +22,7 @@ export const getCmpnColumns = (actions: CmpnColumnsActions): ColumnDef<CmpnInfo>
{ {
accessorKey: "cmpnTel", accessorKey: "cmpnTel",
header: "전화번호", header: "전화번호",
cell: ({ row }) => formatKoreanPhoneNumber(row.original.cmpnTel ?? ""),
enableSorting: true, enableSorting: true,
}, },
{ {

View File

@@ -1,8 +1,9 @@
import { DataTableColumn } from "@/components/data-table/DataTable.type"; import { DataTableColumn } from "@/components/data-table/DataTable.type";
import {ListContactResult, listHeader, ListIsUse, ListResultBase, ListSendResult} from "@/types/list"; import {ListContactResult, listHeader, ListIsUse, ListResultBase, ListSendResult, SurveyResult} from "@/types/list";
import { ListHeaderConst, ListHeaderDefaultConst, ListHeaderDefaultFieldConst } from "@/const/listConst"; import { ListHeaderConst, ListHeaderDefaultConst, ListHeaderDefaultFieldConst } from "@/const/listConst";
import { formatKst } from "@kri/common"; import { formatKst } from "@kri/common";
import { ResultCode, ResultCodeType } from "@/types/project"; import { formatKoreanPhoneNumber } from "@/utils/phone";
import { ProjectSurvey, ResultCode, ResultCodeType } from "@/types/project";
import { isListHeaderVisibleByAccess } from "@/utils/listAccess"; import { isListHeaderVisibleByAccess } from "@/utils/listAccess";
export type ListTableRow = Record<string, unknown>; export type ListTableRow = Record<string, unknown>;
@@ -15,117 +16,111 @@ export const LIST_IS_USE_LABEL: Record<ListIsUse, string> = {
[ListIsUse.TEST]: "테스트", [ListIsUse.TEST]: "테스트",
}; };
const getResultColumns = (resultCodeArray: ResultCode[]): DataTableColumn<ListTableRow>[] => { const getResultColumns = (resultCodeArray: ResultCode[], surveys: ProjectSurvey[]): DataTableColumn<ListTableRow>[] => {
const labelByTypeCode = new Map<string, string>(); const labelByTypeCode = new Map<string, string>();
resultCodeArray.forEach((item) => { resultCodeArray.forEach((item) => {
labelByTypeCode.set(`${item.resultCdTy}:${item.resultCd}`, item.resultCdLbl); labelByTypeCode.set(`${item.resultCdTy}:${item.resultCd}`, item.resultCdLbl);
}); });
const getResultLabel = (resultType: ResultCodeType, result?: ListResultBase) => { const formatResult = (
result?: ListResultBase,
options?: { resultType?: ResultCodeType; showCount?: boolean },
) => {
const lastResultCd = result?.lastResultCd; const lastResultCd = result?.lastResultCd;
if (lastResultCd === undefined) return ""; if (lastResultCd === undefined) return "";
return labelByTypeCode.get(`${resultType}:${lastResultCd}`) ?? ""; const fallbackLabel =
} options?.resultType !== undefined ? labelByTypeCode.get(`${options.resultType}:${lastResultCd}`) ?? "" : "";
const label = result?.lastResultViewLabel || fallbackLabel;
const formatResult = (resultType: ResultCodeType, result?: ListContactResult) => { const showCount = options?.showCount ?? true;
const lastResultCd = result?.lastResultCd;
if (lastResultCd === undefined) return "";
const label = getResultLabel(resultType, result);
const count = result?.attemptCount ?? 0; const count = result?.attemptCount ?? 0;
const dt = `(${formatKst(result?.lastResultDt ?? "", "dateHourMin")})`; const resultText = showCount ? `${lastResultCd}. ${label} (${count}회)` : `${lastResultCd}. ${label}`;
const resultText = `${lastResultCd}. ${label} (${count}회)`; const dt = result?.lastResultDt ? formatKst(result.lastResultDt, "dateHourMin") : "";
return ( return (
<div className="leading-tight"> <div className="leading-tight">
<div>{resultText}</div> <div>{resultText}</div>
<div>{dt}</div> {dt && <div>({dt})</div>}
</div> </div>
); );
}; };
const formatSendResult = (result?: ListSendResult) => { const formatSurveyResult = (result?: SurveyResult) => {
const label = result?.lastResultLabel ?? ""; if (result === undefined) return "";
const dt = `(${formatKst(result?.lastResultDt ?? "", "dateHourMin")})`;
const fallbackLabel = labelByTypeCode.get(`${ResultCodeType.SURVEY}:${result.lastResultCd}`) ?? "";
const dt = result.lastResultDt ? formatKst(result.lastResultDt, "dateHourMin") : "";
return ( return (
<div className="leading-tight"> <div className="leading-tight">
<div>{label}</div> <div>{`${result.lastResultCd}. ${fallbackLabel}`}</div>
<div>{dt}</div> {dt && <div>({dt})</div>}
</div> </div>
); );
}; };
const formatSurveyResult = (result?: ListResultBase) => {
const lastResultCd = result?.lastResultCd;
if (lastResultCd === undefined) return "";
const label = getResultLabel(ResultCodeType.SURVEY, result);
const dt = `(${formatKst(result?.lastResultDt ?? "", "dateHourMin")})`;
return (
<div className="leading-tight">
<div>{label}</div>
<div>{dt}</div>
</div>
);
};
const columns: DataTableColumn<ListTableRow>[] = [ const columns: DataTableColumn<ListTableRow>[] = [
{ {
id: "contactResult", id: "result-contact",
header: "컨택 결과", header: "컨택 결과",
accessorFn: (row) => (row.contactResult as ListContactResult | undefined)?.lastResultCd ?? null,
cell: ({ row }) => cell: ({ row }) =>
formatResult(ResultCodeType.CONTACT, row.original.contactResult as ListContactResult | undefined), formatResult(row.original.contactResult as ListContactResult | undefined, { resultType: ResultCodeType.CONTACT }),
enableSorting: false, enableSorting: true,
}, },
{ {
id: "mailSendResult", id: "mailSendResult",
header: "email 발송 결과", header: "email 발송 결과",
cell: ({ row }) => cell: ({ row }) =>
formatSendResult(row.original.mailSendResult as ListSendResult | undefined), formatResult(row.original.mailSendResult as ListSendResult | undefined),
enableSorting: false, enableSorting: false,
}, },
{ {
id: "smsSendResult", id: "smsSendResult",
header: "문자 발송 결과", header: "문자 발송 결과",
cell: ({ row }) => cell: ({ row }) =>
formatSendResult(row.original.smsSendResult as ListSendResult | undefined), formatResult(row.original.smsSendResult as ListSendResult | undefined),
enableSorting: false, enableSorting: false,
}, },
{ {
id: "interviewResult", id: "result-interview",
header: "면접 결과", header: "면접 결과",
accessorFn: (row) => (row.interviewResult as ListContactResult | undefined)?.lastResultCd ?? null,
cell: ({ row }) => cell: ({ row }) =>
formatResult(ResultCodeType.INTERVIEW, row.original.interviewResult as ListContactResult | undefined), formatResult(row.original.interviewResult as ListContactResult | undefined, { resultType: ResultCodeType.INTERVIEW }),
enableSorting: false, enableSorting: true,
}, },
{ ...surveys.map((survey): DataTableColumn<ListTableRow> => ({
id: "surveyStatus", id: `result-survey-${survey.prjctSurveyIdx}`,
header: "설문 진행 상태", header: survey.surveyName,
cell: ({ row }) => accessorFn: (row) => {
formatSurveyResult(row.original.surveyResult as ListResultBase | undefined), const surveyResults = (row.surveyResults as SurveyResult[] | undefined) ?? [];
enableSorting: false, return surveyResults.find((item) => item.prjctSurveyIdx === survey.prjctSurveyIdx)?.lastResultCd ?? null;
}, },
cell: ({ row }) => {
const surveyResults = (row.original.surveyResults as SurveyResult[] | undefined) ?? [];
const result = surveyResults.find((item) => item.prjctSurveyIdx === survey.prjctSurveyIdx);
return formatSurveyResult(result);
},
enableSorting: true,
})),
]; ];
const resultColumnOrder = new Map([ const resultColumnOrder = new Map([
["contactResult", 0], ["result-contact", 0],
["interviewResult", 1], ["result-interview", 1],
["surveyStatus", 2],
["mailSendResult", 3], ["mailSendResult", 3],
["smsSendResult", 4], ["smsSendResult", 4],
]); ]);
return columns.sort((a, b) => (resultColumnOrder.get(a.id ?? "") ?? 0) - (resultColumnOrder.get(b.id ?? "") ?? 0)); return columns.sort((a, b) => (resultColumnOrder.get(a.id ?? "") ?? 2) - (resultColumnOrder.get(b.id ?? "") ?? 2));
}; };
export const getListColumns = ( export const getListColumns = (
listHeaders: listHeader[], listHeaders: listHeader[],
resultCodeArray: ResultCode[], resultCodeArray: ResultCode[],
userRole: number userRole: number,
surveys: ProjectSurvey[]
): DataTableColumn<ListTableRow>[] => { ): DataTableColumn<ListTableRow>[] => {
const visibleHeaders = listHeaders const visibleHeaders = listHeaders
.filter((header) => isListHeaderVisibleByAccess(header, userRole)) .filter((header) => isListHeaderVisibleByAccess(header, userRole))
@@ -139,7 +134,7 @@ export const getListColumns = (
id: `assign-${header.listHderTy}`, id: `assign-${header.listHderTy}`,
header: header.listHderNm, header: header.listHderNm,
accessorFn: (row) => (row.assignList as Record<number, string> | undefined)?.[header.listHderTy] ?? "", accessorFn: (row) => (row.assignList as Record<number, string> | undefined)?.[header.listHderTy] ?? "",
enableSorting: false, enableSorting: true,
}; };
} }
@@ -152,6 +147,18 @@ export const getListColumns = (
}; };
} }
if(field === ListHeaderDefaultFieldConst[ListHeaderDefaultConst.MEMO]){
return {
id: field,
header: header.listHderNm,
accessorFn: (row) => row[field] ?? "",
meta: {
maxWidth: 200,
},
enableSorting: true,
};
}
if (field) { if (field) {
return { return {
id: field, id: field,
@@ -161,6 +168,16 @@ export const getListColumns = (
}; };
} }
if (header.listHderTy === ListHeaderConst.TEL_NUM) {
return {
id: String(header.listHderId),
header: header.listHderNm,
accessorFn: (row) => row[String(header.listHderId)] ?? "",
cell: ({ row }) => formatKoreanPhoneNumber(String(row.original[String(header.listHderId)] ?? "")),
enableSorting: true,
};
}
if (header.listHderTy === ListHeaderConst.FILE) { if (header.listHderTy === ListHeaderConst.FILE) {
return { return {
id: `file-${header.listHderId}`, id: `file-${header.listHderId}`,
@@ -177,7 +194,7 @@ export const getListColumns = (
}; };
}); });
const resultColumns = getResultColumns(resultCodeArray); const resultColumns = getResultColumns(resultCodeArray, surveys);
return [...headerColumns, ...resultColumns]; return [...headerColumns, ...resultColumns];
}; };

View File

@@ -6,7 +6,10 @@ import {cn} from "@/lib/utils";
import {PROJECT_STATUS_CLASS, PROJECT_STATUS_LABEL} from "@/const/projectConst"; import {PROJECT_STATUS_CLASS, PROJECT_STATUS_LABEL} from "@/const/projectConst";
import {ItrntUserInfo} from "@/types/user"; import {ItrntUserInfo} from "@/types/user";
export const getProjectColumns = (users:ItrntUserInfo[]): ColumnDef<ProjectInfo>[] => [ export const getProjectColumns = (
users:ItrntUserInfo[],
groupCodeLabelMap: Map<string, string> = new Map(),
): ColumnDef<ProjectInfo>[] => [
{ {
accessorKey: "prjctIdx", accessorKey: "prjctIdx",
header: "No", header: "No",
@@ -16,11 +19,17 @@ export const getProjectColumns = (users:ItrntUserInfo[]): ColumnDef<ProjectInfo>
accessorKey: "prjctCd", accessorKey: "prjctCd",
header: "프로젝트 코드", header: "프로젝트 코드",
enableSorting: true, enableSorting: true,
meta: {
maxWidth: 180
},
}, },
{ {
accessorKey: "prjctName", accessorKey: "prjctName",
header: "프로젝트 명", header: "프로젝트 명",
enableSorting: true, enableSorting: true,
meta: {
maxWidth: 1000
},
}, },
{ {
accessorKey: "prjctStatus", accessorKey: "prjctStatus",
@@ -36,6 +45,9 @@ export const getProjectColumns = (users:ItrntUserInfo[]): ColumnDef<ProjectInfo>
accessorKey: "ownerDept", accessorKey: "ownerDept",
header: "담당 그룹", header: "담당 그룹",
enableSorting: true, enableSorting: true,
cell: ({row}) => (
groupCodeLabelMap.get(row.original.ownerDept) ?? row.original.ownerDept
),
}, },
{ {
accessorKey: "ownerFw", accessorKey: "ownerFw",

View File

@@ -56,6 +56,9 @@ export const getUserColumns = (
accessorKey: "memo", accessorKey: "memo",
header: "메모", header: "메모",
enableSorting: false, enableSorting: false,
meta: {
maxWidth: 180,
},
}, },
{ {
id: "actions", id: "actions",

View File

@@ -2,9 +2,10 @@ import * as React from "react"
import { cn } from "@/lib/utils" import { cn } from "@/lib/utils"
function Input({ className, type, ...props }: React.ComponentProps<"input">) { function Input({ className, type, ref, ...props }: React.ComponentProps<"input">) {
return ( return (
<input <input
ref={ref}
type={type} type={type}
data-slot="input" data-slot="input"
className={cn( className={cn(

View File

@@ -1,7 +1,7 @@
import {ProjectStatus, ResultCodeType, SurveyType} from "@/types/project"; import {ProjectStatus, ResultCodeType, SurveyType} from "@/types/project";
// 설문 카드는 항상 실제 타입(KON/KIWI/외부)을 가져야 하므로 "없음"은 선택지에서 제외한다.
export const SURVEY_TYPE_ORDER = [ export const SURVEY_TYPE_ORDER = [
SurveyType.NONE,
SurveyType.KON, SurveyType.KON,
SurveyType.KIWI, SurveyType.KIWI,
SurveyType.EXTERNAL, SurveyType.EXTERNAL,
@@ -15,7 +15,6 @@ export const SURVEY_TYPE_LABEL = {
} as const satisfies Record<SurveyType, string>; } as const satisfies Record<SurveyType, string>;
export const SURVEY_TYPE_OPTIONS = [ export const SURVEY_TYPE_OPTIONS = [
{ value: SurveyType.NONE, label: SURVEY_TYPE_LABEL[SurveyType.NONE] },
{ value: SurveyType.KON, label: SURVEY_TYPE_LABEL[SurveyType.KON] }, { value: SurveyType.KON, label: SURVEY_TYPE_LABEL[SurveyType.KON] },
{ value: SurveyType.KIWI, label: SURVEY_TYPE_LABEL[SurveyType.KIWI] }, { value: SurveyType.KIWI, label: SURVEY_TYPE_LABEL[SurveyType.KIWI] },
{ value: SurveyType.EXTERNAL, label: SURVEY_TYPE_LABEL[SurveyType.EXTERNAL] }, { value: SurveyType.EXTERNAL, label: SURVEY_TYPE_LABEL[SurveyType.EXTERNAL] },
@@ -58,7 +57,6 @@ export const RESULT_CODE_TYPE_OPTIONS = [
{ value: ResultCodeType.SURVEY, label: RESULT_CODE_TYPE_LABEL[ResultCodeType.SURVEY] }, { value: ResultCodeType.SURVEY, label: RESULT_CODE_TYPE_LABEL[ResultCodeType.SURVEY] },
] as const; ] as const;
export const PROJECT_NAME_REGEX= /^[^\u0000-\u001F\u007F]+$/
export const PROJECT_SEARCH_COUNT = 20 export const PROJECT_SEARCH_COUNT = 20
// 결과 코드 값 자체가 시스템 동작을 결정하는 약속된(고정) 코드들 // 결과 코드 값 자체가 시스템 동작을 결정하는 약속된(고정) 코드들

View File

@@ -3,8 +3,5 @@ export const FW_USER_ROLE_GROUP = 9
export const CONTACT_INTERVIEWER_ROLE = 9002 export const CONTACT_INTERVIEWER_ROLE = 9002
export const FIELD_INTERVIEWER_ROLE = 9003 export const FIELD_INTERVIEWER_ROLE = 9003
export const USER_NAME_REGEX = /^[가-힣A-Za-z][가-힣A-Za-z0-9_ ()]*$/
export const DEFAULT_COMPANY_NAME = 'KRI'
export const FW_TEAM = "S101" export const FW_TEAM = "S101"
export const QC_TEAM = "S201" export const QC_TEAM = "S201"

View File

@@ -0,0 +1,17 @@
// 여러 화면에 흩어져 있던 검증용 정규식을 한 곳에서 관리한다.
// 신규 정규식이 필요하면 여기에 추가하고, src/utils/validation.ts의 validateValue와 함께 사용한다.
// 프로젝트명 등 일반 텍스트 입력에 공통으로 쓰는 화이트리스트.
// 한글/영문/숫자/공백 + 지정된 특수문자만 허용하고,
// 그 외 문자(이모지, 다른 언어 문자, 제어문자 등)는 전부 거부한다.
export const COMMON_TEXT_REGEX = /^[가-힣A-Za-z0-9 !@#$%^&*()_+\-={}\[\]:;"'<>,.?/·~]+$/
// 한글/영문으로 시작하고, 한글/영문/숫자/언더스코어/공백/괄호만 허용
export const USER_NAME_REGEX = /^[가-힣A-Za-z][가-힣A-Za-z0-9_ ()]*$/
// 비밀번호에 허용되는 특수문자 안내 텍스트
export const ALLOWED_PW_SPECIALS_TEXT = `~ ! @ # $ % ^ & * ( ) _ + - = { } [ ] : ; " ' < > , . ? /`
// 비밀번호에 허용된 문자만 사용했는지
export const ONLY_ALLOWED_PW_REGEX = /^[A-Za-z\d~!@#$%^&*()_+\-={}\[\]:;"'<>,.?/]+$/
// 영문 1개 이상 + 숫자 1개 이상 포함, 8~20자, 허용된 문자만 사용
export const KRI_PW_REGEX = /^(?=.*[A-Za-z])(?=.*\d)[A-Za-z\d!@#$%^&*()_+\-={}\[\]:;"'<>,.?/]{8,20}$/

View File

@@ -1,8 +1,12 @@
"use client"; "use client";
import { useSyncExternalStore } from "react"; import { useCallback, useSyncExternalStore } from "react";
import { ctiClient } from "@/lib/cti/ctiClient"; import { ctiClient } from "@/lib/cti/ctiClient";
export function useCtiLastCallHistId() { export function useCtiLastCallHistId(prjctIdx: number, sid: number) {
return useSyncExternalStore(ctiClient.subscribe, ctiClient.getLastCallHistId, () => null); const getSnapshot = useCallback(
() => ctiClient.getLastCallHistIdFor(prjctIdx, sid),
[prjctIdx, sid],
);
return useSyncExternalStore(ctiClient.subscribe, getSnapshot, () => null);
} }

View File

@@ -1,7 +1,9 @@
import { clientEnv } from "@/lib/env.client"; import { clientEnv } from "@/lib/env.client";
import { nextApi } from "@/lib/http-client"; import { nextApi } from "@/lib/http-client";
import { CTI_AGENT_GROUP, CTI_AGENT_STATUS } from "@/const/ctiConst"; import { CTI_AGENT_GROUP, CTI_AGENT_STATUS } from "@/const/ctiConst";
import type { ListCallHist, ListCallHistRequest } from "@/types/list"; import type { ListCallHist, ListCallHistRequest, ListCallHistSession } from "@/types/list";
import { getLocalStorage, removeLocalStorage, setLocalStorage } from "@/store/storage/secure-storage";
import { StorageKeys } from "@/store/storage/storage-keys";
// TEMP_CTI_LOG: 배포 후 CTI 연동 오류를 콘솔에서 바로 확인하기 위한 임시 로그. // TEMP_CTI_LOG: 배포 후 CTI 연동 오류를 콘솔에서 바로 확인하기 위한 임시 로그.
// 안정화되면 "TEMP_CTI_LOG"로 검색해서 이 파일의 관련 로그를 전부 제거할 것. // 안정화되면 "TEMP_CTI_LOG"로 검색해서 이 파일의 관련 로그를 전부 제거할 것.
@@ -29,6 +31,20 @@ type CtiCallContext = {
listHderId: number; listHderId: number;
}; };
type PersistedCtiState = {
version: 1;
agentLoginId: string;
agentStatus: string | null;
currentCallContext: CtiCallContext | null;
lastCallContext: CtiCallContext | null;
agentSessionId: string | null;
lastCallHistId: number | null;
updatedAt: number;
};
const CTI_STATE_VERSION = 1;
const CTI_STATE_TTL_MS = 24 * 60 * 60 * 1000;
let socket: WebSocket | null = null; let socket: WebSocket | null = null;
let connectionState: CtiConnectionState = "idle"; let connectionState: CtiConnectionState = "idle";
let currentAgentLoginId: string | null = null; let currentAgentLoginId: string | null = null;
@@ -36,6 +52,8 @@ let currentConnectionKey: string | null = null;
let currentLoginParams: CtiLoginParams | null = null; let currentLoginParams: CtiLoginParams | null = null;
let agentStatus: string | null = null; let agentStatus: string | null = null;
let currentCallContext: CtiCallContext | null = null; let currentCallContext: CtiCallContext | null = null;
let lastCallContext: CtiCallContext | null = null;
let currentAgentSessionId: string | null = null;
let lastCallHistId: number | null = null; let lastCallHistId: number | null = null;
const listeners = new Set<() => void>(); const listeners = new Set<() => void>();
@@ -44,6 +62,103 @@ const notify = () => {
listeners.forEach((listener) => listener()); listeners.forEach((listener) => listener());
}; };
const isCallContext = (value: unknown): value is CtiCallContext => {
if (typeof value !== "object" || value === null) return false;
const context = value as Partial<CtiCallContext>;
return (
typeof context.prjctIdx === "number" &&
Number.isFinite(context.prjctIdx) &&
typeof context.sid === "number" &&
Number.isFinite(context.sid) &&
typeof context.listHderId === "number" &&
Number.isFinite(context.listHderId)
);
};
const isPersistedCtiState = (value: unknown): value is PersistedCtiState => {
if (typeof value !== "object" || value === null) return false;
const state = value as Partial<PersistedCtiState>;
return (
state.version === CTI_STATE_VERSION &&
typeof state.agentLoginId === "string" &&
(state.agentStatus === null || typeof state.agentStatus === "string") &&
(state.currentCallContext === null || isCallContext(state.currentCallContext)) &&
(state.lastCallContext === null || isCallContext(state.lastCallContext)) &&
(state.agentSessionId === null || typeof state.agentSessionId === "string") &&
(state.lastCallHistId === null || typeof state.lastCallHistId === "number") &&
typeof state.updatedAt === "number"
);
};
const persistCtiState = () => {
if (!currentAgentLoginId) return;
setLocalStorage(StorageKeys.CtiState, {
version: CTI_STATE_VERSION,
agentLoginId: currentAgentLoginId,
agentStatus,
currentCallContext,
lastCallContext,
agentSessionId: currentAgentSessionId,
lastCallHistId,
updatedAt: Date.now(),
} satisfies PersistedCtiState);
};
const restoreCtiState = (agentLoginId: string) => {
const stored = getLocalStorage(StorageKeys.CtiState);
if (
!isPersistedCtiState(stored) ||
stored.agentLoginId !== agentLoginId ||
Date.now() - stored.updatedAt > CTI_STATE_TTL_MS
) {
if (stored !== null) removeLocalStorage(StorageKeys.CtiState);
return false;
}
agentStatus = stored.agentStatus;
currentCallContext = stored.currentCallContext;
lastCallContext = stored.lastCallContext;
currentAgentSessionId = stored.agentSessionId;
lastCallHistId = stored.lastCallHistId;
notify();
return true;
};
const recoverLastCallHistId = async (agentLoginId: string) => {
const agentSessionId = currentAgentSessionId;
const callContext = currentCallContext ?? lastCallContext;
if (!agentSessionId || lastCallHistId !== null || !callContext) return;
try {
const result = await nextApi.get<ListCallHistSession>(
`/list-call-hist/session/${encodeURIComponent(agentSessionId)}`,
);
const isSameCall =
currentAgentLoginId === agentLoginId &&
currentAgentSessionId === agentSessionId &&
result.agentSessionId === agentSessionId &&
result.prjctIdx === callContext.prjctIdx &&
result.sid === callContext.sid &&
result.listHderId === callContext.listHderId;
if (!isSameCall) {
console.warn("[CTI][TEMP_LOG] recovered call history does not match persisted context", {
agentSessionId,
callContext,
result,
}); // TEMP_CTI_LOG
return;
}
lastCallContext = callContext;
setLastCallHistId(result.listCallHistIdx);
console.log("[CTI][TEMP_LOG] recovered listCallHistIdx ->", result.listCallHistIdx); // TEMP_CTI_LOG
} catch (error) {
console.warn("[CTI][TEMP_LOG] failed to recover call history", { agentSessionId, error }); // TEMP_CTI_LOG
}
};
const setConnectionState = (next: CtiConnectionState) => { const setConnectionState = (next: CtiConnectionState) => {
connectionState = next; connectionState = next;
notify(); notify();
@@ -51,11 +166,13 @@ const setConnectionState = (next: CtiConnectionState) => {
const setAgentStatus = (next: string | null) => { const setAgentStatus = (next: string | null) => {
agentStatus = next; agentStatus = next;
persistCtiState();
notify(); notify();
}; };
const setLastCallHistId = (next: number | null) => { const setLastCallHistId = (next: number | null) => {
lastCallHistId = next; lastCallHistId = next;
persistCtiState();
notify(); notify();
}; };
@@ -68,7 +185,8 @@ const saveCallHistory = (parsed: Record<string, unknown>, options: { clearContex
return; return;
} }
const { prjctIdx, sid, listHderId } = currentCallContext; const callContext = currentCallContext;
const { prjctIdx, sid, listHderId } = callContext;
const startTime = typeof parsed.StartTime === "string" ? parsed.StartTime : ""; const startTime = typeof parsed.StartTime === "string" ? parsed.StartTime : "";
const body: ListCallHistRequest = { const body: ListCallHistRequest = {
@@ -87,20 +205,37 @@ const saveCallHistory = (parsed: Record<string, unknown>, options: { clearContex
recordFileName: String(parsed.RecordFileName ?? ""), recordFileName: String(parsed.RecordFileName ?? ""),
}; };
currentAgentSessionId = body.agentSessionId || currentAgentSessionId;
persistCtiState();
if (
options.clearContextAfter &&
body.totalTime <= 0 &&
body.talkTime <= 0 &&
body.recordFileName.trim() === ""
) {
console.warn(
"[CTI][TEMP_LOG] CallClosed has no backend endDt marker (totalTime, talkTime, recordFileName)",
parsed,
); // TEMP_CTI_LOG
}
console.log("[CTI][TEMP_LOG] saving call history", { prjctIdx, sid, body }); // TEMP_CTI_LOG console.log("[CTI][TEMP_LOG] saving call history", { prjctIdx, sid, body }); // TEMP_CTI_LOG
nextApi nextApi
.put<ListCallHist>(`/list-call-hist/${prjctIdx}/${sid}`, body) .put<ListCallHist>(`/list-call-hist/${prjctIdx}/${sid}`, body)
.then((result) => { .then((result) => {
console.log("[CTI][TEMP_LOG] call history saved, listCallHistIdx =", result?.listCallHistIdx); // TEMP_CTI_LOG console.log("[CTI][TEMP_LOG] call history saved, listCallHistIdx =", result?.listCallHistIdx); // TEMP_CTI_LOG
lastCallContext = callContext;
setLastCallHistId(result?.listCallHistIdx ?? null); setLastCallHistId(result?.listCallHistIdx ?? null);
if (options.clearContextAfter && currentCallContext === callContext) {
currentCallContext = null;
persistCtiState();
}
}) })
.catch((error) => { .catch((error) => {
console.error("[CTI][TEMP_LOG] failed to save call history", error); // TEMP_CTI_LOG console.error("[CTI][TEMP_LOG] failed to save call history", error); // TEMP_CTI_LOG
}); });
if (options.clearContextAfter) {
currentCallContext = null;
}
}; };
// WS 서버 -> 클라이언트로 오는 메시지는 ZCommand가 기준값이다. // WS 서버 -> 클라이언트로 오는 메시지는 ZCommand가 기준값이다.
@@ -125,11 +260,13 @@ const handleIncomingMessage = (raw: unknown) => {
} }
case "StartSessionRecord": { case "StartSessionRecord": {
console.log("[CTI][TEMP_LOG] StartSessionRecord ->", parsed); // TEMP_CTI_LOG console.log("[CTI][TEMP_LOG] StartSessionRecord ->", parsed); // TEMP_CTI_LOG
setAgentStatus("2");
saveCallHistory(parsed, { clearContextAfter: false }); saveCallHistory(parsed, { clearContextAfter: false });
break; break;
} }
case "CallClosed": { case "CallClosed": {
console.log("[CTI][TEMP_LOG] CallClosed ->", parsed); // TEMP_CTI_LOG console.log("[CTI][TEMP_LOG] CallClosed ->", parsed); // TEMP_CTI_LOG
setAgentStatus(null);
saveCallHistory(parsed, { clearContextAfter: true }); saveCallHistory(parsed, { clearContextAfter: true });
break; break;
} }
@@ -163,11 +300,11 @@ const teardownSocket = () => {
socket = null; socket = null;
} }
setConnectionState("idle"); setConnectionState("idle");
setAgentStatus(null);
}; };
const logout = () => { const logout = () => {
console.log("[CTI][TEMP_LOG] logout called, currentAgentLoginId =", currentAgentLoginId, "connectionState =", connectionState); // TEMP_CTI_LOG console.log("[CTI][TEMP_LOG] logout called, currentAgentLoginId =", currentAgentLoginId, "connectionState =", connectionState); // TEMP_CTI_LOG
const shouldClearPersistedState = currentAgentLoginId !== null;
if (currentAgentLoginId && connectionState === "open") { if (currentAgentLoginId && connectionState === "open") {
send({ ZCommand: "Logout", AgentLoginID: currentAgentLoginId }); send({ ZCommand: "Logout", AgentLoginID: currentAgentLoginId });
} }
@@ -176,7 +313,11 @@ const logout = () => {
currentConnectionKey = null; currentConnectionKey = null;
currentLoginParams = null; currentLoginParams = null;
currentCallContext = null; currentCallContext = null;
lastCallContext = null;
currentAgentSessionId = null;
setAgentStatus(null);
setLastCallHistId(null); setLastCallHistId(null);
if (shouldClearPersistedState) removeLocalStorage(StorageKeys.CtiState);
}; };
const connectAndLogin = (params: CtiLoginParams) => { const connectAndLogin = (params: CtiLoginParams) => {
@@ -203,6 +344,8 @@ const connectAndLogin = (params: CtiLoginParams) => {
currentAgentLoginId = params.agentLoginId; currentAgentLoginId = params.agentLoginId;
currentConnectionKey = key; currentConnectionKey = key;
currentLoginParams = params; currentLoginParams = params;
const restored = restoreCtiState(params.agentLoginId);
if (restored) void recoverLastCallHistId(params.agentLoginId);
setConnectionState("connecting"); setConnectionState("connecting");
console.log("[CTI][TEMP_LOG] opening websocket ->", clientEnv.CTI_WS_URL); // TEMP_CTI_LOG console.log("[CTI][TEMP_LOG] opening websocket ->", clientEnv.CTI_WS_URL); // TEMP_CTI_LOG
@@ -252,10 +395,14 @@ export const ctiClient = {
getConnectionState: () => connectionState, getConnectionState: () => connectionState,
getAgentStatus: () => agentStatus, getAgentStatus: () => agentStatus,
getLastCallHistId: () => lastCallHistId, getLastCallHistId: () => lastCallHistId,
getLastCallHistIdFor: (prjctIdx: number, sid: number) =>
lastCallContext?.prjctIdx === prjctIdx && lastCallContext.sid === sid ? lastCallHistId : null,
makeCall: (params: CtiMakeCallParams) => { makeCall: (params: CtiMakeCallParams) => {
if (!currentAgentLoginId || !currentLoginParams) return; if (!currentAgentLoginId || !currentLoginParams) return;
console.log("[CTI][TEMP_LOG] makeCall", params); // TEMP_CTI_LOG console.log("[CTI][TEMP_LOG] makeCall", params); // TEMP_CTI_LOG
currentCallContext = { prjctIdx: params.prjctIdx, sid: params.sid, listHderId: params.listHderId }; currentCallContext = { prjctIdx: params.prjctIdx, sid: params.sid, listHderId: params.listHderId };
lastCallContext = null;
currentAgentSessionId = null;
setLastCallHistId(null); // 새 통화 시작, 이전 통화의 listCallHistIdx는 더 이상 유효하지 않음 setLastCallHistId(null); // 새 통화 시작, 이전 통화의 listCallHistIdx는 더 이상 유효하지 않음
send({ send({
ZCommand: "MakeCall", ZCommand: "MakeCall",
@@ -265,8 +412,9 @@ export const ctiClient = {
}); });
}, },
hangup: requireAgent((agentLoginId) => { hangup: requireAgent((agentLoginId) => {
// CTI_HANGUP_PENDING_VENDOR: 외주사와 ZCommand/동작 확인 후 UI 활성화 예정.
console.log("[CTI][TEMP_LOG] hangup"); // TEMP_CTI_LOG console.log("[CTI][TEMP_LOG] hangup"); // TEMP_CTI_LOG
send({ ZCommand: "HangUp", AgentLoginID: agentLoginId }); send({ ZCommand: "Hangup", AgentLoginID: agentLoginId });
}), }),
setReady: requireAgent((agentLoginId) => { setReady: requireAgent((agentLoginId) => {
console.log("[CTI][TEMP_LOG] setReady"); // TEMP_CTI_LOG console.log("[CTI][TEMP_LOG] setReady"); // TEMP_CTI_LOG

View File

@@ -3,8 +3,8 @@
import {keepPreviousData, useQuery} from "@tanstack/react-query"; import {keepPreviousData, useQuery} from "@tanstack/react-query";
import {qk} from "@/query/key/keys"; import {qk} from "@/query/key/keys";
import {nextApi} from "@/lib/http-client"; import {nextApi} from "@/lib/http-client";
import {ItrntUserInfo} from "@/types/user"; import {GroupCodeInfo, ItrntUserInfo} from "@/types/user";
import {CallerTelNumInfo, IntranetProjectSearchResponse, KonKiwiProjectInfo} from "@/types/project"; import {CallerTelNumInfo, IntranetProjectSearchResponse} from "@/types/project";
export function useIntranetProjectListQuery(keyword: string, enabled: boolean) { export function useIntranetProjectListQuery(keyword: string, enabled: boolean) {
const kw = keyword.trim(); const kw = keyword.trim();
@@ -44,3 +44,12 @@ export function useCallerTelNumListQuery(enabled: boolean) {
staleTime: 60_000, staleTime: 60_000,
}); });
} }
export function useGroupCodeListQuery(enabled: boolean = true) {
return useQuery({
queryKey: qk.groupCodeList(),
queryFn: () => nextApi.get<GroupCodeInfo[]>("/intranet/group-code-list"),
enabled,
staleTime: 10 * 60_000,
});
}

View File

@@ -47,6 +47,7 @@ export const qk = {
intranetProjectList: (keyword: string) => ["intranet", "project-list", keyword] as const, intranetProjectList: (keyword: string) => ["intranet", "project-list", keyword] as const,
intranetUsers: () => ["intranet", "user-list"] as const, intranetUsers: () => ["intranet", "user-list"] as const,
callerTelNumList: () => ["intranet", "caller-tel-num"] as const, callerTelNumList: () => ["intranet", "caller-tel-num"] as const,
groupCodeList: () => ["intranet", "group-code-list"] as const,
/********** 인트라넷 관련 **********/ /********** 인트라넷 관련 **********/
/********** 리스트 관련 **********/ /********** 리스트 관련 **********/

View File

@@ -32,7 +32,7 @@ export function useListHeaderQuery(prjctIdx: number, enabled: boolean) {
staleTime: 0, // 항상 오래된 데이터 취급 staleTime: 0, // 항상 오래된 데이터 취급
refetchOnMount: "always", // 컴포넌트 다시 붙을 때마다 refetchOnMount: "always", // 컴포넌트 다시 붙을 때마다
placeholderData: keepPreviousData, placeholderData: keepPreviousData,
meta: { ignoreGlobalLoading: true }, meta: { ignoreGlobalLoading: false },
}); });
} }
@@ -50,8 +50,8 @@ const serializeListSearchRequest = (request: ListSearchRequest) => ({
resultCodeMap: request.listFilter.resultCodeMap ?? { resultCodeMap: request.listFilter.resultCodeMap ?? {
[ResultCodeType.CONTACT]: [], [ResultCodeType.CONTACT]: [],
[ResultCodeType.INTERVIEW]: [], [ResultCodeType.INTERVIEW]: [],
[ResultCodeType.SURVEY]: [],
}, },
surveyResultConditions: request.listFilter.surveyResultConditions ?? [],
memoConditions: request.listFilter.memoConditions ?? [], memoConditions: request.listFilter.memoConditions ?? [],
otherItemConditions: request.listFilter.otherItemConditions ?? [], otherItemConditions: request.listFilter.otherItemConditions ?? [],
}, },
@@ -72,7 +72,7 @@ export function useListSearchQuery(prjctIdx: number, request: ListSearchRequest,
staleTime: 0, staleTime: 0,
refetchOnMount: "always", refetchOnMount: "always",
placeholderData: keepPreviousData, placeholderData: keepPreviousData,
meta: { ignoreGlobalLoading: true }, meta: { ignoreGlobalLoading: false },
}); });
} }
@@ -85,7 +85,7 @@ export function useListDetailQuery(prjctIdx: number, sid: string, enabled: boole
refetchOnMount: "always", refetchOnMount: "always",
// 조사 시작으로 새 창이 뜬 뒤 응답을 마치고 이 탭으로 돌아왔을 때 최신 상태(설문 응답 등)를 바로 보여주기 위함. // 조사 시작으로 새 창이 뜬 뒤 응답을 마치고 이 탭으로 돌아왔을 때 최신 상태(설문 응답 등)를 바로 보여주기 위함.
refetchOnWindowFocus: true, refetchOnWindowFocus: true,
meta: { ignoreGlobalLoading: true }, meta: { ignoreGlobalLoading: false },
}); });
} }
@@ -162,6 +162,15 @@ export function useUploadListItemFileMutation(prjctIdx: number, sid: string) {
}); });
} }
export function useDownloadListItemFileByHeaderMutation(prjctIdx: number, sid: string) {
return useMutation({
mutationFn: (listHderId: number) =>
nextApi.get<ArrayBuffer>(`/list/item-file-download/${prjctIdx}/${sid}/${listHderId}`, {
expectBinary: true,
}),
});
}
export function useDownloadListExcelTemplateMutation() { export function useDownloadListExcelTemplateMutation() {
return useMutation({ return useMutation({
mutationFn: (prjctIdx: number) => mutationFn: (prjctIdx: number) =>

View File

@@ -238,8 +238,6 @@ export function useDeleteProjectMutation(prjctIdx: number) {
* 시나리오 이미지 업로드 (엔드포인트 spelling은 너 서버 기준으로) * 시나리오 이미지 업로드 (엔드포인트 spelling은 너 서버 기준으로)
*/ */
export function useUploadScenarioImageMutation(prjctIdx: number, prjctCd: string) { export function useUploadScenarioImageMutation(prjctIdx: number, prjctCd: string) {
const qc = useQueryClient();
return useMutation({ return useMutation({
mutationFn: async (file: File): Promise<string> => { mutationFn: async (file: File): Promise<string> => {
const formData = new FormData(); const formData = new FormData();
@@ -248,9 +246,7 @@ export function useUploadScenarioImageMutation(prjctIdx: number, prjctCd: string
// 서버가 업로드된 이미지 URL을 문자열로 반환한다는 전제 // 서버가 업로드된 이미지 URL을 문자열로 반환한다는 전제
return await nextApi.postForm<string>(`/project/senario-image/${prjctCd}`, formData); return await nextApi.postForm<string>(`/project/senario-image/${prjctCd}`, formData);
}, },
onSuccess: () => { // 업로드는 URL만 돌려받는 동작이라 projectInfo를 실제로 바꾸지 않는다.
// 업로드 결과가 projectInfo에 반영된다면 해당 프로젝트만 갱신 // 여기서 invalidate하면 편집 중(저장 전) projectInfo refetch가 발생해 미저장 폼 값을 덮어쓴다.
qc.invalidateQueries({ queryKey: qk.projectInfo(prjctIdx) });
},
}); });
} }

View File

@@ -70,6 +70,7 @@ export function useUpsertUserMutation() {
}, },
onSuccess: (_res, v) => { onSuccess: (_res, v) => {
qc.invalidateQueries({ queryKey: qk.users() }); qc.invalidateQueries({ queryKey: qk.users() });
qc.invalidateQueries({ queryKey: qk.fieldworkUsers() });
const userId = (v.data as any)?.userId; const userId = (v.data as any)?.userId;
if (userId) { if (userId) {
@@ -83,7 +84,10 @@ export function useDeleteUserMutation() {
const qc = useQueryClient(); const qc = useQueryClient();
return useMutation({ return useMutation({
mutationFn: (userId: string) => nextApi.del<void>(`/user/${encodeURIComponent(userId)}`), mutationFn: (userId: string) => nextApi.del<void>(`/user/${encodeURIComponent(userId)}`),
onSuccess: () => qc.invalidateQueries({ queryKey: qk.users() }), onSuccess: () => {
qc.invalidateQueries({ queryKey: qk.users() });
qc.invalidateQueries({ queryKey: qk.fieldworkUsers() });
},
}); });
} }
@@ -99,6 +103,7 @@ export function useUploadUsersExcelMutation() {
onSuccess: (res) => { onSuccess: (res) => {
if (!res.hasErrorFile) { if (!res.hasErrorFile) {
qc.invalidateQueries({ queryKey: qk.users() }); qc.invalidateQueries({ queryKey: qk.users() });
qc.invalidateQueries({ queryKey: qk.fieldworkUsers() });
} }
}, },
}); });

View File

@@ -3,7 +3,6 @@
import { StorageKeys } from "@/store/storage/storage-keys"; import { StorageKeys } from "@/store/storage/storage-keys";
import { createPersistentAtom } from "@kri/common/jotai"; import { createPersistentAtom } from "@kri/common/jotai";
import { sessionJsonStorage } from "@/store/storage/secure-storage"; import { sessionJsonStorage } from "@/store/storage/secure-storage";
import {SurveyType} from "@/types/project";
export type SelectedProject = { export type SelectedProject = {
prjctIdx: number; prjctIdx: number;
@@ -12,7 +11,6 @@ export type SelectedProject = {
itrntPrjctCd: string; itrntPrjctCd: string;
ownerDept: string; ownerDept: string;
ownerFw: string; ownerFw: string;
surveyTy: SurveyType;
ff: boolean; ff: boolean;
}; };

View File

@@ -3,6 +3,7 @@ export const StorageKeys = {
SelectedProject: "kri:selectedProject", SelectedProject: "kri:selectedProject",
ItrntUserList:"kri:itrntUserList", ItrntUserList:"kri:itrntUserList",
LastListVisit: "kri:lastListVisit", LastListVisit: "kri:lastListVisit",
CtiState: "kri:ctiState",
//SidebarCollapsed: "kri:sidebarCollapsed", //SidebarCollapsed: "kri:sidebarCollapsed",
// 필요하면 여기 계속 추가 // 필요하면 여기 계속 추가
} as const; } as const;
@@ -12,6 +13,7 @@ export const StorageType: Record<StorageKey, "local" | "session"> = {
[StorageKeys.SelectedProject]: "session", [StorageKeys.SelectedProject]: "session",
[StorageKeys.ItrntUserList]: "session", [StorageKeys.ItrntUserList]: "session",
[StorageKeys.LastListVisit]: "session", [StorageKeys.LastListVisit]: "session",
[StorageKeys.CtiState]: "local",
}; };
export type StorageKey = (typeof StorageKeys)[keyof typeof StorageKeys]; export type StorageKey = (typeof StorageKeys)[keyof typeof StorageKeys];

View File

@@ -20,7 +20,7 @@ export type ExternalAction = keyof typeof EXTERNAL_ACTION_CODE_BY_SLUG;
export type ExternalEventMeta = { export type ExternalEventMeta = {
entryType: ExternalEntryTypeCode; entryType: ExternalEntryTypeCode;
action: ExternalActionCode; action: ExternalActionCode;
pid: string; psidx: string;
sid: string; sid: string;
remoteAddr: string | null; remoteAddr: string | null;
uri: string; uri: string;
@@ -34,7 +34,7 @@ export type ExternalEventMeta = {
export type ExternalEventBody = { export type ExternalEventBody = {
action: ExternalActionCode; action: ExternalActionCode;
prjctIdx: number; prjctSurveyIdx: number;
sid: number; sid: number;
meta: ExternalEventMeta; meta: ExternalEventMeta;
}; };

View File

@@ -115,13 +115,19 @@ export type listHeader = {
filterContents?: string[]; filterContents?: string[];
}; };
export type SurveyResultCondition = {
prjctSurveyIdx: number;
resultCodes: number[];
};
export type ListFilter = { export type ListFilter = {
sidSet: string[]; sidSet: string[];
listUseSet: ListIsUse[]; listUseSet: ListIsUse[];
listUseConditions: ListFilterCondition[]; listUseConditions: ListFilterCondition[];
assignUserMap: Record<ListHeaderAssignType, string[]>; assignUserMap: Record<ListHeaderAssignType, string[]>;
assignConditions: ListAssignFilterCondition[]; assignConditions: ListAssignFilterCondition[];
resultCodeMap: Record<ResultCodeType, number[]>; resultCodeMap: Record<Exclude<ResultCodeType, ResultCodeType.SURVEY>, number[]>;
surveyResultConditions: SurveyResultCondition[];
memoConditions: ListFilterCondition[]; memoConditions: ListFilterCondition[];
otherItemConditions: ListOtherItemFilterCondition[]; otherItemConditions: ListOtherItemFilterCondition[];
}; };
@@ -139,8 +145,8 @@ export const createEmptyListFilter = (): ListFilter => ({
resultCodeMap: { resultCodeMap: {
[ResultCodeType.CONTACT]: [], [ResultCodeType.CONTACT]: [],
[ResultCodeType.INTERVIEW]: [], [ResultCodeType.INTERVIEW]: [],
[ResultCodeType.SURVEY]: [],
}, },
surveyResultConditions: [],
memoConditions: [], memoConditions: [],
otherItemConditions: [], otherItemConditions: [],
}); });
@@ -148,11 +154,14 @@ export const createEmptyListFilter = (): ListFilter => ({
// ListSearchTable의 검색/필터 UI 상태 중, 페이지를 떠났다가 돌아왔을 때 "같은 목록·같은 순서"를 // ListSearchTable의 검색/필터 UI 상태 중, 페이지를 떠났다가 돌아왔을 때 "같은 목록·같은 순서"를
// 재현하기 위해 함께 기억해야 하는 부분. pageIndex만 기억하면 필터가 없어져 목록 순서가 달라져서 // 재현하기 위해 함께 기억해야 하는 부분. pageIndex만 기억하면 필터가 없어져 목록 순서가 달라져서
// 엉뚱한 페이지로 안내하게 된다(예: "SID 30~40" 필터를 걸면 SID 30이 1페이지지만, 필터 없이는 2페이지일 수 있음). // 엉뚱한 페이지로 안내하게 된다(예: "SID 30~40" 필터를 걸면 SID 30이 1페이지지만, 필터 없이는 2페이지일 수 있음).
// 설문별 결과 필터 선택값. key는 prjctSurveyIdx, value는 선택된 결과 코드(문자열) 목록.
export type SurveyResultSelections = Record<number, string[]>;
export type ListSearchUiState = { export type ListSearchUiState = {
searchText: string; searchText: string;
searchContactResult: string[]; searchContactResult: string[];
searchInterviewResult: string[]; searchInterviewResult: string[];
searchSurveyResult: string[]; surveyResultSelections: SurveyResultSelections;
filterRows: FilterRow[]; filterRows: FilterRow[];
sorting: { id: string; desc: boolean }[]; sorting: { id: string; desc: boolean }[];
}; };
@@ -193,7 +202,8 @@ export type ListUploadHistory = {
export type ListUpdateRequest = { export type ListUpdateRequest = {
updateContents: Record<string, string>; updateContents: Record<string, string>;
updateResultCodes?: Partial<Record<ResultCodeType, number>>; updateResultCodes?: Partial<Record<Exclude<ResultCodeType, ResultCodeType.SURVEY>, number>>;
updateSurveyResultCodes?: { prjctSurveyIdx: number; resultCd: number }[];
listFilter: ListFilter; listFilter: ListFilter;
}; };
@@ -275,6 +285,15 @@ export type ListCallHist = ListCallHistRequest & {
regDt: string; regDt: string;
}; };
export type ListCallHistSession = {
listCallHistIdx: number;
agentSessionId: string;
destSessionId: string;
prjctIdx: number;
sid: number;
listHderId: number;
};
export type ListReserveRequest = { export type ListReserveRequest = {
prjctIdx: number; prjctIdx: number;
sid: number; sid: number;
@@ -311,18 +330,26 @@ export type ListEventHistDownloadRequest = {
export type ListResultBase = { export type ListResultBase = {
lastResultCd: number; lastResultCd: number;
lastResultDt: string; lastResultDt: string;
lastResultViewLabel: string;
attemptCount: number; attemptCount: number;
}; };
export type ListSendResult = ListResultBase & { export type ListSendResult = ListResultBase;
lastResultLabel: string;
};
export type ListContactResult = ListResultBase & { export type ListContactResult = ListResultBase & {
lastUser: string; lastUser: string;
assignUser: string; assignUser: string;
}; };
export type SurveyResult = {
prjctSurveyIdx: number;
surveyName: string;
surveyTy: number;
lastResultCd: number;
lastResultDt: string;
attemptCount: number;
};
export type ListSearchBase = { export type ListSearchBase = {
prjctIdx: number; prjctIdx: number;
sid: number; sid: number;
@@ -335,7 +362,7 @@ export type ListSearchBase = {
export type ListSearchWithResult = ListSearchBase & { export type ListSearchWithResult = ListSearchBase & {
contactResult: ListContactResult; contactResult: ListContactResult;
interviewResult: ListContactResult; interviewResult: ListContactResult;
surveyResult: ListResultBase; surveyResults: SurveyResult[];
}; };
export type ListSearchWithFullResult = ListSearchWithResult & { export type ListSearchWithFullResult = ListSearchWithResult & {

View File

@@ -38,6 +38,10 @@ export type SendResultInfo = {
cmid: string; cmid: string;
bulkSendKey?: string; bulkSendKey?: string;
sendTy: number; sendTy: number;
itrntPrjctCd: string;
reqstSvc: string;
prjctCd: string;
sid: string;
resve: boolean; resve: boolean;
resultCode: number; resultCode: number;
resultLabel?: string; resultLabel?: string;

View File

@@ -17,7 +17,7 @@ export enum ProjectStatus {
export enum ResultCodeType { export enum ResultCodeType {
CONTACT = 21, CONTACT = 21,
INTERVIEW = 22, INTERVIEW = 22,
SURVEY = 99, SURVEY = 91,
} }
export enum ExternalActionCode { export enum ExternalActionCode {
@@ -27,6 +27,18 @@ export enum ExternalActionCode {
QUOTA = 98, QUOTA = 98,
} }
export type ProjectSurvey = {
prjctSurveyIdx?: number | null;
surveyOrder: number;
surveyName: string;
surveyTy: SurveyType;
surveyPrjctCd?: string | null;
surveyUrl?: string | null;
surveyFullUrl?: string | null;
surveyShortUrl?: string | null;
surveyDashboardUrl?: string | null;
};
export type ProjectInfo = { export type ProjectInfo = {
prjctIdx: number; // Long prjctIdx: number; // Long
prjctCd: string; prjctCd: string;
@@ -36,10 +48,7 @@ export type ProjectInfo = {
ownerDept: string; ownerDept: string;
ownerFw: string; ownerFw: string;
callerTelNum: string; callerTelNum: string;
surveyTy: SurveyType; surveys: ProjectSurvey[];
surveyPrjctCd?: string;
surveyUrl?: string;
surveyDashboardUrl?: string;
ff: boolean; ff: boolean;
useContactSenario: boolean; useContactSenario: boolean;
contactSenario?: string; contactSenario?: string;

View File

@@ -6,6 +6,11 @@ export type ItrntUserInfo = {
userRole: number; userRole: number;
}; };
export type GroupCodeInfo = {
groupCode: string;
groupCodeLabel: string;
};
export type UserInfo = { export type UserInfo = {
userId: string userId: string
userPw?: string userPw?: string

View File

@@ -1,7 +1,7 @@
import { ListHeaderAssignConst, ListHeaderConst } from "@/const/listConst"; import { ListHeaderAssignConst, ListHeaderConst } from "@/const/listConst";
import { CONTACT_INTERVIEWER_ROLE, FIELD_INTERVIEWER_ROLE } from "@/const/userConst"; import { CONTACT_INTERVIEWER_ROLE, FIELD_INTERVIEWER_ROLE } from "@/const/userConst";
import { ListIsUse, type ListFilter, type listHeader } from "@/types/list"; import { ListIsUse, type ListFilter, type listHeader } from "@/types/list";
import { isExternalManager, isFieldWorkUser, isInternalManager } from "@/utils/userRole"; import {isExternalManager, isFieldWorkUser, isInternalManager, isManager} from "@/utils/userRole";
type ListAccessUser = { type ListAccessUser = {
userRole?: number | null; userRole?: number | null;
@@ -23,9 +23,9 @@ export const isListFilterVisibleByAccess = (header: listHeader, userRole?: numbe
// 컨택 진행 화면(/list/contact)은 역할과 무관하게 면접원 노출 항목만 보여준다. // 컨택 진행 화면(/list/contact)은 역할과 무관하게 면접원 노출 항목만 보여준다.
export const isListFieldVisibleForContact = (header: listHeader) => header.useIntrvwerView; export const isListFieldVisibleForContact = (header: listHeader) => header.useIntrvwerView;
// SID는 항상 읽기 전용. internal 권한은 그 외 전부 수정 가능, 그 외 역할은 헤더별 면접원 수정가능 여부를 따른다. // SID는 항상 읽기 전용. manager 권한은 그 외 전부 수정 가능, 그 외 역할은 헤더별 면접원 수정가능 여부를 따른다.
export const isListFieldEditableForContact = (header: listHeader, userRole?: number | null) => export const isListFieldEditableForContact = (header: listHeader, userRole?: number | null) =>
header.listHderTy !== ListHeaderConst.SID && (isInternalManager(userRole) || header.useIntrvwerEdit); header.listHderTy !== ListHeaderConst.SID && (isManager(userRole) || header.useIntrvwerEdit);
export const getLockedListFilterHeaderTypes = (userRole?: number | null) => { export const getLockedListFilterHeaderTypes = (userRole?: number | null) => {
const lockedTypes = new Set<number>(); const lockedTypes = new Set<number>();

50
src/utils/validation.ts Normal file
View File

@@ -0,0 +1,50 @@
export interface ValidateOptions {
/** 값이 비어있으면(trim 후 빈 문자열) 실패 처리 */
required?: boolean
requiredMessage?: string
/** 최소 길이(trim 후 기준) */
minLength?: number
/** 최대 길이(trim 후 기준) */
maxLength?: number
lengthMessage?: string
/** 형식 검증용 정규식(trim 후 값에 대해 test) */
pattern?: RegExp
patternMessage?: string
}
export interface ValidateResult {
valid: boolean
message?: string
}
const DEFAULT_REQUIRED_MESSAGE = '값을 입력해주세요.'
const DEFAULT_PATTERN_MESSAGE = '형식이 올바르지 않습니다.'
/**
* 값이 비었는지 / 길이가 맞는지 / 정규식에 맞는지를 옵션으로 선택해서 검사한다.
* 빈 값이고 required가 아니면 나머지 검사는 건너뛰고 통과 처리한다.
*/
export function validateValue(value: string, options: ValidateOptions): ValidateResult {
const trimmed = value.trim()
if (!trimmed) {
if (options.required) {
return { valid: false, message: options.requiredMessage ?? DEFAULT_REQUIRED_MESSAGE }
}
return { valid: true }
}
if (options.minLength !== undefined && trimmed.length < options.minLength) {
return { valid: false, message: options.lengthMessage ?? `${options.minLength}자 이상 입력해주세요.` }
}
if (options.maxLength !== undefined && trimmed.length > options.maxLength) {
return { valid: false, message: options.lengthMessage ?? `${options.maxLength}자 이하로 입력해주세요.` }
}
if (options.pattern && !options.pattern.test(trimmed)) {
return { valid: false, message: options.patternMessage ?? DEFAULT_PATTERN_MESSAGE }
}
return { valid: true }
}