260716_01_ENH: 본 서버에서 기동 후 중간 테스트를 위한 커밋

This commit is contained in:
2026-07-16 09:12:57 +09:00
parent c710a60beb
commit 36c7b41191
29 changed files with 864 additions and 532 deletions

View File

@@ -1,6 +1,6 @@
'use client'
import { useEffect, useMemo, useState } from 'react'
import { useEffect, useState } from 'react'
import { Plus, X } from 'lucide-react'
import { KriDialog } from '@/components/common/KriDialog'
import { Button } from '@/components/ui/button'
@@ -12,12 +12,19 @@ import {
SelectTrigger,
SelectValue,
} from '@/components/ui/select'
import { KriSingleSelect } from '@/components/common/KriAutoComplete'
import ApplyFilterOption from './ListDialogOption/ApplyFilterOption'
import { useDialog } from '@/hooks/useDialog'
import type { DialogId } from '@/store/jotai/dialog'
import type { FilterValueOption, ListFilterTarget } from '@/types/list'
import { type ResultCode, ResultCodeType } from '@/types/project'
import { ListHeaderConst, LIST_BATCH_EDIT_FILE_DELETE_VALUE } from '@/const/listConst'
export type BatchEditOption = {
id: number
label: string
listHderTy: number
valueOptions?: FilterValueOption[]
}
export type BatchEditRow = {
@@ -26,57 +33,74 @@ export type BatchEditRow = {
value: string
}
export type BatchEditResultCodes = Partial<Record<ResultCodeType, number>>
export type BatchEditPayload = {
rows: BatchEditRow[]
resultCodes: BatchEditResultCodes
target: ListFilterTarget
}
export type ListBatchEditDialogProps = {
dialogId?: DialogId
open?: boolean
onOpenChange?: (open: boolean) => void
appliedFilters?: Record<number, string[]>
headerOptions: BatchEditOption[]
resultCodes: ResultCode[]
filterSummary?: string[]
initialRows?: BatchEditRow[]
onConfirm: (rows: BatchEditRow[]) => void | Promise<void>
initialResultCodes?: BatchEditResultCodes
onConfirm: (payload: BatchEditPayload) => void | Promise<void>
}
const createRow = (headerId: number): BatchEditRow => ({
const createRow = (headerId: number, value = ''): BatchEditRow => ({
id: crypto.randomUUID(),
headerId,
value: '',
value,
})
const NO_CHANGE = '__no_change__'
const resultCodeGroups: { type: ResultCodeType; label: string }[] = [
{ type: ResultCodeType.CONTACT, label: '컨택 결과' },
{ type: ResultCodeType.INTERVIEW, label: '면접 결과' },
{ type: ResultCodeType.SURVEY, label: '설문 결과' },
]
const ListBatchEditDialog = ({
dialogId = 'listBatchEditDialog',
open,
onOpenChange,
appliedFilters = {},
headerOptions,
resultCodes,
filterSummary,
initialRows = [],
initialResultCodes = {},
onConfirm,
}: ListBatchEditDialogProps) => {
const { isDialogOpen, showDialog, hideDialog } = useDialog()
const [rows, setRows] = useState<BatchEditRow[]>([])
const [resultCodeSelections, setResultCodeSelections] = useState<BatchEditResultCodes>({})
const [target, setTarget] = useState<ListFilterTarget>('filtered')
const [submitting, setSubmitting] = useState(false)
const resolvedOpen = open ?? isDialogOpen(dialogId)
const defaultHeaderId = headerOptions[0]?.id ?? 0
const isFileHeader = (headerId: number) => headerOptions.find((option) => option.id === headerId)?.listHderTy === ListHeaderConst.FILE
useEffect(() => {
if (!resolvedOpen) return
if (initialRows.length > 0) {
setRows(initialRows.map((row) => ({ ...row })))
return
} else if (defaultHeaderId > 0) {
setRows([createRow(defaultHeaderId, isFileHeader(defaultHeaderId) ? LIST_BATCH_EDIT_FILE_DELETE_VALUE : '')])
} else {
setRows([])
}
if (defaultHeaderId > 0) {
setRows([createRow(defaultHeaderId)])
}
}, [resolvedOpen, initialRows, defaultHeaderId])
const filterSummary = useMemo(() => {
return Object.entries(appliedFilters)
.map(([headerId, values]) => {
const headerLabel = headerOptions.find((opt) => opt.id === Number(headerId))?.label ?? headerId
return `${headerLabel}: ${values.join(', ')}`
})
.join(' / ')
}, [appliedFilters, headerOptions])
setResultCodeSelections({ ...initialResultCodes })
setTarget('filtered')
}, [resolvedOpen, initialRows, initialResultCodes, defaultHeaderId])
const handleOpenChange = (nextOpen: boolean) => {
onOpenChange?.(nextOpen)
@@ -89,7 +113,7 @@ const ListBatchEditDialog = ({
const handleAddRow = () => {
if (defaultHeaderId <= 0) return
setRows((prev) => [...prev, createRow(defaultHeaderId)])
setRows((prev) => [...prev, createRow(defaultHeaderId, isFileHeader(defaultHeaderId) ? LIST_BATCH_EDIT_FILE_DELETE_VALUE : '')])
}
const handleRemoveRow = (id: string) => {
@@ -97,23 +121,38 @@ const ListBatchEditDialog = ({
}
const handleChangeHeader = (id: string, headerId: number) => {
setRows((prev) => prev.map((row) => (row.id === id ? { ...row, headerId } : row)))
const value = isFileHeader(headerId) ? LIST_BATCH_EDIT_FILE_DELETE_VALUE : ''
setRows((prev) => prev.map((row) => (row.id === id ? { ...row, headerId, value } : row)))
}
const getValueOptions = (headerId: number) => headerOptions.find((option) => option.id === headerId)?.valueOptions
const handleChangeValue = (id: string, value: string) => {
setRows((prev) => prev.map((row) => (row.id === id ? { ...row, value } : row)))
}
const handleChangeResultCode = (type: ResultCodeType, value: string) => {
setResultCodeSelections((prev) => {
if (value === NO_CHANGE) {
const next = { ...prev }
delete next[type]
return next
}
return { ...prev, [type]: Number(value) }
})
}
const handleConfirm = async () => {
const normalized = rows.filter((row) => row.headerId > 0 && row.value.trim().length > 0)
if (normalized.length === 0) {
const hasResultCodeChange = Object.keys(resultCodeSelections).length > 0
if (normalized.length === 0 && !hasResultCodeChange) {
alert('일괄 수정할 항목을 입력해주세요.')
return
}
setSubmitting(true)
try {
await onConfirm(normalized)
await onConfirm({ rows: normalized, resultCodes: resultCodeSelections, target })
handleOpenChange(false)
} finally {
setSubmitting(false)
@@ -138,13 +177,45 @@ const ListBatchEditDialog = ({
</>
}
>
<div className="rounded-md border px-4 py-3 text-sm">
<p className="font-semibold mb-1">적용된 필터</p>
<p className="text-muted-foreground">
{filterSummary.length > 0 ? filterSummary : '적용된 필터가 없습니다.'}
</p>
<div className="rounded-md border p-4 space-y-4">
<p className="text-lg font-semibold">적용 대상</p>
<ApplyFilterOption value={target} onValueChange={setTarget} idPrefix="batch-edit-target" filterSummary={filterSummary} />
</div>
<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">
{resultCodeGroups.map((group) => (
<div key={group.type} className="space-y-1">
<p className="text-sm text-muted-foreground">{group.label}</p>
<Select
value={
resultCodeSelections[group.type] !== undefined
? String(resultCodeSelections[group.type])
: NO_CHANGE
}
onValueChange={(v) => handleChangeResultCode(group.type, v)}
>
<SelectTrigger className="w-full">
<SelectValue placeholder="변경 안함" />
</SelectTrigger>
<SelectContent>
<SelectItem value={NO_CHANGE}>변경 안함</SelectItem>
{resultCodes
.filter((code) => code.resultCdTy === group.type && code.resultCd !== 0)
.map((code) => (
<SelectItem key={code.resultCdUUID} value={String(code.resultCd)}>
{code.resultCdLbl}
</SelectItem>
))}
</SelectContent>
</Select>
</div>
))}
</div>
</div>
<p className="font-semibold text-sm">항목값 수정</p>
<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">
<span>헤더</span>
@@ -153,7 +224,11 @@ const ListBatchEditDialog = ({
</div>
<div className="max-h-72 overflow-auto">
{rows.map((row) => (
{rows.map((row) => {
const valueOptions = getValueOptions(row.headerId)
const isFile = isFileHeader(row.headerId)
return (
<div
key={row.id}
className="h-12 px-4 border-b last:border-b-0 grid grid-cols-[1fr_2fr_64px] items-center gap-2"
@@ -174,11 +249,27 @@ const ListBatchEditDialog = ({
</SelectContent>
</Select>
<Input
value={row.value}
onChange={(e) => handleChangeValue(row.id, e.target.value)}
placeholder="수정할 값을 입력해주세요"
/>
{isFile ? (
<p className="text-sm font-bold text-red-600">파일 삭제</p>
) : valueOptions !== undefined ? (
<KriSingleSelect
items={valueOptions}
value={row.value}
onChange={(value) => handleChangeValue(row.id, value)}
getValue={(item) => item.value}
getLabel={(item) => item.label}
placeholder="값 선택"
heightClassName="h-9"
widthClassName="w-full"
className="w-full"
/>
) : (
<Input
value={row.value}
onChange={(e) => handleChangeValue(row.id, e.target.value)}
placeholder="수정할 값을 입력해주세요"
/>
)}
<div className="flex justify-center">
<Button
@@ -192,7 +283,8 @@ const ListBatchEditDialog = ({
</Button>
</div>
</div>
))}
)
})}
</div>
</div>

View File

@@ -11,28 +11,47 @@ type ApplyFilterGroupProps = {
value: ApplyFilterOptionValue
onValueChange: (value: ApplyFilterOptionValue) => void
idPrefix: string
/** '필터 적용 대상만' 선택 시 보여줄, 사람이 읽을 수 있는 현재 필터 조건 목록 */
filterSummary?: string[]
}
const ApplyFilterOption = ({ value, onValueChange, idPrefix }: ApplyFilterGroupProps) => {
const ApplyFilterOption = ({ value, onValueChange, idPrefix, filterSummary }: ApplyFilterGroupProps) => {
return (
<RadioGroup
value={value}
onValueChange={(next) => onValueChange(next as ApplyFilterOptionValue)}
className="flex items-center gap-6 flex-wrap"
>
<div className="flex items-center gap-2">
<RadioGroupItem value="selected" id={`${idPrefix}-selected`} />
<Label className="text-base" htmlFor={`${idPrefix}-selected`}>선택 항목만</Label>
</div>
<div className="flex items-center gap-2">
<RadioGroupItem value="filtered" id={`${idPrefix}-filtered`} />
<Label className="text-base" htmlFor={`${idPrefix}-filtered`}>필터 적용 대상만</Label>
</div>
<div className="flex items-center gap-2">
<RadioGroupItem value="all" id={`${idPrefix}-all`} />
<Label className="text-base" htmlFor={`${idPrefix}-all`}>전체 대상</Label>
</div>
</RadioGroup>
<div className="space-y-3">
<RadioGroup
value={value}
onValueChange={(next) => onValueChange(next as ApplyFilterOptionValue)}
className="flex items-center gap-6 flex-wrap"
>
<div className="flex items-center gap-2 cursor-pointer">
<RadioGroupItem value="selected" id={`${idPrefix}-selected`} />
<Label className="text-base" htmlFor={`${idPrefix}-selected`}>선택 항목만</Label>
</div>
<div className="flex items-center gap-2 cursor-pointer">
<RadioGroupItem value="filtered" id={`${idPrefix}-filtered`} />
<Label className="text-base" htmlFor={`${idPrefix}-filtered`}>필터 적용 대상만</Label>
</div>
<div className="flex items-center gap-2 cursor-pointer">
<RadioGroupItem value="all" id={`${idPrefix}-all`} />
<Label className="text-base" htmlFor={`${idPrefix}-all`}>전체 대상</Label>
</div>
</RadioGroup>
{value === 'filtered' && filterSummary !== undefined && (
<div className="rounded-md border px-4 py-3 text-sm">
<p className="font-semibold mb-1">적용된 필터</p>
{filterSummary.length > 0 ? (
<ul className="text-muted-foreground list-disc pl-4 space-y-0.5">
{filterSummary.map((line, index) => (
<li key={index}>{line}</li>
))}
</ul>
) : (
<p className="text-muted-foreground">적용된 필터가 없습니다.</p>
)}
</div>
)}
</div>
)
}

View File

@@ -17,6 +17,7 @@ export type ListDownloadDialogProps = {
open?: boolean
onOpenChange?: (open: boolean) => void
mode: ListDownloadMode
filterSummary?: string[]
onDownload: (payload: ListDownloadPayload) => void | Promise<void>
}
@@ -32,6 +33,7 @@ const ListDownloadDialog = ({
open,
onOpenChange,
mode,
filterSummary,
onDownload,
}: ListDownloadDialogProps) => {
const { isDialogOpen, showDialog, hideDialog } = useDialog()
@@ -116,7 +118,7 @@ const ListDownloadDialog = ({
) : null}
<div className="rounded-md border p-4 space-y-4">
<p className="text-lg font-semibold">다운로드 범위</p>
<ApplyFilterOption value={target} onValueChange={setTarget} idPrefix="download-scope-target" />
<ApplyFilterOption value={target} onValueChange={setTarget} idPrefix="download-scope-target" filterSummary={filterSummary} />
</div>
{mode === 'contact-history' ? (
<div className="rounded-md border p-4 space-y-4">

View File

@@ -26,7 +26,7 @@ export type ListFilterDialogProps = {
onConfirm: (rows: FilterRow[]) => void | Promise<void>
}
const operatorLabel: Record<FilterOperator, string> = {
export const operatorLabel: Record<FilterOperator, string> = {
eq: '같음',
neq: '다름',
contains: '포함',
@@ -117,7 +117,9 @@ const ListFilterDialog = ({
)
const handleConfirm = async () => {
if (serializedRows.length === 0) {
// rows가 아예 없으면 "필터를 전부 지우겠다"는 의도이므로 그대로 통과시킨다.
// rows는 있는데 값을 안 채워 serializedRows가 비면, 실수로 방치된 조건일 가능성이 높아 알려준다.
if (rows.length > 0 && serializedRows.length === 0) {
alert('필터 조건을 입력해주세요.')
return
}

View File

@@ -14,6 +14,7 @@ export type ListResetDialogProps = {
dialogId?: DialogId
open?: boolean
onOpenChange?: (open: boolean) => void
filterSummary?: string[]
onConfirm: (payload: { target: ListFilterTarget; scope: ListResetScope }) => void | Promise<void>
}
@@ -21,6 +22,7 @@ const ListResetDialog = ({
dialogId = 'listResetDialog',
open,
onOpenChange,
filterSummary,
onConfirm,
}: ListResetDialogProps) => {
const { isDialogOpen, showDialog, hideDialog } = useDialog()
@@ -73,6 +75,7 @@ const ListResetDialog = ({
value={target}
onValueChange={(v) => setTarget(v)}
idPrefix="list-reset-target"
filterSummary={filterSummary}
/>
</div>

View File

@@ -213,7 +213,10 @@ const ListUploadDialog = ({
}),
[baseHeaderRows.length, compareRows, excelHeaders, hasCommonHeader],
)
const hasHeaderMismatch = headerCompareList.some(({ serverHeader, isMatched }) => !!serverHeader && !isMatched)
const hasHeaderCountMismatch =
excelHeaders.length < compareRows.length || (hasCommonHeader && excelHeaders.length > compareRows.length)
const hasHeaderMismatch =
hasHeaderCountMismatch || headerCompareList.some(({ serverHeader, isMatched }) => !!serverHeader && !isMatched)
const renderHeaderTypeCell = (
serverHeader: listHeader | undefined,
@@ -316,6 +319,11 @@ const ListUploadDialog = ({
{selectedFile && excelHeaders.length > 0 && compareRows.length > 0 && (
<div className="min-w-0 space-y-3">
<Label className="text-lg font-semibold">헤더 비교</Label>
{hasHeaderCountMismatch && (
<p className="text-sm text-red-600">
업로드 파일의 헤더 개수({excelHeaders.length}개)가 리스트 헤더 개수({compareRows.length}개)와 일치하지 않습니다.
</p>
)}
<div className="block w-full max-w-full overflow-x-scroll rounded-md border pb-1">
<div className="w-max whitespace-nowrap">
{headerCompareList.map(({ header, index, isMatched, isSettingRequired, serverHeader }) => {

View File

@@ -72,9 +72,14 @@ const MessageHistoryDialog = ({
const visibleRows = useMemo(() => {
if (tab === 'email') return emailListQuery.data ?? []
return [...(smsListQuery.data ?? []), ...(lmsListQuery.data ?? [])].sort((a, b) =>
(b.regDt ?? '').localeCompare(a.regDt ?? ''),
)
// 문자 길이에 따라 SMS로 발송된 건도 자동으로 LMS/MMS로 전환될 수 있는데, 이 경우 두 목록 API가
// 같은 bulkSendKey를 각각 반환해 합치면 행이 중복된다. bulkSendKey 기준으로 한 번만 남긴다.
const merged = new Map<string, BulkSendInfo>()
for (const row of [...(smsListQuery.data ?? []), ...(lmsListQuery.data ?? [])]) {
merged.set(row.bulkSendKey, row)
}
return Array.from(merged.values()).sort((a, b) => (b.regDt ?? '').localeCompare(a.regDt ?? ''))
}, [tab, emailListQuery.data, smsListQuery.data, lmsListQuery.data])
const detailQuery = useBulkSendDetailQuery(

View File

@@ -3,23 +3,19 @@
import { useEffect, useMemo, useRef, useState } from 'react'
import { KriDialog } from '@/components/common/KriDialog'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
import { Label } from '@/components/ui/label'
import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
import { KriDateTimePicker } from '@/components/common/KriDateTimePicker'
import { KriSingleSelect } from '@/components/common/KriAutoComplete'
import { useDialog } from '@/hooks/useDialog'
import { useAuth } from '@/hooks/useAuth'
import { useSelectedProject } from '@/hooks/useSelectedProject'
import { useListSearchQuery } from '@/query/list'
import {
useCreateBulkSendKeyMutation,
useMainTemplateIdxQuery,
useSendBulkMutation,
useSendBulkMessageMutation,
useTemplateListQuery,
useTemplateQuery,
} from '@/query/message'
import {ChannelType, type DestInfo, TemplateSms, type TemplateSummary} from '@kri/common/noti-hub'
import { ChannelType, TemplateSms, type TemplateSummary } from '@kri/common/noti-hub'
import { sanitizeHtmlForPreview } from '@/components/kri-editor/utils/sanitizeHtml'
import { cn } from '@/lib/utils'
import { getNearestFutureDateTime } from '@/lib/datetime'
@@ -28,18 +24,10 @@ import { createEmptyListFilter, type ListFilter, type ListFilterTarget, type lis
import { ListHeaderConst } from '@/const/listConst'
import type { ListTableRow } from '@/components/table-column/ListTableColumn'
import ApplyFilterOption from './ListDialogOption/ApplyFilterOption'
import {KriEditor} from "@/components/kri-editor";
import {clientEnv} from "@/lib/env.client";
import { KriEditor } from '@/components/kri-editor'
export type MessageSendMode = 'email' | 'sms'
const MAX_TARGET_COUNT = 5000
const toTargetRow = (row: ListTableRow): { sid: string; itemList: Record<number, string> } => ({
sid: String(row.sid ?? ''),
itemList: (row.itemList as Record<number, string> | undefined) ?? {},
})
export type MessageSendDialogProps = {
dialogId?: DialogId
open?: boolean
@@ -48,6 +36,7 @@ export type MessageSendDialogProps = {
listHeaders: listHeader[]
currentFilter: ListFilter
selectedRows: ListTableRow[]
filterSummary?: string[]
onSent?: () => void
}
@@ -64,18 +53,15 @@ const MessageSendDialog = ({
listHeaders,
currentFilter,
selectedRows,
filterSummary,
onSent,
}: MessageSendDialogProps) => {
const { isDialogOpen, showDialog, hideDialog } = useDialog()
const { auth } = useAuth()
const { selectedProject } = useSelectedProject()
const chnnlTy = mode === 'email' ? ChannelType.EMAIL : ChannelType.SMS
const [templateIdx, setTemplateIdx] = useState<number | null>(null)
const [senderEmail, setSenderEmail] = useState('')
const [senderName, setSenderName] = useState('')
const [senderNumber, setSenderNumber] = useState('')
const [scheduleType, setScheduleType] = useState<'instant' | 'reserve'>('instant')
const [reserveAt, setReserveAt] = useState('')
const [targetHeaderId, setTargetHeaderId] = useState<number | null>(null)
@@ -85,7 +71,6 @@ const MessageSendDialog = ({
const resolvedOpen = open ?? isDialogOpen(dialogId)
const prjctIdx = selectedProject?.prjctIdx ?? 0
const prjctCd = selectedProject?.prjctCd ?? ''
const itrntPrjctCd = selectedProject?.itrntPrjctCd ?? ''
const enabled = resolvedOpen && !!selectedProject && prjctIdx > 0
@@ -96,43 +81,23 @@ const MessageSendDialog = ({
const mainTemplateQuery = useMainTemplateIdxQuery(prjctIdx, chnnlTy, enabled)
const mainTemplateIdx = mainTemplateQuery.data ?? null
const templateSenderName = selectedTemplate?.sendNm
const templateSenderEmail = selectedTemplate && 'sendEml' in selectedTemplate ? selectedTemplate.sendEml : undefined
const templateSenderTel = selectedTemplate && 'sendTel' in selectedTemplate ? selectedTemplate.sendTel : undefined
const headerType = mode === 'email' ? ListHeaderConst.EMAIL : ListHeaderConst.TEL_NUM
const targetHeaderOptions = useMemo(
() => listHeaders.filter((header) => header.listHderTy === headerType),
[listHeaders, headerType],
)
// '전체'/'필터 적용 대상'은 현재 페이지에 보이는 행을 넘어설 수 있어 별도로 넓게 조회한다
const bulkTargetFilter = target === 'all' ? createEmptyListFilter() : currentFilter
const bulkTargetEnabled = enabled && target !== 'selected'
const bulkTargetQuery = useListSearchQuery(
prjctIdx,
{
listFilter: bulkTargetFilter,
pageRequest: { pageIndex: 0, pageSize: MAX_TARGET_COUNT, sortBy: 'sid', sortDir: 'asc' },
},
bulkTargetEnabled,
)
const targetRows = useMemo(() => {
const rows = target === 'selected' ? selectedRows : (bulkTargetQuery.data?.content ?? [])
return rows.map(toTargetRow)
}, [target, selectedRows, bulkTargetQuery.data])
const targetTotalCount = target === 'selected' ? selectedRows.length : (bulkTargetQuery.data?.totalElements ?? 0)
const isTargetTruncated = target !== 'selected' && targetTotalCount > MAX_TARGET_COUNT
const createBulkKeyMutation = useCreateBulkSendKeyMutation(mode)
const sendBulkMutation = useSendBulkMutation(mode)
const sendBulkMessageMutation = useSendBulkMessageMutation(mode, prjctIdx)
const mainTemplateAppliedRef = useRef(false)
useEffect(() => {
if (!resolvedOpen) return
setTemplateIdx(null)
setSenderEmail('')
setSenderName('')
setSenderNumber('')
setScheduleType('instant')
setReserveAt('')
setTarget('selected')
@@ -147,14 +112,6 @@ const MessageSendDialog = ({
if (mainTemplateIdx) setTemplateIdx(mainTemplateIdx)
}, [enabled, mainTemplateQuery.isSuccess, mainTemplateIdx])
// 템플릿 상세가 도착하면 발신 정보를 세팅한다 (발송 전 수정 가능)
useEffect(() => {
if (!selectedTemplate) return
setSenderName(selectedTemplate.sendNm)
if ('sendEml' in selectedTemplate) setSenderEmail(selectedTemplate.sendEml)
if ('sendTel' in selectedTemplate) setSenderNumber(selectedTemplate.sendTel)
}, [selectedTemplate])
useEffect(() => {
if (targetHeaderId !== null) return
const first = targetHeaderOptions[0]
@@ -182,26 +139,15 @@ const MessageSendDialog = ({
setTemplateIdx(Number.isFinite(idx) && idx > 0 ? idx : null)
}
const buildMsgParam = (itemList: Record<number, string>): Record<string, string> => {
const param: Record<string, string> = {}
listHeaders.forEach((header) => {
const value = itemList[header.listHderId]
if (value !== undefined) param[header.listHderNm] = value
})
return param
}
const buildDestInfoList = (): DestInfo[] => {
if (!targetHeaderId) return []
return targetRows.map(({ sid, itemList }) => {
const destValue = itemList[targetHeaderId] ?? ''
const buildListFilter = (): ListFilter => {
if (target === 'all') return createEmptyListFilter()
if (target === 'selected') {
return {
sid,
destEml: mode === 'email' ? destValue : undefined,
destTel: mode === 'sms' ? destValue : undefined,
msgParam: buildMsgParam(itemList),
...createEmptyListFilter(),
sidSet: selectedRows.map((row) => String(row.sid ?? '')).filter((sid) => sid.length > 0),
}
})
}
return currentFilter
}
const handleConfirm = async () => {
@@ -213,50 +159,39 @@ const MessageSendDialog = ({
alert(`수신 ${mode === 'email' ? '이메일' : '번호'} 헤더를 선택해 주세요.`)
return
}
if (mode === 'email' && !senderEmail.trim()) {
alert('발송자 메일을 입력해 주세요.')
if (mode === 'email' && !templateSenderEmail) {
alert('선택한 템플릿에 발송자 메일이 등록되어 있지 않습니다. 템플릿 설정을 확인해 주세요.')
return
}
if (mode === 'sms' && !senderNumber.trim()) {
alert('발송 번호를 입력해 주세요.')
if (mode === 'sms' && !templateSenderTel) {
alert('선택한 템플릿에 발송 번호가 등록되어 있지 않습니다. 템플릿 설정을 확인해 주세요.')
return
}
if (scheduleType === 'reserve' && !reserveAt) {
alert('예약 발송 일시를 선택해 주세요.')
return
}
if (isTargetTruncated) {
alert(`수신 대상이 ${MAX_TARGET_COUNT}건을 초과합니다. 대상 범위를 좁혀 주세요.`)
return
}
const destInfoList = buildDestInfoList()
if (destInfoList.length === 0) {
const listFilter = buildListFilter()
if (target === 'selected' && listFilter.sidSet.length === 0) {
alert('수신 대상이 없습니다.')
return
}
setSubmitting(true)
try {
const bulkSendKey = await createBulkKeyMutation.mutateAsync({
reqstCmpn: auth.user?.userCmpn ?? '',
reqstUser: auth.user?.userId ?? '',
reqstSvc: clientEnv.REQUEST_SVC,
prjctCd,
const res = await sendBulkMessageMutation.mutateAsync({
tmplatIdx: templateIdx,
resve: scheduleType === 'reserve',
sendDt: scheduleType === 'reserve' ? new Date(reserveAt).toISOString() : undefined,
trgtCnt: destInfoList.length,
listFilter,
destHeaderIds: [targetHeaderId],
})
await sendBulkMutation.mutateAsync({
sendEml: mode === 'email' ? senderEmail : undefined,
sendTel: mode === 'sms' ? senderNumber : undefined,
sendNm: senderName || undefined,
bulkSendKey,
destInfoList,
})
alert('발송 요청이 완료되었습니다.')
if (res.failCount > 0) {
alert(`대상 ${res.targetCount}건 중 ${res.acceptCount}건 접수, ${res.failCount}건 실패했습니다.`)
} else {
alert(`대상 ${res.targetCount}건 발송 요청이 완료되었습니다.`)
}
onSent?.()
handleOpenChange(false)
} catch (e) {
@@ -304,17 +239,23 @@ const MessageSendDialog = ({
<div className="grid grid-cols-1 sm:grid-cols-2 gap-2">
<div className="space-y-2">
<Label className="text-base">발송자 메일</Label>
<Input value={senderEmail} onChange={(e) => setSenderEmail(e.target.value)} />
<p className="text-sm rounded-md border px-3 py-2 h-9 flex items-center bg-muted/30">
{templateSenderEmail || '-'}
</p>
</div>
<div className="space-y-2">
<Label className="text-base">발송자 이름</Label>
<Input value={senderName} onChange={(e) => setSenderName(e.target.value)} />
<p className="text-sm rounded-md border px-3 py-2 h-9 flex items-center bg-muted/30">
{templateSenderName || '-'}
</p>
</div>
</div>
) : (
<div className="space-y-2">
<Label className="text-base">발송 번호</Label>
<Input value={senderNumber} onChange={(e) => setSenderNumber(e.target.value)} />
<p className="text-sm rounded-md border px-3 py-2 h-9 flex items-center bg-muted/30">
{templateSenderTel || '-'}
</p>
</div>
)}
@@ -360,11 +301,7 @@ const MessageSendDialog = ({
<div className="space-y-2 rounded-md border p-4">
<Label className="text-base">수신 대상</Label>
<ApplyFilterOption value={target} onValueChange={setTarget} idPrefix="message-send-target" />
<p className="text-sm text-muted-foreground">
대상 {targetTotalCount.toLocaleString()}건
{isTargetTruncated ? ` (최대 ${MAX_TARGET_COUNT.toLocaleString()}건까지만 발송 가능합니다)` : ''}
</p>
<ApplyFilterOption value={target} onValueChange={setTarget} idPrefix="message-send-target" filterSummary={filterSummary} />
</div>
</div>

View File

@@ -1,6 +1,6 @@
'use client'
import { useState, useEffect } from 'react'
import { useEffect, useMemo, useState } from 'react'
import { KriDialog } from '@/components/common/KriDialog'
import { Button } from '@/components/ui/button'
import { Input } from '@/components/ui/input'
@@ -15,6 +15,13 @@ import {apiError} from "@kri/common/http";
import {CONTACT_INTERVIEWER_ROLE, FW_TEAM, USER_NAME_REGEX} from "@/const/userConst";
import {NONE_HTTP_ERROR, UNKNOWN_HTTP_ERROR} from "@kri/common/http";
import type { CmpnInfo } from "@/types/cmpn";
import { isExternalManager, isFieldWorkUser } from "@/utils/userRole";
// 외주사(EXTERNAL_USER_ROLE_GROUP)와 콜센터/컨택원/면접원(FW_USER_ROLE_GROUP)은 배정 체계가 완전히 달라
// 서로 넘나드는 권한 수정을 지원하지 않는다. 하나 새로 만들어서 넘기는 게 맞다.
const isCrossExternalFwRoleChange = (fromRole: number, toRole: number) =>
(isExternalManager(fromRole) && isFieldWorkUser(toRole)) ||
(isFieldWorkUser(fromRole) && isExternalManager(toRole))
export type UserUpsertDialogProps = {
/** Jotai로 관리할 다이얼로그 ID */
@@ -94,6 +101,13 @@ const UserUpsertDialog = ({
}
}, [initialData, mode, resolvedOpen])
// 수정 모드에서는 최초 권한 기준으로 외주사 ↔ 콜센터/컨택원/면접원 간 이동이 되는 선택지를 아예 뺀다.
const availableRoleArray = useMemo(() => {
if (mode === 'create' || initialData?.userRole == null) return userRoleArray
const initialRole = initialData.userRole
return userRoleArray.filter((item) => !isCrossExternalFwRoleChange(initialRole, Number(item.value)))
}, [mode, initialData?.userRole, userRoleArray])
const handleInputChange = <K extends keyof UserInfoSaveRequest>(field: K, value: UserInfoSaveRequest[K]) => {
setFormData(prev => ({
...prev,
@@ -250,7 +264,7 @@ const UserUpsertDialog = ({
<div className="grid gap-2">
<Label>계정 권한</Label>
<KriSelect
items={userRoleArray}
items={availableRoleArray}
value={String(formData.userRole)}
getLabel={(item) => item.label}
getValue={(item) => String(item.value)}