diff --git a/package-lock.json b/package-lock.json index 1390186..460537a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "@dnd-kit/core": "^6.3.1", "@dnd-kit/sortable": "^10.0.0", "@dnd-kit/utilities": "^3.2.2", - "@kri/common": "^0.18.0", + "@kri/common": "^0.19.0", "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-dropdown-menu": "^2.1.16", @@ -1116,9 +1116,9 @@ } }, "node_modules/@kri/common": { - "version": "0.18.0", - "resolved": "https://gitea.kric.com/api/packages/KRi/npm/%40kri%2Fcommon/-/0.18.0/common-0.18.0.tgz", - "integrity": "sha512-vd4oDG11GD9ZQmMrx/lDuGiM4CaXb0VVDoNy9zcbplhEbyl8F8eokML9UK9BOhScacF3jiamEEUkVOaqRHLgig==", + "version": "0.19.0", + "resolved": "https://gitea.kric.com/api/packages/KRi/npm/%40kri%2Fcommon/-/0.19.0/common-0.19.0.tgz", + "integrity": "sha512-PIYoqxm+Cvfp+92oQ4GAwrCzg6BpPPg7vu6PxsTzuAk00M8V1m6uMK/plJijoNiik20sDy5RS/0/s6o4SRMOUw==", "license": "UNLICENSED", "dependencies": { "clsx": "^2.1.1", diff --git a/package.json b/package.json index 58f0c7a..5b81548 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "@dnd-kit/core": "^6.3.1", "@dnd-kit/sortable": "^10.0.0", "@dnd-kit/utilities": "^3.2.2", - "@kri/common": "^0.18.0", + "@kri/common": "^0.19.0", "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-dropdown-menu": "^2.1.16", diff --git a/src/app/(pages)/(main)/message/template/email/page.tsx b/src/app/(pages)/(main)/message/template/email/page.tsx index 8c083d2..51e85d1 100644 --- a/src/app/(pages)/(main)/message/template/email/page.tsx +++ b/src/app/(pages)/(main)/message/template/email/page.tsx @@ -1,4 +1,4 @@ -import { MessageType, type TemplateEmail } from "@kri/common/noti-hub"; +import { MessageType, TemplatePurpose, type TemplateEmail } from "@kri/common/noti-hub"; import MessageTemplate from "@/components/message-template/MessageTemplate"; import type { TemplateWithPurpose } from "@/types/message"; @@ -8,7 +8,7 @@ const EmailTemplatePage = () => { tmplatIdx: undefined, itrntPrjctCd: '', tmplatTy: MessageType.EMAIL, - tmplatPurpose: 0, + tmplatPurpose: TemplatePurpose.NORMAL, tmplatNm: '', tmplatTitle: '', tmplatBody: '', diff --git a/src/app/(pages)/(main)/message/template/kko/page.tsx b/src/app/(pages)/(main)/message/template/kko/page.tsx new file mode 100644 index 0000000..6c97c79 --- /dev/null +++ b/src/app/(pages)/(main)/message/template/kko/page.tsx @@ -0,0 +1,13 @@ +'use client' + +import KkoMessageTemplate from "@/components/message-template/KkoMessageTemplate"; + +const KkoTemplatePage = () => { + return ( +
+ +
+ ) +} + +export default KkoTemplatePage; diff --git a/src/app/(pages)/(main)/message/template/sms/page.tsx b/src/app/(pages)/(main)/message/template/sms/page.tsx index 6927e1a..f1cc8d9 100644 --- a/src/app/(pages)/(main)/message/template/sms/page.tsx +++ b/src/app/(pages)/(main)/message/template/sms/page.tsx @@ -1,6 +1,6 @@ 'use client' -import { MessageType, type TemplateSms } from "@kri/common/noti-hub"; +import { MessageType, TemplatePurpose, type TemplateSms } from "@kri/common/noti-hub"; import MessageTemplate from "@/components/message-template/MessageTemplate"; import type { TemplateWithPurpose } from "@/types/message"; @@ -10,7 +10,7 @@ const SmsTemplatePage = () => { tmplatIdx: undefined, itrntPrjctCd: '', tmplatTy: MessageType.SMS, - tmplatPurpose: 0, + tmplatPurpose: TemplatePurpose.NORMAL, tmplatNm: '', tmplatTitle: undefined, tmplatBody: '', diff --git a/src/app/(pages)/(main)/page.tsx b/src/app/(pages)/(main)/page.tsx index 6eb6564..8818fe8 100644 --- a/src/app/(pages)/(main)/page.tsx +++ b/src/app/(pages)/(main)/page.tsx @@ -23,6 +23,7 @@ import { useMounted } from "@kri/common/hooks"; import { LoadingOverlayAdapter } from "@/components/app-shell/LoadingOverlayAdapter"; import {useItrntUserList} from "@/hooks/useItrntUserList"; import {useRouter} from "next/navigation"; +import type {Route} from "next"; import {useCreateProjectMutation, useProjectListQuery, useProjectOwnerListQuery} from "@/query/project"; import {useGroupCodeListQuery} from "@/query/intranet"; import {PROJECT_STATUS_LABEL} from "@/const/projectConst"; @@ -123,7 +124,7 @@ const MainPage = () => { showDialog('projectCreateDialog'); } - const navigateWithProject = (projectInfo: ProjectInfo, path: string) => { + const navigateWithProject = (projectInfo: ProjectInfo, path: Route) => { setSelectedProject({ prjctIdx: projectInfo.prjctIdx, prjctCd: projectInfo.prjctCd, diff --git a/src/app/(pages)/(main)/progress/message/page.tsx b/src/app/(pages)/(main)/progress/message/page.tsx index 4fb395b..c3eb39b 100644 --- a/src/app/(pages)/(main)/progress/message/page.tsx +++ b/src/app/(pages)/(main)/progress/message/page.tsx @@ -11,12 +11,13 @@ import { clientEnv } from "@/lib/env.client"; import { MessageType } from "@kri/common/noti-hub"; import type { SendResultSummaryResponse } from "@kri/common/noti-hub"; -const SEND_TYPE_ORDER = [MessageType.SMS, MessageType.LMS_MMS, MessageType.EMAIL] as const; +const SEND_TYPE_ORDER = [MessageType.SMS, MessageType.LMS_MMS, MessageType.EMAIL, MessageType.KKO] as const; const SEND_TYPE_LABEL: Record = { [MessageType.SMS]: "단문", [MessageType.LMS_MMS]: "장문", [MessageType.EMAIL]: "메일", + [MessageType.KKO]: "알림톡", }; type SummaryRow = { diff --git a/src/app/api/message-report/[[...slug]]/route.ts b/src/app/api/message-report/[[...slug]]/route.ts index b9bde87..9965ecf 100644 --- a/src/app/api/message-report/[[...slug]]/route.ts +++ b/src/app/api/message-report/[[...slug]]/route.ts @@ -3,8 +3,7 @@ import {RouteContext} from "@/types/common"; import {createContactApi} from "@/lib/http-server"; import {errorToResponse} from "@kri/common/http"; import type {FileResponse, PageRequest, PageResponse} from "@kri/common"; -import type {BulkSendInfo, SendResultSummaryRequest, SendResultSummaryResponse} from "@kri/common/noti-hub"; -import type {SendResultInfo} from "@/types/message"; +import type {BulkSendInfo, SendResultInfo, SendResultSummaryRequest, SendResultSummaryResponse} from "@kri/common/noti-hub"; export const GET = async (req: NextRequest, context: RouteContext) => { try { diff --git a/src/app/api/message-send/[[...slug]]/route.ts b/src/app/api/message-send/[[...slug]]/route.ts index 23501c3..44b3380 100644 --- a/src/app/api/message-send/[[...slug]]/route.ts +++ b/src/app/api/message-send/[[...slug]]/route.ts @@ -2,9 +2,11 @@ import {NextRequest, NextResponse} from "next/server"; import {RouteContext} from "@/types/common"; import {createContactApi} from "@/lib/http-server"; import {errorToResponse} from "@kri/common/http"; -import type {MessageBulkSendResponse, SendSingleResponse} from "@/types/message"; +import type {BulkSendResult} from "@kri/common/noti-hub"; +import type {MessageSendChannel, SendSingleResponse} from "@/types/message"; -const isChannel = (value: string): value is "sms" | "email" => value === "sms" || value === "email"; +const isChannel = (value: string): value is MessageSendChannel => + value === "sms" || value === "email" || value === "kko"; export const POST = async (req: NextRequest, context: RouteContext) => { try { @@ -27,7 +29,7 @@ export const POST = async (req: NextRequest, context: RouteContext) => { } if (action === "bulk") { - const result = await contactApi.post(`/message-send/${channel}/bulk/${prjctIdx}`, body); + const result = await contactApi.post(`/message-send/${channel}/bulk/${prjctIdx}`, body); return NextResponse.json(result, {status: 200}); } diff --git a/src/app/api/message-template/[[...slug]]/route.ts b/src/app/api/message-template/[[...slug]]/route.ts index 2fa1680..171c005 100644 --- a/src/app/api/message-template/[[...slug]]/route.ts +++ b/src/app/api/message-template/[[...slug]]/route.ts @@ -2,7 +2,31 @@ import {RouteContext} from "@/types/common"; import {createContactApi} from "@/lib/http-server"; import {errorToResponse} from "@kri/common/http"; -import type { Template, TemplateSummary } from "@kri/common/noti-hub"; +import type { KkoTemplateDetail, KkoTemplateListResponse, Template, TemplateSummary } from "@kri/common/noti-hub"; + +// 외부 알림톡 템플릿 목록·상세 조회. JSON 본문을 contact-back에 그대로 전달한다. +export const POST = async (req: NextRequest, context: RouteContext) => { + try{ + const {slug = []} = await context.params; + const [channel, action] = slug; + if (channel !== "kko" || slug.length !== 2 || (action !== "list" && action !== "detail")) { + return NextResponse.json({ message: "Not found" }, { status: 404 }); + } + + const body = await req.json().catch(() => null); + if (!body || typeof body !== "object") { + return NextResponse.json({ message: "요청 바디가 없습니다." }, { status: 400 }); + } + + const contactApi = await createContactApi(); + const result = action === "list" + ? await contactApi.post(`/message-template/kko/list`, body) + : await contactApi.post(`/message-template/kko/detail`, body); + return NextResponse.json(result, { status: 200 }); + } catch (error: unknown) { + return errorToResponse(error); + } +} export const GET = async (req: NextRequest, context: RouteContext) => { try{ diff --git a/src/components/app-shell/AppMainLayout.tsx b/src/components/app-shell/AppMainLayout.tsx index a0b519c..820e86c 100644 --- a/src/components/app-shell/AppMainLayout.tsx +++ b/src/components/app-shell/AppMainLayout.tsx @@ -2,6 +2,7 @@ import { ReactNode, useEffect, useMemo, useState } from "react"; import { usePathname, useRouter } from "next/navigation"; +import type { Route } from "next"; import { useMounted } from "@kri/common/hooks"; import { getCurrentPositionMeta } from "@kri/common/browser"; import { KriMainLayout } from "@/components/layout/KriMainLayout"; @@ -141,7 +142,8 @@ export default function AppMainLayout({ children, initialFontSize }: AppMainLayo }); const movePage = (path: string) => { - router.push(path); + // 메뉴 설정(menu.data.ts)의 경로라 typedRoutes가 정적으로 검사할 수 없다. + router.push(path as Route); }; const decreaseFontSize = () => { diff --git a/src/components/dialog/MessageHistoryDialog.tsx b/src/components/dialog/MessageHistoryDialog.tsx index 86ee1ab..8d18c21 100644 --- a/src/components/dialog/MessageHistoryDialog.tsx +++ b/src/components/dialog/MessageHistoryDialog.tsx @@ -13,12 +13,11 @@ import { downloadBase64File, XLSX_MIME_TYPE } from '@kri/common/browser' import { formatKst } from '@kri/common' import type { PaginationState } from '@tanstack/react-table' import type { DialogId } from '@/store/jotai/dialog' -import type { BulkSendInfo } from '@kri/common/noti-hub' -import type { SendResultInfo } from '@/types/message' +import type { BulkSendInfo, SendResultInfo } from '@kri/common/noti-hub' import {clientEnv} from "@/lib/env.client"; import { formatKoreanPhoneNumber } from "@/utils/phone"; -export type MessageHistoryType = 'sms' | 'email' +export type MessageHistoryType = 'sms' | 'email' | 'kko' export type MessageHistoryDialogProps = { dialogId?: DialogId @@ -29,6 +28,7 @@ export type MessageHistoryDialogProps = { const tabLabelMap: Record = { sms: '문자', email: '이메일', + kko: '알림톡', } const historyColumns: DataTableColumn[] = [ @@ -70,9 +70,11 @@ const MessageHistoryDialog = ({ const emailListQuery = useBulkSendListQuery(MessageType.EMAIL, clientEnv.REQUEST_SVC, prjctCd, enabled && tab === 'email') const smsListQuery = useBulkSendListQuery(MessageType.SMS, clientEnv.REQUEST_SVC, prjctCd, enabled && tab === 'sms') const lmsListQuery = useBulkSendListQuery(MessageType.LMS_MMS, clientEnv.REQUEST_SVC, prjctCd, enabled && tab === 'sms') + const kkoListQuery = useBulkSendListQuery(MessageType.KKO, clientEnv.REQUEST_SVC, prjctCd, enabled && tab === 'kko') const visibleRows = useMemo(() => { if (tab === 'email') return emailListQuery.data ?? [] + if (tab === 'kko') return kkoListQuery.data ?? [] // 문자 길이에 따라 SMS로 발송된 건도 자동으로 LMS/MMS로 전환될 수 있는데, 이 경우 두 목록 API가 // 같은 bulkSendKey를 각각 반환해 합치면 행이 중복된다. bulkSendKey 기준으로 한 번만 남긴다. @@ -81,7 +83,7 @@ const MessageHistoryDialog = ({ 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]) + }, [tab, emailListQuery.data, smsListQuery.data, lmsListQuery.data, kkoListQuery.data]) const detailQuery = useBulkSendDetailQuery( selectedKey ?? '', @@ -141,6 +143,9 @@ const MessageHistoryDialog = ({ +
diff --git a/src/components/dialog/MessageSendDialog.tsx b/src/components/dialog/MessageSendDialog.tsx index bcbaa98..9617e9d 100644 --- a/src/components/dialog/MessageSendDialog.tsx +++ b/src/components/dialog/MessageSendDialog.tsx @@ -15,18 +15,17 @@ import { useTemplateListQuery, useTemplateQuery, } from '@/query/message' -import { ChannelType } from '@kri/common/noti-hub' -import { getNearestFutureDateTime } from '@/lib/datetime' +import { getNearestFutureDateTime, toReserveSendDt } from '@/lib/datetime' import type { DialogId } from '@/store/jotai/dialog' import { createEmptyListFilter, type ListFilter, type ListFilterTarget, type listHeader } from '@/types/list' import { ListHeaderConst } from '@/const/listConst' import type { ListTableRow } from '@/components/table-column/ListTableColumn' import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption' import MessageSendPreview from '@/components/message-template/MessageSendPreview' -import type { TemplateSummaryWithPurpose } from '@/types/message' -import { TEMPLATE_PURPOSE } from '@/const/messageTemplateConst' +import type { MessageSendChannel, TemplateSummaryWithPurpose } from '@/types/message' +import { MESSAGE_CHANNEL_TYPE, TEMPLATE_PURPOSE } from '@/const/messageTemplateConst' -export type MessageSendMode = 'email' | 'sms' +export type MessageSendMode = MessageSendChannel export type MessageSendDialogProps = { dialogId?: DialogId @@ -43,6 +42,7 @@ export type MessageSendDialogProps = { const titleMap: Record = { email: '메일 발송', sms: '문자 발송', + kko: '알림톡 발송', } const MessageSendDialog = ({ @@ -59,7 +59,7 @@ const MessageSendDialog = ({ const { isDialogOpen, showDialog, hideDialog } = useDialog() const { selectedProject } = useSelectedProject() - const chnnlTy = mode === 'email' ? ChannelType.EMAIL : ChannelType.SMS + const chnnlTy = MESSAGE_CHANNEL_TYPE[mode] const [templateIdx, setTemplateIdx] = useState(null) const [scheduleType, setScheduleType] = useState<'instant' | 'reserve'>('instant') @@ -171,7 +171,7 @@ const MessageSendDialog = ({ alert('선택한 템플릿에 발송자 메일이 등록되어 있지 않습니다. 템플릿 설정을 확인해 주세요.') return } - if (mode === 'sms' && !templateSenderTel) { + if (mode !== 'email' && !templateSenderTel) { alert('선택한 템플릿에 발송 번호가 등록되어 있지 않습니다. 템플릿 설정을 확인해 주세요.') return } @@ -190,7 +190,7 @@ const MessageSendDialog = ({ const res = await sendBulkMessageMutation.mutateAsync({ tmplatIdx: templateIdx, resve: scheduleType === 'reserve', - sendDt: scheduleType === 'reserve' ? new Date(reserveAt).toISOString() : undefined, + sendDt: scheduleType === 'reserve' ? toReserveSendDt(reserveAt) : undefined, listFilter, destHeaderIds: [targetHeaderId], }) diff --git a/src/components/dialog/SingleMessageSendDialog.tsx b/src/components/dialog/SingleMessageSendDialog.tsx index 306da7f..49faf45 100644 --- a/src/components/dialog/SingleMessageSendDialog.tsx +++ b/src/components/dialog/SingleMessageSendDialog.tsx @@ -14,16 +14,17 @@ import { useTemplateListQuery, useTemplateQuery, } from '@/query/message' -import { ChannelType, type TemplateSummary } from '@kri/common/noti-hub' -import { getNearestFutureDateTime } from '@/lib/datetime' +import type { TemplateSummary } from '@kri/common/noti-hub' +import { getNearestFutureDateTime, toReserveSendDt } from '@/lib/datetime' import type { DialogId } from '@/store/jotai/dialog' import type { MessageSendChannel, PhoneVerificationSendData } from '@/types/message' import MessageSendPreview from '@/components/message-template/MessageSendPreview' -import { TEMPLATE_PURPOSE } from '@/const/messageTemplateConst' +import { TEMPLATE_PURPOSE, MESSAGE_CHANNEL_TYPE } from '@/const/messageTemplateConst' const titleMap: Record = { email: '메일 발송', sms: '문자 발송', + kko: '알림톡 발송', } export type SingleMessageSendDialogProps = { @@ -54,7 +55,7 @@ const SingleMessageSendDialog = ({ const { isDialogOpen, showDialog, hideDialog } = useDialog() const resolvedOpen = open ?? isDialogOpen(dialogId) - const chnnlTy = channel === 'email' ? ChannelType.EMAIL : ChannelType.SMS + const chnnlTy = MESSAGE_CHANNEL_TYPE[channel] const [templateIdx, setTemplateIdx] = useState(null) const [scheduleType, setScheduleType] = useState<'instant' | 'reserve'>('instant') @@ -132,7 +133,7 @@ const SingleMessageSendDialog = ({ const res = await sendSingleMutation.mutateAsync({ tmplatIdx: templateIdx, resve: scheduleType === 'reserve', - sendDt: scheduleType === 'reserve' ? new Date(reserveAt).toISOString() : undefined, + sendDt: scheduleType === 'reserve' ? toReserveSendDt(reserveAt) : undefined, sid, destHeaderIds: [destHeaderId], }) diff --git a/src/components/kri-editor/KriEditor.tsx b/src/components/kri-editor/KriEditor.tsx index df47653..056434f 100644 --- a/src/components/kri-editor/KriEditor.tsx +++ b/src/components/kri-editor/KriEditor.tsx @@ -4,6 +4,7 @@ import type { KriEditorProps, KriEditorMode } from "./types"; import { KriEditorHtmlOnly } from "./KriEditorHtmlOnly"; import { KriEditorWysiwyg } from "./KriEditorWysiwyg"; import {KriEditorSms} from "./KriEditorSms"; +import { KriEditorKko } from "./KriEditorKko"; function resolveMode(mode?: KriEditorMode, editorMode?: KriEditorMode): KriEditorMode { return mode ?? editorMode ?? "wysiwyg"; @@ -20,5 +21,9 @@ export function KriEditor(props: KriEditorProps) { return } + if (mode === "kko") { + return ; + } + return ; } diff --git a/src/components/kri-editor/KriEditorKko.tsx b/src/components/kri-editor/KriEditorKko.tsx new file mode 100644 index 0000000..07706c3 --- /dev/null +++ b/src/components/kri-editor/KriEditorKko.tsx @@ -0,0 +1,59 @@ +'use client' + +import { User } from 'lucide-react' +import { cn } from '@/lib/utils' +import type { KriEditorProps } from './types' + +type KkoEditorProps = Omit & { mode: 'kko' } + +export function KriEditorKko({ + label, + value, + placeholder = '미리볼 내용이 없습니다.', + className, + kkoTitle = '', + kkoSenderName = '', + kkoHeaderLabel = '알림톡 도착', +}: KkoEditorProps) { + const body = value ?? '' + + return ( +
+ {label ?
{label}
: null} +
+
+
+ {kkoSenderName ? ( +
{kkoSenderName}
+ ) : null} +
+ {kkoSenderName ? ( +
+ + {kkoSenderName} +
+ ) : null} +
+ +
{kkoHeaderLabel}
+ {kkoTitle ?
{kkoTitle}
: null} + {body.trim() ? ( +
{body}
+ ) : ( +
{placeholder}
+ )} +
+
+
+
+
+
+ ) +} diff --git a/src/components/kri-editor/index.ts b/src/components/kri-editor/index.ts index efce1bb..99b77c9 100644 --- a/src/components/kri-editor/index.ts +++ b/src/components/kri-editor/index.ts @@ -1,5 +1,6 @@ export { KriEditor } from './KriEditor' export { KriEditorHtmlOnly } from './KriEditorHtmlOnly' +export { KriEditorKko } from './KriEditorKko' export { KriEditorSms } from './KriEditorSms' export { KriEditorWysiwyg } from './KriEditorWysiwyg' export { ToolbarButton as KriEditorToolbarButton } from './toolbar/ToolbarButton' diff --git a/src/components/kri-editor/types.ts b/src/components/kri-editor/types.ts index 02607c8..23e75eb 100644 --- a/src/components/kri-editor/types.ts +++ b/src/components/kri-editor/types.ts @@ -2,7 +2,7 @@ import type { Extensions } from '@tiptap/core' import type { Editor } from '@tiptap/react' import type { ReactNode } from 'react' -export type KriEditorMode = 'wysiwyg' | 'both' | 'html' | 'sms' +export type KriEditorMode = 'wysiwyg' | 'both' | 'html' | 'sms' | 'kko' export type KriEditorUploadResult = string | { url: string } export type KriEditorToolbarFeature = @@ -91,6 +91,12 @@ export type KriEditorProps = { smsImages?: KriEditorSmsImage[] /** 휴대폰 프레임 class (기본 높이 h-[600px] 조정 등) */ smsFrameClassName?: string + /** 알림톡 미리보기의 강조 제목. 없으면 표시하지 않는다. */ + kkoTitle?: string + /** 알림톡 미리보기의 채널명·발신 프로필 이름. 없으면 표시하지 않는다. */ + kkoSenderName?: string + /** 알림톡 말풍선 상단 문구. 기본값 "알림톡 도착" */ + kkoHeaderLabel?: string toolbar?: KriEditorToolbarConfig | false fontFamilyOptions?: KriEditorFontFamilyOption[] renderToolbarEnd?: (context: KriEditorToolbarContext) => ReactNode diff --git a/src/components/list-contact/ListContactEventPanel.tsx b/src/components/list-contact/ListContactEventPanel.tsx index c6c17b0..7699919 100644 --- a/src/components/list-contact/ListContactEventPanel.tsx +++ b/src/components/list-contact/ListContactEventPanel.tsx @@ -11,7 +11,7 @@ import { useSendResultBySidQuery } from '@/query/message' import { useInternalInfoQuery } from '@/query/internal' import { clientEnv } from '@/lib/env.client' import { ChannelType } from '@kri/common/noti-hub' -import type { SendResultInfo } from '@/types/message' +import type { SendResultInfo } from '@kri/common/noti-hub' import { formatKst } from '@kri/common' import { type ResultCode, ResultCodeType } from '@/types/project' import { CONTACT_INTERVIEWER_ROLE, FIELD_INTERVIEWER_ROLE } from '@/const/userConst' @@ -272,13 +272,14 @@ const SendResultTable = ({ isLoading, results }: { isLoading: boolean; results: } const SendResultHistory = ({ sid, prjctCd }: { sid: string; prjctCd: string }) => { - const [tab, setTab] = useState<'email' | 'sms'>('email') + const [tab, setTab] = useState<'email' | 'sms' | 'kko'>('email') const emailQuery = useSendResultBySidQuery(sid, prjctCd, clientEnv.REQUEST_SVC, ChannelType.EMAIL, tab === 'email') const smsQuery = useSendResultBySidQuery(sid, prjctCd, clientEnv.REQUEST_SVC, ChannelType.SMS, tab === 'sms') - const activeQuery = tab === 'email' ? emailQuery : smsQuery + const kkoQuery = useSendResultBySidQuery(sid, prjctCd, clientEnv.REQUEST_SVC, ChannelType.KKO, tab === 'kko') + const activeQuery = tab === 'email' ? emailQuery : tab === 'sms' ? smsQuery : kkoQuery - const handleTabClick = (e: React.MouseEvent, next: 'email' | 'sms') => { + const handleTabClick = (e: React.MouseEvent, next: 'email' | 'sms' | 'kko') => { e.stopPropagation() setTab(next) } @@ -307,6 +308,14 @@ const SendResultHistory = ({ sid, prjctCd }: { sid: string; prjctCd: string }) = > 문자 + activeQuery.refetch()} isFetching={activeQuery.isFetching} />
} diff --git a/src/components/list-contact/ListContactInfoPanel.tsx b/src/components/list-contact/ListContactInfoPanel.tsx index 981b5ab..53b05a0 100644 --- a/src/components/list-contact/ListContactInfoPanel.tsx +++ b/src/components/list-contact/ListContactInfoPanel.tsx @@ -1,7 +1,7 @@ 'use client' import { useEffect, useRef, useState, type ReactNode } from 'react' -import { Mail, MessageSquare, Paperclip, Phone, QrCode } from 'lucide-react' +import { Mail, MessageCircle, MessageSquare, Paperclip, Phone, QrCode } from 'lucide-react' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Label } from '@/components/ui/label' @@ -24,6 +24,7 @@ import { useCtiCallPhase } from '@/hooks/useCtiCallPhase' import { cn } from '@/lib/utils' import { downloadFile } from '@kri/common/browser' import { + buildKkoVariableValues, buildListContactVariableValues, resolveListHeaderValue, } from '@/components/list-contact/listContactVariables' @@ -126,6 +127,8 @@ const ListContactInfoPanel = ({ const surveyResultByIdx = new Map((detail?.surveyResults ?? []).map((result) => [result.prjctSurveyIdx, result])) const surveyUrlValues = buildListContactVariableValues(listHeaders, detail, sid) + // 알림톡은 #{설문명}도 설문 URL로 치환한다. 문자·메일은 기존처럼 헤더 값만 쓴다. + const kkoVariableValues = buildKkoVariableValues(surveyUrlValues, surveys) const handleStartSurvey = (survey: ProjectSurvey) => { if (!survey.surveyUrl) return @@ -240,6 +243,16 @@ const ListContactInfoPanel = ({ 발송 +
{(isDialing || isOnCall) &&

@@ -383,7 +396,7 @@ const ListContactInfoPanel = ({ itrntPrjctCd={itrntPrjctCd} sid={sid} destHeaderId={sendTarget?.headerId ?? 0} - variableValues={surveyUrlValues} + variableValues={sendTarget?.channel === 'kko' ? kkoVariableValues : surveyUrlValues} />

) diff --git a/src/components/list-contact/listContactVariables.ts b/src/components/list-contact/listContactVariables.ts index ad33843..af6a499 100644 --- a/src/components/list-contact/listContactVariables.ts +++ b/src/components/list-contact/listContactVariables.ts @@ -1,7 +1,9 @@ import { LIST_IS_USE_LABEL } from '@/components/table-column/ListTableColumn' import { ListHeaderConst } from '@/const/listConst' import type { listHeader, ListSearchWithFullResult } from '@/types/list' +import type { ProjectSurvey } from '@/types/project' import { isAssignHeaderType } from '@/utils/listAccess' +import { substituteVariables } from '@/lib/variableSubstitution' export const resolveListHeaderValue = ( header: listHeader, @@ -34,3 +36,21 @@ export const buildListContactVariableValues = ( values.SID = sid return values } + +// 알림톡 변수 값: 헤더 값에 더해 설문명(#{설문명})을 대상자 값으로 채운 설문 URL로 치환한다. +// 같은 이름의 헤더가 있으면 헤더 값을 우선한다. +export const buildKkoVariableValues = ( + headerValues: Record, + surveys: ProjectSurvey[], +): Record => { + const values: Record = { ...headerValues } + + for (const survey of surveys) { + const surveyName = survey.surveyName?.trim() + const surveyUrl = survey.surveyUrl?.trim() + if (!surveyName || !surveyUrl || surveyName in values) continue + values[surveyName] = substituteVariables(surveyUrl, headerValues) + } + + return values +} diff --git a/src/components/list/ListManageActions.tsx b/src/components/list/ListManageActions.tsx index ee6ac31..189d67b 100644 --- a/src/components/list/ListManageActions.tsx +++ b/src/components/list/ListManageActions.tsx @@ -4,6 +4,7 @@ import { Download, FileClock, Mail, + MessageCircle, MessageSquareMore, RotateCcw, Upload, @@ -75,6 +76,10 @@ export function ListManageActions({ 문자 발송 + + )} + + {selectedCode && kkoDetailQuery.isFetching && !externalDetail ? ( +

상세를 불러오는 중입니다.

+ ) : ( + {}} + kkoTitle={previewTitle || undefined} + kkoSenderName={KKO_SENDER_NAME} + placeholder="미리볼 내용이 없습니다." + className="max-w-none mx-0" + /> + )} + {selectedCode && kkoDetailQuery.isError && ( +

상세를 불러오지 못했습니다. 다시 조회해 주세요.

+ )} + {unsavableWarning && ( +

⚠️ {unsavableWarning}

+ )} + + + +
+ + {draft.tmplatIdx && ( + + )} +
+ + + + ); +}; + +export default KkoMessageTemplate; diff --git a/src/components/message-template/MessageSendPreview.tsx b/src/components/message-template/MessageSendPreview.tsx index e67af94..3751bb9 100644 --- a/src/components/message-template/MessageSendPreview.tsx +++ b/src/components/message-template/MessageSendPreview.tsx @@ -1,16 +1,16 @@ 'use client' -import { ChannelType, type TemplateSms } from '@kri/common/noti-hub' +import { ChannelType } from '@kri/common/noti-hub' import { KriEditor } from '@/components/kri-editor' import { applyLinkPreviewClass } from '@/components/kri-editor/utils/linkPreview' import { sanitizeEmailHtml } from '@/components/message-template/emailHtmlPolicy' import { normalizeQrCodeForEditor, renderQrCodePreviewHtml } from '@/components/message-template/qrcode' import TemplateAttachmentList from '@/components/message-template/TemplateAttachmentList' -import { PHONE_VERIFICATION_PREVIEW_SUFFIX, TEMPLATE_PURPOSE } from '@/const/messageTemplateConst' -import { escapeHtml, substituteVariables } from '@/lib/variableSubstitution' +import { KKO_SENDER_NAME, PHONE_VERIFICATION_PREVIEW_SUFFIX, TEMPLATE_PURPOSE } from '@/const/messageTemplateConst' +import { escapeHtml, substituteKkoVariables, substituteVariables } from '@/lib/variableSubstitution' import { cn } from '@/lib/utils' import { useTemplateAttachmentImagesQuery } from '@/query/message' -import type { TemplateEmailWithAttachments, TemplateSmsWithAttachments, TemplateWithPurpose } from '@/types/message' +import { getTemplateAttachmentNames, type TemplateWithPurpose } from '@/types/message' // 다이얼로그(max-h 90vh)의 헤더·푸터·미리보기 제목을 뺀 높이에 맞추되, // 본문 입력칸 최소 높이(360px)가 잘리지 않도록 480px 아래로는 줄이지 않는다. @@ -19,19 +19,22 @@ const SMS_PREVIEW_FRAME_CLASS_NAME = 'h-[clamp(480px,calc(90vh-240px),600px)]' export type MessageSendPreviewProps = { chnnlTy: ChannelType template: TemplateWithPurpose | null - /** 지정하면 [$변수] 토큰을 값으로 치환한다(없는 값은 빈 문자열). 생략하면 토큰을 그대로 보여준다. */ + /** + * 지정하면 변수 토큰을 값으로 치환한다. 생략하면 토큰을 그대로 보여준다. + * 문자·메일은 [$변수]를 치환하고 없는 값은 빈 문자열로, 알림톡은 #{변수}·[$변수]를 치환하고 없는 값은 원문을 유지한다. + */ variableValues?: Record } /** - * 문자/메일 발송 다이얼로그 공용 미리보기. + * 문자/메일/알림톡 발송 다이얼로그 공용 미리보기. * 이메일 본문은 템플릿 관리 미리보기(KriEditor)와 같은 순서로 sanitize → 링크 스타일 → QR 예시 이미지 변환을 거친다. + * 알림톡 본문은 KriEditor(mode="kko")가 텍스트로만 렌더링한다. */ const MessageSendPreview = ({ chnnlTy, template, variableValues }: MessageSendPreviewProps) => { const isSms = chnnlTy === ChannelType.SMS - const attachmentNames = template - ? ((template as TemplateEmailWithAttachments | TemplateSmsWithAttachments).atchFl?.split('|').filter(Boolean) ?? []) - : [] + const isKko = chnnlTy === ChannelType.KKO + const attachmentNames = template ? getTemplateAttachmentNames(template) : [] const smsAttachmentImages = useTemplateAttachmentImagesQuery( template?.tmplatIdx ?? 0, isSms ? attachmentNames : [], @@ -48,6 +51,24 @@ const MessageSendPreview = ({ chnnlTy, template, variableValues }: MessageSendPr const resolvedTitle = template ? substitute(template.tmplatTitle ?? '') : '' + if (isKko) { + const substituteKko = (contents: string) => (variableValues ? substituteKkoVariables(contents, variableValues) : contents) + return ( + // min-w-0: 다이얼로그 grid 칸 너비를 넘지 않도록 한다. +
+

미리보기

+ {}} + kkoTitle={template?.tmplatTitle ? substituteKko(template.tmplatTitle) : undefined} + kkoSenderName={KKO_SENDER_NAME} + placeholder="선택된 템플릿이 없습니다." + /> +
+ ) + } + return ( // min-w-0: 다이얼로그 grid 칸 너비를 넘지 않도록 한다.
@@ -65,7 +86,7 @@ const MessageSendPreview = ({ chnnlTy, template, variableValues }: MessageSendPr
{}} isSmsReadOnly smsPreviewSuffix={ diff --git a/src/components/message-template/MessageTemplate.tsx b/src/components/message-template/MessageTemplate.tsx index 0af1f50..3cc8265 100644 --- a/src/components/message-template/MessageTemplate.tsx +++ b/src/components/message-template/MessageTemplate.tsx @@ -6,6 +6,7 @@ import { ChannelType, MessageType, SMS_TYPE_ARRAY, + TemplatePurpose, TemplateSms, } from "@kri/common/noti-hub"; import {Paperclip, X} from "lucide-react"; @@ -35,12 +36,11 @@ import {ProjectMainTemplateUpdateRequest, ProjectSurvey} from "@/types/project"; import type { DataVerification } from "@kri/common"; import {COMMON_TEXT_REGEX, EMAIL_REGEX} from "@/const/validationConst"; import {formatKoreanPhoneNumber} from "@/utils/phone"; -import type { - TemplateAttachmentImage, - TemplateEmailWithAttachments, - TemplateSmsWithAttachments, - TemplateSummaryWithPurpose, - TemplateWithPurpose, +import { + getTemplateAttachmentNames, + type SmsEmailTemplateWithPurpose, + type TemplateAttachmentImage, + type TemplateSummaryWithPurpose, } from "@/types/message"; import { useTemplateListQuery, @@ -73,7 +73,7 @@ import { interface MessageTemplateProps { pageTitle: string; - defaultTemplate: TemplateWithPurpose; + defaultTemplate: SmsEmailTemplateWithPurpose; } const MESSAGE_EDITOR_EXTENSIONS = [QrCode]; @@ -90,7 +90,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = const editorCmdRef = useRef(null); const sessionTempUrlsRef = useRef>(new Set()); - const [selectedTemplate, setSelectedTemplate] = useState(defaultTemplate); + const [selectedTemplate, setSelectedTemplate] = useState(defaultTemplate); const [selectedTemplateIdx, setSelectedTemplateIdx] = useState(null); // 이메일 첨부파일 draft (신규 첨부 / 기존 첨부 삭제 예정). 저장 성공 시, 템플릿 전환 시 초기화된다. @@ -98,7 +98,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = const [deletedAttachmentNames, setDeletedAttachmentNames] = useState([]); const attachmentInputRef = useRef(null); - const isSmsTemplate = (t: TemplateWithPurpose): t is TemplateSms & Pick => + const isSmsTemplate = (t: SmsEmailTemplateWithPurpose): t is TemplateSms & { tmplatPurpose: TemplatePurpose } => (SMS_TYPE_ARRAY as readonly MessageType[]).includes(t.tmplatTy); const isSms = isSmsTemplate(defaultTemplate); @@ -129,10 +129,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = const surveys = useMemo(() => projectInfoQuery.data?.surveys ?? [], [projectInfoQuery.data?.surveys]) // 서버에 저장된 첨부파일명 목록 (파이프(|) 구분, 이메일·문자 템플릿 공통) - const existingAttachmentNames = useMemo(() => { - const atchFl = (selectedTemplate as TemplateEmailWithAttachments | TemplateSmsWithAttachments).atchFl; - return atchFl ? atchFl.split("|").filter(Boolean) : []; - }, [selectedTemplate]); + const existingAttachmentNames = useMemo(() => getTemplateAttachmentNames(selectedTemplate), [selectedTemplate]); // 교체 대상(같은 이름의 새 파일)도 삭제 예정에 들어가 있으므로 여기서 제외된다. const keptAttachmentNames = existingAttachmentNames.filter((name) => !deletedAttachmentNames.includes(name)); @@ -195,7 +192,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = // 템플릿 상세가 도착하면 draft에 주입 useEffect(() => { const d = templateDetailQuery.data; - if (!d) return; + if (!d || d.tmplatTy === MessageType.KKO) return; if (selectedTemplateIdx && d.tmplatIdx === selectedTemplateIdx) { setSelectedTemplate(d); resetAttachmentDraft(); @@ -209,14 +206,14 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = } }, [selectedTemplate.tmplatIdx, mainTemplateIdx]); - const handleChange = >( + const handleChange = >( field: K, - value: ValueOfUnionKey + value: ValueOfUnionKey ) => { setSelectedTemplate((prev) => { const next = { ...prev } as any; next[field] = value; - return next as TemplateWithPurpose; + return next as SmsEmailTemplateWithPurpose; }); }; @@ -233,7 +230,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = }); }; - const validateTemplate = (tpl: TemplateWithPurpose): DataVerification => { + const validateTemplate = (tpl: SmsEmailTemplateWithPurpose): DataVerification => { const ok = (): DataVerification => ({ success: true, fieldName: "", errMessage: "" }); const fail = (fieldName: string, errMessage: string): DataVerification => ({ success: false, @@ -444,6 +441,8 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = deleteFileNames: method === "patch" ? deletedAttachmentNames : undefined, }); + // 이메일·문자 화면에서 저장했으므로 알림톡 응답은 오지 않는다. 타입 좁히기용 방어 코드. + if (res.tmplatTy === MessageType.KKO) return; setSelectedTemplate(res); setSelectedTemplateIdx(res.tmplatIdx ?? null); resetAttachmentDraft(); @@ -532,7 +531,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = - handleChange("tmplatPurpose", Number(value) as 0 | 1) + handleChange("tmplatPurpose", Number(value) as TemplatePurpose) } className="flex flex-wrap gap-4" > @@ -769,7 +768,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = setTemplateBody(html)} placeholder="문자 내용을 입력해 주세요" className="max-w-none mx-0" @@ -777,7 +776,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = onCommandReady={(cmd) => { editorCmdRef.current = cmd; }} - smsTitle={(selectedTemplate as TemplateSms).tmplatTitle} + smsTitle={selectedTemplate.tmplatTitle} smsPreviewSuffix={ selectedTemplate.tmplatPurpose === TEMPLATE_PURPOSE.PHONE_VERIFICATION ? PHONE_VERIFICATION_PREVIEW_SUFFIX diff --git a/src/config/menu.data.ts b/src/config/menu.data.ts index e566bfa..4cd210b 100644 --- a/src/config/menu.data.ts +++ b/src/config/menu.data.ts @@ -53,12 +53,13 @@ export const projectSideMenus: SideMenuItem[] = [ }, { id: "message", - label: "문자/메일 템플릿", + label: "발송 템플릿 관리", icon: MessageSquare, accessRole: [1001, 2001, 3001], children: [ { id: "message-template-sms", label: "문자 템플릿 관리", path: "/message/template/sms", accessRole: [1001, 2001, 3001] }, { id: "message-template-email", label: "이메일 템플릿 관리", path: "/message/template/email", accessRole: [1001, 2001, 3001] }, + { id: "message-template-kko", label: "알림톡 템플릿 관리", path: "/message/template/kko", accessRole: [1001, 2001, 3001] }, ], }, { diff --git a/src/const/messageTemplateConst.ts b/src/const/messageTemplateConst.ts index 8825636..8da51a7 100644 --- a/src/const/messageTemplateConst.ts +++ b/src/const/messageTemplateConst.ts @@ -1,4 +1,20 @@ -import { MessageType, type SmsType } from "@kri/common/noti-hub"; +import { ChannelType, MessageType, TemplatePurpose, type SmsType } from "@kri/common/noti-hub"; +import type { MessageSendChannel } from "@/types/message"; + +export const MESSAGE_CHANNEL_TYPE = { + email: ChannelType.EMAIL, + sms: ChannelType.SMS, + kko: ChannelType.KKO, +} as const satisfies Record; + +// 알림톡 발신자 명(카카오 채널명). 템플릿 저장 sendNm과 미리보기 채널명에 공통으로 쓴다. +export const KKO_SENDER_NAME = "코리아리서치"; + +// 외부 알림톡 템플릿 코드: 영문·숫자·밑줄·하이픈 1~30자 (trim하지 않음) +export const KKO_TEMPLATE_CODE_REGEX = /^[A-Za-z0-9_-]{1,30}$/; +// 외부 알림톡 템플릿 검색어 길이 (trim 후, 빈 값이면 기본 목록) +export const KKO_TEMPLATE_KEYWORD_MIN_LENGTH = 2; +export const KKO_TEMPLATE_KEYWORD_MAX_LENGTH = 50; export const SMS_TYPE_ORDER = [ MessageType.SMS, @@ -16,8 +32,8 @@ export const SMS_TYPE_OPTIONS = [ ] as const; export const TEMPLATE_PURPOSE = { - NORMAL: 0, - PHONE_VERIFICATION: 1, + NORMAL: TemplatePurpose.NORMAL, + PHONE_VERIFICATION: TemplatePurpose.PHONE_VERIFICATION, } as const; export const TEMPLATE_PURPOSE_OPTIONS = [ diff --git a/src/hooks/useCtiConnection.ts b/src/hooks/useCtiConnection.ts index 73be72e..2bc9dd2 100644 --- a/src/hooks/useCtiConnection.ts +++ b/src/hooks/useCtiConnection.ts @@ -44,9 +44,11 @@ export function useCtiConnection() { // 떠날 때 CTI 서버에 Logout, 돌아올 때 다시 Login 하여 새로고침 없이 전화걸기를 쓸 수 있게 한다. useEffect(() => { const handlePageHide = (event: PageTransitionEvent) => { + console.log("[CTI][TEMP_LOG] pagehide, persisted =", event.persisted); // TEMP_CTI_LOG if (event.persisted) ctiClient.suspendForPageHide(); }; const handlePageShow = (event: PageTransitionEvent) => { + console.log("[CTI][TEMP_LOG] pageshow, persisted =", event.persisted); // TEMP_CTI_LOG if (event.persisted) ctiClient.resumeFromPageShow(); }; diff --git a/src/lib/datetime.ts b/src/lib/datetime.ts index 893f7c6..6a0728f 100644 --- a/src/lib/datetime.ts +++ b/src/lib/datetime.ts @@ -16,3 +16,19 @@ export const getNearestFutureDateTime = (stepMinutes = RESERVE_MINUTE_STEP): str return `${year}-${month}-${day}T${hour}:${minute}` } + +const KST_DATE_TIME_FORMAT = new Intl.DateTimeFormat('sv-SE', { + timeZone: 'Asia/Seoul', + year: 'numeric', + month: '2-digit', + day: '2-digit', + hour: '2-digit', + minute: '2-digit', + second: '2-digit', + hour12: false, +}) + +// 날짜·시각 선택값(로컬 시각)을 예약 발송 sendDt 형식(KST "yyyy-MM-dd HH:mm:ss")으로 바꾼다. +// 이메일·문자·알림톡 공통 형식이다. +export const toReserveSendDt = (localDateTime: string): string => + KST_DATE_TIME_FORMAT.format(new Date(localDateTime)) diff --git a/src/lib/variableSubstitution.ts b/src/lib/variableSubstitution.ts index f19bdb5..e5cf4c1 100644 --- a/src/lib/variableSubstitution.ts +++ b/src/lib/variableSubstitution.ts @@ -3,6 +3,12 @@ export const substituteVariables = (contents: string, values: Record) => contents.replace(/\[\$([^\]]+)\]/g, (_, key: string) => values[key] ?? ""); +// 알림톡 본문의 #{변수}, [$변수] 토큰을 values 값으로 바꾼다. +// 발송 시 값이 없는 변수는 원문이 그대로 남으므로, 미리보기에서도 원문 토큰을 유지한다. +export const substituteKkoVariables = (contents: string, values: Record) => + contents.replace(/#\{([^}]+)\}|\[\$([^\]]+)\]/g, (token, kkoKey?: string, kriKey?: string) => + values[(kkoKey ?? kriKey) as string] ?? token); + export const escapeHtml = (value: string) => value.replace( /[&<>"']/g, diff --git a/src/query/key/keys.ts b/src/query/key/keys.ts index dffa4ec..64c16a8 100644 --- a/src/query/key/keys.ts +++ b/src/query/key/keys.ts @@ -77,6 +77,8 @@ export const qk = { templateAttachments: (tmplatIdx: number) => ["message-template", "attachment", tmplatIdx] as const, templateAttachment: (tmplatIdx: number, fileName: string) => ["message-template", "attachment", tmplatIdx, fileName] as const, + kkoTemplateList: (keyword: string) => ["message-template", "kko", "list", keyword] as const, + kkoTemplateDetail: (templateCode: string) => ["message-template", "kko", "detail", templateCode] as const, bulkSendList: (sendTy: number, reqstSvc: string, prjctCd: string) => ["message-report", "bulk-list", sendTy, reqstSvc, prjctCd] as const, diff --git a/src/query/message.ts b/src/query/message.ts index 97d98f5..2e6b350 100644 --- a/src/query/message.ts +++ b/src/query/message.ts @@ -5,18 +5,20 @@ import { nextApi } from "@/lib/http-client"; import { qk } from "@/query/key/keys"; import type { BulkSendInfo, + BulkSendResult, ChannelType, + KkoTemplateDetail, + KkoTemplateListResponse, + SendResultInfo, SendResultSummaryRequest, SendResultSummaryResponse, } from "@kri/common/noti-hub"; import type { FileResponse, PageRequest, PageResponse } from "@kri/common"; import type { ProjectMainTemplateUpdateRequest } from "@/types/project"; import type { - MessageBulkSendResponse, MessageSendBulkRequest, MessageSendChannel, MessageSendSingleRequest, - SendResultInfo, SendSingleResponse, } from "@/types/message"; import type { TemplateAttachmentImage, TemplateSummaryWithPurpose, TemplateWithPurpose } from "@/types/message"; @@ -164,6 +166,42 @@ export function useUploadTemplateBodyImageMutation(itrntPrjctCd: string) { }); } +/** + * 외부 알림톡 템플릿 목록 (POST /message-template/kko/list) + * keyword가 빈 값이면 기본 목록(ACT 상태 첫 페이지 최대 10개)을 조회한다. + */ +export function useKkoTemplateListQuery(keyword: string, enabled: boolean) { + return useQuery({ + queryKey: qk.kkoTemplateList(keyword), + queryFn: async () => { + const res = await nextApi.post(`/message-template/kko/list`, keyword ? { keyword } : {}); + // 외부 응답이므로 list가 배열이 아닌 경우를 빈 목록으로 다룬다. + return Array.isArray(res?.list) ? res.list : []; + }, + enabled, + staleTime: 0, + retry: false, + meta: { ignoreGlobalLoading: true }, + }); +} + +/** + * 외부 알림톡 템플릿 상세 (POST /message-template/kko/detail) + */ +export const fetchKkoTemplateDetail = (templateCode: string) => + nextApi.post(`/message-template/kko/detail`, { templateCode }); + +export function useKkoTemplateDetailQuery(templateCode: string, enabled: boolean) { + return useQuery({ + queryKey: qk.kkoTemplateDetail(templateCode), + queryFn: () => fetchKkoTemplateDetail(templateCode), + enabled: enabled && !!templateCode, + staleTime: 0, + retry: false, + meta: { ignoreGlobalLoading: true }, + }); +} + /** * 대량발송 리스트 조회 (GET /message-report/bulk-list/{sendTy}/{reqstSvc}/{prjctCd}) */ @@ -236,7 +274,7 @@ export function useSendSingleMessageMutation(channel: MessageSendChannel, prjctI export function useSendBulkMessageMutation(channel: MessageSendChannel, prjctIdx: number) { return useMutation({ mutationFn: (req: MessageSendBulkRequest) => - nextApi.post(`/message-send/${channel}/bulk/${prjctIdx}`, req), + nextApi.post(`/message-send/${channel}/bulk/${prjctIdx}`, req), }); } diff --git a/src/types/message.ts b/src/types/message.ts index ddcf8ca..b56b588 100644 --- a/src/types/message.ts +++ b/src/types/message.ts @@ -1,35 +1,21 @@ -import type { Template, TemplateEmail, TemplateSms, TemplateSummary } from '@kri/common/noti-hub'; +import type { MessageType, Template, TemplatePurpose, TemplateSummary } from '@kri/common/noti-hub'; import type { ListFilter } from './list'; -export type TemplatePurpose = 0 | 1; - +// 서버 조회 응답은 모든 채널의 템플릿에 tmplatPurpose를 내려준다. 화면 상태에서는 필수로 다룬다. export type TemplateWithPurpose = Template & { tmplatPurpose: TemplatePurpose; }; -export type TemplateSummaryWithPurpose = TemplateSummary & { - tmplatPurpose: TemplatePurpose; -}; +/** 이메일·문자 템플릿 관리 화면(MessageTemplate) 상태. 알림톡은 별도 화면에서 다룬다. */ +export type SmsEmailTemplateWithPurpose = Exclude; -export type MessageSendChannel = 'sms' | 'email'; +export type TemplateSummaryWithPurpose = TemplateSummary & Required>; -/** - * @kri/common의 TemplateEmail에는 atchFl(첨부파일 필드)이 아직 없어 로컬에서 확장한다. - * 조회 응답 전용 필드로, 파이프(|)로 구분된 첨부파일명 목록이 내려온다. 요청 시엔 사용하지 않는다. - */ -export type TemplateEmailWithAttachments = TemplateEmail & { - tmplatPurpose: TemplatePurpose; - atchFl?: string; -}; +export type MessageSendChannel = 'sms' | 'email' | 'kko'; -/** - * 문자 템플릿 JPG 첨부파일명 목록 (TemplateEmailWithAttachments와 동일하게 조회 응답 전용). - * 첨부가 하나라도 있으면 서버가 LMS_MMS로 저장한다. - */ -export type TemplateSmsWithAttachments = TemplateSms & { - tmplatPurpose: TemplatePurpose; - atchFl?: string; -}; +/** 조회 응답의 첨부파일명 목록(atchFl, 파이프 구분). 알림톡 템플릿에는 첨부가 없다. */ +export const getTemplateAttachmentNames = (template: Template): string[] => + 'atchFl' in template && template.atchFl ? template.atchFl.split('|').filter(Boolean) : []; /** 문자 미리보기에 표시할 첨부 이미지 (src는 data URL 또는 Object URL) */ export type TemplateAttachmentImage = { @@ -64,43 +50,3 @@ export type MessageSendBulkRequest = { destHeaderIds: number[]; destNameHeaderId?: number; }; - -export type MessageFailedChunk = { - sidList?: string[]; - reason?: string; -}; - -export type MessageBulkSendResponse = { - bulkSendKey?: string; - targetCount: number; - requestCount: number; - acceptCount: number; - failCount: number; - failedChunks?: MessageFailedChunk[]; -}; - -export type SendResultInfo = { - cmid: string; - bulkSendKey?: string; - sendTy: number; - itrntPrjctCd: string; - reqstSvc: string; - prjctCd: string; - sid: string; - resve: boolean; - resultCode: number; - resultLabel?: string; - resultViewLabel?: string; - tmplatIdx?: number; - kkoTmplatCd?: string; - sendEml?: string; - sendTel?: string; - sendNm?: string; - sendDt: string; - destEml?: string; - destNm?: string; - destTel?: string; - regCmpn: string; - regUser: string; - regDt: string; -};