From 88233f3a3966bcd50dd41c67f89448a65a5f77da Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Thu, 5 Nov 2026 12:36:08 +0900 Subject: [PATCH 1/2] =?UTF-8?q?261105=5F02=5FENH:=20=EB=AC=B8=EC=9E=90?= =?UTF-8?q?=C2=B7=EC=9D=B4=EB=A9=94=EC=9D=BC=C2=B7=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=ED=86=A1=20=EC=98=88=EC=95=BD=20=EB=B0=9C=EC=86=A1=20=EC=8B=9C?= =?UTF-8?q?=20=EA=B3=BC=EA=B1=B0=20=EC=9D=BC=EC=8B=9C=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=20=EC=B0=A8=EB=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/dialog/MessageSendDialog.tsx | 6 +++++- src/components/dialog/SingleMessageSendDialog.tsx | 6 +++++- src/lib/datetime.ts | 6 ++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/components/dialog/MessageSendDialog.tsx b/src/components/dialog/MessageSendDialog.tsx index 7a4b9d6..a50f1b4 100644 --- a/src/components/dialog/MessageSendDialog.tsx +++ b/src/components/dialog/MessageSendDialog.tsx @@ -14,7 +14,7 @@ import { useTemplateListQuery, useTemplateQuery, } from '@/query/message' -import { getNearestFutureDateTime, toReserveSendDt } from '@/lib/datetime' +import { getNearestFutureDateTime, isPastReserveDateTime, 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' @@ -183,6 +183,10 @@ const MessageSendDialog = ({ alert('예약 발송 일시를 선택해 주세요.') return } + if (scheduleType === 'reserve' && isPastReserveDateTime(reserveAt)) { + alert('예약 발송 일시는 현재 시각 이후로 선택해 주세요.') + return + } const listFilter = buildListFilter() if (target === 'selected' && listFilter.sidSet.length === 0) { alert('수신 대상이 없습니다.') diff --git a/src/components/dialog/SingleMessageSendDialog.tsx b/src/components/dialog/SingleMessageSendDialog.tsx index 49faf45..d6cf4b0 100644 --- a/src/components/dialog/SingleMessageSendDialog.tsx +++ b/src/components/dialog/SingleMessageSendDialog.tsx @@ -15,7 +15,7 @@ import { useTemplateQuery, } from '@/query/message' import type { TemplateSummary } from '@kri/common/noti-hub' -import { getNearestFutureDateTime, toReserveSendDt } from '@/lib/datetime' +import { getNearestFutureDateTime, isPastReserveDateTime, 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' @@ -127,6 +127,10 @@ const SingleMessageSendDialog = ({ alert('예약 발송 일시를 선택해 주세요.') return } + if (scheduleType === 'reserve' && isPastReserveDateTime(reserveAt)) { + alert('예약 발송 일시는 현재 시각 이후로 선택해 주세요.') + return + } setSubmitting(true) try { diff --git a/src/lib/datetime.ts b/src/lib/datetime.ts index 6a0728f..99aa631 100644 --- a/src/lib/datetime.ts +++ b/src/lib/datetime.ts @@ -32,3 +32,9 @@ const KST_DATE_TIME_FORMAT = new Intl.DateTimeFormat('sv-SE', { // 이메일·문자·알림톡 공통 형식이다. export const toReserveSendDt = (localDateTime: string): string => KST_DATE_TIME_FORMAT.format(new Date(localDateTime)) + +// 예약 발송 일시(로컬 시각)가 현재 시각보다 이전이거나 해석할 수 없으면 true를 반환한다. +export const isPastReserveDateTime = (localDateTime: string): boolean => { + const time = new Date(localDateTime).getTime() + return Number.isNaN(time) || time < Date.now() +} -- 2.49.0.windows.1 From d9c76d6d9c13d749d3d4fe5bcb9cff89e2b1effa Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 10 Nov 2026 17:28:51 +0900 Subject: [PATCH 2/2] =?UTF-8?q?261105=5F02=5FENH:=20=EB=AC=B8=EC=9E=90?= =?UTF-8?q?=C2=B7=EC=9D=B4=EB=A9=94=EC=9D=BC=C2=B7=EC=95=8C=EB=A6=BC?= =?UTF-8?q?=ED=86=A1=20=EC=98=88=EC=95=BD=20=EB=B0=9C=EC=86=A1=20=EC=8B=9C?= =?UTF-8?q?=20=EA=B3=BC=EA=B1=B0=20=EC=9D=BC=EC=8B=9C=20=EC=84=A0=ED=83=9D?= =?UTF-8?q?=20=EC=B0=A8=EB=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/message-template/KkoMessageTemplate.tsx | 2 +- src/components/message-template/MessageTemplate.tsx | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/message-template/KkoMessageTemplate.tsx b/src/components/message-template/KkoMessageTemplate.tsx index 8efa5c9..43b986a 100644 --- a/src/components/message-template/KkoMessageTemplate.tsx +++ b/src/components/message-template/KkoMessageTemplate.tsx @@ -269,7 +269,7 @@ const KkoMessageTemplate = () => { if (!d.kkoTmplatCd) return fail("kkoTmplatCd", "알림톡 템플릿을 선택해 주세요."); if (!KKO_TEMPLATE_CODE_REGEX.test(d.kkoTmplatCd)) return fail("kkoTmplatCd", "알림톡 템플릿 코드 형식이 올바르지 않습니다."); if (isBlank(d.tmplatNm)) return fail("tmplatNm", "알림톡 템플릿 명이 없습니다."); - if (d.tmplatNm.length > 32) return fail("tmplatNm", "알림톡 템플릿 명이 32자를 초과해 저장할 수 없습니다."); + if (d.tmplatNm.length > 128) return fail("tmplatNm", "알림톡 템플릿 명이 128자를 초과해 저장할 수 없습니다."); if (isBlank(d.sendTel)) return fail("sendTel", "발신 전화번호를 입력해 주세요."); if (d.sendTel.length > 16) return fail("sendTel", "발신 전화번호는 16자 이하로 입력해주세요."); return ok(); diff --git a/src/components/message-template/MessageTemplate.tsx b/src/components/message-template/MessageTemplate.tsx index ba29bfd..9300940 100644 --- a/src/components/message-template/MessageTemplate.tsx +++ b/src/components/message-template/MessageTemplate.tsx @@ -243,7 +243,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = if (isBlank(tpl.itrntPrjctCd)) return fail("itrntPrjctCd", "인트라넷 프로젝트 코드가 없습니다."); if (isBlank(tpl.tmplatNm)) return fail("tmplatNm", "템플릿명을 입력해 주세요."); - if (tpl.tmplatNm.length > 32) return fail("tmplatNm", "템플릿명은 32자 이하로 입력해주세요."); + if (tpl.tmplatNm.length > 128) return fail("tmplatNm", "템플릿명은 128자 이하로 입력해주세요."); if (!TEMPLATE_TEXT_REGEX.test(tpl.tmplatNm)) return fail("tmplatNm", "템플릿명에 허용되지 않는 문자가 포함되어 있습니다."); if (isBlank(tpl.tmplatBody)) return fail("tmplatBody", "본문을 입력해 주세요."); if (isBlank(tpl.sendNm)) return fail("sendNm", "발신자명을 입력해 주세요."); @@ -251,7 +251,8 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) = if (!TEMPLATE_TEXT_REGEX.test(tpl.sendNm)) return fail("sendNm", "발신자명에 허용되지 않는 문자가 포함되어 있습니다."); if (!isBlank(tpl.tmplatTitle)) { - if (tpl.tmplatTitle!.length > 128) return fail("tmplatTitle", "제목은 128자 이하로 입력해주세요."); + const titleMaxLength = isSmsTemplate(tpl) ? 64 : 128; + if (tpl.tmplatTitle!.length > titleMaxLength) return fail("tmplatTitle", `제목은 ${titleMaxLength}자 이하로 입력해주세요.`); if (!TEMPLATE_TEXT_REGEX.test(tpl.tmplatTitle!)) return fail("tmplatTitle", "제목에 허용되지 않는 문자가 포함되어 있습니다."); } -- 2.49.0.windows.1