Compare commits

..

63 Commits

Author SHA1 Message Date
904bbd6509 261120_01_FIX: 삭제·권한 없는 프로젝트의 리스트 작업 기록이 남아 403이 반복 조회되는 문제 수정 2026-11-20 15:49:06 +09:00
88b36bf27d 261119_01_ENH: 리스트 필터 다이얼로그에 필터 초기화 버튼 추가 2026-11-19 07:23:14 +09:00
359969c13f 261117_05_ENH: @types/node를 배포 서버 Node 24 기준(^24)으로 변경 2026-11-17 10:15:22 +09:00
02a830f3ee 261117_04_ENH: kri-editor를 KriUiRegistry 최신본으로 재설치(React Compiler lint·SonarQube 지적 사항 반영) 2026-11-17 09:54:37 +09:00
27e41c783b 261117_03_ENH: @kri/common 0.20.0 적용 및 cn 0.5.2 고정 2026-11-17 09:26:39 +09:00
db1f12f9aa 261117_02_FIX: Next.js 16.4.6 업그레이드(보안 취약점 대응)
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-17 08:49:12 +09:00
f955dbaeea 261117_01_ENH: KriColorPalette를 KriUiRegistry(kri-color-palette) 설치본으로 교체
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-17 08:49:12 +09:00
623615a287 261116_03_ENH: KriColorPalette 중첩 삼항 제거 및 Dice UI 출처 주석 추가 2026-11-16 16:54:42 +09:00
e64a48417b 261116_02_ENH: 여러 줄 텍스트(98) 헤더 타입 추가 및 컨택 진행 화면 textarea 입력 적용 2026-11-16 12:29:47 +09:00
606b6e30d0 261112_02_ENH: CTI 통화 이력 복구·재시도 로직 제거 및 시작·종료 저장 단일 요청으로 간소화 2026-11-12 14:01:28 +09:00
4daf2daf9c 261112_01_FIX: CTI 종료 이력 저장 404 시 재시도 중단 및 오류 팝업 미노출 2026-11-12 12:07:13 +09:00
2d00f7e490 Merge remote-tracking branch 'origin/develop' into develop 2026-11-10 17:29:02 +09:00
d9c76d6d9c 261105_02_ENH: 문자·이메일·알림톡 예약 발송 시 과거 일시 선택 차단 2026-11-10 17:28:51 +09:00
88233f3a39 261105_02_ENH: 문자·이메일·알림톡 예약 발송 시 과거 일시 선택 차단 2026-11-10 17:28:38 +09:00
d595ea8b8c 261105_02_ENH: 문자·이메일·알림톡 예약 발송 시 과거 일시 선택 차단 2026-11-05 12:36:08 +09:00
986f9bf9a9 261105_01_FIX: 리스트 헤더 저장 및 업로드 헤더 비교 시 Trim 적용
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-05 09:03:40 +09:00
dd4fc8f230 261103_03_ENH: 공유 인증 사용자 정보 동기화 및 프로젝트 접근 전환 개선 2026-11-03 15:11:33 +09:00
7f9cbe4f09 261103_02_FIX: 다른 서비스와 도메인 인증 겹치지 않도록 키변경 2026-11-03 10:48:30 +09:00
d91fc8f5a8 261103_01_FIX: KriAutoComplete 기본 검색을 contains 방식으로 변경 2026-11-03 08:37:04 +09:00
491b5a5e9f 261102_07_FIX: 통화 중 새로고침 시 컨택 페이지 이탈 방지 및 CTI 송수신 로그 추가 2026-11-02 18:28:43 +09:00
72c8cdca37 Merge pull request '261028_01_ENH: CTI 통화 재연결 복원 대응 및 종료 우회 처리 정리' (#68) from feature-tera-ws into develop
Reviewed-on: #68
2026-11-02 18:11:05 +09:00
ff9968db2e 261102_06_ENH: 메시지 템플릿 제목·템플릿명·발신자명에 다국어 입력 허용 (이모지 제외) 2026-11-02 17:10:44 +09:00
bfde326316 261102_05_ENH: 환경변수 public끼리 모음 2026-11-02 16:07:54 +09:00
5a82fe6396 261102_04_ENH: 설문현황 KON·KIWI 바로가기를 환경별 KART 프로젝트 URL로 변경 2026-11-02 16:07:03 +09:00
475204b12b 261102_03_ENH: KART와 JWT 쿠키 처리 방식 통일 및 만료 시간 상수화 2026-11-02 15:53:55 +09:00
d17b7316e7 261102_02_ENH: 공용 JWT 쿠키 Domain 적용 조건을 환경변수 값 기준으로 변경 2026-11-02 15:23:06 +09:00
273caf267d 261102_01_ENH: KART 로그인 연동을 위한 공용 JWT 쿠키 설정 및 로그아웃 처리 통일 2026-11-02 15:12:42 +09:00
50a0cb1ef5 261029_01_ENH: 이메일·문자·알림톡 템플릿 삭제 기능 추가 및 삭제 2026-11-02 12:07:06 +09:00
07e70d1f44 Merge pull request '261029_01_ENH: 이메일·문자·알림톡 템플릿 삭제 기능 추가 및 삭제' (#66) from master into develop
Reviewed-on: #66
2026-10-29 09:05:04 +09:00
e67d57c51a 261029_01_ENH: 이메일·문자·알림톡 템플릿 삭제 기능 추가 및 삭제 2026-10-29 09:04:06 +09:00
98546a83fd Merge pull request '261028_03_HOT: 헤더관리에서 사용 허용, 외주사, 컨택원, 면접원은 disabled처리' (#65) from master into develop
Reviewed-on: #65
2026-10-28 17:12:29 +09:00
55c988ce20 261028_03_HOT: 헤더관리에서 사용 허용, 외주사, 컨택원, 면접원은 disabled처리 2026-10-28 17:10:18 +09:00
61ac9420c9 Merge pull request 'master' (#64) from master into develop
Reviewed-on: #64
2026-10-28 16:58:52 +09:00
362aca6dbf 261028_02_HOT: 컨택 진행 사용 허용 필드를 단일 선택으로 변경 2026-10-28 16:58:06 +09:00
4fd52bf8fc 261028_01_ENH: CTI 통화 재연결 복원 대응 및 종료 우회 처리 정리
- Talking 재수신 시 기존 통화 세션 복원
- 재로그인 상태 11인 종료 누락 통화를 기존 API로 정리
- 정상 종료 선반영 및 3초 강제 재연결 제거
- 종료 요청 대기·재시도와 중복 이벤트·지연 응답 처리 보완
2026-10-28 16:50:10 +09:00
27b4902a7c Merge pull request '261027_01_ENH: KON·KIWI 프로젝트 목록 및 현황 URL 조회를 backend bypass로 전환하고 연동 403 로그아웃 방지' (#63) from develop into master
Reviewed-on: #63
2026-10-28 08:34:33 +09:00
5a2f30c8b0 261027_01_ENH: KON·KIWI 프로젝트 목록 및 현황 URL 조회를 backend bypass로 전환하고 연동 403 로그아웃 방지 2026-10-27 15:24:52 +09:00
47973ed82d Merge pull request '261026_01_ENH: 문자, 알림톡 발신 번호에 대한 가이드에 KRi 계정 명시' (#62) from develop into master
Reviewed-on: #62
2026-10-26 09:47:43 +09:00
19a5d8b606 261026_01_ENH: 문자, 알림톡 발신 번호에 대한 가이드에 KRi 계정 명시 2026-10-26 09:46:02 +09:00
6c0722f2e5 Merge pull request 'develop' (#61) from develop into master
Reviewed-on: #61
2026-10-26 08:30:58 +09:00
3b552f38cf 261023_02_ENH: 일괄 발송 일부 접수 완료 상태 지원 및 결과 알림·건수 표시 개선 2026-10-23 15:10:46 +09:00
3c27a1fa46 261023_02_ENH: 컨택 진행에서 너무 긴 헤더명은 줄바꿈 2026-10-23 12:34:41 +09:00
2adbba779a Merge branch 'master' into develop
# Conflicts:
#	package-lock.json
#	package.json
#	src/components/dialog/MessageHistoryDialog.tsx
#	src/components/list-contact/ListContactEventPanel.tsx
2026-10-23 12:25:03 +09:00
c2c2eed3b4 Merge branch 'master' into develop 2026-10-23 12:20:22 +09:00
fd4ddb5797 Merge pull request '261023_01_ENH: 문자 SMS·LMS·MMS 유형 분리 및 템플릿·발송 이력·통계 반영' (#58) from hotfix-split-lms-mms into master
Reviewed-on: #58
2026-10-23 12:14:03 +09:00
38ce40c360 261023_01_ENH: 문자 SMS·LMS·MMS 유형 분리 및 템플릿·발송 이력·통계 반영 2026-10-23 12:07:11 +09:00
17ad56939c 261022_05_ENH: 리스트 초기화 범위 세분화 및 설문별 상태이력 초기화 추가 2026-10-22 16:59:04 +09:00
f65dacdec1 261022_03_ENH: 예약 취소 추가 2026-10-22 15:49:14 +09:00
061ef782bc Merge pull request 'hotfix-kkotemplate-ready' (#57) from hotfix-kkotemplate-ready into develop
Reviewed-on: #57
2026-10-22 12:48:07 +09:00
bbaedfc325 Merge pull request 'hotfix-kkotemplate-ready' (#56) from hotfix-kkotemplate-ready into master
Reviewed-on: #56
2026-10-22 12:47:05 +09:00
b087d9527e 261022_02_ENH: 카카오 템플릿 안내문 수정 2026-10-22 12:46:27 +09:00
191c0017a8 261022_01_FIX: kri common 버전업 2026-10-22 12:45:43 +09:00
d2e214696d 261020_02_FIX: 짧은 비동기 작업 종료 시 리스트 및 배정 목록이 갱신되지 않는 오류 수정 2026-10-20 11:57:46 +09:00
8f0de91e93 Merge pull request 'hofix-kkotamplate-alert' (#55) from hofix-kkotamplate-alert into develop
Reviewed-on: #55
2026-10-20 08:36:23 +09:00
361c065ec9 Merge pull request '261020_01_ENH: 카카오 템플릿 리스트 조회 실패시 alert표기하지 않음' (#54) from hofix-kkotamplate-alert into master
Reviewed-on: #54
2026-10-20 08:34:06 +09:00
eb44c57d39 261020_01_ENH: 카카오 템플릿 리스트 조회 실패시 alert표기하지 않음 2026-10-20 08:32:07 +09:00
d4db99337a Merge pull request '261019_01_ENH: 리스트 비동기 작업 동시 실행 제한 및 진행 상태 UI 개선, 미사용 참조 정리' (#53) from feature-async-list-bulk-work into develop
Reviewed-on: #53
2026-10-19 14:29:17 +09:00
d2e826702e 261019_01_ENH: 리스트 비동기 작업 동시 실행 제한 및 진행 상태 UI 개선, 미사용 참조 정리 2026-10-19 14:22:07 +09:00
3d58ffc1b4 Merge pull request '261015_02_ENH: 컨택 진행 화면 발송 현황 모바일 UI 개선' (#52) from develop into master
Reviewed-on: #52
2026-10-15 08:37:09 +09:00
4e51530922 261015_03_ENH: CTI 연결 끊김 자동 복구(최대 15초 간격 재시도)
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-15 08:36:20 +09:00
044579c27f 261015_02_ENH: 컨택 진행 화면 발송 현황 모바일 UI 개선
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-15 08:34:49 +09:00
bb641464e2 Merge pull request '261015_01_ENH: 메인 화면·헤더 모바일 UI 개선' (#51) from develop into master
Reviewed-on: #51
2026-10-15 08:26:21 +09:00
ae8f2e6fc5 261015_01_ENH: 메인 화면·헤더 모바일 UI 개선
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
2026-10-15 08:24:21 +09:00
107 changed files with 6172 additions and 1951 deletions

View File

@@ -1,9 +1,9 @@
NEXT_PUBLIC_ENV=dev NEXT_PUBLIC_ENV=dev
NEXT_PUBLIC_API_BASE=https://test-contact.kric.com/api NEXT_PUBLIC_API_BASE=https://test-contact.kric.com/api
NEXT_PUBLIC_KART_URL=https://test-kart.kric.com
ENV=dev ENV=dev
CONTACT_SERVER=http://127.0.0.1:4001 CONTACT_SERVER=http://127.0.0.1:4001
API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1 API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1
API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1
API_KART_SERVER=https://rapi.kric.com/api/v1 AUTH_COOKIE_DOMAIN=kric.com
KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230

View File

@@ -1,9 +1,9 @@
NEXT_PUBLIC_ENV=local NEXT_PUBLIC_ENV=local
NEXT_PUBLIC_API_BASE=http://localhost:4000/api NEXT_PUBLIC_API_BASE=http://localhost:4000/api
NEXT_PUBLIC_KART_URL=https://test-kart.kric.com
ENV=local ENV=local
CONTACT_SERVER=http://localhost:4001 CONTACT_SERVER=http://localhost:4001
API_CONTACT_SERVER=http://localhost:4001/api/v1 API_CONTACT_SERVER=http://localhost:4001/api/v1
API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1
API_KART_SERVER=https://rapi.kric.com/api/v1 AUTH_COOKIE_DOMAIN=
KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230

View File

@@ -1,9 +1,9 @@
NEXT_PUBLIC_ENV=prod NEXT_PUBLIC_ENV=prod
NEXT_PUBLIC_API_BASE=https://contact.kric.com/api NEXT_PUBLIC_API_BASE=https://contact.kric.com/api
NEXT_PUBLIC_KART_URL=https://kart.kric.com
ENV=prod ENV=prod
CONTACT_SERVER=http://127.0.0.1:4001 CONTACT_SERVER=http://127.0.0.1:4001
API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1 API_CONTACT_SERVER=http://127.0.0.1:4001/api/v1
API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1 API_INTRANET_SERVER=https://intranet-ext.kric.com/api/v1
API_KART_SERVER=https://rapi.kric.com/api/v1 AUTH_COOKIE_DOMAIN=kric.com
KART_API_KEY=4B726963-436F6E74616374-46726F6E74-402531213230

View File

@@ -229,6 +229,7 @@ When implementation is complete, report in Korean:
- Treat the current React version, component style, state management, routing, styling, and test approach as authoritative. - Treat the current React version, component style, state management, routing, styling, and test approach as authoritative.
- Do not perform unrelated class-to-hook, JavaScript-to-TypeScript, state-library, styling-system, or React-to-Next.js migrations. - Do not perform unrelated class-to-hook, JavaScript-to-TypeScript, state-library, styling-system, or React-to-Next.js migrations.
- Keep components focused and follow the repository's established split between presentation, state, data access, and side effects. - Keep components focused and follow the repository's established split between presentation, state, data access, and side effects.
- Do not use nested ternary expressions. Use clear `if`/`else` branches, early returns, or well-named intermediate variables instead; a single, non-nested ternary is acceptable only when it remains immediately readable.
- Keep effects dependency-correct and clean up subscriptions, timers, listeners, and in-flight work where applicable. - Keep effects dependency-correct and clean up subscriptions, timers, listeners, and in-flight work where applicable.
- Use stable semantic keys and preserve accessibility, loading, empty, error, disabled, and success states. - Use stable semantic keys and preserve accessibility, loading, empty, error, disabled, and success states.
- Preserve public component props and shared UI contracts unless a coordinated breaking change is explicitly approved. - Preserve public component props and shared UI contracts unless a coordinated breaking change is explicitly approved.
@@ -265,6 +266,35 @@ Before each related task, read the current contents of every matching reference,
If a task spans multiple scopes, read every matching reference. Generated files under `.agent-harness/references/` are read-only copies; edit KriFrontCommon's `.agent/consumer.md` or `.agent/consumer-references/` and recompose instead. If a task spans multiple scopes, read every matching reference. Generated files under `.agent-harness/references/` are read-only copies; edit KriFrontCommon's `.agent/consumer.md` or `.agent/consumer-references/` and recompose instead.
## Noti-hub SMS Types
- `MessageType.SMS = 21`, `LMS = 22`, `MMS = 23`; `ChannelType.SMS = 2` is unchanged. `SMS_TYPE_ARRAY` and `SmsType` include all three.
- `LMS_MMS = 22` remains a deprecated source-compatibility alias for LMS only. It does not represent MMS. Enum reverse lookup for 22 returns LMS. Use numeric bulk-list paths; the server no longer accepts LMS_MMS in paths. Numeric 21/22/23 bulk-list requests all return the entire SMS channel, not type-filtered lists.
- Requests retain their existing URLs/body shapes. The server chooses the actual type per recipient after substitution: attachment -> MMS; otherwise title or UTF-8 body >= 90 bytes -> LMS; otherwise SMS.
- Refresh templates from the save response (`tmplatTy`); display actual delivery types from `sendTy`, not the template or result code. A bulk can contain multiple SMS types. LMS/MMS share result codes; use existing server result labels.
- SMS, LMS, MMS and KKO use cancellation code 9998. Verify with `npm run typecheck`, `npm run build`, and `node --test tests/noti-hub-sms.test.mjs`.
## Noti-hub Reservation Cancellation
- Import cancellation types, constants, and helpers from `@kri/common/noti-hub` only. They are runtime-neutral and require no optional peers.
- Individual current cancellation state is determined by resultCode via isReserveCanceledResult; bulk current state is cancellationStatus (NONE/PARTIAL/ALL). These describe current cancellation state, not cancellation eligibility. cancelDt and cancelUser are request history, not current state.
- SendResultInfo, SendInfo, and BulkSendInfo expose optional cancelable. Use isSendCancelable(item), which returns true only for cancelable === true, for cancellation eligibility; missing values from older responses are treated as false. Never infer eligibility from cancelDt, result labels, or result codes.
- cancelable reflects query-time state and may change before cancellation. Determine the final outcome from SendCancelResponse counts.
- sendIdx is the single-cancel identifier, not cmid. It is absent from the latest abbreviated report (/api/v1/report/last/send/...). Request sendIdx must be a positive integer; bulkSendKey is required and at most 32 characters.
- EMAIL_RESERVE_CANCELED_RESULT_CODE is 108 for EMAIL. SMS_KKO_RESERVE_CANCELED_RESULT_CODE is 9998 for SMS, LMS, MMS, and KKO. Unknown message types are not recognized as canceled.
- Display the server's resultViewLabel/resultLabel ("예약 취소"). There is no separate result-code list API.
- HTTP 200 can contain notCancelableCount. parseSendCancelResponse validates nonnegative integer counts and targetCount = canceledCount + alreadyCanceledCount + notCancelableCount, throwing TypeError on invalid data. Bulk targetCount counts currently registered detail rows; response canceledCount counts only cancellations made by that request.
- Existing response fields are unchanged; all added fields on existing types are optional. Verify with npm run typecheck and npm run build.
## HTTP Streaming
- `@kri/common/http` HTTP clients expose streamGet/streamPost/streamPut/streamPatch/streamDel, returning HttpStreamResponse (status, statusText, headers, url, nullable body).
- Streaming shares ordinary authentication, URL, body and HTTP-error policy. Read body incrementally; no automatic JSON/NDJSON/SSE parsing or reconnect is performed.
- Streaming options accept an external AbortSignal. Caller cancellation raises AbortError without an HTTP error notification. Cancel the body when it will not be consumed.
- timeoutMs covers connection/headers (and an HTTP error body); idleTimeoutMs covers inactivity after successful headers and resets on consumed chunks. Both default to the client's defaultTimeoutMs (60 seconds by default), and 0 disables that timer for streaming only.
- Mid-stream transport/time-out errors reach the body reader. HTTP error statuses use existing HttpError handlers before a stream is returned. A 204 response has body=null.
- See HTTP_STREAMING.md for examples and node --test tests/http-stream.test.mjs for focused validation after npm run build.
## KriUiRegistry Consumer Contract ## KriUiRegistry Consumer Contract
When implementing or changing frontend UI, use this order: When implementing or changing frontend UI, use this order:
@@ -274,6 +304,28 @@ When implementing or changing frontend UI, use this order:
3. Otherwise, prefer a suitable shadcn/ui component. 3. Otherwise, prefer a suitable shadcn/ui component.
4. Create a custom component only when the preceding options cannot meet the requirement safely. 4. Create a custom component only when the preceding options cannot meet the requirement safely.
### KriAutoComplete Search Scroll
- `kri-auto-complete` exposes `resetScrollOnSearch?: boolean` on `KriSingleSelect`, `KriMultiSelect`, and `MultiSelect`. It defaults to `false`, preserving existing behavior.
- When enabled, a search value change (including clearing it) resets the option list scroll to the top on the next animation frame in both `filter` and `inputOnly` modes. Async result updates alone do not trigger another reset.
### KriAutoComplete Option Tooltip
- `kri-auto-complete` exposes `optionTooltip?: 'singleLine' | 'wrap'` and `optionTooltipClassName?: string` on `KriSingleSelect`, `KriMultiSelect`, and `MultiSelect`. It is off by default, preserving existing behavior.
- When enabled, hovering an option shows its full `label` in a right-side tooltip. `singleLine` stays on one line until the available viewport width; `wrap` wraps at 28rem. The item depends on the shadcn `tooltip` component and provides its own `TooltipProvider`.
### KriAutoComplete Search Match
- `kri-auto-complete` exposes `searchMatch?: 'fuzzy' | 'contains'` on `KriSingleSelect`, `KriMultiSelect`, and `MultiSelect`. It defaults to `fuzzy` (cmdk's default subsequence scoring), preserving existing behavior.
- `contains` keeps only options whose label or value contains the search text as a case-insensitive substring, in the original option order. It applies only when `searchMode` is `filter`.
### KriEditor SMS Preview
- `changeSmsType` reports `SMS | LMS | MMS`. Update consumer callbacks to handle `MMS`; this widens the previous callback contract.
- Attachment presence (`smsHasAttachment`) takes priority and reports MMS. Otherwise a title or UTF-8 preview size >= `smsMaxBytes` (default 90) reports LMS; the remainder reports SMS. LMS/MMS share `lmsMaxBytes` (default 2000).
- UTF-8 byte counting includes `smsPreviewSuffix` and its separating newline, without storing the suffix in the body.
- This is a preview. Use the template-save response for saved `tmplatTy` and delivery-result `sendTy` for actual per-recipient type after server substitution. Registry updates require updating installed consumer copies.
### Required Shared References ### Required Shared References
Before each related task, read the current contents of every matching reference, even if it was read earlier in the session. Before each related task, read the current contents of every matching reference, even if it was read earlier in the session.

1285
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -12,7 +12,7 @@
"@dnd-kit/core": "^6.3.1", "@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0", "@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2", "@dnd-kit/utilities": "^3.2.2",
"@kri/common": "^0.19.0", "@kri/common": "^0.20.0",
"@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-checkbox": "^1.3.3",
"@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-dialog": "^1.1.15",
"@radix-ui/react-dropdown-menu": "^2.1.16", "@radix-ui/react-dropdown-menu": "^2.1.16",
@@ -42,13 +42,14 @@
"@tiptap/starter-kit": "^3.12.0", "@tiptap/starter-kit": "^3.12.0",
"class-variance-authority": "^0.7.1", "class-variance-authority": "^0.7.1",
"cmdk": "^1.1.1", "cmdk": "^1.1.1",
"cn": "0.5.2",
"date-fns": "^4.4.0", "date-fns": "^4.4.0",
"dompurify": "^3.4.10", "dompurify": "^3.4.10",
"echarts": "^6.1.0", "echarts": "^6.1.0",
"echarts-for-react": "^3.0.6", "echarts-for-react": "^3.0.6",
"jotai": "^2.15.1", "jotai": "^2.15.1",
"lucide-react": "^0.553.0", "lucide-react": "^0.553.0",
"next": "^16.0.7", "next": "^16.4.6",
"next-themes": "^0.4.6", "next-themes": "^0.4.6",
"prettier": "^3.9.6", "prettier": "^3.9.6",
"qrcode": "^1.5.4", "qrcode": "^1.5.4",
@@ -61,13 +62,13 @@
}, },
"devDependencies": { "devDependencies": {
"@tailwindcss/postcss": "^4", "@tailwindcss/postcss": "^4",
"@types/node": "^20", "@types/node": "^24.19.2",
"@types/qrcode": "^1.5.6", "@types/qrcode": "^1.5.6",
"@types/react": "^19", "@types/react": "^19",
"@types/react-dom": "^19", "@types/react-dom": "^19",
"babel-plugin-react-compiler": "1.0.0", "babel-plugin-react-compiler": "1.0.0",
"eslint": "^9", "eslint": "^9",
"eslint-config-next": "^16.0.7", "eslint-config-next": "^16.4.6",
"tailwindcss": "^4", "tailwindcss": "^4",
"tw-animate-css": "^1.4.0", "tw-animate-css": "^1.4.0",
"typescript": "^5" "typescript": "^5"

View File

@@ -1,6 +1,8 @@
'use client' 'use client'
import { useEffect, useMemo, useState } from 'react' import { useEffect, useMemo, useState } from 'react'
import { useAtom } from 'jotai'
import { listJobOpenRequestAtom } from '@/store/jotai/list-job'
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 { useAuth } from '@/hooks/useAuth' import { useAuth } from '@/hooks/useAuth'
@@ -13,7 +15,10 @@ import { AssignTargetList, useAssignTargetRows } from '@/components/assign/Assig
import { ListSearchTable } from '@/components/list/ListSearchTable' import { ListSearchTable } from '@/components/list/ListSearchTable'
import { useProjectInfoQuery, 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 { ListJobPageQueryContext, useSubmitListJob } from '@/query/list-job'
import { ListJobGatePanel } from '@/components/list/ListJobGate'
import { ListJobRefreshNotice } from '@/components/list/ListJobRefreshNotice'
import { useListJobPageMonitor } from '@/hooks/useListJobPageMonitor'
import { ListHeaderAssignConst, LIST_HEADER_TYPE_LABEL } from '@/const/listConst' import { ListHeaderAssignConst, LIST_HEADER_TYPE_LABEL } from '@/const/listConst'
import { createEmptyListFilter, type ListFilter, type ListHeaderAssignType, type listHeader } from '@/types/list' import { createEmptyListFilter, type ListFilter, type ListHeaderAssignType, type listHeader } from '@/types/list'
import type { ResultCode } from '@/types/project' import type { ResultCode } from '@/types/project'
@@ -55,8 +60,13 @@ const ListAssignPage = () => {
const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled) const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled)
const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled) const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled)
const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled) const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled)
const upsertListAssignMutation = useUpsertListAssignMutation(prjctIdx) const assignMutation = useSubmitListJob(prjctIdx)
const resetListAssignMutation = useResetListAssignMutation(prjctIdx) const pageMonitor = useListJobPageMonitor(prjctIdx, 'LIST_ASSIGN', enabled, {
hasSelection: !!selectedAssignId,
isSubmitting: assignMutation.isPending,
})
const { gate: assignGate, dataRevision } = pageMonitor
const [openRequest, setOpenRequest] = useAtom(listJobOpenRequestAtom)
const assignTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType: effectiveAssignType }) const assignTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType: effectiveAssignType })
const resultCodeArray = useMemo<ResultCode[]>(() => resultCodesQuery.data ?? [], [resultCodesQuery.data]) const resultCodeArray = useMemo<ResultCode[]>(() => resultCodesQuery.data ?? [], [resultCodesQuery.data])
@@ -122,7 +132,15 @@ const ListAssignPage = () => {
const hasNoAppliedFilter = () => filterSummary.length === 0 && assignFilterIds.length === 0 const hasNoAppliedFilter = () => filterSummary.length === 0 && assignFilterIds.length === 0
useEffect(() => {
if (enabled && openRequest && !openRequest.opened && openRequest.jobType === 'LIST_ASSIGN'
&& openRequest.userId === auth.user?.userId && openRequest.prjctIdx === prjctIdx) {
setOpenRequest({ ...openRequest, opened: true })
}
}, [enabled, openRequest, auth.user?.userId, prjctIdx, setOpenRequest])
const handleAssign = async () => { const handleAssign = async () => {
if (assignGate.submitBlocked || assignMutation.isPending) return
if (!selectedAssignId) { if (!selectedAssignId) {
alert('배정할 대상을 선택해주세요.') alert('배정할 대상을 선택해주세요.')
return return
@@ -131,33 +149,38 @@ const ListAssignPage = () => {
return return
} }
await upsertListAssignMutation.mutateAsync({ await assignMutation.mutateAsync({
assignId: selectedAssignId, jobType: 'LIST_ASSIGN',
request: { path: `mutations/assign/${encodeURIComponent(selectedAssignId)}`,
body: {
assignType: effectiveAssignType, assignType: effectiveAssignType,
transferResve: effectiveAssignType === ListHeaderAssignConst.OUTSOURCE? false : transferResve, transferResve: effectiveAssignType === ListHeaderAssignConst.OUTSOURCE? false : transferResve,
listFilter: currentListFilter, listFilter: currentListFilter,
}, },
}) })
alert('배정되었습니다.')
} }
const handleResetAssign = async () => { const handleResetAssign = async () => {
if (assignGate.submitBlocked || assignMutation.isPending) return
if (hasNoAppliedFilter() && !confirm('적용된 필터가 없습니다. 전체 리스트를 대상으로 진행 하시겠습니까?')) { if (hasNoAppliedFilter() && !confirm('적용된 필터가 없습니다. 전체 리스트를 대상으로 진행 하시겠습니까?')) {
return return
} }
if (!confirm('정말 배정을 초기화 하시겠습니까?')) return if (!confirm('정말 배정을 초기화 하시겠습니까?')) return
await resetListAssignMutation.mutateAsync({ await assignMutation.mutateAsync({
jobType: 'LIST_ASSIGN',
path: 'mutations/assign-reset',
body: {
assignType: effectiveAssignType, assignType: effectiveAssignType,
listFilter: currentListFilter, listFilter: currentListFilter,
},
}) })
alert('배정이 초기화 되었습니다.')
} }
if (!mounted || !selectedProject) return <LoadingOverlayAdapter force /> if (!mounted || !selectedProject) return <LoadingOverlayAdapter force />
return ( return (
<ListJobPageQueryContext.Provider value="LIST_ASSIGN">
<div className="flex gap-4 text-sm"> <div className="flex gap-4 text-sm">
<div className="w-72 shrink-0 space-y-2"> <div className="w-72 shrink-0 space-y-2">
<Tabs value={String(effectiveAssignType)} onValueChange={handleTabChange}> <Tabs value={String(effectiveAssignType)} onValueChange={handleTabChange}>
@@ -180,8 +203,11 @@ const ListAssignPage = () => {
/> />
</div> </div>
<div className="min-w-0 flex-1"> <div className="min-w-0 flex-1 space-y-2">
<ListJobGatePanel gate={assignGate} />
<ListJobRefreshNotice monitor={pageMonitor} />
<ListSearchTable <ListSearchTable
dataRevision={dataRevision}
prjctIdx={prjctIdx} prjctIdx={prjctIdx}
enabled={enabled} enabled={enabled}
userRole={userRole} userRole={userRole}
@@ -219,10 +245,10 @@ const ListAssignPage = () => {
예약 이관 예약 이관
</label> </label>
)} )}
<Button type="button" onClick={handleAssign}> <Button type="button" onClick={handleAssign} disabled={assignMutation.isPending || assignGate.submitBlocked}>
배정 배정
</Button> </Button>
<Button type="button" variant="outline" onClick={handleResetAssign}> <Button type="button" variant="outline" onClick={handleResetAssign} disabled={assignMutation.isPending || assignGate.submitBlocked}>
배정 초기화 배정 초기화
</Button> </Button>
</> </>
@@ -230,6 +256,7 @@ const ListAssignPage = () => {
/> />
</div> </div>
</div> </div>
</ListJobPageQueryContext.Provider>
) )
} }

View File

@@ -1,3 +1,4 @@
import { AuthSessionGate } from "@/components/app-shell/AuthSessionGate";
import AppMainLayout from "@/components/app-shell/AppMainLayout"; import AppMainLayout from "@/components/app-shell/AppMainLayout";
import { cookies } from "next/headers"; import { cookies } from "next/headers";
import { redirect } from "next/navigation"; import { redirect } from "next/navigation";
@@ -31,8 +32,8 @@ export default async function MainLayoutWrapper({
} }
return ( return (
<AppMainLayout initialFontSize={initialFontSize}> <AuthSessionGate><AppMainLayout initialFontSize={initialFontSize}>
{children} {children}
</AppMainLayout> </AppMainLayout></AuthSessionGate>
); );
} }

View File

@@ -1,6 +1,6 @@
'use client' 'use client'
import { Suspense, useEffect, useMemo, useState } from "react"; import { Suspense, useEffect, useMemo, useRef, useState } from "react";
import { useRouter, useSearchParams } from "next/navigation"; import { useRouter, useSearchParams } from "next/navigation";
import { ArrowLeft, RefreshCw } from "lucide-react"; import { ArrowLeft, RefreshCw } from "lucide-react";
import { useMounted } from "@kri/common/hooks"; import { useMounted } from "@kri/common/hooks";
@@ -37,6 +37,7 @@ const ListContactPageContent = () => {
const userRole = auth?.user?.userRole ?? 0; const userRole = auth?.user?.userRole ?? 0;
const ctiCallPhase = useCtiCallPhase(); const ctiCallPhase = useCtiCallPhase();
const shouldBlockNavigation = CTI_CALL_PHASE.includes(ctiCallPhase); const shouldBlockNavigation = CTI_CALL_PHASE.includes(ctiCallPhase);
const hasObservedCall = useRef(false);
const queriesEnabled = mounted && prjctIdx > 0; const queriesEnabled = mounted && prjctIdx > 0;
const enabled = queriesEnabled && !!sid; const enabled = queriesEnabled && !!sid;
@@ -74,10 +75,12 @@ const ListContactPageContent = () => {
const hasGuardEntry = window.history.state?.[CALL_NAVIGATION_GUARD_KEY] === true; const hasGuardEntry = window.history.state?.[CALL_NAVIGATION_GUARD_KEY] === true;
if (!shouldBlockNavigation) { if (!shouldBlockNavigation) {
if (hasGuardEntry) window.history.back(); if (hasGuardEntry && hasObservedCall.current) window.history.back();
hasObservedCall.current = false;
return; return;
} }
hasObservedCall.current = true;
let isRestoringHistory = false; let isRestoringHistory = false;
if (!hasGuardEntry) { if (!hasGuardEntry) {

View File

@@ -1,6 +1,9 @@
'use client' 'use client'
import { useEffect, useMemo, useRef, useState } from 'react' import { useEffect, useMemo, useRef, useState } from 'react'
import { useAtom } from 'jotai'
import { toast } from 'sonner'
import { listJobOpenRequestAtom } from '@/store/jotai/list-job'
import type { PaginationState } from '@tanstack/react-table' import type { PaginationState } from '@tanstack/react-table'
import { useQueryClient } from '@tanstack/react-query' import { useQueryClient } from '@tanstack/react-query'
import { useRouter } from 'next/navigation' import { useRouter } from 'next/navigation'
@@ -11,21 +14,23 @@ import { useDialog } from '@/hooks/useDialog'
import { useSelectedProject } from '@/hooks/useSelectedProject' import { useSelectedProject } from '@/hooks/useSelectedProject'
import { useStorage } from '@/hooks/useStorage' import { useStorage } from '@/hooks/useStorage'
import { StorageKeys } from '@/store/storage/storage-keys' import { StorageKeys } from '@/store/storage/storage-keys'
import { ListManageActions } from '@/components/list/ListManageActions' import { ListManageActions, type ListManageActionKey } from '@/components/list/ListManageActions'
import { ListSearchTable } from '@/components/list/ListSearchTable' import { ListSearchTable } from '@/components/list/ListSearchTable'
import { import {
useDownloadListEventHistoryMutation,
useDownloadListExcelTemplateMutation, useDownloadListExcelTemplateMutation,
useDownloadListItemFileMutation,
useDownloadListMutation,
useDownloadListUpdateHistoryMutation,
useDownloadUploadHistoryFileMutation, useDownloadUploadHistoryFileMutation,
useListHeaderQuery, useListHeaderQuery,
useListUploadHistoryQuery, useListUploadHistoryQuery,
useResetListMutation,
useUpdateListHeaderMutation, useUpdateListHeaderMutation,
useUploadListExcelMutation,
} from '@/query/list' } from '@/query/list'
import { ListJobPageQueryContext, useMyActiveListJobs, useSubmitListJob } from '@/query/list-job'
import { ListJobGatePanel } from '@/components/list/ListJobGate'
import { ListJobRefreshNotice } from '@/components/list/ListJobRefreshNotice'
import { useListJobPageMonitor } from '@/hooks/useListJobPageMonitor'
import { useTrackedListJobs } from '@/store/list-job-tracker'
import { isListPageActionBlocked } from '@/utils/listJobAvailability'
import type { ListJobType } from '@/types/list-job'
import { LIST_DOWNLOAD_JOB_TYPE, LIST_JOB_VIEW, MESSAGE_JOB_TYPE } from '@/const/listJobConst'
import { useProjectInfoQuery, 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 {
@@ -39,8 +44,8 @@ import {
type ListFilterTarget, type ListFilterTarget,
type listHeader, type listHeader,
type ListSearchUiState, type ListSearchUiState,
ListResetMode, type ListResetRequest,
type ListResetScope, type ListResetSelection,
type ListUploadRequest, type ListUploadRequest,
} from '@/types/list' } from '@/types/list'
import { type ResultCode, ResultCodeType } from '@/types/project' import { type ResultCode, ResultCodeType } from '@/types/project'
@@ -50,7 +55,7 @@ import ListHeaderManageDialog from '@/components/dialog/ListHeaderManageDialog'
import ListDownloadDialog from '@/components/dialog/ListDownloadDialog' import ListDownloadDialog from '@/components/dialog/ListDownloadDialog'
import MessageSendDialog, { type MessageSendMode } from '@/components/dialog/MessageSendDialog' import MessageSendDialog, { type MessageSendMode } from '@/components/dialog/MessageSendDialog'
import MessageHistoryDialog from '@/components/dialog/MessageHistoryDialog' import MessageHistoryDialog from '@/components/dialog/MessageHistoryDialog'
import { downloadBase64File, downloadFile, XLSX_MIME_TYPE } from '@kri/common/browser' import { downloadFile } from '@kri/common/browser'
import {CONTACT_INTERVIEWER_ROLE} from "@/const/userConst"; import {CONTACT_INTERVIEWER_ROLE} from "@/const/userConst";
import { isInternalManager, isManager } from "@/utils/userRole"; import { isInternalManager, isManager } from "@/utils/userRole";
import { applyListAccessFilter } from "@/utils/listAccess"; import { applyListAccessFilter } from "@/utils/listAccess";
@@ -84,6 +89,7 @@ const ListManagePage = () => {
const { auth } = useAuth() const { auth } = useAuth()
const { showDialog } = useDialog() const { showDialog } = useDialog()
const { selectedProject, isSelectedProjectHydrated } = useSelectedProject() const { selectedProject, isSelectedProjectHydrated } = useSelectedProject()
const [openRequest, setOpenRequest] = useAtom(listJobOpenRequestAtom)
const [downloadMode, setDownloadMode] = useState<ListDownloadMode>('list') const [downloadMode, setDownloadMode] = useState<ListDownloadMode>('list')
const [messageSendMode, setMessageSendMode] = useState<MessageSendMode>('email') const [messageSendMode, setMessageSendMode] = useState<MessageSendMode>('email')
@@ -110,19 +116,56 @@ const ListManagePage = () => {
const canManageList = isManager(userRole); const canManageList = isManager(userRole);
// 리스트 초기화/헤더 관리/업로드는 내부 관리자 전용 — 외주사 계정에는 노출되면 안 됨. // 리스트 초기화/헤더 관리/업로드는 내부 관리자 전용 — 외주사 계정에는 노출되면 안 됨.
const isInternal = isInternalManager(userRole); const isInternal = isInternalManager(userRole);
const pageMonitor = useListJobPageMonitor(prjctIdx, 'LIST_RESET', enabled, { hasSelection: selectedRows.length > 0 })
const { gate: pageGate, dataRevision } = pageMonitor
const trackedJobs = useTrackedListJobs()
useEffect(() => {
if (!mounted || !restoreResolved || !enabled || !openRequest || openRequest.opened
|| openRequest.userId !== userId || openRequest.prjctIdx !== prjctIdx) return
const view = LIST_JOB_VIEW[openRequest.jobType]
if (view.path !== '/list/manage' || !view.dialogId) return
if (!canManageList || (!isInternal && (openRequest.jobType === 'LIST_UPLOAD' || openRequest.jobType === 'LIST_RESET'))) {
toast.error('해당 작업 화면을 열 권한이 없습니다.')
setOpenRequest(null)
return
}
if (view.downloadMode) setDownloadMode(view.downloadMode)
if (view.messageMode) setMessageSendMode(view.messageMode)
showDialog(view.dialogId)
setOpenRequest({ ...openRequest, opened: true })
}, [mounted, restoreResolved, enabled, openRequest, userId, prjctIdx, canManageList, isInternal, setOpenRequest, showDialog])
const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled) const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled)
const projectInfoQuery = useProjectInfoQuery(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()
const uploadListExcelMutation = useUploadListExcelMutation(prjctIdx) const submitJob = useSubmitListJob(prjctIdx)
// 전역 ListJobWatcher가 갱신하는 동일 쿼리를 구독하고 별도 폴링은 만들지 않는다.
const myActiveJobsQuery = useMyActiveListJobs(prjctIdx, false)
const myActiveJobTypes = new Set<string>((myActiveJobsQuery.data ?? []).map((job) => job.jobType))
const inspectableJobTypes = new Set([
...trackedJobs.filter(job => job.userId === userId && job.prjctIdx === prjctIdx).map(job => job.jobType),
...myActiveJobTypes,
...(pageGate.availability?.blockers.filter(blocker => blocker.mine && blocker.jobKey).map(blocker => blocker.jobType) ?? []),
])
const isActionDisabled = (jobType: ListJobType) => !inspectableJobTypes.has(jobType) && isListPageActionBlocked(
pageGate.status === 'unsupported' ? undefined : pageGate.availability,
jobType,
pageGate.status === 'checking' || pageGate.status === 'error',
)
const actionJobTypes: Record<ListManageActionKey, ListJobType> = {
reset: 'LIST_RESET', upload: 'LIST_UPLOAD', ...LIST_DOWNLOAD_JOB_TYPE, ...MESSAGE_JOB_TYPE,
}
const disabledActions = new Set((Object.keys(actionJobTypes) as ListManageActionKey[]).filter(action => isActionDisabled(actionJobTypes[action])))
const runningActions = new Set<ListManageActionKey>([
...(myActiveJobTypes.has('LIST_RESET') ? ['reset' as const] : []),
...(myActiveJobTypes.has('LIST_UPLOAD') ? ['upload' as const] : []),
...(Object.keys(LIST_DOWNLOAD_JOB_TYPE) as ListDownloadMode[]).filter((mode) => myActiveJobTypes.has(LIST_DOWNLOAD_JOB_TYPE[mode])),
...(Object.keys(MESSAGE_JOB_TYPE) as MessageSendMode[]).filter((mode) => myActiveJobTypes.has(MESSAGE_JOB_TYPE[mode])),
])
const updateListHeaderMutation = useUpdateListHeaderMutation(prjctIdx) const updateListHeaderMutation = useUpdateListHeaderMutation(prjctIdx)
const resetListMutation = useResetListMutation(prjctIdx)
const downloadListMutation = useDownloadListMutation(prjctIdx)
const downloadListUpdateHistoryMutation = useDownloadListUpdateHistoryMutation(prjctIdx)
const downloadListEventHistoryMutation = useDownloadListEventHistoryMutation(prjctIdx)
const downloadListItemFileMutation = useDownloadListItemFileMutation(prjctIdx)
const downloadUploadHistoryFileMutation = useDownloadUploadHistoryFileMutation(prjctIdx) const downloadUploadHistoryFileMutation = useDownloadUploadHistoryFileMutation(prjctIdx)
const resultCodeArray = useMemo<ResultCode[]>(() => resultCodesQuery.data ?? [], [resultCodesQuery.data]) const resultCodeArray = useMemo<ResultCode[]>(() => resultCodesQuery.data ?? [], [resultCodesQuery.data])
@@ -140,7 +183,6 @@ const ListManagePage = () => {
removeLastListVisit() removeLastListVisit()
} }
setRestoreResolved(true) setRestoreResolved(true)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [mounted, isSelectedProjectHydrated, restoreResolved]) }, [mounted, isSelectedProjectHydrated, restoreResolved])
useEffect(() => { useEffect(() => {
@@ -222,28 +264,16 @@ const ListManagePage = () => {
showDialog('messageSendDialog') showDialog('messageSendDialog')
} }
const handleResetConfirm = async (payload: { target: ListFilterTarget; scope: ListResetScope }) => { const handleResetConfirm = async (payload: { target: ListFilterTarget; selection: ListResetSelection }) => {
const listFilter = buildTargetFilter(payload.target) const body: ListResetRequest = {
const resetCount = await resetListMutation.mutateAsync({ ...payload.selection,
resetMode: payload.scope === 'result-and-history' ? ListResetMode.HIST : ListResetMode.ALL, listFilter: buildTargetFilter(payload.target),
listFilter, }
}) await submitJob.mutateAsync({ jobType: 'LIST_RESET', path: 'reset', body })
alert(`${resetCount}건 삭제 되었습니다.`)
refreshList()
} }
const handleUploadConfirm = async (file: File, request: ListUploadRequest) => { const handleUploadConfirm = async (file: File, request: ListUploadRequest) => {
const res = await uploadListExcelMutation.mutateAsync({ file, request }) await submitJob.mutateAsync({ jobType: 'LIST_UPLOAD', path: 'upload', file, body: request })
if (res.hasErrorFile && res.errorFileBase64) {
alert("업로드 중 오류가 발생하여 오류 파일을 다운로드합니다.");
downloadBase64File(res.errorFileBase64, res.errorFileName ?? "error.xlsx", XLSX_MIME_TYPE);
}
else{
alert(`${res.successCount}개의 리스트를 업로드했습니다.`);
}
refreshList()
} }
const handleDownloadTemplate = async () => { const handleDownloadTemplate = async () => {
@@ -262,45 +292,47 @@ const ListManagePage = () => {
const handleDownloadConfirm = async (payload: ListDownloadPayload) => { const handleDownloadConfirm = async (payload: ListDownloadPayload) => {
const listFilter = buildTargetFilter(payload.target) const listFilter = buildTargetFilter(payload.target)
const jobType = LIST_DOWNLOAD_JOB_TYPE[payload.mode]
if (payload.mode === 'list') { if (payload.mode === 'list') {
const buffer = await downloadListMutation.mutateAsync({ listFilter, includeResult: payload.includeResult }) await submitJob.mutateAsync({ jobType, path: `downloads/list?includeResult=${payload.includeResult}`, body: listFilter })
downloadArrayBuffer(buffer, `${prjctName} list.xlsx`)
return return
} }
if (payload.mode === 'list-change-history') { if (payload.mode === 'list-change-history') {
const buffer = await downloadListUpdateHistoryMutation.mutateAsync(listFilter) await submitJob.mutateAsync({ jobType, path: 'downloads/update-history', body: listFilter })
downloadArrayBuffer(buffer, `${prjctName} update-history.xlsx`)
return return
} }
if (payload.mode === 'upload-file') { if (payload.mode === 'upload-file') {
const buffer = await downloadListItemFileMutation.mutateAsync(listFilter) await submitJob.mutateAsync({ jobType, path: 'downloads/item-files', body: listFilter })
downloadArrayBuffer(buffer, `${prjctName} upload-files.zip`, 'application/zip')
return return
} }
const buffer = await downloadListEventHistoryMutation.mutateAsync({ await submitJob.mutateAsync({ jobType, path: `downloads/event-history?includeResult=${payload.includeResult}`, body: {
includeResult: payload.includeResult,
listFilter, listFilter,
resultCodeTypes: [ResultCodeType.CONTACT, ResultCodeType.INTERVIEW, ResultCodeType.SURVEY], resultCodeTypes: [ResultCodeType.CONTACT, ResultCodeType.INTERVIEW, ResultCodeType.SURVEY],
searchBase: payload.contactHistoryType === 'latest' ? ListEventHistoryBase.LATEST : ListEventHistoryBase.ALL, searchBase: payload.contactHistoryType === 'latest' ? ListEventHistoryBase.LATEST : ListEventHistoryBase.ALL,
historyOrder: payload.historyOrder ?? ListEventHistoryOrder.DESC, historyOrder: payload.historyOrder ?? ListEventHistoryOrder.DESC,
dateRange: toDateTimeRange(payload.contactHistoryDateFrom, payload.contactHistoryDateTo), dateRange: toDateTimeRange(payload.contactHistoryDateFrom, payload.contactHistoryDateTo),
}) } })
downloadArrayBuffer(buffer, `${prjctName} contact-history.xlsx`)
} }
if (!mounted || !restoreResolved) return <LoadingOverlayAdapter force /> if (!mounted || !restoreResolved) return <LoadingOverlayAdapter force />
return ( return (
<ListJobPageQueryContext.Provider value="LIST_RESET">
<div className="space-y-6 text-sm"> <div className="space-y-6 text-sm">
<ListJobGatePanel gate={pageGate} showCurrentJob={false} />
<ListJobRefreshNotice monitor={pageMonitor} clearsSelection={selectedRows.length > 0} />
{canManageList && ( {canManageList && (
<ListManageActions <ListManageActions
showAdminActions={isInternal} showAdminActions={isInternal}
runningActions={runningActions}
disabledActions={disabledActions}
headerManageDisabled={pageGate.submitBlocked}
onReset={() => showDialog('listResetDialog')} onReset={() => showDialog('listResetDialog')}
onHeaderManage={() => showDialog('listHeaderManageDialog')} onHeaderManage={() => { if (!pageGate.submitBlocked) showDialog('listHeaderManageDialog') }}
onUpload={() => showDialog('listUploadDialog')} onUpload={() => showDialog('listUploadDialog')}
onDownload={openDownloadDialog} onDownload={openDownloadDialog}
onMessageSend={openMessageDialog} onMessageSend={openMessageDialog}
@@ -320,6 +352,8 @@ const ListManagePage = () => {
listHeaders={headerManageRows} listHeaders={headerManageRows}
fieldInterviewEnabled={selectedProject?.ff !== false} fieldInterviewEnabled={selectedProject?.ff !== false}
enableBatchEdit={canManageList} enableBatchEdit={canManageList}
batchEditDisabled={isActionDisabled('LIST_UPDATE')}
dataRevision={dataRevision}
selectMode={canManageList ? 'multi' : 'click-event'} selectMode={canManageList ? 'multi' : 'click-event'}
refreshKey={listRefreshKey} refreshKey={listRefreshKey}
onCurrentFilterChange={setCurrentListFilter} onCurrentFilterChange={setCurrentListFilter}
@@ -342,11 +376,15 @@ const ListManagePage = () => {
{isInternal && ( {isInternal && (
<> <>
<ListResetDialog <ListResetDialog
key={prjctIdx}
prjctIdx={prjctIdx}
surveys={projectInfoQuery.data?.surveys}
selectedSids={selectedSidSet} selectedSids={selectedSidSet}
filterSummary={filterSummary} filterSummary={filterSummary}
onConfirm={handleResetConfirm} onConfirm={handleResetConfirm}
/> />
<ListUploadDialog <ListUploadDialog
prjctIdx={prjctIdx}
onUpload={handleUploadConfirm} onUpload={handleUploadConfirm}
onDownloadTemplate={handleDownloadTemplate} onDownloadTemplate={handleDownloadTemplate}
uploadHistory={uploadHistoryQuery.data ?? []} uploadHistory={uploadHistoryQuery.data ?? []}
@@ -356,13 +394,14 @@ const ListManagePage = () => {
}} }}
headerRows={headerManageRows} headerRows={headerManageRows}
/> />
<ListHeaderManageDialog prjctIdx={prjctIdx} rows={headerManageRows} onConfirm={handleHeaderManageConfirm} /> <ListHeaderManageDialog prjctIdx={prjctIdx} rows={headerManageRows} onConfirm={handleHeaderManageConfirm} saveDisabled={pageGate.submitBlocked} />
</> </>
)} )}
{canManageList && ( {canManageList && (
<> <>
<ListDownloadDialog <ListDownloadDialog
prjctIdx={prjctIdx}
mode={downloadMode} mode={downloadMode}
selectedSids={selectedSidSet} selectedSids={selectedSidSet}
filterSummary={filterSummary} filterSummary={filterSummary}
@@ -380,6 +419,7 @@ const ListManagePage = () => {
</> </>
)} )}
</div> </div>
</ListJobPageQueryContext.Provider>
) )
} }

View File

@@ -1,7 +1,10 @@
'use client' 'use client'
import {useMemo, useState} from "react"; import {useMemo, useState} from "react";
import {ChevronDown} from "lucide-react";
import AppPageTitle from "@/components/app-shell/AppPageTitle"; import AppPageTitle from "@/components/app-shell/AppPageTitle";
import {Badge} from "@/components/ui/badge";
import {Button} from "@/components/ui/button"; import {Button} from "@/components/ui/button";
import {cn} from "@/lib/utils";
import {DataTable} from "@/components/data-table/DataTable"; import {DataTable} from "@/components/data-table/DataTable";
import {getProjectColumns} from "@/components/table-column/ProjectTableColumn"; import {getProjectColumns} from "@/components/table-column/ProjectTableColumn";
import { import {
@@ -28,7 +31,6 @@ import {useCreateProjectMutation, useProjectListQuery, useProjectOwnerListQuery}
import {useGroupCodeListQuery} from "@/query/intranet"; import {useGroupCodeListQuery} from "@/query/intranet";
import {PROJECT_STATUS_LABEL} from "@/const/projectConst"; import {PROJECT_STATUS_LABEL} from "@/const/projectConst";
import {isInternalManager, isManager} from "@/utils/userRole"; import {isInternalManager, isManager} from "@/utils/userRole";
import {CONTACT_INTERVIEWER_ROLE} from "@/const/userConst";
const MainPage = () => { const MainPage = () => {
const router = useRouter(); const router = useRouter();
@@ -100,6 +102,9 @@ const MainPage = () => {
const [searchStatus, setSearchStatus] = useState<string[]>([]); const [searchStatus, setSearchStatus] = useState<string[]>([]);
const [searchDept, setSearchDept] = useState<string[]>([]); const [searchDept, setSearchDept] = useState<string[]>([]);
const [searchFw, setSearchFw] = useState<string[]>([]); const [searchFw, setSearchFw] = useState<string[]>([]);
// 모바일(md 미만)에서만 필터 영역을 접고 펼친다. md 이상에서는 항상 노출된다.
const [filtersOpen, setFiltersOpen] = useState(false);
const hasActiveFilters = searchStatus.length > 0 || searchDept.length > 0 || searchFw.length > 0;
const userId = auth.user?.userId ?? ""; const userId = auth.user?.userId ?? "";
const userRole = auth.user?.userRole; const userRole = auth.user?.userRole;
@@ -155,11 +160,12 @@ const MainPage = () => {
<div className="space-y-6 text-sm"> <div className="space-y-6 text-sm">
<AppPageTitle titleText={"프로젝트"}/> <AppPageTitle titleText={"프로젝트"}/>
<div className="flex gap-2 items-center"> <div className="flex flex-col gap-2 md:flex-row md:flex-wrap md:items-center">
<div className="flex flex-1 items-center gap-2"> <div className="flex flex-col gap-2 md:flex-1 md:flex-row md:flex-wrap md:items-center">
<div className="flex items-center gap-2">
<Input <Input
placeholder="프로젝트 코드 Or 프로젝트 명" placeholder="프로젝트 코드 Or 프로젝트 명"
className="w-120 h-9 bg-white" className="h-9 flex-1 bg-white md:w-120 md:flex-none"
value={searchText} value={searchText}
onChange={(e) => setSearchText(e.target.value)} onChange={(e) => setSearchText(e.target.value)}
onKeyDown={(e) => { onKeyDown={(e) => {
@@ -168,6 +174,34 @@ const MainPage = () => {
} }
}} }}
/> />
<Button
className="md:hidden"
onClick={handleSearchClick}
>
검색
</Button>
</div>
<Button
type="button"
variant="outline"
className="w-full justify-between md:hidden"
aria-expanded={filtersOpen}
aria-controls="project-search-filters"
onClick={() => setFiltersOpen((prev) => !prev)}
>
<span className="flex items-center gap-2">
필터
{hasActiveFilters ? <Badge>적용 중</Badge> : null}
</span>
<ChevronDown className={cn("h-4 w-4 transition-transform", filtersOpen && "rotate-180")} />
</Button>
<div
id="project-search-filters"
className={cn(
"flex flex-col gap-2 md:flex-row md:flex-wrap md:items-center",
!filtersOpen && "hidden md:flex",
)}
>
{ {
isManager(userRole) && isManager(userRole) &&
<KriMultiSelect <KriMultiSelect
@@ -177,7 +211,7 @@ const MainPage = () => {
getValue={(item) => item.value} getValue={(item) => item.value}
getLabel={(item) => item.label} getLabel={(item) => item.label}
placeholder="진행 상태" placeholder="진행 상태"
widthClassName="w-60" widthClassName="w-full md:w-60"
heightClassName="h-9" heightClassName="h-9"
/> />
} }
@@ -188,7 +222,7 @@ const MainPage = () => {
getValue={(item) => item.value} getValue={(item) => item.value}
getLabel={(item) => item.label} getLabel={(item) => item.label}
placeholder="담당 그룹" placeholder="담당 그룹"
widthClassName="w-60" widthClassName="w-full md:w-60"
heightClassName="h-9" heightClassName="h-9"
/> />
<KriMultiSelect <KriMultiSelect
@@ -198,10 +232,12 @@ const MainPage = () => {
getValue={(item) => item.value} getValue={(item) => item.value}
getLabel={(item) => item.label} getLabel={(item) => item.label}
placeholder="담당 실사" placeholder="담당 실사"
widthClassName="w-60" widthClassName="w-full md:w-60"
heightClassName="h-9" heightClassName="h-9"
/> />
</div>
<Button <Button
className="hidden md:inline-flex"
onClick={handleSearchClick} onClick={handleSearchClick}
> >
검색 검색
@@ -209,6 +245,7 @@ const MainPage = () => {
</div> </div>
{isInternal && ( {isInternal && (
<Button <Button
className="w-full md:w-auto"
onClick={handleCreateClick} onClick={handleCreateClick}
> >
프로젝트 등록 프로젝트 등록

View File

@@ -11,11 +11,12 @@ import { clientEnv } from "@/lib/env.client";
import { MessageType } from "@kri/common/noti-hub"; import { MessageType } from "@kri/common/noti-hub";
import type { SendResultSummaryResponse } from "@kri/common/noti-hub"; import type { SendResultSummaryResponse } from "@kri/common/noti-hub";
const SEND_TYPE_ORDER = [MessageType.SMS, MessageType.LMS_MMS, MessageType.EMAIL, MessageType.KKO] as const; const SEND_TYPE_ORDER = [MessageType.SMS, MessageType.LMS, MessageType.MMS, MessageType.EMAIL, MessageType.KKO] as const;
const SEND_TYPE_LABEL: Record<number, string> = { const SEND_TYPE_LABEL: Record<number, string> = {
[MessageType.SMS]: "단문", [MessageType.SMS]: "단문",
[MessageType.LMS_MMS]: "장문", [MessageType.LMS]: "장문",
[MessageType.MMS]: "첨부 문자",
[MessageType.EMAIL]: "메일", [MessageType.EMAIL]: "메일",
[MessageType.KKO]: "알림톡", [MessageType.KKO]: "알림톡",
}; };
@@ -28,6 +29,7 @@ type SummaryRow = {
successCount: number; successCount: number;
failCount: number; failCount: number;
standByCount: number; standByCount: number;
canceledCount: number;
}; };
const sum = (list: SendResultSummaryResponse[], field: keyof SendResultSummaryResponse) => const sum = (list: SendResultSummaryResponse[], field: keyof SendResultSummaryResponse) =>
@@ -44,6 +46,7 @@ const buildRows = (data: SendResultSummaryResponse[]): SummaryRow[] =>
successCount: sum(matched, "successCount"), successCount: sum(matched, "successCount"),
failCount: sum(matched, "failCount"), failCount: sum(matched, "failCount"),
standByCount: sum(matched, "standByCount"), standByCount: sum(matched, "standByCount"),
canceledCount: sum(matched, "canceledCount"),
}; };
}); });
@@ -80,6 +83,7 @@ const MessageProgressPage = () => {
successCount: rows.reduce((acc, row) => acc + row.successCount, 0), successCount: rows.reduce((acc, row) => acc + row.successCount, 0),
failCount: rows.reduce((acc, row) => acc + row.failCount, 0), failCount: rows.reduce((acc, row) => acc + row.failCount, 0),
standByCount: rows.reduce((acc, row) => acc + row.standByCount, 0), standByCount: rows.reduce((acc, row) => acc + row.standByCount, 0),
canceledCount: rows.reduce((acc, row) => acc + row.canceledCount, 0),
}), }),
[rows], [rows],
); );
@@ -103,6 +107,7 @@ const MessageProgressPage = () => {
<th className="h-10 px-3 text-center font-semibold border-b">성공</th> <th className="h-10 px-3 text-center font-semibold border-b">성공</th>
<th className="h-10 px-3 text-center font-semibold border-b">실패</th> <th className="h-10 px-3 text-center font-semibold border-b">실패</th>
<th className="h-10 px-3 text-center font-semibold border-b">발송중</th> <th className="h-10 px-3 text-center font-semibold border-b">발송중</th>
<th className="h-10 px-3 text-center font-semibold border-b">취소</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@@ -115,6 +120,7 @@ const MessageProgressPage = () => {
<td className="h-10 px-3 text-center">{caseUnit(row.successCount)}</td> <td className="h-10 px-3 text-center">{caseUnit(row.successCount)}</td>
<td className="h-10 px-3 text-center">{caseUnit(row.failCount)}</td> <td className="h-10 px-3 text-center">{caseUnit(row.failCount)}</td>
<td className="h-10 px-3 text-center">{caseUnit(row.standByCount)}</td> <td className="h-10 px-3 text-center">{caseUnit(row.standByCount)}</td>
<td className="h-10 px-3 text-center">{caseUnit(row.canceledCount)}</td>
</tr> </tr>
))} ))}
<tr className="bg-gray-50 font-semibold"> <tr className="bg-gray-50 font-semibold">
@@ -124,6 +130,7 @@ const MessageProgressPage = () => {
<td className="h-10 px-3 text-center">{caseUnit(total.successCount)}</td> <td className="h-10 px-3 text-center">{caseUnit(total.successCount)}</td>
<td className="h-10 px-3 text-center">{caseUnit(total.failCount)}</td> <td className="h-10 px-3 text-center">{caseUnit(total.failCount)}</td>
<td className="h-10 px-3 text-center">{caseUnit(total.standByCount)}</td> <td className="h-10 px-3 text-center">{caseUnit(total.standByCount)}</td>
<td className="h-10 px-3 text-center">{caseUnit(total.canceledCount)}</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>

View File

@@ -1,19 +1,18 @@
'use client' 'use client'
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 { Button } from "@/components/ui/button";
import { useSelectedProject } from "@/hooks/useSelectedProject"; import { useSelectedProject } from "@/hooks/useSelectedProject";
import { useProjectInfoQuery, useSurveyRedirectUrlQuery } from "@/query/project"; import { useProjectInfoQuery } from "@/query/project";
import { clientEnv } from "@/lib/env.client";
import { SurveyType } from "@/types/project"; import { SurveyType } from "@/types/project";
import { SURVEY_TYPE_LABEL } from "@/const/projectConst"; import { SURVEY_TYPE_LABEL } from "@/const/projectConst";
const SurveyProgressPage = () => { const SurveyProgressPage = () => {
const mounted = useMounted(); const mounted = useMounted();
const { selectedProject } = useSelectedProject(); const { selectedProject } = useSelectedProject();
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;
@@ -21,35 +20,7 @@ const SurveyProgressPage = () => {
const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled); const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled);
const surveys = projectInfoQuery.data?.surveys ?? []; const surveys = projectInfoQuery.data?.surveys ?? [];
const [activeSurveyIdx, setActiveSurveyIdx] = useState<number | null>(null); const isLoading = !mounted || projectInfoQuery.isLoading;
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 isKiwi = surveyTy === SurveyType.KIWI ? 1 : 0;
const pkey = selectedSurvey?.surveyPrjctCd ?? "";
const redirectUrlEnabled = enabled && !!selectedSurvey && isKonKiwi && !!pkey;
const redirectUrlQuery = useSurveyRedirectUrlQuery(isKiwi, pkey, redirectUrlEnabled);
const targetUrl = !selectedSurvey
? null
: isKonKiwi
? (redirectUrlQuery.data ?? null)
: surveyTy === SurveyType.EXTERNAL
? (selectedSurvey.surveyDashboardUrl || null)
: null;
useEffect(() => {
if (!targetUrl || openedForRef.current === targetUrl) return;
openedForRef.current = targetUrl;
window.open(targetUrl, "_blank");
setOpenedUrl(targetUrl);
}, [targetUrl]);
const isLoading = !mounted || projectInfoQuery.isLoading || (redirectUrlEnabled && redirectUrlQuery.isLoading);
if (isLoading) return <LoadingOverlayAdapter force />; if (isLoading) return <LoadingOverlayAdapter force />;
@@ -62,7 +33,14 @@ const SurveyProgressPage = () => {
) : ( ) : (
<div className="max-w-[600px] space-y-2"> <div className="max-w-[600px] space-y-2">
{surveys.map((survey) => { {surveys.map((survey) => {
const hasReport = survey.surveyTy !== SurveyType.NONE; const isKonKiwi = survey.surveyTy === SurveyType.KON || survey.surveyTy === SurveyType.KIWI;
let targetUrl: string | null = null;
if (isKonKiwi && survey.surveyPrjctCd) {
const projectType = survey.surveyTy === SurveyType.KIWI ? 1 : 0;
targetUrl = `${clientEnv.KART_URL}/Report/Current?projectType=${projectType}&pkey=${encodeURIComponent(survey.surveyPrjctCd)}`;
} else if (survey.surveyTy === SurveyType.EXTERNAL) {
targetUrl = survey.surveyDashboardUrl || null;
}
return ( return (
<div <div
key={survey.prjctSurveyIdx ?? survey.surveyOrder} key={survey.prjctSurveyIdx ?? survey.surveyOrder}
@@ -72,28 +50,21 @@ const SurveyProgressPage = () => {
<p className="font-semibold">{survey.surveyName}</p> <p className="font-semibold">{survey.surveyName}</p>
<p className="text-xs text-muted-foreground">{SURVEY_TYPE_LABEL[survey.surveyTy]}</p> <p className="text-xs text-muted-foreground">{SURVEY_TYPE_LABEL[survey.surveyTy]}</p>
</div> </div>
<Button {targetUrl ? (
type="button" <Button asChild>
disabled={!hasReport} <a href={targetUrl} target="_blank" rel="noopener noreferrer">
onClick={() => setActiveSurveyIdx(survey.prjctSurveyIdx ?? null)}
>
바로가기 바로가기
</a>
</Button> </Button>
) : (
<Button type="button" disabled>바로가기</Button>
)}
</div> </div>
); );
})} })}
</div> </div>
)} )}
{openedUrl ? (
<p>
새 창에서 열립니다. 열리지 않았다면{" "}
<a href={openedUrl} target="_blank" rel="noreferrer" className="text-blue-600 underline">
여기
</a>
를 클릭해 주세요.
</p>
) : null}
</div> </div>
); );
}; };

View File

@@ -279,6 +279,14 @@ const SurveyCard = ({ survey, index, itrntPrjctCd, userTeam, invalidField, onReg
heightClassName="h-9" heightClassName="h-9"
widthClassName="w-full" widthClassName="w-full"
/> />
{kartProjectListQuery.isError && (
<div role="alert" className="flex items-center gap-2 text-destructive">
<span>프로젝트 목록을 불러오지 못했습니다.</span>
<Button type="button" variant="outline" size="sm" onClick={() => void kartProjectListQuery.refetch()}>
다시 시도
</Button>
</div>
)}
</div> </div>
)} )}
@@ -444,7 +452,7 @@ const ProjectInfoPage = () => {
const updateMutation = useUpdateProjectMutation(prjctIdx); const updateMutation = useUpdateProjectMutation(prjctIdx);
const deleteMutation = useDeleteProjectMutation(prjctIdx); const deleteMutation = useDeleteProjectMutation(prjctIdx);
const uploadScenarioMutation = useUploadScenarioImageMutation(prjctIdx, projectInfo.prjctCd); const uploadScenarioMutation = useUploadScenarioImageMutation(projectInfo.prjctCd);
const [resultCodeArray, setResultCodeArray] = useState<ResultCode[]>([]); const [resultCodeArray, setResultCodeArray] = useState<ResultCode[]>([]);
const [assignCmpnIdArray, setAssignCmpnIdArray] = useState<string[]>([]); const [assignCmpnIdArray, setAssignCmpnIdArray] = useState<string[]>([]);

View File

@@ -14,10 +14,8 @@ const toRedirectSlug = (slug: string): RedirectSlug | null => {
const redirectPage = async ({ const redirectPage = async ({
params, params,
searchParams,
}: redirectPageProps) => { }: redirectPageProps) => {
const { slug } = await params; const { slug } = await params;
const sp = searchParams ? await searchParams : undefined;
const redirectSlug = toRedirectSlug(slug); const redirectSlug = toRedirectSlug(slug);
if (!redirectSlug) notFound(); if (!redirectSlug) notFound();

View File

@@ -64,37 +64,6 @@ export const PUT = async (req: NextRequest, context: RouteContext) => {
return new NextResponse(null, { status: 204 }); return new NextResponse(null, { status: 204 });
} }
if (action === "list" && slug.length === 3) {
const body = await req.json().catch(() => null);
if (!body) {
return NextResponse.json(
{ message: "요청 바디가 없습니다." },
{ status: 400 }
);
}
const result = await contactApi.put<number>(`/assign/list/${slug[1]}/${slug[2]}`, body);
return NextResponse.json(result, { status: 200 });
}
return NextResponse.json({ message: "Not found" }, { status: 404 });
} catch (error: unknown) {
return errorToResponse(error);
}
};
export const DELETE = async (req: NextRequest, context: RouteContext) => {
try {
const { slug = [] } = await context.params;
const [action] = slug;
const contactApi = await createContactApi();
if (action === "list" && slug[1] === "reset" && slug.length === 3) {
const body = await req.json().catch(() => null);
const result = await contactApi.del<number>(`/assign/list/reset/${slug[2]}`, { json: body });
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

@@ -0,0 +1,22 @@
import { NextResponse } from "next/server";
import { errorToResponse } from "@kri/common/http";
import { createContactApi } from "@/lib/http-server";
import {isLoginUser} from "@/lib/auth-user";
export async function GET(_request: Request, context: { params: Promise<{ slug?: string[] }> }) {
const { slug = [] } = await context.params;
if (slug.length !== 1 || slug[0] !== "my-info")
return NextResponse.json({ message: "Not found" }, { status: 404, headers: { "Cache-Control": "no-store" } });
try {
const api = await createContactApi();
const user = await api.get<unknown>("/auth/my-info", { cache: "no-store" });
if (!isLoginUser(user)) {
return NextResponse.json({ message: "Invalid user response" }, { status: 502, headers: { "Cache-Control": "no-store" } });
}
return NextResponse.json({ userId: user.userId, userName: user.userName, userCmpn: user.userCmpn, userTeam: user.userTeam, userRole: user.userRole }, { headers: { "Cache-Control": "no-store" } });
} catch (error) {
const response = errorToResponse(error);
response.headers.set("Cache-Control", "no-store");
return response;
}
}

View File

@@ -1,6 +1,6 @@
import {NextRequest, NextResponse} from "next/server"; import {NextRequest, NextResponse} from "next/server";
import {RouteContext} from "@/types/common"; import {RouteContext} from "@/types/common";
import {createKartApi} from "@/lib/http-server"; import {createContactApi} from "@/lib/http-server";
import {KonKiwiProjectInfo} from "@/types/project"; import {KonKiwiProjectInfo} from "@/types/project";
import {errorToResponse} from "@kri/common/http"; import {errorToResponse} from "@kri/common/http";
@@ -9,32 +9,19 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
const { searchParams } = new URL(req.url); const { searchParams } = new URL(req.url);
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action] = slug; const [action] = slug;
const kartApi = await createKartApi(); const contactApi = await createContactApi();
if(action === "project-list" && slug.length === 4){ if(action === "project-list" && slug.length === 3){
const keyword = (searchParams.get("keyword") ?? "").trim(); const keyword = (searchParams.get("keyword") ?? "").trim();
const result = await kartApi.get<KonKiwiProjectInfo[]>( const [, intranetCode, projectType] = slug;
`/project/list/${slug[1]}/${slug[2]}/${slug[3]}`, if (!intranetCode.trim() || intranetCode.length > 32 || !["0", "1"].includes(projectType)) {
{ query: keyword ? { keyword } : {} } return NextResponse.json({ message: "프로젝트 정보를 확인해 주세요." }, { status: 400 });
);
return NextResponse.json(result, { status: 200 });
} }
const result = await contactApi.get<KonKiwiProjectInfo[]>(`/kart/project/list`, {
if(action === "survey-redirect-url" && slug.length === 3){ query: { intranetCode, projectType, ...(keyword ? { keyword } : {}) },
const [, isKiwi, pkey] = slug;
const skey = await kartApi.get<string>(`/encrypt/pkey`, {
headers: { pkey, iskiwi: isKiwi },
}); });
const shortUrl = await kartApi.post<string>( return NextResponse.json(result, { status: 200 });
`/uri/short`,
{ realURI: "/Report/Current", mode: "U" },
{ headers: { skey } },
);
return NextResponse.json(shortUrl, { status: 200 });
} }
return NextResponse.json({ message: "Not found" }, { status: 404 }); return NextResponse.json({ message: "Not found" }, { status: 404 });

View File

@@ -2,25 +2,7 @@ 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 {ListCallHist, ListCallHistSession} from "@/types/list"; import type {ListCallHist} 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 {
@@ -45,21 +27,3 @@ export const PUT = async (req: NextRequest, context: RouteContext) => {
return errorToResponse(error); return errorToResponse(error);
} }
}; };
export const PATCH = async (_req: NextRequest, context: RouteContext) => {
try {
const { slug = [] } = await context.params;
const [action, agentSessionId] = slug;
if (action !== "hangup" || !agentSessionId) {
return NextResponse.json({ message: "Not found" }, { status: 404 });
}
const contactApi = await createContactApi();
const result = await contactApi.patch<boolean>(
`/list-call-hist/hangup/${encodeURIComponent(agentSessionId)}`,
);
return NextResponse.json(result, { status: 200 });
} catch (error: unknown) {
return errorToResponse(error);
}
};

View File

@@ -4,7 +4,7 @@ import {createContactApi} from "@/lib/http-server";
import {errorToResponse} from "@kri/common/http"; import {errorToResponse} from "@kri/common/http";
import type {ListEventHistory, ListUpdateHistory} from "@/types/list"; import type {ListEventHistory, ListUpdateHistory} from "@/types/list";
export const GET = async (req: NextRequest, context: RouteContext) => { export const GET = async (_req: NextRequest, context: RouteContext) => {
try { try {
const { slug = [] } = await context.params; const { slug = [] } = await context.params;
const [action] = slug; const [action] = slug;
@@ -30,7 +30,7 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
} }
}; };
export const DELETE = async (req: NextRequest, context: RouteContext) => { export const DELETE = async (_req: NextRequest, context: RouteContext) => {
try { try {
const { slug = [] } = await context.params; const { slug = [] } = await context.params;
const [action] = slug; const [action] = slug;

View File

@@ -0,0 +1,59 @@
import { NextRequest, NextResponse } from 'next/server'
import { cookies } from 'next/headers'
import { errorToResponse } from '@kri/common/http'
import { createContactApi } from '@/lib/http-server'
import { serverEnv } from '@/lib/env.server'
import { CookieKeys } from '@/store/cookie/cookie-keys'
import type { RouteContext } from '@/types/common'
const project = '[1-9][0-9]*'
const key = '[a-f0-9]{32}'
const getPath = new RegExp(`^${project}/(?:availability|upload-reset-active|my-active|${key}(?:/(?:sid-failures|range-failures|validation-errors|source-file|files/[0-9]+|message-report/(?:batches|preparation-failures)))?)$`)
const postPath = new RegExp(`^${project}/(?:upload|reset|${key}/cancel|mutations/(?:update|assign-reset|assign/[^/]+)|downloads/(?:list|event-history|update-history|item-files)|messages/(?:email|sms|kko))$`)
// The shared HTTP client decodes binary bodies. Forward file bodies as streams instead.
async function forwardFile(req: NextRequest, path: string) {
const token = (await cookies()).get(CookieKeys.AuthToken)?.value
if (!token) return NextResponse.json({ message: '로그인이 필요합니다.' }, { status: 401 })
const headers = new Headers({ Authorization: `Bearer ${token}` })
if (req.method === 'POST') {
const type = req.headers.get('content-type')
if (!type?.startsWith('multipart/form-data;')) return NextResponse.json({ message: '파일 요청 형식이 올바르지 않습니다.' }, { status: 400 })
headers.set('Content-Type', type)
}
const options: RequestInit & { duplex?: 'half' } = {
method: req.method, headers, cache: 'no-store', redirect: 'error',
signal: AbortSignal.any([req.signal, AbortSignal.timeout(300_000)]),
...(req.method === 'POST' ? { body: req.body, duplex: 'half' as const } : {}),
}
const upstream = await fetch(`${serverEnv.API_CONTACT_SERVER.replace(/\/$/, '')}/list/jobs/${path}`, options)
const responseHeaders = new Headers({ 'Cache-Control': 'no-store' })
for (const name of ['Content-Type', 'Content-Disposition', 'Content-Length']) {
const value = upstream.headers.get(name)
if (value) responseHeaders.set(name, value)
}
return new NextResponse(upstream.body, { status: upstream.status, headers: responseHeaders })
}
async function proxy(req: NextRequest, context: RouteContext) {
try {
const { slug = [] } = await context.params
const path = slug.map(encodeURIComponent).join('/')
if (!(req.method === 'GET' ? getPath : postPath).test(path)) return NextResponse.json({ message: '지원하지 않는 작업 경로입니다.' }, { status: 404 })
if (/\/(source-file|files\/[0-9]+|upload)$/.test(path)) return await forwardFile(req, path)
const query = new URLSearchParams()
for (const name of ['offset', 'limit', 'includeResult', 'jobType']) {
const value = req.nextUrl.searchParams.get(name)
if (value !== null) query.set(name, value)
}
const url = `/list/jobs/${path}${query.size ? `?${query}` : ''}`
const api = await createContactApi()
const value = req.method === 'GET'
? await api.get(url, { cache: 'no-store' })
: await api.post(url, await req.json().catch(() => undefined))
return NextResponse.json(value, { headers: { 'Cache-Control': 'no-store' } })
} catch (error: unknown) { return errorToResponse(error) }
}
export const GET = proxy
export const POST = proxy

View File

@@ -4,13 +4,12 @@ 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 {listHeader, ListSearchRequest, ListSearchWithFullResult} from "@/types/list"; import {listHeader, ListSearchRequest, ListSearchWithFullResult} from "@/types/list";
import {LIST_EXCEL_TIMEOUT_MS} from "@/const/listConst";
const excelHeaders = { const excelHeaders = {
"Content-Type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", "Content-Type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
}; };
export const GET = async (req: NextRequest, context: RouteContext) => { export const GET = async (_req: NextRequest, context: RouteContext) => {
try { try {
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action] = slug; const [action] = slug;
@@ -101,52 +100,6 @@ export const POST = async (req: NextRequest, context: RouteContext) => {
return new NextResponse(null, { status: 204 }); return new NextResponse(null, { status: 204 });
} }
if (action === "excel-upload") {
const form = await req.formData();
const result = await contactApi.postForm(`/list/excel/upload/${slug[1]}`, form, {
timeoutMs: LIST_EXCEL_TIMEOUT_MS,
});
return NextResponse.json(result, { status: 200 });
}
if (action === "excel-download") {
const body = await req.json().catch(() => null);
const includeResult = req.nextUrl.searchParams.get("includeResult") !== "false";
const result = await contactApi.post<ArrayBuffer>(
`/list/excel/download/${slug[1]}?includeResult=${includeResult}`,
body,
{ expectBinary: true, timeoutMs: LIST_EXCEL_TIMEOUT_MS },
);
return new NextResponse(result, { status: 200, headers: excelHeaders });
}
if (action === "excel-download-update") {
const body = await req.json().catch(() => null);
const result = await contactApi.post<ArrayBuffer>(`/list/excel/download/update/${slug[1]}`, body, {
expectBinary: true,
});
return new NextResponse(result, { status: 200, headers: excelHeaders });
}
if (action === "event-history-download") {
const body = await req.json().catch(() => null);
const includeResult = req.nextUrl.searchParams.get("includeResult") !== "false";
const result = await contactApi.post<ArrayBuffer>(
`/list-hist/excel/download/event/${slug[1]}?includeResult=${includeResult}`,
body,
{ expectBinary: true, timeoutMs: LIST_EXCEL_TIMEOUT_MS },
);
return new NextResponse(result, { status: 200, headers: excelHeaders });
}
if (action === "item-file-download") {
const body = await req.json().catch(() => null);
const result = await contactApi.post<ArrayBuffer>(`/list/item-file/download/${slug[1]}`, body, {
expectBinary: true,
});
return new NextResponse(result, { status: 200, headers: { "Content-Type": "application/zip" } });
}
if (action === "upload-history-file") { if (action === "upload-history-file") {
const result = await contactApi.post<ArrayBuffer>( const result = await contactApi.post<ArrayBuffer>(
`/list/excel/upload-history/file/${slug[1]}/${slug[2]}`, `/list/excel/upload-history/file/${slug[1]}/${slug[2]}`,
@@ -184,15 +137,3 @@ export const PATCH = async (req: NextRequest, context: RouteContext) => {
return errorToResponse(error); return errorToResponse(error);
} }
}; };
export const DELETE = async (req: NextRequest, context: RouteContext) => {
try {
const { slug = [] } = await context.params;
const body = await req.json().catch(() => null);
const contactApi = await createContactApi();
const result = await contactApi.del<number>(`/list/${slug[0]}`, { json: body });
return NextResponse.json(result, { status: 200 });
} catch (error: unknown) {
return errorToResponse(error);
}
};

View File

@@ -1,9 +1,8 @@
import { NextRequest, NextResponse } from "next/server"; import { NextRequest, NextResponse } from "next/server";
import type { LoginRequest, LoginUser } from "@kri/common"; import type { LoginRequest, LoginUser } from "@kri/common";
import {serverEnv} from "@/lib/env.server"; import {setAuthCookie} from "@/lib/auth-cookie";
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 {CookieKeys} from "@/store/cookie/cookie-keys";
//?ㅼ젣 Backend //?ㅼ젣 Backend
type LoginResponse = { type LoginResponse = {
@@ -19,13 +18,7 @@ export const POST = async (req: NextRequest) => {
const result = await contactApi.post<LoginResponse>("/auth/login", body); const result = await contactApi.post<LoginResponse>("/auth/login", body);
const res = NextResponse.json(result.user, { status: 200 }); const res = NextResponse.json(result.user, { status: 200 });
res.cookies.set(CookieKeys.AuthToken, result.accessToken, { setAuthCookie(res, result.accessToken);
httpOnly: true,
secure: serverEnv.ENV === "prod",
sameSite: "lax",
path: "/",
maxAge: 24 * 60 * 60, // 24?쒓컙
});
return res; return res;
} catch (error : unknown) { } catch (error : unknown) {

View File

@@ -1,12 +1,11 @@
import { NextRequest, NextResponse } from "next/server"; import { NextRequest, NextResponse } from "next/server";
import {serverEnv} from "@/lib/env.server"; import {setAuthCookie} from "@/lib/auth-cookie";
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 {RouteContext} from "@/types/common"; import {RouteContext} from "@/types/common";
import {CookieKeys} from "@/store/cookie/cookie-keys";
export async function POST( export async function POST(
req: NextRequest, _req: NextRequest,
context: RouteContext context: RouteContext
) { ) {
try { try {
@@ -22,13 +21,7 @@ export async function POST(
await contactApi.post<boolean>(url); await contactApi.post<boolean>(url);
const res = NextResponse.json({ ok: true }); const res = NextResponse.json({ ok: true });
res.cookies.set(CookieKeys.AuthToken, "", { setAuthCookie(res, "");
httpOnly: true,
secure: serverEnv.ENV === "prod",
sameSite: "lax",
path: "/",
maxAge: 0,
});
return res; return res;
} catch (error: unknown) { } catch (error: unknown) {

View File

@@ -2,18 +2,48 @@ 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 {BulkSendResult} from "@kri/common/noti-hub"; import type {SendCancelResponse} from "@kri/common/noti-hub";
import type {MessageSendChannel, SendSingleResponse} from "@/types/message"; import type {MessageSendChannel, SendSingleResponse} from "@/types/message";
const isChannel = (value: string): value is MessageSendChannel => const isChannel = (value: string): value is MessageSendChannel =>
value === "sms" || value === "email" || value === "kko"; value === "sms" || value === "email" || value === "kko";
const BULK_SEND_KEY_MAX_LENGTH = 32;
const readCancelBody = (body: unknown, target: string): Record<string, number | string> | null => {
if (!body || typeof body !== "object") return null;
if (target === "single") {
const sendIdx = (body as {sendIdx?: unknown}).sendIdx;
return typeof sendIdx === "number" && Number.isSafeInteger(sendIdx) && sendIdx > 0 ? {sendIdx} : null;
}
if (target === "bulk") {
const bulkSendKey = (body as {bulkSendKey?: unknown}).bulkSendKey;
return typeof bulkSendKey === "string" && bulkSendKey.trim() !== "" && bulkSendKey.length <= BULK_SEND_KEY_MAX_LENGTH
? {bulkSendKey}
: null;
}
return null;
};
export const POST = async (req: NextRequest, context: RouteContext) => { export const POST = async (req: NextRequest, context: RouteContext) => {
try { try {
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [channel, action, prjctIdx] = slug; const [channel, action, prjctIdx] = slug;
const contactApi = await createContactApi(); const contactApi = await createContactApi();
// 예약 취소 (POST /message-send/cancel/{single|bulk}). 채널 구분 없이 공통 API를 사용한다.
if (channel === "cancel") {
if (action !== "single" && action !== "bulk") {
return NextResponse.json({message: "Not found"}, {status: 404});
}
const cancelBody = readCancelBody(await req.json().catch(() => null), action);
if (!cancelBody) {
return NextResponse.json({message: "취소 요청 값이 올바르지 않습니다."}, {status: 400});
}
const result = await contactApi.post<SendCancelResponse>(`/message-send/cancel/${action}`, cancelBody);
return NextResponse.json(result, {status: 200});
}
if (!isChannel(channel) || !prjctIdx) { if (!isChannel(channel) || !prjctIdx) {
return NextResponse.json({message: "Not found"}, {status: 404}); return NextResponse.json({message: "Not found"}, {status: 404});
} }
@@ -28,11 +58,6 @@ export const POST = async (req: NextRequest, context: RouteContext) => {
return NextResponse.json(result, {status: 200}); return NextResponse.json(result, {status: 200});
} }
if (action === "bulk") {
const result = await contactApi.post<BulkSendResult>(`/message-send/${channel}/bulk/${prjctIdx}`, body);
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,7 @@
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 { KkoSenderProfile } from "@/types/message";
import type { KkoTemplateDetail, KkoTemplateListResponse, Template, TemplateSummary } from "@kri/common/noti-hub"; import type { KkoTemplateDetail, KkoTemplateListResponse, Template, TemplateSummary } from "@kri/common/noti-hub";
// 외부 알림톡 템플릿 목록·상세 조회. JSON 본문을 contact-back에 그대로 전달한다. // 외부 알림톡 템플릿 목록·상세 조회. JSON 본문을 contact-back에 그대로 전달한다.
@@ -35,6 +36,11 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
const [action] = slug; const [action] = slug;
const contactApi = await createContactApi(); const contactApi = await createContactApi();
if (slug.length === 2 && action === "kko" && slug[1] === "profiles") {
const result = await contactApi.get<KkoSenderProfile[]>(`/message-template/kko/profiles`);
return NextResponse.json(result, { status: 200 });
}
if(slug.length === 2 && slug[1] === "attachment"){ if(slug.length === 2 && slug[1] === "attachment"){
const fileName = searchParams.get("fileName"); const fileName = searchParams.get("fileName");
if (!fileName) { if (!fileName) {
@@ -70,7 +76,6 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
export const PUT = async (req: NextRequest, context: RouteContext) => { export const PUT = async (req: NextRequest, context: RouteContext) => {
try{ try{
const { searchParams } = new URL(req.url);
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action] = slug; const [action] = slug;
const contactApi = await createContactApi(); const contactApi = await createContactApi();
@@ -117,7 +122,6 @@ export const PUT = async (req: NextRequest, context: RouteContext) => {
export const PATCH = async (req: NextRequest, context: RouteContext) => { export const PATCH = async (req: NextRequest, context: RouteContext) => {
try{ try{
const { searchParams } = new URL(req.url);
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action] = slug; const [action] = slug;
const contactApi = await createContactApi(); const contactApi = await createContactApi();
@@ -140,3 +144,20 @@ export const PATCH = async (req: NextRequest, context: RouteContext) => {
return errorToResponse(error); return errorToResponse(error);
} }
} }
// 템플릿 삭제. 성공 응답은 빈 body이므로 JSON으로 파싱하지 않는다.
export const DELETE = async (req: NextRequest, context: RouteContext) => {
try{
const {slug = []} = await context.params;
const [tmplatIdx] = slug;
if (slug.length !== 1 || !/^[1-9]\d*$/.test(tmplatIdx)) {
return NextResponse.json({ message: "Not found" }, { status: 404 });
}
const contactApi = await createContactApi();
await contactApi.del(`/message-template/${tmplatIdx}`, { expectText: true });
return new NextResponse(null, { status: 204 });
} catch (error: unknown) {
return errorToResponse(error);
}
}

View File

@@ -1,5 +1,5 @@
import {NextRequest, NextResponse} from "next/server"; import {NextRequest, NextResponse} from "next/server";
import {createContactApi, createIntranetApi} from "@/lib/http-server"; import {createContactApi} from "@/lib/http-server";
import {errorToResponse} from "@kri/common/http"; import {errorToResponse} from "@kri/common/http";
import type {PageResponse} from "@kri/common"; import type {PageResponse} from "@kri/common";
import {RouteContext} from "@/types/common"; import {RouteContext} from "@/types/common";
@@ -172,10 +172,9 @@ export const PATCH = async (req: NextRequest, context: RouteContext) => {
} }
}; };
export const DELETE = async (req: NextRequest, context: RouteContext) => { export const DELETE = async (_req: NextRequest, context: RouteContext) => {
try { try {
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action] = slug;
const contactApi = await createContactApi(); const contactApi = await createContactApi();
if(slug.length === 1){ if(slug.length === 1){

View File

@@ -48,7 +48,7 @@ export const GET = async (req: NextRequest, context: RouteContext) => {
} }
}; };
export const PUT = async (req: NextRequest, context: RouteContext) => { export const PUT = async (req: NextRequest) => {
try { try {
const body = await req.json().catch(() => null); const body = await req.json().catch(() => null);
if (!body) { if (!body) {

View File

@@ -1,14 +1,12 @@
import {NextRequest, NextResponse} from "next/server"; 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 {ProjectInfo, ProjectOwnerResponse, ResultCode} from "@/types/project"; import {ResultCode} from "@/types/project";
import {errorToResponse} from "@kri/common/http"; import {errorToResponse} from "@kri/common/http";
export const GET = async (req: NextRequest, context: RouteContext) => { export const GET = async (_req: NextRequest, context: RouteContext) => {
try { try {
const { searchParams } = new URL(req.url);
const {slug = []} = await context.params; const {slug = []} = await context.params;
const [action] = slug;
const contactApi = await createContactApi(); const contactApi = await createContactApi();
if(slug.length === 1){ if(slug.length === 1){

View File

@@ -4,7 +4,7 @@ import {RoleInfo} from "@/types/role";
import {errorToResponse} from "@kri/common/http"; import {errorToResponse} from "@kri/common/http";
import {RouteContext} from "@/types/common"; import {RouteContext} from "@/types/common";
export const GET = async (req: NextRequest, context: RouteContext) => { export const GET = async (_req: NextRequest, context: RouteContext) => {
try { try {
const { slug = [] } = await context.params; const { slug = [] } = await context.params;
const [action] = slug; const [action] = slug;

View File

@@ -149,7 +149,7 @@ export const PATCH = async (req: NextRequest, context: RouteContext) => {
} }
}; };
export const DELETE = async (req: NextRequest, context: RouteContext) => { export const DELETE = async (_req: NextRequest, context: RouteContext) => {
try { try {
const { slug = [] } = await context.params; const { slug = [] } = await context.params;
const [userId] = slug ?? []; const [userId] = slug ?? [];

View File

@@ -2,7 +2,7 @@ import type { Metadata } from "next";
import {Geist, Geist_Mono} from "next/font/google"; import {Geist, Geist_Mono} from "next/font/google";
import { AppProvider } from "@/components/providers/AppProvider"; import { AppProvider } from "@/components/providers/AppProvider";
import "./globals.css"; import "./globals.css";
import {Toaster} from "sonner"; import {Toaster} from "@/components/ui/sonner";
const geistSans = Geist({ const geistSans = Geist({
variable: "--font-geist-sans", variable: "--font-geist-sans",

View File

@@ -1,8 +1,16 @@
"use client"; "use client";
import Image from "next/image"; import Image from "next/image";
import { CalendarClock, LogOut, ZoomIn, ZoomOut } from "lucide-react"; import { CalendarClock, LogOut, UserRound, ZoomIn, ZoomOut } from "lucide-react";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
} from "@/components/ui/dropdown-menu";
import { KriHeader } from "@/components/layout/KriHeader"; import { KriHeader } from "@/components/layout/KriHeader";
import type { TopMenuItem } from "@/config/menu.types"; import type { TopMenuItem } from "@/config/menu.types";
import type { LoginUser } from "@kri/common"; import type { LoginUser } from "@kri/common";
@@ -54,13 +62,13 @@ export function AppHeader({
<> <>
<KriHeader <KriHeader
logo={ logo={
<div className="flex h-10 w-20 items-center justify-center"> <div className="flex h-10 w-16 items-center justify-center sm:w-20">
<Image <Image
src="/kri_logo.png" src="/kri_logo.png"
alt="KRI 로고" alt="KRI 로고"
width={120} width={120}
height={40} height={40}
className="object-contain" className="h-full w-full object-contain"
priority priority
/> />
</div> </div>
@@ -73,7 +81,8 @@ export function AppHeader({
onToggleMenu={onToggleMenu} onToggleMenu={onToggleMenu}
onNavigate={(path) => {if(!isContactPage) onNavigate(path)}} onNavigate={(path) => {if(!isContactPage) onNavigate(path)}}
className="border-gray-200 bg-white" className="border-gray-200 bg-white"
innerClassName="h-16 px-4" // 모바일(sm 미만)은 헤더 폭이 좁아 로고와 우측 버튼이 겹치지 않도록 간격을 줄인다.
innerClassName="h-16 gap-2 px-2 sm:gap-4 sm:px-4"
center={ center={
showProjectTitle ? ( showProjectTitle ? (
<h1 className="ml-3 hidden truncate text-2xl font-bold lg:block" title={projectName}>{projectName}</h1> <h1 className="ml-3 hidden truncate text-2xl font-bold lg:block" title={projectName}>{projectName}</h1>
@@ -81,16 +90,16 @@ export function AppHeader({
} }
right={ right={
<> <>
<div className="flex items-center gap-1 border-r pr-4"> <div className="flex items-center gap-1 border-r pr-2 sm:pr-4">
<Button variant="ghost" size="icon" onClick={decreaseFontSize} title="폰트 작게"> <Button variant="ghost" size="icon" className="size-8 sm:size-9" onClick={decreaseFontSize} title="폰트 작게">
<ZoomOut className="h-4 w-4" /> <ZoomOut className="h-4 w-4" />
</Button> </Button>
<span className="min-w-[3rem] text-center text-xs text-gray-500">{fontSize}px</span> <span className="min-w-6 text-center text-xs text-gray-500" title={`글자 크기 ${fontSize}px`}>{fontSize}</span>
<Button variant="ghost" size="icon" onClick={increaseFontSize} title="폰트 크게"> <Button variant="ghost" size="icon" className="size-8 sm:size-9" onClick={increaseFontSize} title="폰트 크게">
<ZoomIn className="h-4 w-4" /> <ZoomIn className="h-4 w-4" />
</Button> </Button>
</div> </div>
<Button variant="ghost" size="icon-lg" onClick={onOpenReserveSearch} title="예약 내역 조회"> <Button variant="ghost" size="icon-lg" className="size-8 sm:size-10" onClick={onOpenReserveSearch} title="예약 내역 조회">
<CalendarClock className="size-6" /> <CalendarClock className="size-6" />
</Button> </Button>
<span className="hidden items-center gap-1.5 text-sm text-gray-600 sm:inline-flex"> <span className="hidden items-center gap-1.5 text-sm text-gray-600 sm:inline-flex">
@@ -108,10 +117,30 @@ export function AppHeader({
</span> </span>
) : null} ) : null}
</span> </span>
<Button variant="ghost" size="sm" className="gap-2" onClick={() => onNavigate("/logout")}> <Button variant="ghost" size="sm" className="hidden gap-2 sm:inline-flex" onClick={() => onNavigate("/logout")}>
<LogOut className="h-4 w-4" /> <LogOut className="h-4 w-4" />
<span className="hidden sm:inline">로그아웃</span> <span>로그아웃</span>
</Button> </Button>
{/* 모바일(sm 미만)은 헤더 폭이 좁아 이름과 로그아웃을 사용자 메뉴로 묶는다. CTI는 모바일에서 사용하지 않아 표시하지 않는다. */}
<DropdownMenu>
<DropdownMenuTrigger asChild>
<Button variant="ghost" size="icon" className="size-8 sm:hidden" title="사용자 메뉴" aria-label="사용자 메뉴">
<UserRound className="h-4 w-4" />
</Button>
</DropdownMenuTrigger>
<DropdownMenuContent align="end">
{userInfo?.userName ? (
<>
<DropdownMenuLabel>{`${userInfo.userName} 님`}</DropdownMenuLabel>
<DropdownMenuSeparator />
</>
) : null}
<DropdownMenuItem onSelect={() => onNavigate("/logout")}>
<LogOut className="h-4 w-4" />
로그아웃
</DropdownMenuItem>
</DropdownMenuContent>
</DropdownMenu>
</> </>
} }
/> />

View File

@@ -17,6 +17,7 @@ import { manageSideMenus, projectSideMenus, topMenus } from "@/config/menu.data"
import type { SideMenuItem, SideSubMenuItem, TopMenuItem } from "@/config/menu.types"; import type { SideMenuItem, SideSubMenuItem, TopMenuItem } from "@/config/menu.types";
import { cn } from "@/lib/utils"; import { cn } from "@/lib/utils";
import { FONT_SIZE } from "@/const/commonConst"; import { FONT_SIZE } from "@/const/commonConst";
import { ListJobWatcher } from "@/components/list/ListJobWatcher";
type AppMainLayoutProps = { type AppMainLayoutProps = {
children: ReactNode; children: ReactNode;
@@ -200,7 +201,7 @@ export default function AppMainLayout({ children, initialFontSize }: AppMainLayo
bodyClassName={cn(!isMain && isContactPage && "min-h-0")} bodyClassName={cn(!isMain && isContactPage && "min-h-0")}
mainClassName={cn("p-4", "min-h-0")} mainClassName={cn("p-4", "min-h-0")}
mainStyle={{ fontSize: `var(--content-font-size, ${initialFontSize}px)` }} mainStyle={{ fontSize: `var(--content-font-size, ${initialFontSize}px)` }}
sidebarOpen={!isMain && isContactPage && menuOpen} sidebarOpen={!isMain && !isContactPage && menuOpen}
onSidebarOpenChange={setMenuOpen} onSidebarOpenChange={setMenuOpen}
header={ header={
<AppHeader <AppHeader
@@ -235,6 +236,7 @@ export default function AppMainLayout({ children, initialFontSize }: AppMainLayo
} }
> >
{children} {children}
{mounted && auth.user && <ListJobWatcher userId={auth.user.userId} prjctIdx={selectedProject?.prjctIdx ?? 0} />}
<ReserveSearchDialog /> <ReserveSearchDialog />
</KriMainLayout> </KriMainLayout>
); );

View File

@@ -0,0 +1,19 @@
"use client";
import type { ReactNode } from "react";
import { useAuthSession } from "@/hooks/useAuthSession";
export function AuthSessionGate({ children }: { children: ReactNode }) {
const session = useAuthSession();
const user = session.data;
const checking = session.isPending || session.isFetching;
const identity = user && JSON.stringify([user.userId, user.userRole, user.userTeam, user.userCmpn]);
return <>
{session.isError && !checking && <div role="alert" className="p-8 text-center text-sm">
<p>로그인 정보를 확인하지 못했습니다.</p>
<button type="button" onClick={() => { void session.refetch(); }}>다시 시도</button>
</div>}
{user && <div key={identity} hidden={session.isError}>{children}</div>}
</>;
}

View File

@@ -3,14 +3,15 @@
import * as React from 'react' import * as React from 'react'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import { MultiSelect } from '@/components/common/multi-select' import { MultiSelect } from '@/components/common/multi-select'
import type { MultiSelectOption, MultiSelectRef } from '@/components/common/multi-select' import type { MultiSelectOption, MultiSelectRef, MultiSelectSearchMatch } from '@/components/common/multi-select'
export type { MultiSelectOption, MultiSelectRef } from '@/components/common/multi-select' export type { MultiSelectOption, MultiSelectRef, MultiSelectSearchMatch } from '@/components/common/multi-select'
export interface KriAutoCompleteBaseProps<T> { export interface KriAutoCompleteBaseProps<T> {
items: T[] items: T[]
searchable?: boolean searchable?: boolean
searchMode?: 'filter' | 'inputOnly' searchMode?: 'filter' | 'inputOnly'
searchMatch?: MultiSelectSearchMatch
defaultSearchValue?: string defaultSearchValue?: string
onSearchValueChange?: (value: string) => void onSearchValueChange?: (value: string) => void
placeholder?: string placeholder?: string
@@ -58,6 +59,7 @@ export function KriMultiSelect<T = unknown>({
onChange, onChange,
searchable = true, searchable = true,
searchMode = 'filter', searchMode = 'filter',
searchMatch = 'contains',
defaultSearchValue = '', defaultSearchValue = '',
onSearchValueChange, onSearchValueChange,
maxCount = 1, maxCount = 1,
@@ -100,6 +102,7 @@ export function KriMultiSelect<T = unknown>({
badgeLabelClassName={badgeLabelClassName} badgeLabelClassName={badgeLabelClassName}
searchable={searchable} searchable={searchable}
searchMode={searchMode} searchMode={searchMode}
searchMatch={searchMatch}
defaultSearchValue={defaultSearchValue} defaultSearchValue={defaultSearchValue}
onSearchValueChange={onSearchValueChange} onSearchValueChange={onSearchValueChange}
maxCount={maxCount} maxCount={maxCount}
@@ -135,6 +138,7 @@ function KriSingleSelectInner<T>(
onChange, onChange,
searchable = true, searchable = true,
searchMode = 'filter', searchMode = 'filter',
searchMatch = 'contains',
defaultSearchValue = '', defaultSearchValue = '',
onSearchValueChange, onSearchValueChange,
placeholder = '옵션을 선택하세요', placeholder = '옵션을 선택하세요',
@@ -216,6 +220,7 @@ function KriSingleSelectInner<T>(
badgeLabelClassName={badgeLabelClassName ?? 'min-w-0 flex-1'} badgeLabelClassName={badgeLabelClassName ?? 'min-w-0 flex-1'}
searchable={searchable} searchable={searchable}
searchMode={searchMode} searchMode={searchMode}
searchMatch={searchMatch}
defaultSearchValue={defaultSearchValue} defaultSearchValue={defaultSearchValue}
onSearchValueChange={onSearchValueChange} onSearchValueChange={onSearchValueChange}
preventDeselect={preventDeselect} preventDeselect={preventDeselect}

View File

@@ -0,0 +1,247 @@
'use client'
import { useState, type CSSProperties, type KeyboardEvent } from 'react'
import { Check } from 'lucide-react'
import { Slider as SliderPrimitive } from 'radix-ui'
import { Button } from '@/components/ui/button'
import { ColorPicker, ColorPickerArea, ColorPickerHueSlider } from '@/components/common/color-palette/color-picker'
import { Input } from '@/components/ui/input'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
import { cn } from '@/lib/utils'
import { formatHexColor, isLightHexColor, normalizeHexColor, parseHexColor } from '@/components/common/color-palette/color'
export const KRI_COLOR_PALETTE_DEFAULT_COLORS = [
'#111827', '#4B5563', '#9CA3AF', '#E5E7EB', '#EF4444', '#F97316', '#F59E0B', '#EAB308',
'#84CC16', '#22C55E', '#14B8A6', '#06B6D4', '#3B82F6', '#6366F1', '#A855F7', '#EC4899',
] as const
const CUSTOM_PICKER_FALLBACK = '#3B82F6'
const CHECKERBOARD = 'repeating-conic-gradient(#ccc 0% 25%, #fff 0% 50%) 0% 50% / 8px 8px'
export type KriColorPaletteProps = {
/** `#RRGGBB` 또는 `#RRGGBBAA` 형식의 색상. 지정되지 않았으면 null */
value: string | null
onChange: (value: string | null) => void
colors?: readonly string[]
/** 색상 영역·색조 슬라이더·HEX 입력 노출 여부 */
allowCustom?: boolean
/**
* 투명도 슬라이더 노출 및 `#RRGGBBAA` 입력 허용 여부.
* false여도 전달받은 값의 투명도는 표시·보존하며, 사용자가 색을 바꾸면 불투명(`#RRGGBB`)으로 바뀐다.
*/
allowAlpha?: boolean
allowClear?: boolean
disabled?: boolean
placeholder?: string
className?: string
'aria-label'?: string
}
const swatchStyle = (color: string): CSSProperties => ({
background: `linear-gradient(${color}, ${color}), ${CHECKERBOARD}`,
})
export function KriColorPalette({
value,
onChange,
colors = KRI_COLOR_PALETTE_DEFAULT_COLORS,
allowCustom = true,
allowAlpha = false,
allowClear = true,
disabled = false,
placeholder = '색상 없음',
className,
'aria-label': ariaLabel = '색상 선택',
}: KriColorPaletteProps) {
const normalizedValue = normalizeHexColor(value)
const parsedValue = parseHexColor(normalizedValue)
const currentAlpha = parsedValue?.alpha ?? 255
const [open, setOpen] = useState(false)
// 프리셋·HEX 입력·제거로 값이 바뀌면 색상 영역을 새 값으로 다시 초기화한다.
const [pickerKey, setPickerKey] = useState(0)
const [hexDraft, setHexDraft] = useState(normalizedValue ?? '')
const [hexDraftSource, setHexDraftSource] = useState(normalizedValue)
const [hexInvalid, setHexInvalid] = useState(false)
if (hexDraftSource !== normalizedValue) {
setHexDraftSource(normalizedValue)
setHexDraft(normalizedValue ?? '')
setHexInvalid(false)
}
const withAlpha = (rgb: string) => formatHexColor(rgb, allowAlpha ? currentAlpha : 255)
const selectDiscrete = (next: string | null) => {
onChange(next)
setPickerKey((key) => key + 1)
}
const handlePickerChange = (next: string) => {
const parsed = parseHexColor(next)
if (!parsed) return
const nextValue = withAlpha(parsed.rgb)
if (nextValue === normalizedValue) return
onChange(nextValue)
}
const handleAlphaChange = (values: number[]) => {
const percent = values[0] ?? 100
const nextValue = formatHexColor(parsedValue?.rgb ?? CUSTOM_PICKER_FALLBACK, (percent / 100) * 255)
if (nextValue === normalizedValue) return
onChange(nextValue)
}
const commitHexDraft = () => {
if (hexDraft.trim() === '') {
setHexDraft(normalizedValue ?? '')
setHexInvalid(false)
return
}
// 전달받은 값을 그대로 두고 포커스만 이동한 경우(투명도 포함 값 포함)는 변경으로 보지 않는다.
if (normalizeHexColor(hexDraft) === normalizedValue) {
setHexDraft(normalizedValue ?? '')
setHexInvalid(false)
return
}
const parsed = parseHexColor(hexDraft)
if (!parsed || (!allowAlpha && parsed.alpha !== 255)) {
setHexInvalid(true)
return
}
const nextValue = formatHexColor(parsed.rgb, parsed.alpha)
setHexInvalid(false)
setHexDraft(nextValue)
if (nextValue !== normalizedValue) selectDiscrete(nextValue)
}
const handleHexKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {
if (event.key !== 'Enter') return
event.preventDefault()
commitHexDraft()
}
const hexFormatLabel = allowAlpha ? '#RRGGBB 또는 #RRGGBBAA' : '#RRGGBB'
const alphaPercent = Math.round((currentAlpha / 255) * 100)
// disabled이면 트리거 상태와 무관하게 팝오버가 열리지 않도록 한다(이미 열린 상태에서 disabled로 바뀐 경우 포함).
const resolvedOpen = open && !disabled
return (
<Popover open={resolvedOpen} onOpenChange={(nextOpen) => setOpen(nextOpen && !disabled)}>
<PopoverTrigger asChild>
<Button
type="button"
variant="outline"
size="sm"
disabled={disabled}
aria-label={`${ariaLabel}: ${normalizedValue ?? placeholder}`}
className={cn('w-full justify-start gap-2 px-2 font-normal', className)}
>
<span
aria-hidden
className={cn('size-4 shrink-0 rounded-sm border', !normalizedValue && 'bg-[linear-gradient(to_bottom_right,transparent_calc(50%-1px),var(--destructive)_calc(50%-1px)_calc(50%+1px),transparent_calc(50%+1px))]')}
style={normalizedValue ? swatchStyle(normalizedValue) : undefined}
/>
<span className={cn('truncate font-mono text-xs', !normalizedValue && 'text-muted-foreground font-sans')}>
{normalizedValue ?? placeholder}
</span>
</Button>
</PopoverTrigger>
<PopoverContent align="start" className="w-64 space-y-3 p-3">
<div className="grid grid-cols-8 gap-1.5" role="group" aria-label="기본 색상">
{colors.map((color) => {
const parsedColor = parseHexColor(color)
if (!parsedColor) return null
const selected = parsedColor.rgb === parsedValue?.rgb
const checkColorClass = isLightHexColor(parsedColor.rgb) ? 'text-black' : 'text-white'
return (
<button
key={parsedColor.rgb}
type="button"
className="focus-visible:ring-ring flex size-6 items-center justify-center rounded-sm border focus-visible:ring-2 focus-visible:outline-none"
style={{ backgroundColor: parsedColor.rgb }}
aria-label={`색상 ${parsedColor.rgb}`}
aria-pressed={selected}
title={parsedColor.rgb}
onClick={() => selectDiscrete(withAlpha(parsedColor.rgb))}
>
{selected ? <Check className={cn('size-3.5', checkColorClass)} /> : null}
</button>
)
})}
</div>
{allowCustom ? (
<div className="space-y-3 border-t pt-3">
<ColorPicker
key={pickerKey}
inline
defaultValue={parsedValue?.rgb ?? CUSTOM_PICKER_FALLBACK}
onValueChange={handlePickerChange}
className="flex flex-col gap-3"
>
<ColorPickerArea className="h-32" />
<ColorPickerHueSlider aria-label="색조" />
</ColorPicker>
{allowAlpha ? (
<div className="flex items-center gap-2">
<SliderPrimitive.Root
className="relative flex w-full touch-none items-center select-none"
min={0}
max={100}
step={1}
value={[alphaPercent]}
onValueChange={handleAlphaChange}
aria-label="투명도"
>
<SliderPrimitive.Track
className="relative h-3 w-full grow overflow-hidden rounded-full"
style={{ background: CHECKERBOARD }}
>
<div
className="absolute inset-0 rounded-full"
style={{ background: `linear-gradient(to right, transparent, ${parsedValue?.rgb ?? CUSTOM_PICKER_FALLBACK})` }}
/>
</SliderPrimitive.Track>
<SliderPrimitive.Thumb className="border-primary/50 bg-background focus-visible:ring-ring block size-4 rounded-full border shadow focus-visible:ring-1 focus-visible:outline-none" />
</SliderPrimitive.Root>
<span className="text-muted-foreground w-10 shrink-0 text-right font-mono text-xs">{alphaPercent}%</span>
</div>
) : null}
<div className="space-y-1">
<Input
value={hexDraft}
onChange={(event) => {
setHexDraft(event.target.value)
setHexInvalid(false)
}}
onBlur={commitHexDraft}
onKeyDown={handleHexKeyDown}
placeholder={allowAlpha ? '#RRGGBBAA' : '#RRGGBB'}
maxLength={allowAlpha ? 9 : 7}
aria-label="HEX 색상 코드"
aria-invalid={hexInvalid}
className="h-8 font-mono text-sm"
/>
{hexInvalid ? <p className="text-destructive text-xs">{hexFormatLabel} 형식으로 입력해 주세요.</p> : null}
</div>
</div>
) : null}
{allowClear ? (
<div className="flex justify-end border-t pt-2">
<Button
type="button"
variant="ghost"
size="sm"
disabled={!normalizedValue}
onClick={() => selectDiscrete(null)}
>
색상 제거
</Button>
</div>
) : null}
</PopoverContent>
</Popover>
)
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,42 @@
export type ParsedHexColor = {
/** `#RRGGBB` (대문자) */
rgb: string
/** 0~255. 투명도가 없는 값은 255 */
alpha: number
}
const HEX_COLOR_PATTERN = /^#?([0-9A-F]{6})([0-9A-F]{2})?$/
/** `#RRGGBB` 또는 `#RRGGBBAA`(대소문자 무관, `#` 생략 가능)를 해석한다. 형식이 다르면 null. */
export const parseHexColor = (value: string | null | undefined): ParsedHexColor | null => {
if (!value) return null
const match = HEX_COLOR_PATTERN.exec(value.trim().toUpperCase())
if (!match) return null
return {
rgb: `#${match[1]}`,
alpha: match[2] ? Number.parseInt(match[2], 16) : 255,
}
}
/** 투명도가 255이면 `#RRGGBB`, 아니면 `#RRGGBBAA`로 만든다. */
export const formatHexColor = (rgb: string, alpha = 255): string => {
const clamped = Math.max(0, Math.min(255, Math.round(alpha)))
if (clamped === 255) return rgb.toUpperCase()
return `${rgb.toUpperCase()}${clamped.toString(16).padStart(2, '0').toUpperCase()}`
}
/** 정규화된 hex 문자열. 형식이 다르면 null. */
export const normalizeHexColor = (value: string | null | undefined): string | null => {
const parsed = parseHexColor(value)
return parsed ? formatHexColor(parsed.rgb, parsed.alpha) : null
}
/** 흰 배경 위에 그렸을 때 밝은 색인지 판단한다(투명도 반영). 글자색 대비 결정에 쓴다. */
export const isLightHexColor = (value: string): boolean => {
const parsed = parseHexColor(value)
if (!parsed) return true
const ratio = parsed.alpha / 255
const channel = (offset: number) => Number.parseInt(parsed.rgb.slice(offset, offset + 2), 16) * ratio + 255 * (1 - ratio)
const luminance = (channel(1) * 299 + channel(3) * 587 + channel(5) * 114) / 1000
return luminance > 150
}

View File

@@ -0,0 +1,8 @@
import * as React from "react";
function useRefWithInit<T>(init: () => T): React.RefObject<T> {
const [ref] = React.useState(() => ({ current: init() }));
return ref;
}
export { useRefWithInit };

View File

@@ -0,0 +1,14 @@
import { useLayoutEffect } from "radix-ui/internal";
import * as React from "react";
function useValueAsRef<T>(value: T) {
const ref = React.useRef<T>(value);
useLayoutEffect(() => {
ref.current = value;
});
return ref;
}
export { useValueAsRef };

View File

@@ -0,0 +1,154 @@
"use client";
import * as React from "react";
type InputValue = string[] | string;
interface VisuallyHiddenInputProps<T = InputValue> extends Omit<
React.InputHTMLAttributes<HTMLInputElement>,
"value" | "checked" | "onReset"
> {
value?: T;
checked?: boolean;
control: HTMLElement | null;
bubbles?: boolean;
}
function VisuallyHiddenInput<T = InputValue>(
props: VisuallyHiddenInputProps<T>,
) {
const {
control,
value,
checked,
bubbles = true,
type = "hidden",
style,
...inputProps
} = props;
const isCheckInput = React.useMemo(
() => type === "checkbox" || type === "radio" || type === "switch",
[type],
);
const inputRef = React.useRef<HTMLInputElement>(null);
const prevValueRef = React.useRef<T | boolean | undefined>(
isCheckInput ? checked : value,
);
const [measuredSize, setMeasuredSize] = React.useState<{
control: HTMLElement;
width: number;
height: number;
} | null>(null);
const controlSize = React.useMemo<{
width?: number;
height?: number;
}>(
() =>
control && measuredSize?.control === control
? { width: measuredSize.width, height: measuredSize.height }
: {},
[control, measuredSize],
);
React.useLayoutEffect(() => {
if (!control) return;
if (typeof window === "undefined") return;
const resizeObserver = new ResizeObserver((entries) => {
if (!Array.isArray(entries) || !entries.length) return;
const entry = entries[0];
if (!entry) return;
let width: number;
let height: number;
if ("borderBoxSize" in entry) {
const borderSizeEntry = entry.borderBoxSize;
const borderSize = Array.isArray(borderSizeEntry)
? borderSizeEntry[0]
: borderSizeEntry;
width = borderSize.inlineSize;
height = borderSize.blockSize;
} else {
width = control.offsetWidth;
height = control.offsetHeight;
}
setMeasuredSize({ control, width, height });
});
resizeObserver.observe(control, { box: "border-box" });
return () => {
resizeObserver.disconnect();
};
}, [control]);
React.useEffect(() => {
const currentValue = isCheckInput ? checked : value;
const prevValue = prevValueRef.current;
prevValueRef.current = currentValue;
const input = inputRef.current;
if (!input) return;
const inputProto = window.HTMLInputElement.prototype;
const propertyKey = isCheckInput ? "checked" : "value";
const eventType = isCheckInput ? "click" : "input";
let serializedCurrentValue: unknown = value;
if (isCheckInput) {
serializedCurrentValue = checked;
} else if (typeof value === "object" && value !== null) {
serializedCurrentValue = JSON.stringify(value);
}
const descriptor = Object.getOwnPropertyDescriptor(inputProto, propertyKey);
const setter = descriptor?.set;
if (prevValue !== currentValue && setter) {
const event = new Event(eventType, { bubbles });
setter.call(input, serializedCurrentValue);
input.dispatchEvent(event);
}
}, [value, checked, bubbles, isCheckInput]);
const composedStyle = React.useMemo<React.CSSProperties>(() => {
return {
...style,
...(controlSize.width !== undefined && controlSize.height !== undefined
? controlSize
: {}),
border: 0,
clip: "rect(0 0 0 0)",
clipPath: "inset(50%)",
height: "1px",
margin: "-1px",
overflow: "hidden",
padding: 0,
position: "absolute",
whiteSpace: "nowrap",
width: "1px",
};
}, [style, controlSize]);
return (
<input
type={type}
{...inputProps}
ref={inputRef}
aria-hidden={isCheckInput}
tabIndex={-1}
defaultChecked={isCheckInput ? checked : undefined}
style={composedStyle}
/>
);
}
export { VisuallyHiddenInput };

View File

@@ -31,6 +31,7 @@ function MultiSelectInner<T>(
hideSelectAll = false, hideSelectAll = false,
searchable = true, searchable = true,
searchMode = 'filter', searchMode = 'filter',
searchMatch = 'fuzzy',
defaultSearchValue = '', defaultSearchValue = '',
onSearchValueChange, onSearchValueChange,
emptyIndicator = '검색 결과가 없습니다.', emptyIndicator = '검색 결과가 없습니다.',
@@ -201,6 +202,7 @@ function MultiSelectInner<T>(
selectedValues={selectedValues} selectedValues={selectedValues}
searchable={searchable} searchable={searchable}
searchMode={searchMode} searchMode={searchMode}
searchMatch={searchMatch}
searchValue={searchValue} searchValue={searchValue}
onSearchValueChange={handleSearchChange} onSearchValueChange={handleSearchChange}
hideSelectAll={hideSelectAll} hideSelectAll={hideSelectAll}

View File

@@ -11,14 +11,19 @@ import {
CommandSeparator, CommandSeparator,
} from '@/components/ui/command' } from '@/components/ui/command'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import type { MultiSelectGroup, MultiSelectOption, MultiSelectOptions } from './types' import type { MultiSelectGroup, MultiSelectOption, MultiSelectOptions, MultiSelectSearchMatch } from './types'
import { isGroupedOptions } from './utils' import { isGroupedOptions } from './utils'
function containsFilter(value: string, search: string) {
return value.toLowerCase().includes(search.toLowerCase()) ? 1 : 0
}
interface MultiSelectContentProps<T> { interface MultiSelectContentProps<T> {
options: MultiSelectOptions<T> options: MultiSelectOptions<T>
selectedValues: string[] selectedValues: string[]
searchable: boolean searchable: boolean
searchMode: 'filter' | 'inputOnly' searchMode: 'filter' | 'inputOnly'
searchMatch?: MultiSelectSearchMatch
searchValue: string searchValue: string
onSearchValueChange: (value: string) => void onSearchValueChange: (value: string) => void
hideSelectAll: boolean hideSelectAll: boolean
@@ -96,6 +101,7 @@ export function MultiSelectContent<T>({
selectedValues, selectedValues,
searchable, searchable,
searchMode, searchMode,
searchMatch = 'fuzzy',
searchValue, searchValue,
onSearchValueChange, onSearchValueChange,
hideSelectAll, hideSelectAll,
@@ -111,7 +117,7 @@ export function MultiSelectContent<T>({
const allSelected = selectableOptions.length > 0 && selectableOptions.every((option) => selectedValues.includes(option.value)) const allSelected = selectableOptions.length > 0 && selectableOptions.every((option) => selectedValues.includes(option.value))
return ( return (
<Command shouldFilter={searchMode === 'filter'}> <Command shouldFilter={searchMode === 'filter'} filter={searchMatch === 'contains' ? containsFilter : undefined}>
{searchable ? ( {searchable ? (
<CommandInput <CommandInput
value={searchValue} value={searchValue}

View File

@@ -3,6 +3,7 @@ export type {
AnimationConfig, AnimationConfig,
MultiSelectGroup, MultiSelectGroup,
MultiSelectOption, MultiSelectOption,
MultiSelectSearchMatch,
MultiSelectOptions, MultiSelectOptions,
MultiSelectProps, MultiSelectProps,
MultiSelectRef, MultiSelectRef,

View File

@@ -28,6 +28,7 @@ export interface MultiSelectGroup<T = unknown> {
export type MultiSelectOptions<T = unknown> = MultiSelectOption<T>[] | MultiSelectGroup<T>[] export type MultiSelectOptions<T = unknown> = MultiSelectOption<T>[] | MultiSelectGroup<T>[]
export type MultiSelectSelectionMode = 'single' | 'multiple' export type MultiSelectSelectionMode = 'single' | 'multiple'
export type MultiSelectSearchMatch = 'fuzzy' | 'contains'
export type MultiSelectVariant = 'default' | 'secondary' | 'destructive' | 'inverted' export type MultiSelectVariant = 'default' | 'secondary' | 'destructive' | 'inverted'
export interface MultiSelectResponsiveSettings { export interface MultiSelectResponsiveSettings {
@@ -65,6 +66,7 @@ export interface MultiSelectProps<T = unknown>
hideSelectAll?: boolean hideSelectAll?: boolean
searchable?: boolean searchable?: boolean
searchMode?: 'filter' | 'inputOnly' searchMode?: 'filter' | 'inputOnly'
searchMatch?: MultiSelectSearchMatch
defaultSearchValue?: string defaultSearchValue?: string
onSearchValueChange?: (value: string) => void onSearchValueChange?: (value: string) => void
emptyIndicator?: React.ReactNode emptyIndicator?: React.ReactNode

View File

@@ -121,7 +121,7 @@ export function DataTable<TData, TValue = unknown>({
[topPinnedRows, data, bottomPinnedRows], [topPinnedRows, data, bottomPinnedRows],
) )
const internalGetRowId = useCallback((row: TData, index: number) => { const internalGetRowId = useCallback((_row: TData, index: number) => {
if (index < topPinnedRows.length) return `__top-pinned-${index}` if (index < topPinnedRows.length) return `__top-pinned-${index}`
if (index >= topPinnedRows.length + data.length) { if (index >= topPinnedRows.length + data.length) {
return `__bottom-pinned-${index - topPinnedRows.length - data.length}` return `__bottom-pinned-${index - topPinnedRows.length - data.length}`

View File

@@ -15,6 +15,7 @@ import {
import { KriSingleSelect } from '@/components/common/KriAutoComplete' import { KriSingleSelect } from '@/components/common/KriAutoComplete'
import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption' import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import { ListJobGatePanel, useListJobGate } from '@/components/list/ListJobGate'
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 ProjectSurvey, type ResultCode, ResultCodeType } from '@/types/project' import { type ProjectSurvey, type ResultCode, ResultCodeType } from '@/types/project'
@@ -47,6 +48,7 @@ export type BatchEditPayload = {
} }
export type ListBatchEditDialogProps = { export type ListBatchEditDialogProps = {
prjctIdx: number
dialogId?: DialogId dialogId?: DialogId
open?: boolean open?: boolean
onOpenChange?: (open: boolean) => void onOpenChange?: (open: boolean) => void
@@ -75,6 +77,7 @@ const resultCodeGroups: { type: Exclude<ResultCodeType, ResultCodeType.SURVEY>;
] ]
const ListBatchEditDialog = ({ const ListBatchEditDialog = ({
prjctIdx,
dialogId = 'listBatchEditDialog', dialogId = 'listBatchEditDialog',
open, open,
onOpenChange, onOpenChange,
@@ -98,6 +101,7 @@ const ListBatchEditDialog = ({
const rowInputRefs = useRef<Map<string, HTMLInputElement>>(new Map()) const rowInputRefs = useRef<Map<string, HTMLInputElement>>(new Map())
const resolvedOpen = open ?? isDialogOpen(dialogId) const resolvedOpen = open ?? isDialogOpen(dialogId)
const gate = useListJobGate({ prjctIdx, jobType: 'LIST_UPDATE', active: resolvedOpen })
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
@@ -168,6 +172,7 @@ const ListBatchEditDialog = ({
} }
const handleConfirm = async () => { const handleConfirm = async () => {
if (gate.submitBlocked || submitting) return
setInvalidRowId(null) setInvalidRowId(null)
if (!validateApplyFilterTarget(target, { selectedCount: selectedSids.length, filterSummary })) return if (!validateApplyFilterTarget(target, { selectedCount: selectedSids.length, filterSummary })) return
@@ -203,7 +208,6 @@ const ListBatchEditDialog = ({
setSubmitting(true) setSubmitting(true)
try { try {
await onConfirm({ rows: normalized, resultCodes: resultCodeSelections, surveyResultCodes, target }) await onConfirm({ rows: normalized, resultCodes: resultCodeSelections, surveyResultCodes, target })
handleOpenChange(false)
} finally { } finally {
setSubmitting(false) setSubmitting(false)
} }
@@ -214,19 +218,23 @@ const ListBatchEditDialog = ({
open={resolvedOpen} open={resolvedOpen}
onOpenChange={handleOpenChange} onOpenChange={handleOpenChange}
title={<span className="text-2xl font-bold">일괄 수정</span>} title={<span className="text-2xl font-bold">일괄 수정</span>}
contentClassName="sm:max-w-[900px]" contentClassName="sm:max-w-[900px] max-h-[90vh] overflow-y-auto"
bodyClassName="space-y-4" bodyClassName="space-y-4"
footer={ footer={
<> <>
<Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}> <Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}>
취소 {gate.hasCurrentJob ? '닫기' : '취소'}
</Button> </Button>
<Button type="button" onClick={handleConfirm} disabled={submitting}> {!gate.hasCurrentJob && (
<Button type="button" onClick={handleConfirm} disabled={submitting || gate.submitBlocked}>
적용 적용
</Button> </Button>
)}
</> </>
} }
> >
<ListJobGatePanel gate={gate} acknowledgeLabel="새 작업" />
{!gate.hasCurrentJob && <>
<div className="rounded-md border p-4 space-y-4"> <div className="rounded-md border p-4 space-y-4">
<p className="text-lg font-semibold">적용 대상</p> <p className="text-lg font-semibold">적용 대상</p>
<ApplyFilterOption <ApplyFilterOption
@@ -399,6 +407,7 @@ const ListBatchEditDialog = ({
<Plus className="w-4 h-4" /> <Plus className="w-4 h-4" />
행 추가 행 추가
</Button> </Button>
</>}
</KriDialog> </KriDialog>
) )
} }

View File

@@ -8,6 +8,8 @@ import { Checkbox } from '@/components/ui/checkbox'
import { Label } from '@/components/ui/label' 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 { ListJobGatePanel, useListJobGate } from '@/components/list/ListJobGate'
import { LIST_DOWNLOAD_JOB_TYPE } from '@/const/listJobConst'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption' import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption'
import KriDateRangePicker from '@/components/common/KriDateRangePicker' import KriDateRangePicker from '@/components/common/KriDateRangePicker'
@@ -20,6 +22,7 @@ import {
} from '@/types/list' } from '@/types/list'
export type ListDownloadDialogProps = { export type ListDownloadDialogProps = {
prjctIdx: number
dialogId?: DialogId dialogId?: DialogId
open?: boolean open?: boolean
onOpenChange?: (open: boolean) => void onOpenChange?: (open: boolean) => void
@@ -37,6 +40,7 @@ const titleMap: Record<ListDownloadMode, string> = {
} }
const ListDownloadDialog = ({ const ListDownloadDialog = ({
prjctIdx,
dialogId = 'listDownloadDialog', dialogId = 'listDownloadDialog',
open, open,
onOpenChange, onOpenChange,
@@ -55,6 +59,7 @@ const ListDownloadDialog = ({
const [submitting, setSubmitting] = useState(false) const [submitting, setSubmitting] = useState(false)
const resolvedOpen = open ?? isDialogOpen(dialogId) const resolvedOpen = open ?? isDialogOpen(dialogId)
const gate = useListJobGate({ prjctIdx, jobType: LIST_DOWNLOAD_JOB_TYPE[mode], active: resolvedOpen })
const handleOpenChange = (nextOpen: boolean) => { const handleOpenChange = (nextOpen: boolean) => {
onOpenChange?.(nextOpen) onOpenChange?.(nextOpen)
@@ -66,6 +71,7 @@ const ListDownloadDialog = ({
} }
const handleDownload = async () => { const handleDownload = async () => {
if (gate.submitBlocked || submitting) return
if (!validateApplyFilterTarget(target, { selectedCount: selectedSids.length, filterSummary })) return if (!validateApplyFilterTarget(target, { selectedCount: selectedSids.length, filterSummary })) return
if (mode === 'contact-history') { if (mode === 'contact-history') {
@@ -93,7 +99,6 @@ const ListDownloadDialog = ({
contactHistoryType: mode === 'contact-history' ? contactHistoryType : undefined, contactHistoryType: mode === 'contact-history' ? contactHistoryType : undefined,
historyOrder: mode === 'contact-history' ? historyOrder : undefined, historyOrder: mode === 'contact-history' ? historyOrder : undefined,
}) })
handleOpenChange(false)
} finally { } finally {
setSubmitting(false) setSubmitting(false)
} }
@@ -104,20 +109,24 @@ const ListDownloadDialog = ({
open={resolvedOpen} open={resolvedOpen}
onOpenChange={handleOpenChange} onOpenChange={handleOpenChange}
title={<span className="text-2xl font-bold">{titleMap[mode]}</span>} title={<span className="text-2xl font-bold">{titleMap[mode]}</span>}
contentClassName="sm:max-w-[560px]" contentClassName="sm:max-w-[560px] max-h-[90vh] overflow-y-auto"
bodyClassName="space-y-4" bodyClassName="space-y-4"
footer={ footer={
<> <>
<Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}> <Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}>
취소 {gate.hasCurrentJob ? '닫기' : '취소'}
</Button> </Button>
<Button type="button" onClick={handleDownload} disabled={submitting} className="gap-2"> {!gate.hasCurrentJob && (
<Button type="button" onClick={handleDownload} disabled={submitting || gate.submitBlocked} className="gap-2">
<Download className="w-4 h-4" /> <Download className="w-4 h-4" />
다운로드 다운로드
</Button> </Button>
)}
</> </>
} }
> >
<ListJobGatePanel gate={gate} acknowledgeLabel="새 작업" />
{!gate.hasCurrentJob && <>
{mode === 'contact-history' ? ( {mode === 'contact-history' ? (
<div className="rounded-md border p-4 space-y-4"> <div className="rounded-md border p-4 space-y-4">
<p className="text-lg font-semibold">조회 기간</p> <p className="text-lg font-semibold">조회 기간</p>
@@ -189,6 +198,7 @@ const ListDownloadDialog = ({
</RadioGroup> </RadioGroup>
</div> </div>
) : null} ) : null}
</>}
</KriDialog> </KriDialog>
) )
} }

View File

@@ -1,6 +1,7 @@
'use client' 'use client'
import { useEffect, useMemo, useState } from 'react' import { useEffect, useMemo, useState } from 'react'
import { RotateCcw } 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'
import { Input } from '@/components/ui/input' import { Input } from '@/components/ui/input'
@@ -107,6 +108,18 @@ const ListFilterDialog = ({
[rows, headerOptions], [rows, headerOptions],
) )
// 잠긴 헤더는 조회 조건에 쓰이지 않으므로 초기화 필요 여부 판단에서 제외한다.
const isResettable = rows.some((row) => {
if (isDisabledHeader(row.headerId)) return false
const defaultOperator = getHeaderOption(row.headerId)?.defaultOperator ?? 'eq'
return row.operator !== defaultOperator || row.textValue !== '' || row.multiValues.length > 0
})
// 다이얼로그 내 입력만 기본값으로 되돌린다. 실제 반영은 "적용"을 눌러야 이뤄진다.
const handleReset = () => {
setRows(headerOptions.map((option) => createFilterRow(option.id, headerOptions)))
}
const handleConfirm = async () => { const handleConfirm = async () => {
setSubmitting(true) setSubmitting(true)
try { try {
@@ -138,7 +151,20 @@ const ListFilterDialog = ({
<div className="grid h-11 grid-cols-[1fr_140px_1.4fr] items-center border-b bg-muted px-4 text-sm font-semibold"> <div className="grid h-11 grid-cols-[1fr_140px_1.4fr] items-center border-b bg-muted px-4 text-sm font-semibold">
<span>헤더</span> <span>헤더</span>
<span>비교 연산자</span> <span>비교 연산자</span>
<div className="flex items-center justify-between gap-2">
<span>값</span> <span>값</span>
<Button
type="button"
variant="ghost"
size="sm"
className="h-7 text-muted-foreground"
onClick={handleReset}
disabled={submitting || !isResettable}
>
<RotateCcw className="size-3.5" />
초기화
</Button>
</div>
</div> </div>
<div className="max-h-170 overflow-auto"> <div className="max-h-170 overflow-auto">

View File

@@ -20,6 +20,7 @@ import {
} from '@dnd-kit/sortable' } from '@dnd-kit/sortable'
import { CSS } from '@dnd-kit/utilities' import { CSS } from '@dnd-kit/utilities'
import { GripVertical, Plus, Trash2 } from 'lucide-react' import { GripVertical, Plus, Trash2 } from 'lucide-react'
import { KriColorPalette } from '@/components/common/KriColorPalette'
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 { Checkbox } from '@/components/ui/checkbox' import { Checkbox } from '@/components/ui/checkbox'
@@ -29,7 +30,7 @@ import { useDialog } from '@/hooks/useDialog'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import { listHeader, ListHeaderGrade, ListHeaderType } from '@/types/list' import { listHeader, ListHeaderGrade, ListHeaderType } from '@/types/list'
import { LIST_HEADER_TYPE_LABEL, LIST_HEADER_TYPE_OPTIONS } from '@/const/listConst' import { LIST_HEADER_TYPE_LABEL, LIST_HEADER_TYPE_OPTIONS, ListHeaderConst } from '@/const/listConst'
export type ListHeaderManageDialogProps = { export type ListHeaderManageDialogProps = {
dialogId?: DialogId dialogId?: DialogId
@@ -38,11 +39,13 @@ export type ListHeaderManageDialogProps = {
prjctIdx: number prjctIdx: number
rows: listHeader[] rows: listHeader[]
onConfirm: (rows: listHeader[]) => void | Promise<void> onConfirm: (rows: listHeader[]) => void | Promise<void>
saveDisabled?: boolean
} }
type ListHeaderRowProps = { type ListHeaderRowProps = {
row: listHeader row: listHeader
activeId: number | null activeId: number | null
onHeaderColorChange: (id: number, color: string | null) => void
onHeaderNameChange: (id: number, listHderNm: string) => void onHeaderNameChange: (id: number, listHderNm: string) => void
onHeaderTypeChange: (id: number, listHderTy: ListHeaderType) => void onHeaderTypeChange: (id: number, listHderTy: ListHeaderType) => void
onFlagChange: (id: number, field: 'useColView' | 'useFilter' | 'useIntrvwerView' | 'useIntrvwerEdit', checked: boolean) => void onFlagChange: (id: number, field: 'useColView' | 'useFilter' | 'useIntrvwerView' | 'useIntrvwerEdit', checked: boolean) => void
@@ -54,13 +57,30 @@ const COMMON_GRADE_ORDER_START = 101
const isCommonGrade = (grade: ListHeaderGrade) => grade === ListHeaderGrade.COMMON const isCommonGrade = (grade: ListHeaderGrade) => grade === ListHeaderGrade.COMMON
const isImmutableGrade = (grade: ListHeaderGrade) => grade === ListHeaderGrade.IMMUTABLE const isImmutableGrade = (grade: ListHeaderGrade) => grade === ListHeaderGrade.IMMUTABLE
const ListHeaderRow = ({ row, activeId, onHeaderNameChange, onHeaderTypeChange, onFlagChange, onDelete }: ListHeaderRowProps) => { const isInterviewerEditDisabled = (row: listHeader) =>
isImmutableGrade(row.listHderGrad) ||
row.listHderTy === ListHeaderConst.IS_USE ||
row.listHderTy === ListHeaderConst.OUTSOURCE ||
row.listHderTy === ListHeaderConst.CONTACT_INTERVIEWER ||
row.listHderTy === ListHeaderConst.FIELD_INTERVIEWER
const ListHeaderRow = ({
row,
activeId,
onHeaderColorChange,
onHeaderNameChange,
onHeaderTypeChange,
onFlagChange,
onDelete,
}: ListHeaderRowProps) => {
const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id: row.listHderId }) const { attributes, listeners, setNodeRef, transform, transition, isDragging } = useSortable({ id: row.listHderId })
const canEditName = isCommonGrade(row.listHderGrad) const canEditName = isCommonGrade(row.listHderGrad)
const canEditType = isCommonGrade(row.listHderGrad) const canEditType = isCommonGrade(row.listHderGrad)
const canDelete = isCommonGrade(row.listHderGrad) const canDelete = isCommonGrade(row.listHderGrad)
const canEditFlags = !isImmutableGrade(row.listHderGrad) const canEditFlags = !isImmutableGrade(row.listHderGrad)
const canSort = isCommonGrade(row.listHderGrad) const canSort = isCommonGrade(row.listHderGrad)
// IMMUTABLE 헤더의 색상은 서버가 저장하지 않으므로 선택을 막는다.
const canEditColor = !isImmutableGrade(row.listHderGrad)
const style: CSSProperties = { const style: CSSProperties = {
transform: CSS.Transform.toString(transform), transform: CSS.Transform.toString(transform),
@@ -78,7 +98,7 @@ const ListHeaderRow = ({ row, activeId, onHeaderNameChange, onHeaderTypeChange,
ref={setNodeRef} ref={setNodeRef}
style={style} style={style}
className={cn( className={cn(
'h-12 px-4 border-b last:border-b-0 grid grid-cols-[56px_1fr_150px_96px_96px_110px_110px_88px] items-center gap-2', 'h-12 px-4 border-b last:border-b-0 grid grid-cols-[56px_1fr_150px_120px_96px_96px_110px_110px_88px] items-center gap-2',
(activeId === row.listHderId || isDragging) && 'bg-muted', (activeId === row.listHderId || isDragging) && 'bg-muted',
)} )}
> >
@@ -123,6 +143,12 @@ const ListHeaderRow = ({ row, activeId, onHeaderNameChange, onHeaderTypeChange,
))} ))}
</SelectContent> </SelectContent>
</Select> </Select>
<KriColorPalette
value={row.listHderColor ?? null}
onChange={(color) => onHeaderColorChange(row.listHderId, color)}
disabled={!canEditColor}
aria-label={`${row.listHderNm} 헤더 색상`}
/>
<div className="flex items-center gap-2 justify-center"> <div className="flex items-center gap-2 justify-center">
<Checkbox <Checkbox
id={`header-visible-${row.listHderId}`} id={`header-visible-${row.listHderId}`}
@@ -152,7 +178,7 @@ const ListHeaderRow = ({ row, activeId, onHeaderNameChange, onHeaderTypeChange,
id={`header-intrvwer-edit-${row.listHderId}`} id={`header-intrvwer-edit-${row.listHderId}`}
checked={row.useIntrvwerEdit} checked={row.useIntrvwerEdit}
onCheckedChange={(checked) => onFlagChange(row.listHderId, 'useIntrvwerEdit', checked === true)} onCheckedChange={(checked) => onFlagChange(row.listHderId, 'useIntrvwerEdit', checked === true)}
disabled={!canEditFlags} disabled={isInterviewerEditDisabled(row)}
/> />
</div> </div>
<div className="flex justify-center"> <div className="flex justify-center">
@@ -179,6 +205,7 @@ const ListHeaderManageDialog = ({
prjctIdx, prjctIdx,
rows, rows,
onConfirm, onConfirm,
saveDisabled = false,
}: ListHeaderManageDialogProps) => { }: ListHeaderManageDialogProps) => {
const { isDialogOpen, showDialog, hideDialog } = useDialog() const { isDialogOpen, showDialog, hideDialog } = useDialog()
const [localRows, setLocalRows] = useState<listHeader[]>([]) const [localRows, setLocalRows] = useState<listHeader[]>([])
@@ -247,6 +274,16 @@ const ListHeaderManageDialog = ({
) )
} }
const handleHeaderColorChange = (id: number, listHderColor: string | null) => {
setLocalRows((prev) =>
prev.map((row) => {
if (row.listHderId !== id) return row
if (isImmutableGrade(row.listHderGrad)) return row
return { ...row, listHderColor }
}),
)
}
const handleHeaderNameChange = (id: number, listHderNm: string) => { const handleHeaderNameChange = (id: number, listHderNm: string) => {
setLocalRows((prev) => setLocalRows((prev) =>
prev.map((row) => { prev.map((row) => {
@@ -266,6 +303,7 @@ const ListHeaderManageDialog = ({
prev.map((row) => { prev.map((row) => {
if (row.listHderId !== id) return row if (row.listHderId !== id) return row
if (isImmutableGrade(row.listHderGrad)) return row if (isImmutableGrade(row.listHderGrad)) return row
if (field === 'useIntrvwerEdit' && isInterviewerEditDisabled(row)) return row
return { ...row, [field]: checked } return { ...row, [field]: checked }
}), }),
) )
@@ -292,6 +330,7 @@ const ListHeaderManageDialog = ({
useColView: true, useColView: true,
useIntrvwerView: false, useIntrvwerView: false,
useIntrvwerEdit: false, useIntrvwerEdit: false,
listHderColor: null,
} }
return [...prev, nextRow] return [...prev, nextRow]
@@ -299,7 +338,12 @@ const ListHeaderManageDialog = ({
} }
const handleConfirm = async () => { const handleConfirm = async () => {
if (saveDisabled || submitting) return
const names = localRows.map((row) => row.listHderNm.trim()) const names = localRows.map((row) => row.listHderNm.trim())
if (names.some((name) => name.length === 0)) {
alert('헤더명을 입력해 주세요.')
return
}
const duplicateNames = [...new Set(names.filter((name, index) => names.indexOf(name) !== index))] const duplicateNames = [...new Set(names.filter((name, index) => names.indexOf(name) !== index))]
if (duplicateNames.length > 0) { if (duplicateNames.length > 0) {
alert(`중복된 헤더명이 있습니다: ${duplicateNames.join(', ')}`) alert(`중복된 헤더명이 있습니다: ${duplicateNames.join(', ')}`)
@@ -333,8 +377,10 @@ const ListHeaderManageDialog = ({
let defaultOrder = 0 let defaultOrder = 0
let commonOrder = COMMON_GRADE_ORDER_START - 1 let commonOrder = COMMON_GRADE_ORDER_START - 1
const orderedRows = localRows.map((row) => { const orderedRows = localRows.map((row) => {
const listHderOrder = isCommonGrade(row.listHderGrad) ? (commonOrder += 1) : (defaultOrder += 1) const isCommon = isCommonGrade(row.listHderGrad)
return { ...row, prjctIdx: row.prjctIdx ?? prjctIdx, listHderOrder } const listHderOrder = isCommon ? (commonOrder += 1) : (defaultOrder += 1)
const listHderNm = isCommon ? row.listHderNm.trim() : row.listHderNm
return { ...row, prjctIdx: row.prjctIdx ?? prjctIdx, listHderOrder, listHderNm }
}) })
await onConfirm(orderedRows) await onConfirm(orderedRows)
handleOpenChange(false) handleOpenChange(false)
@@ -354,12 +400,13 @@ const ListHeaderManageDialog = ({
<Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}> <Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}>
취소 취소
</Button> </Button>
<Button type="button" onClick={handleConfirm} disabled={submitting}> <Button type="button" onClick={handleConfirm} disabled={submitting || saveDisabled}>
저장 저장
</Button> </Button>
</> </>
} }
> >
{saveDisabled && <p role="alert" className="mb-2 text-sm text-amber-800">리스트 작업이 진행 중이거나 작업 상태를 확인할 수 없어 헤더를 저장할 수 없습니다.</p>}
<div className="flex justify-between mb-2"> <div className="flex justify-between mb-2">
<span className="text-base text-red-600 font-semibold">⚠️ 헤더명이 수정 되거나 헤더가 삭제되면 KON또는 KON-KIWI의 리스트 관련 하드코딩에 영향이 있을 수 있습니다.</span> <span className="text-base text-red-600 font-semibold">⚠️ 헤더명이 수정 되거나 헤더가 삭제되면 KON또는 KON-KIWI의 리스트 관련 하드코딩에 영향이 있을 수 있습니다.</span>
@@ -370,10 +417,11 @@ const ListHeaderManageDialog = ({
</div> </div>
<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-[56px_1fr_150px_96px_96px_110px_110px_88px] items-center gap-2 text-sm font-semibold"> <div className="h-11 px-4 border-b bg-muted grid grid-cols-[56px_1fr_150px_120px_96px_96px_110px_110px_88px] items-center gap-2 text-sm font-semibold">
<span>순서</span> <span>순서</span>
<span>헤더명</span> <span>헤더명</span>
<span>헤더 타입</span> <span>헤더 타입</span>
<span>헤더 색상</span>
<span>헤더 노출</span> <span>헤더 노출</span>
<span>필터 사용</span> <span>필터 사용</span>
<span>면접원 노출</span> <span>면접원 노출</span>
@@ -395,6 +443,7 @@ const ListHeaderManageDialog = ({
key={row.listHderId} key={row.listHderId}
row={row} row={row}
activeId={activeId} activeId={activeId}
onHeaderColorChange={handleHeaderColorChange}
onHeaderNameChange={handleHeaderNameChange} onHeaderNameChange={handleHeaderNameChange}
onHeaderTypeChange={handleHeaderTypeChange} onHeaderTypeChange={handleHeaderTypeChange}
onFlagChange={handleFlagChange} onFlagChange={handleFlagChange}

View File

@@ -3,23 +3,44 @@
import { useState } from 'react' import { 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 { Checkbox } from '@/components/ui/checkbox'
import { Label } from '@/components/ui/label' import { Label } from '@/components/ui/label'
import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import { ListJobGatePanel, useListJobGate } from '@/components/list/ListJobGate'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption' import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption'
import type { ListFilterTarget, ListResetScope } from '@/types/list' import type { ListFilterTarget, ListResetSelection } from '@/types/list'
import type { ProjectSurvey } from '@/types/project'
export type ListResetDialogProps = { export type ListResetDialogProps = {
prjctIdx: number
/** 프로젝트에 연동된 설문 목록. undefined면 아직 불러오지 못한 상태로 보고 초기화를 막는다. */
surveys?: ProjectSurvey[]
dialogId?: DialogId dialogId?: DialogId
open?: boolean open?: boolean
onOpenChange?: (open: boolean) => void onOpenChange?: (open: boolean) => void
selectedSids: string[] selectedSids: string[]
filterSummary?: string[] filterSummary?: string[]
onConfirm: (payload: { target: ListFilterTarget; scope: ListResetScope }) => void | Promise<void> onConfirm: (payload: { target: ListFilterTarget; selection: ListResetSelection }) => void | Promise<void>
}
type ResetSurveyOption = { prjctSurveyIdx: number; surveyName: string }
const toResetSurveyOptions = (surveys: ProjectSurvey[]): ResetSurveyOption[] => {
const seen = new Set<number>()
return [...surveys]
.sort((a, b) => a.surveyOrder - b.surveyOrder)
.flatMap((survey) => {
const id = survey.prjctSurveyIdx
if (id == null || seen.has(id)) return []
seen.add(id)
return [{ prjctSurveyIdx: id, surveyName: survey.surveyName }]
})
} }
const ListResetDialog = ({ const ListResetDialog = ({
prjctIdx,
surveys,
dialogId = 'listResetDialog', dialogId = 'listResetDialog',
open, open,
onOpenChange, onOpenChange,
@@ -29,10 +50,38 @@ const ListResetDialog = ({
}: ListResetDialogProps) => { }: ListResetDialogProps) => {
const { isDialogOpen, showDialog, hideDialog } = useDialog() const { isDialogOpen, showDialog, hideDialog } = useDialog()
const [target, setTarget] = useState<ListFilterTarget>('selected') const [target, setTarget] = useState<ListFilterTarget>('selected')
const [scope, setScope] = useState<ListResetScope>('result-and-history') const [resetList, setResetList] = useState(false)
const [resetContactHistory, setResetContactHistory] = useState(false)
const [resetInterviewHistory, setResetInterviewHistory] = useState(false)
const [selectedSurveyIds, setSelectedSurveyIds] = useState<number[]>([])
const [submitting, setSubmitting] = useState(false) const [submitting, setSubmitting] = useState(false)
const resolvedOpen = open ?? isDialogOpen(dialogId) const resolvedOpen = open ?? isDialogOpen(dialogId)
const gate = useListJobGate({ prjctIdx, jobType: 'LIST_RESET', active: resolvedOpen })
const surveysReady = surveys !== undefined
const surveyOptions = toResetSurveyOptions(surveys ?? [])
const allSurveyIds = surveyOptions.map((survey) => survey.prjctSurveyIdx)
// 설문 목록이 다시 조회되어 빠진 설문이 있으면 요청에서 제외한다.
const checkedSurveyIds = allSurveyIds.filter((id) => selectedSurveyIds.includes(id))
const hasSelection = resetList || resetContactHistory || resetInterviewHistory || checkedSurveyIds.length > 0
// 리스트 초기화는 모든 이력을 포함해야 하므로 이력을 전부 선택하고 잠근다.
// 해제 시에는 잠금 중 화면에 보이던 전체 선택 상태를 그대로 유지한다(잠금 중 로드된 설문 포함).
const handleResetListChange = (checked: boolean) => {
setResetList(checked)
setResetContactHistory(true)
setResetInterviewHistory(true)
setSelectedSurveyIds(allSurveyIds)
}
const handleSurveyChange = (id: number, checked: boolean) => {
setSelectedSurveyIds((prev) => (checked ? [...prev.filter((v) => v !== id), id] : prev.filter((v) => v !== id)))
}
const buildSelection = (): ListResetSelection => resetList
? { resetList: true, resetContactHistory: true, resetInterviewHistory: true, resetSurveyIds: allSurveyIds }
: { resetList: false, resetContactHistory, resetInterviewHistory, resetSurveyIds: checkedSurveyIds }
const handleOpenChange = (nextOpen: boolean) => { const handleOpenChange = (nextOpen: boolean) => {
onOpenChange?.(nextOpen) onOpenChange?.(nextOpen)
@@ -43,14 +92,33 @@ const ListResetDialog = ({
hideDialog(dialogId) hideDialog(dialogId)
} }
// '새 작업'(완료 확인)을 누르면 이전 작업의 대상·범위를 이어 쓰지 않도록 초기값으로 되돌린다.
const gatePanel = {
...gate,
acknowledge: () => {
gate.acknowledge()
setTarget('selected')
setResetList(false)
setResetContactHistory(false)
setResetInterviewHistory(false)
setSelectedSurveyIds([])
},
}
// 전체 대상은 선택 시점에도 한 번 확인한다. 취소하면 기존 대상을 유지한다.
const handleTargetChange = (next: ListFilterTarget) => {
if (next === 'all' && target !== 'all' && !confirm('전체 대상을 선택하면 프로젝트의 모든 리스트가 초기화 대상이 됩니다. 선택하시겠습니까?')) return
setTarget(next)
}
const handleConfirm = async () => { const handleConfirm = async () => {
if (gate.submitBlocked || submitting || !surveysReady || !hasSelection) return
if (!validateApplyFilterTarget(target, { selectedCount: selectedSids.length, filterSummary })) return if (!validateApplyFilterTarget(target, { selectedCount: selectedSids.length, filterSummary })) return
if (target === 'all' && !confirm('전체 리스트가 초기화 됩니다. 진행하시겠습니까?')) return if (target === 'all' && !confirm('전체 리스트가 초기화 됩니다. 진행하시겠습니까?')) return
setSubmitting(true) setSubmitting(true)
try { try {
await onConfirm({ target, scope }) await onConfirm({ target, selection: buildSelection() })
handleOpenChange(false)
} finally { } finally {
setSubmitting(false) setSubmitting(false)
} }
@@ -61,24 +129,33 @@ const ListResetDialog = ({
open={resolvedOpen} open={resolvedOpen}
onOpenChange={handleOpenChange} onOpenChange={handleOpenChange}
title={<span className="text-2xl font-bold">리스트 초기화</span>} title={<span className="text-2xl font-bold">리스트 초기화</span>}
contentClassName="sm:max-w-[700px]" contentClassName="sm:max-w-[700px] max-h-[90vh] overflow-y-auto"
bodyClassName="space-y-6 py-2" bodyClassName="space-y-6 py-2"
footer={ footer={
<> <>
<Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}> <Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}>
취소 {gate.hasCurrentJob ? '닫기' : '취소'}
</Button> </Button>
<Button type="button" variant="destructive" onClick={handleConfirm} disabled={submitting}> {!gate.hasCurrentJob && (
<Button
type="button"
variant="destructive"
onClick={handleConfirm}
disabled={submitting || gate.submitBlocked || !surveysReady || !hasSelection}
>
초기화 초기화
</Button> </Button>
)}
</> </>
} }
> >
<ListJobGatePanel gate={gatePanel} acknowledgeLabel="새 작업" />
{!gate.hasCurrentJob && <>
<div className="rounded-md border p-4 space-y-4"> <div className="rounded-md border p-4 space-y-4">
<p className="text-lg font-semibold text-red-600">초기화 대상</p> <p className="text-lg font-semibold text-red-600">초기화 대상</p>
<ApplyFilterOption <ApplyFilterOption
value={target} value={target}
onValueChange={(v) => setTarget(v)} onValueChange={handleTargetChange}
idPrefix="list-reset-target" idPrefix="list-reset-target"
selectedSids={selectedSids} selectedSids={selectedSids}
filterSummary={filterSummary} filterSummary={filterSummary}
@@ -87,17 +164,65 @@ const ListResetDialog = ({
<div className="rounded-md border p-4 space-y-4"> <div className="rounded-md border p-4 space-y-4">
<p className="text-lg font-semibold text-red-600">초기화 범위</p> <p className="text-lg font-semibold text-red-600">초기화 범위</p>
<RadioGroup value={scope} onValueChange={(v) => setScope(v as ListResetScope)} className="space-y-2"> <div className="space-y-3">
<div className="flex flex-wrap items-center gap-x-6 gap-y-2">
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<RadioGroupItem value="result-and-history" id="list-reset-scope-result-history" /> <Checkbox
<Label className="text-base" htmlFor="list-reset-scope-result-history">결과 + 이력 삭제</Label> id="list-reset-scope-list"
checked={resetList}
onCheckedChange={(checked) => handleResetListChange(checked === true)}
/>
<Label className="text-base" htmlFor="list-reset-scope-list">리스트</Label>
</div> </div>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<RadioGroupItem value="list-only" id="list-reset-scope-list-only" /> <Checkbox
<Label className="text-base" htmlFor="list-reset-scope-list-only">결과 + 이력 + 리스트 삭제</Label> id="list-reset-scope-contact"
checked={resetList || resetContactHistory}
disabled={resetList}
onCheckedChange={(checked) => setResetContactHistory(checked === true)}
/>
<Label className="text-base" htmlFor="list-reset-scope-contact">컨택이력</Label>
</div> </div>
</RadioGroup> <div className="flex items-center gap-2">
<Checkbox
id="list-reset-scope-interview"
checked={resetList || resetInterviewHistory}
disabled={resetList}
onCheckedChange={(checked) => setResetInterviewHistory(checked === true)}
/>
<Label className="text-base" htmlFor="list-reset-scope-interview">면접이력</Label>
</div> </div>
</div>
{(!surveysReady || surveyOptions.length > 0) && (
<div className="space-y-2">
<p className="text-sm font-medium text-muted-foreground">설문 상태이력</p>
{!surveysReady && <p className="text-sm text-muted-foreground">설문 목록을 불러오는 중입니다.</p>}
<div className="flex flex-wrap items-center gap-x-6 gap-y-2">
{surveyOptions.map((survey) => {
const id = `list-reset-scope-survey-${survey.prjctSurveyIdx}`
return (
<div key={survey.prjctSurveyIdx} className="flex items-center gap-2">
<Checkbox
id={id}
checked={resetList || checkedSurveyIds.includes(survey.prjctSurveyIdx)}
disabled={resetList}
onCheckedChange={(checked) => handleSurveyChange(survey.prjctSurveyIdx, checked === true)}
/>
<Label className="text-base" htmlFor={id}>{survey.surveyName}</Label>
</div>
)
})}
</div>
</div>
)}
</div>
<ul className="list-disc space-y-1 pl-5 text-sm text-muted-foreground">
<li>선택한 이력은 해당 유형의 이력과 최신 상태가 함께 초기화되며, 선택하지 않은 이력은 유지됩니다.</li>
<li>리스트를 선택하면 리스트와 모든 이력이 함께 초기화됩니다.</li>
<li>설문 상태이력 초기화는 외부 설문 시스템의 실제 응답 데이터를 삭제하지 않습니다.</li>
</ul>
</div>
</>}
</KriDialog> </KriDialog>
) )
} }

View File

@@ -6,10 +6,9 @@ import { KriDialog } from '@/components/common/KriDialog'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import { Checkbox } from '@/components/ui/checkbox' import { Checkbox } from '@/components/ui/checkbox'
import { Label } from '@/components/ui/label' import { Label } from '@/components/ui/label'
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
import { KriSelect, KriSelectItem } from '@/components/common/KriSelect' import { KriSelect, KriSelectItem } from '@/components/common/KriSelect'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import { ListJobGatePanel, useListJobGate } from '@/components/list/ListJobGate'
import { useLoading } from '@/hooks/useLoading' import { useLoading } from '@/hooks/useLoading'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import { formatKst } from '@kri/common' import { formatKst } from '@kri/common'
@@ -22,6 +21,7 @@ export type ValidationOption = {
} }
export type ListUploadDialogProps = { export type ListUploadDialogProps = {
prjctIdx: number
dialogId?: DialogId dialogId?: DialogId
open?: boolean open?: boolean
onOpenChange?: (open: boolean) => void onOpenChange?: (open: boolean) => void
@@ -32,10 +32,12 @@ export type ListUploadDialogProps = {
headerRows?: listHeader[] headerRows?: listHeader[]
} }
const ACCEPT_EXTENSIONS = ['.xlsx', '.xls', '.csv'] const ACCEPT_EXTENSIONS = ['.xlsx']
// 전체 초기화 후 등록(RESET_AND_INSERT)은 위험성 때문에 사용하지 않는다.
const FIXED_UPLOAD_MODE = ListUploadMode.ADD_AND_CHANGE const FIXED_UPLOAD_MODE = ListUploadMode.ADD_AND_CHANGE
const ListUploadDialog = ({ const ListUploadDialog = ({
prjctIdx,
dialogId = 'listUploadDialog', dialogId = 'listUploadDialog',
open, open,
onOpenChange, onOpenChange,
@@ -52,8 +54,6 @@ const ListUploadDialog = ({
const [selectedFile, setSelectedFile] = useState<File | null>(null) const [selectedFile, setSelectedFile] = useState<File | null>(null)
const [excelHeaders, setExcelHeaders] = useState<string[]>([]) const [excelHeaders, setExcelHeaders] = useState<string[]>([])
const [otherHeaderTypeMap, setOtherHeaderTypeMap] = useState<Record<number, ListHeaderType>>({}) const [otherHeaderTypeMap, setOtherHeaderTypeMap] = useState<Record<number, ListHeaderType>>({})
// eslint-disable-next-line @typescript-eslint/no-unused-vars
const [uploadMode, setUploadMode] = useState<ListUploadMode>(ListUploadMode.ADD_AND_CHANGE)
const [submitting, setSubmitting] = useState(false) const [submitting, setSubmitting] = useState(false)
const [historyExpanded, setHistoryExpanded] = useState(false) const [historyExpanded, setHistoryExpanded] = useState(false)
const [validation, setValidation] = useState<ValidationOption>({ const [validation, setValidation] = useState<ValidationOption>({
@@ -62,6 +62,7 @@ const ListUploadDialog = ({
}) })
const resolvedOpen = open ?? isDialogOpen(dialogId) const resolvedOpen = open ?? isDialogOpen(dialogId)
const gate = useListJobGate({ prjctIdx, jobType: 'LIST_UPLOAD', active: resolvedOpen })
const normalizedHistory = useMemo( const normalizedHistory = useMemo(
() => () =>
@@ -94,7 +95,6 @@ const ListUploadDialog = ({
setSelectedFile(null) setSelectedFile(null)
setExcelHeaders([]) setExcelHeaders([])
setOtherHeaderTypeMap({}) setOtherHeaderTypeMap({})
setUploadMode(ListUploadMode.ADD_AND_CHANGE)
setSubmitting(false) setSubmitting(false)
setHistoryExpanded(false) setHistoryExpanded(false)
setValidation({ setValidation({
@@ -137,7 +137,7 @@ const ListUploadDialog = ({
const { read, utils } = await import('xlsx') const { read, utils } = await import('xlsx')
const buffer = await file.arrayBuffer() const buffer = await file.arrayBuffer()
const workbook = read(buffer, { type: 'array' }) const workbook = read(buffer, { type: 'array', sheetRows: 1, sheets: 0 })
const firstSheet = workbook.SheetNames[0] const firstSheet = workbook.SheetNames[0]
if (!firstSheet) return [] if (!firstSheet) return []
const rows = utils.sheet_to_json<(string | number | null)[]>(workbook.Sheets[firstSheet], { header: 1, raw: false }) const rows = utils.sheet_to_json<(string | number | null)[]>(workbook.Sheets[firstSheet], { header: 1, raw: false })
@@ -151,10 +151,11 @@ const ListUploadDialog = ({
const lower = file.name.toLowerCase() const lower = file.name.toLowerCase()
const valid = ACCEPT_EXTENSIONS.some((ext) => lower.endsWith(ext)) const valid = ACCEPT_EXTENSIONS.some((ext) => lower.endsWith(ext))
if (!valid) { if (!valid) {
alert('엑셀 또는 CSV 파일만 업로드 가능합니다. (.xlsx, .xls, .csv)') alert('XLSX 파일만 업로드 가능합니다. (.xlsx)')
return return
} }
if (file.size > 100 * 1024 * 1024) { alert('100MB 이하의 파일을 선택해 주세요.'); return }
setSelectedFile(file) setSelectedFile(file)
void withLoadingAsync(async () => { void withLoadingAsync(async () => {
try { try {
@@ -168,6 +169,7 @@ const ListUploadDialog = ({
} }
const handleSubmit = async () => { const handleSubmit = async () => {
if (gate.submitBlocked || submitting) return
if (!selectedFile) { if (!selectedFile) {
alert('업로드할 파일을 선택해 주세요.') alert('업로드할 파일을 선택해 주세요.')
return return
@@ -177,7 +179,7 @@ const ListUploadDialog = ({
try { try {
const specificHeader = Object.fromEntries( const specificHeader = Object.fromEntries(
Object.entries(otherHeaderTypeMap) Object.entries(otherHeaderTypeMap)
.map(([index, value]) => [String(Number(index) + 1), value]) .map(([index, value]) => [String(Math.max(101, ...orderedHeaderRows.map(row => row.listHderId + 1)) + Number(index) - baseHeaderRows.length), value])
.filter(([, value]) => value !== ListHeaderConst.TEXT), .filter(([, value]) => value !== ListHeaderConst.TEXT),
) )
@@ -187,8 +189,6 @@ const ListUploadDialog = ({
checkDuplicatePhone: validation.checkPhoneDuplicate, checkDuplicatePhone: validation.checkPhoneDuplicate,
...(Object.keys(specificHeader).length > 0 ? { specificHeader } : {}), ...(Object.keys(specificHeader).length > 0 ? { specificHeader } : {}),
}) })
resetState()
handleOpenChange(false)
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} finally { } finally {
@@ -203,7 +203,7 @@ const ListUploadDialog = ({
const serverHeader = compareRows[index] const serverHeader = compareRows[index]
// compareRows가 이미 listHderOrder 기준 정렬이라 위치로 순서를 보장한다. listHderOrder 값 자체는 // compareRows가 이미 listHderOrder 기준 정렬이라 위치로 순서를 보장한다. listHderOrder 값 자체는
// COMMON 헤더가 101부터 채번되어 index+1과 리터럴하게 같지 않을 수 있으므로(정상), 이름만 비교한다. // COMMON 헤더가 101부터 채번되어 index+1과 리터럴하게 같지 않을 수 있으므로(정상), 이름만 비교한다.
const isMatched = !!serverHeader && serverHeader.listHderNm === header const isMatched = !!serverHeader && serverHeader.listHderNm.trim() === header
const isSettingRequired = !hasCommonHeader && index >= baseHeaderRows.length const isSettingRequired = !hasCommonHeader && index >= baseHeaderRows.length
return { return {
header, header,
@@ -256,44 +256,23 @@ const ListUploadDialog = ({
open={resolvedOpen} open={resolvedOpen}
onOpenChange={handleDialogOpenChange} onOpenChange={handleDialogOpenChange}
title={<span className="text-2xl font-bold">리스트 업로드</span>} title={<span className="text-2xl font-bold">리스트 업로드</span>}
contentClassName="w-[min(960px,95vw)] max-w-[95vw] sm:max-w-[min(960px,95vw)] overflow-hidden" contentClassName="w-[min(960px,95vw)] max-w-[95vw] sm:max-w-[min(960px,95vw)] max-h-[90vh] grid-rows-[auto_minmax(0,1fr)_auto] overflow-hidden"
bodyClassName="min-w-0 space-y-6 py-2" bodyClassName="min-w-0 space-y-6 overflow-y-auto py-2"
footer={ footer={
<> <>
<Button type="button" variant="outline" onClick={() => handleDialogOpenChange(false)} disabled={submitting}> <Button type="button" variant="outline" onClick={() => handleDialogOpenChange(false)} disabled={submitting}>
취소 {gate.hasCurrentJob ? '닫기' : '취소'}
</Button> </Button>
<Button type="button" onClick={handleSubmit} disabled={!selectedFile || submitting || hasHeaderMismatch}> {!gate.hasCurrentJob && (
<Button type="button" onClick={handleSubmit} disabled={!selectedFile || submitting || hasHeaderMismatch || gate.submitBlocked}>
{submitting ? '업로드 중...' : '업로드'} {submitting ? '업로드 중...' : '업로드'}
</Button> </Button>
)}
</> </>
} }
> >
{ <ListJobGatePanel gate={gate} acknowledgeLabel="새 작업" />
/* {!gate.hasCurrentJob && <>
<div className="space-y-3">
<Label className="text-lg font-semibold">업로드 방식</Label>
<RadioGroup
value={String(uploadMode)}
onValueChange={(value) => setUploadMode(Number(value) as ListUploadMode)}
className="flex flex-wrap items-center gap-6"
>
<div className="flex items-center gap-2">
<RadioGroupItem value={String(ListUploadMode.CHANGE)} id="list-upload-mode-change" />
<Label htmlFor="list-upload-mode-change" className="cursor-pointer">
전체 교체
</Label>
</div>
<div className="flex items-center gap-2">
<RadioGroupItem value={String(ListUploadMode.ADD)} id="list-upload-mode-add" />
<Label htmlFor="list-upload-mode-add" className="cursor-pointer">
추가
</Label>
</div>
</RadioGroup>
</div>
*/
}
<div className="space-y-3"> <div className="space-y-3">
<Label className="text-lg font-semibold">업로드 파일</Label> <Label className="text-lg font-semibold">업로드 파일</Label>
<div className="min-w-0 flex items-center gap-2"> <div className="min-w-0 flex items-center gap-2">
@@ -425,6 +404,7 @@ const ListUploadDialog = ({
</div> </div>
)} )}
</div> </div>
</>}
</KriDialog> </KriDialog>
) )
} }

View File

@@ -8,12 +8,15 @@ import type { DataTableColumn } from '@/components/data-table/DataTable.type'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import { useSelectedProject } from '@/hooks/useSelectedProject' import { useSelectedProject } from '@/hooks/useSelectedProject'
import { useBulkSendDetailExcelMutation, useBulkSendDetailQuery, useBulkSendListQuery } from '@/query/message' import { useBulkSendDetailExcelMutation, useBulkSendDetailQuery, useBulkSendListQuery } from '@/query/message'
import { MessageType } from '@kri/common/noti-hub' import { isSendCancelable, MessageType } from '@kri/common/noti-hub'
import { MESSAGE_TYPE_LABEL } from '@/const/messageTemplateConst'
import { downloadBase64File, XLSX_MIME_TYPE } from '@kri/common/browser' import { downloadBase64File, XLSX_MIME_TYPE } from '@kri/common/browser'
import { formatKst } from '@kri/common' import { formatKst } from '@kri/common'
import type { PaginationState } from '@tanstack/react-table' import type { PaginationState } from '@tanstack/react-table'
import type { DialogId } from '@/store/jotai/dialog' import type { DialogId } from '@/store/jotai/dialog'
import type { BulkSendInfo, SendResultInfo } from '@kri/common/noti-hub' import type { BulkSendInfo, SendResultInfo } from '@kri/common/noti-hub'
import type { SendCancelRequest } from '@/types/message'
import { useSendCancel } from '@/hooks/useSendCancel'
import {clientEnv} from "@/lib/env.client"; import {clientEnv} from "@/lib/env.client";
import { formatKoreanPhoneNumber } from "@/utils/phone"; import { formatKoreanPhoneNumber } from "@/utils/phone";
@@ -31,7 +34,40 @@ const tabLabelMap: Record<MessageHistoryType, string> = {
kko: '알림톡', kko: '알림톡',
} }
const historyColumns: DataTableColumn<BulkSendInfo>[] = [ // 취소 일시가 없으면 빈 칸으로 둔다.
const formatCancelDt = (cancelDt: string | undefined) => (cancelDt ? formatKst(cancelDt, 'dateTime') : null)
// 버튼만 셀 가운데에 둔다. 취소 일시는 다른 컬럼과 같은 기본 정렬을 따른다.
const CancelButton = ({ disabled, onClick }: { disabled: boolean; onClick: () => void }) => (
<div className="flex justify-center">
<Button
type="button"
size="sm"
variant="outline"
disabled={disabled}
onClick={(e) => {
// 벌크 목록은 행 클릭으로 상세를 여므로 버튼 클릭이 행 선택으로 번지지 않게 한다.
e.stopPropagation()
onClick()
}}
>
예약 취소
</Button>
</div>
)
type CancelColumnOptions = {
/** false(면접원)이면 취소 버튼 대신 취소 일시(없으면 빈 칸)를 표시한다. */
canCancel: boolean
onCancel: (request: SendCancelRequest) => void
cancelPending: boolean
}
// 버튼은 서버의 cancelable로만 판단한다(값이 없는 구버전 응답은 취소 불가). 최종 결과는 취소 API 응답 건수로 안내한다.
const canCancelDetail = (row: SendResultInfo) => isSendCancelable(row) && !!row.sendIdx
// 취소 컬럼에는 취소 가능하면 버튼, 아니면 취소 일시(없으면 빈 칸) 중 하나만 표시한다.
const buildHistoryColumns = ({ canCancel, onCancel, cancelPending }: CancelColumnOptions): DataTableColumn<BulkSendInfo>[] => [
{ id: 'regDt', header: '등록 일시', accessorFn: (row) => (row.regDt ? formatKst(row.regDt, 'dateTime') : '-') }, { id: 'regDt', header: '등록 일시', accessorFn: (row) => (row.regDt ? formatKst(row.regDt, 'dateTime') : '-') },
{ id: 'sendDt', header: '발송 일시', accessorFn: (row) => (row.sendDt ? formatKst(row.sendDt, 'dateTime') : '-') }, { id: 'sendDt', header: '발송 일시', accessorFn: (row) => (row.sendDt ? formatKst(row.sendDt, 'dateTime') : '-') },
{ id: 'resve', header: '구분', accessorFn: (row) => (row.resve ? '예약' : '즉시') }, { id: 'resve', header: '구분', accessorFn: (row) => (row.resve ? '예약' : '즉시') },
@@ -39,15 +75,44 @@ const historyColumns: DataTableColumn<BulkSendInfo>[] = [
{ id: 'sendCnt', header: '발송수', accessorFn: (row) => row.sendCnt.toLocaleString() }, { id: 'sendCnt', header: '발송수', accessorFn: (row) => row.sendCnt.toLocaleString() },
{ id: 'succesCnt', header: '성공', accessorFn: (row) => row.succesCnt.toLocaleString() }, { id: 'succesCnt', header: '성공', accessorFn: (row) => row.succesCnt.toLocaleString() },
{ id: 'failCnt', header: '실패', accessorFn: (row) => row.failCnt.toLocaleString() }, { id: 'failCnt', header: '실패', accessorFn: (row) => row.failCnt.toLocaleString() },
{
id: 'cancelDt',
header: '취소 일시',
accessorFn: (row) => row.cancelDt ?? '',
cell: ({ row }) =>
canCancel && isSendCancelable(row.original) ? (
<CancelButton
disabled={cancelPending}
onClick={() => onCancel({ type: 'bulk', bulkSendKey: row.original.bulkSendKey })}
/>
) : (
formatCancelDt(row.original.cancelDt)
),
},
{ id: 'completeDt', header: '완료 일시', accessorFn: (row) => (row.completeDt ? formatKst(row.completeDt, 'dateTime') : '-') }, { id: 'completeDt', header: '완료 일시', accessorFn: (row) => (row.completeDt ? formatKst(row.completeDt, 'dateTime') : '-') },
{ id: 'regUser', header: '등록자', accessorFn: (row) => row.regUser ?? '-' }, { id: 'regUser', header: '등록자', accessorFn: (row) => row.regUser ?? '-' },
] ]
const detailColumns: DataTableColumn<SendResultInfo>[] = [ const buildDetailColumns = ({ canCancel, onCancel, cancelPending }: CancelColumnOptions): DataTableColumn<SendResultInfo>[] => [
{ id: 'sendTy', header: '유형', accessorFn: (row) => MESSAGE_TYPE_LABEL[row.sendTy] ?? String(row.sendTy) },
{ id: 'destTo', header: '수신처', accessorFn: (row) => row.destEml || (row.destTel ? formatKoreanPhoneNumber(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 ? formatKoreanPhoneNumber(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) },
{
// 개별 건의 현재 취소 상태는 결과 컬럼(resultCode 라벨)으로 표시한다.
id: 'cancelDt',
header: '취소 일시',
accessorFn: (row) => row.cancelDt ?? '',
cell: ({ row }) => {
const { sendIdx, cancelDt } = row.original
return canCancel && canCancelDetail(row.original) && sendIdx ? (
<CancelButton disabled={cancelPending} onClick={() => onCancel({ type: 'single', sendIdx })} />
) : (
formatCancelDt(cancelDt)
)
},
},
{ 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') : '-') },
] ]
@@ -69,21 +134,15 @@ const MessageHistoryDialog = ({
const emailListQuery = useBulkSendListQuery(MessageType.EMAIL, clientEnv.REQUEST_SVC, prjctCd, enabled && tab === 'email') 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 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 kkoListQuery = useBulkSendListQuery(MessageType.KKO, clientEnv.REQUEST_SVC, prjctCd, enabled && tab === 'kko')
const visibleRows = useMemo(() => { const visibleRows = useMemo(() => {
if (tab === 'email') return emailListQuery.data ?? [] if (tab === 'email') return emailListQuery.data ?? []
if (tab === 'kko') return kkoListQuery.data ?? [] if (tab === 'kko') return kkoListQuery.data ?? []
// 문자 길이에 따라 SMS로 발송된 건도 자동으로 LMS/MMS로 전환될 수 있는데, 이 경우 두 목록 API가 // 21/22/23 경로는 모두 문자 채널 전체를 반환하므로 한 번만 조회한다.
// 같은 bulkSendKey를 각각 반환해 합치면 행이 중복된다. bulkSendKey 기준으로 한 번만 남긴다. return [...(smsListQuery.data ?? [])].sort((a, b) => (b.regDt ?? '').localeCompare(a.regDt ?? ''))
const merged = new Map<string, BulkSendInfo>() }, [tab, emailListQuery.data, smsListQuery.data, kkoListQuery.data])
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, kkoListQuery.data])
const detailQuery = useBulkSendDetailQuery( const detailQuery = useBulkSendDetailQuery(
selectedKey ?? '', selectedKey ?? '',
@@ -96,6 +155,9 @@ const MessageHistoryDialog = ({
enabled && !!selectedKey, enabled && !!selectedKey,
) )
const detailExcelMutation = useBulkSendDetailExcelMutation() const detailExcelMutation = useBulkSendDetailExcelMutation()
const { canCancel, cancel, isPending: cancelPending } = useSendCancel()
const historyColumns = buildHistoryColumns({ canCancel, onCancel: cancel, cancelPending })
const detailColumns = buildDetailColumns({ canCancel, onCancel: cancel, cancelPending })
const handleOpenChange = (nextOpen: boolean) => { const handleOpenChange = (nextOpen: boolean) => {
onOpenChange?.(nextOpen) onOpenChange?.(nextOpen)
@@ -134,7 +196,7 @@ const MessageHistoryDialog = ({
title={<span className="text-2xl font-bold">발송 이력</span>} title={<span className="text-2xl font-bold">발송 이력</span>}
contentClassName="sm:max-w-[1200px] max-h-[90vh] overflow-y-auto" contentClassName="sm:max-w-[1200px] max-h-[90vh] overflow-y-auto"
closeLabel="닫기" closeLabel="닫기"
bodyClassName="space-y-4" bodyClassName="min-w-0 space-y-4"
> >
<div className="flex gap-2"> <div className="flex gap-2">
<Button type="button" variant={tab === 'sms' ? 'default' : 'outline'} onClick={() => handleSelectTab('sms')}> <Button type="button" variant={tab === 'sms' ? 'default' : 'outline'} onClick={() => handleSelectTab('sms')}>
@@ -174,7 +236,7 @@ const MessageHistoryDialog = ({
<DataTable<SendResultInfo> <DataTable<SendResultInfo>
columns={detailColumns} columns={detailColumns}
data={detailQuery.data?.content ?? []} data={detailQuery.data?.content ?? []}
getRowId={(row) => row.cmid} getRowId={(row) => (row.sendIdx ? String(row.sendIdx) : row.cmid)}
isClient={false} isClient={false}
pageCount={detailQuery.data?.totalPages ?? 0} pageCount={detailQuery.data?.totalPages ?? 0}
totalCount={detailQuery.data?.totalElements ?? 0} totalCount={detailQuery.data?.totalElements ?? 0}

View File

@@ -11,11 +11,10 @@ import { useDialog } from '@/hooks/useDialog'
import { useSelectedProject } from '@/hooks/useSelectedProject' import { useSelectedProject } from '@/hooks/useSelectedProject'
import { import {
useMainTemplateIdxQuery, useMainTemplateIdxQuery,
useSendBulkMessageMutation,
useTemplateListQuery, useTemplateListQuery,
useTemplateQuery, useTemplateQuery,
} from '@/query/message' } from '@/query/message'
import { getNearestFutureDateTime, toReserveSendDt } from '@/lib/datetime' import { getNearestFutureDateTime, isPastReserveDateTime, toReserveSendDt } from '@/lib/datetime'
import type { DialogId } from '@/store/jotai/dialog' 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'
@@ -23,6 +22,9 @@ import type { ListTableRow } from '@/components/table-column/ListTableColumn'
import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption' import ApplyFilterOption, { validateApplyFilterTarget } from './ListDialogOption/ApplyFilterOption'
import MessageSendPreview from '@/components/message-template/MessageSendPreview' import MessageSendPreview from '@/components/message-template/MessageSendPreview'
import type { MessageSendChannel, TemplateSummaryWithPurpose } from '@/types/message' import type { MessageSendChannel, TemplateSummaryWithPurpose } from '@/types/message'
import { useSubmitListJob } from '@/query/list-job'
import { ListJobGatePanel, useListJobGate } from '@/components/list/ListJobGate'
import { MESSAGE_JOB_TYPE } from '@/const/listJobConst'
import { MESSAGE_CHANNEL_TYPE, TEMPLATE_PURPOSE } from '@/const/messageTemplateConst' import { MESSAGE_CHANNEL_TYPE, TEMPLATE_PURPOSE } from '@/const/messageTemplateConst'
export type MessageSendMode = MessageSendChannel export type MessageSendMode = MessageSendChannel
@@ -71,6 +73,7 @@ const MessageSendDialog = ({
const resolvedOpen = open ?? isDialogOpen(dialogId) const resolvedOpen = open ?? isDialogOpen(dialogId)
const prjctIdx = selectedProject?.prjctIdx ?? 0 const prjctIdx = selectedProject?.prjctIdx ?? 0
const gate = useListJobGate({ prjctIdx, jobType: MESSAGE_JOB_TYPE[mode], active: resolvedOpen })
const itrntPrjctCd = selectedProject?.itrntPrjctCd ?? '' const itrntPrjctCd = selectedProject?.itrntPrjctCd ?? ''
const enabled = resolvedOpen && !!selectedProject && prjctIdx > 0 const enabled = resolvedOpen && !!selectedProject && prjctIdx > 0
@@ -98,7 +101,7 @@ const MessageSendDialog = ({
[listHeaders, headerType], [listHeaders, headerType],
) )
const sendBulkMessageMutation = useSendBulkMessageMutation(mode, prjctIdx) const sendBulkMessageMutation = useSubmitListJob(prjctIdx)
const mainTemplateAppliedRef = useRef(false) const mainTemplateAppliedRef = useRef(false)
@@ -158,6 +161,7 @@ const MessageSendDialog = ({
} }
const handleConfirm = async () => { const handleConfirm = async () => {
if (gate.submitBlocked || submitting) return
if (!validateApplyFilterTarget(target, { selectedCount: selectedSids.length, filterSummary })) return if (!validateApplyFilterTarget(target, { selectedCount: selectedSids.length, filterSummary })) return
if (!selectedTemplate || !templateIdx) { if (!selectedTemplate || !templateIdx) {
alert('템플릿을 선택해 주세요.') alert('템플릿을 선택해 주세요.')
@@ -179,6 +183,10 @@ const MessageSendDialog = ({
alert('예약 발송 일시를 선택해 주세요.') alert('예약 발송 일시를 선택해 주세요.')
return return
} }
if (scheduleType === 'reserve' && isPastReserveDateTime(reserveAt)) {
alert('예약 발송 일시는 현재 시각 이후로 선택해 주세요.')
return
}
const listFilter = buildListFilter() const listFilter = buildListFilter()
if (target === 'selected' && listFilter.sidSet.length === 0) { if (target === 'selected' && listFilter.sidSet.length === 0) {
alert('수신 대상이 없습니다.') alert('수신 대상이 없습니다.')
@@ -187,21 +195,18 @@ const MessageSendDialog = ({
setSubmitting(true) setSubmitting(true)
try { try {
const res = await sendBulkMessageMutation.mutateAsync({ await sendBulkMessageMutation.mutateAsync({
jobType: MESSAGE_JOB_TYPE[mode],
path: `messages/${mode}`,
body: {
tmplatIdx: templateIdx, tmplatIdx: templateIdx,
resve: scheduleType === 'reserve', resve: scheduleType === 'reserve',
sendDt: scheduleType === 'reserve' ? toReserveSendDt(reserveAt) : undefined, sendDt: scheduleType === 'reserve' ? toReserveSendDt(reserveAt) : undefined,
listFilter, listFilter,
destHeaderIds: [targetHeaderId], destHeaderIds: [targetHeaderId],
},
}) })
if (res.failCount > 0) {
alert(`대상 ${res.targetCount}건 중 ${res.acceptCount}건 접수, ${res.failCount}건 실패했습니다.`)
} else {
alert(`대상 ${res.targetCount}건 발송 요청이 완료되었습니다.`)
}
onSent?.() onSent?.()
handleOpenChange(false)
} catch (e) { } catch (e) {
console.error(e) console.error(e)
} finally { } finally {
@@ -214,19 +219,23 @@ const MessageSendDialog = ({
open={resolvedOpen} open={resolvedOpen}
onOpenChange={handleOpenChange} onOpenChange={handleOpenChange}
title={<span className="text-2xl font-bold">{titleMap[mode]}</span>} title={<span className="text-2xl font-bold">{titleMap[mode]}</span>}
contentClassName="sm:max-w-[1100px] max-h-[90vh] overflow-y-auto" contentClassName={gate.hasCurrentJob ? "sm:max-w-[700px] max-h-[90vh] overflow-y-auto" : "sm:max-w-[1100px] max-h-[90vh] overflow-y-auto"}
bodyClassName="grid grid-cols-1 lg:grid-cols-2 gap-6" bodyClassName={gate.hasCurrentJob ? "space-y-4" : "grid grid-cols-1 lg:grid-cols-2 gap-6"}
footer={ footer={
<> <>
<Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}> <Button type="button" variant="outline" onClick={() => handleOpenChange(false)} disabled={submitting}>
취소 {gate.hasCurrentJob ? '닫기' : '취소'}
</Button> </Button>
<Button type="button" onClick={handleConfirm} disabled={submitting}> {!gate.hasCurrentJob && (
<Button type="button" onClick={handleConfirm} disabled={submitting || gate.submitBlocked}>
{submitting ? '발송 중...' : '발송'} {submitting ? '발송 중...' : '발송'}
</Button> </Button>
)}
</> </>
} }
> >
<ListJobGatePanel gate={gate} acknowledgeLabel="새 작업" className="lg:col-span-2" />
{!gate.hasCurrentJob && <>
<div className="space-y-4"> <div className="space-y-4">
<div className="space-y-2"> <div className="space-y-2">
<Label className="text-base">템플릿을 선택해 주세요</Label> <Label className="text-base">템플릿을 선택해 주세요</Label>
@@ -319,6 +328,7 @@ const MessageSendDialog = ({
</div> </div>
<MessageSendPreview chnnlTy={chnnlTy} template={selectedTemplate} /> <MessageSendPreview chnnlTy={chnnlTy} template={selectedTemplate} />
</>}
</KriDialog> </KriDialog>
) )
} }

View File

@@ -15,7 +15,7 @@ import {
useTemplateQuery, useTemplateQuery,
} from '@/query/message' } from '@/query/message'
import type { TemplateSummary } from '@kri/common/noti-hub' 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 { DialogId } from '@/store/jotai/dialog'
import type { MessageSendChannel, PhoneVerificationSendData } from '@/types/message' import type { MessageSendChannel, PhoneVerificationSendData } from '@/types/message'
import MessageSendPreview from '@/components/message-template/MessageSendPreview' import MessageSendPreview from '@/components/message-template/MessageSendPreview'
@@ -127,6 +127,10 @@ const SingleMessageSendDialog = ({
alert('예약 발송 일시를 선택해 주세요.') alert('예약 발송 일시를 선택해 주세요.')
return return
} }
if (scheduleType === 'reserve' && isPastReserveDateTime(reserveAt)) {
alert('예약 발송 일시는 현재 시각 이후로 선택해 주세요.')
return
}
setSubmitting(true) setSubmitting(true)
try { try {

View File

@@ -65,7 +65,6 @@ export function KriEditorHtmlOnly({
React.useEffect(() => { React.useEffect(() => {
applyExternalValue(value || '') applyExternalValue(value || '')
// 최초 마운트 시 1회만 실행 — 이후 value 변경은 아래 effect가 처리한다. // 최초 마운트 시 1회만 실행 — 이후 value 변경은 아래 effect가 처리한다.
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []) }, [])
React.useEffect(() => { React.useEffect(() => {

View File

@@ -8,8 +8,23 @@ import { useTextareaInsert } from './hooks/useTextareaInsert'
type SmsEditorProps = Omit<KriEditorProps, 'mode'> & { mode: 'sms' } type SmsEditorProps = Omit<KriEditorProps, 'mode'> & { mode: 'sms' }
type SmsMessageType = 'SMS' | 'LMS' | 'MMS'
function calculateBytes(value: string): number { function calculateBytes(value: string): number {
return Array.from(value).reduce((total, character) => total + (character.charCodeAt(0) > 127 ? 2 : 1), 0) return new TextEncoder().encode(value).byteLength
}
// 첨부파일이 있으면 MMS, 제목이 있거나 smsMaxBytes 이상이면 LMS, 나머지는 SMS로 미리보기 판정한다.
function getSmsMessageType(hasAttachment: boolean, byteSize: number, smsMaxBytes: number, title: string): SmsMessageType {
if (hasAttachment) return 'MMS'
if (byteSize >= smsMaxBytes || Boolean(title)) return 'LMS'
return 'SMS'
}
function getTextareaMinHeight(hasImages: boolean, hasTitle: boolean): string {
if (hasImages) return '160px'
if (hasTitle) return '320px'
return '360px'
} }
export function KriEditorSms({ export function KriEditorSms({
@@ -34,14 +49,25 @@ export function KriEditorSms({
const [text, setText] = React.useState(value || '') const [text, setText] = React.useState(value || '')
const textareaRef = React.useRef<HTMLTextAreaElement | null>(null) const textareaRef = React.useRef<HTMLTextAreaElement | null>(null)
const latestTextRef = React.useRef(text) const latestTextRef = React.useRef(text)
const lastTypeRef = React.useRef<'SMS' | 'LMS' | null>(null) const lastTypeRef = React.useRef<SmsMessageType | null>(null)
const { scheduleChange, flushChange } = useDebouncedChange(onChange, debounceMs) const { scheduleChange, flushChange } = useDebouncedChange(onChange, debounceMs)
const textareaInsert = useTextareaInsert(textareaRef) const textareaInsert = useTextareaInsert(textareaRef)
const previewText = smsPreviewSuffix ? `${text}\n${smsPreviewSuffix}` : text const previewText = smsPreviewSuffix ? `${text}\n${smsPreviewSuffix}` : text
const byteSize = React.useMemo(() => calculateBytes(previewText), [previewText]) const byteSize = React.useMemo(() => calculateBytes(previewText), [previewText])
const messageType: 'SMS' | 'LMS' = byteSize > smsMaxBytes || Boolean(smsTitle) || smsHasAttachment ? 'LMS' : 'SMS' const messageType = getSmsMessageType(smsHasAttachment, byteSize, smsMaxBytes, smsTitle)
const maxBytes = messageType === 'SMS' ? smsMaxBytes : lmsMaxBytes const maxBytes = messageType === 'SMS' ? smsMaxBytes : lmsMaxBytes
function getBadgeColor(): string {
switch (messageType) {
case 'SMS':
return 'bg-red-500'
case 'LMS':
return 'bg-blue-500'
case 'MMS':
return 'bg-green-500'
}
}
const commitText = React.useCallback((next: string, immediate = false) => { const commitText = React.useCallback((next: string, immediate = false) => {
setText(next) setText(next)
latestTextRef.current = next latestTextRef.current = next
@@ -90,8 +116,8 @@ export function KriEditorSms({
<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">
<div className="mb-3 flex items-center justify-between px-2"> <div className="mb-3 flex items-center justify-between px-2">
<span className="text-xs font-medium text-gray-600">{byteSize}/{maxBytes}byte</span> <span className="text-xs font-medium text-gray-600">{byteSize}/{maxBytes}byte</span>
<span className={cn('rounded-md px-3 py-1 text-xs font-bold text-white', messageType === 'LMS' ? 'bg-blue-500' : 'bg-red-500')}> <span className={cn('rounded-md px-3 py-1 text-xs font-bold text-white', getBadgeColor())}>
{messageType === 'LMS' ? 'LMS/MMS' : 'SMS'} {messageType}
</span> </span>
</div> </div>
<div className={cn('flex flex-1 flex-col rounded-2xl bg-white shadow-sm', smsImages.length > 0 ? 'overflow-y-auto' : 'overflow-hidden')}> <div className={cn('flex flex-1 flex-col rounded-2xl bg-white shadow-sm', smsImages.length > 0 ? 'overflow-y-auto' : 'overflow-hidden')}>
@@ -116,7 +142,7 @@ export function KriEditorSms({
onBlur={() => flushChange(latestTextRef.current)} onBlur={() => flushChange(latestTextRef.current)}
placeholder={placeholder} placeholder={placeholder}
readOnly={isSmsReadOnly} readOnly={isSmsReadOnly}
style={{ minHeight: smsImages.length > 0 ? '160px' : smsTitle ? '320px' : '360px' }} style={{ minHeight: getTextareaMinHeight(smsImages.length > 0, Boolean(smsTitle)) }}
{...textareaInsert.bindSelectionHandlers} {...textareaInsert.bindSelectionHandlers}
/> />
{smsPreviewSuffix ? ( {smsPreviewSuffix ? (

View File

@@ -39,6 +39,58 @@ import { useImageMapOverlay } from "./hooks/useImageMapOverlay";
type ViewMode = "wysiwyg" | "html"; type ViewMode = "wysiwyg" | "html";
type ToolbarEndSlotProps = Pick<KriEditorProps, "renderToolbarEnd"> & {
editor: Editor;
command: KriEditorCommand;
view: ViewMode;
};
// command는 ref를 사용하는 함수 묶음이라, 렌더 중 외부 함수에 직접 넘기면 React Compiler가
// ref 접근으로 판단한다. 별도 컴포넌트의 props로 전달해 렌더 범위를 분리한다(동작 동일).
function ToolbarEndSlot({ renderToolbarEnd, editor, command, view }: Readonly<ToolbarEndSlotProps>) {
return <>{renderToolbarEnd?.({ editor, command, view })}</>;
}
// 주입된 정제 함수가 우선이고, 없으면 sanitizeHtml 옵션에 따라 기본 정제기를 사용한다.
function sanitizeEditorHtml(
html: string,
htmlSanitizer: KriEditorProps["htmlSanitizer"],
sanitizeEnabled: boolean,
allowedCustomHtml: KriEditorProps["allowedCustomHtml"],
): string {
if (htmlSanitizer) return htmlSanitizer(html);
if (sanitizeEnabled) return sanitizeHtml(html, allowedCustomHtml);
return html;
}
function writeHtmlDraft(
draftRef: { current: string },
textareaRef: { current: HTMLTextAreaElement | null },
html: string,
): void {
draftRef.current = html;
if (textareaRef.current) textareaRef.current.value = html;
}
// 외부에서 본문이 변경된 경우에만 기존 editor 문서를 갱신한다.
function syncEditorContent(editor: Editor, value: string, optimisticHtml: string): void {
// 빈 문자열("")은 ProseMirror 스키마상 유효한 문서가 아니라 setContent가 조용히 실패해
// 이전 템플릿 본문이 그대로 남는 문제가 있었음 -> 빈 값은 빈 문단으로 정규화해서 비교/설정.
const normalizedValue = value || "<p></p>";
if (normalizedValue === editor.getHTML() || normalizedValue === optimisticHtml) return;
editor.commands.setContent(normalizedValue, {
emitUpdate: false,
parseOptions: { preserveWhitespace: "full" },
});
// resize가 활성화된 TipTap 이미지 NodeView는 노드의 src 변경을 기존 DOM에 반영하지 않는다.
// editor 전체 대신 NodeView만 다시 생성해 이미지를 갱신하고 편집 포커스는 유지한다.
if (normalizedValue.includes("<img")) {
editor.createNodeViews();
}
}
function getToolbarState(editor: Editor): ToolbarState { function getToolbarState(editor: Editor): ToolbarState {
const ts = editor.getAttributes("textStyle") as { fontSize?: string | null; fontFamily?: string | null; color?: string | null }; const ts = editor.getAttributes("textStyle") as { fontSize?: string | null; fontFamily?: string | null; color?: string | null };
const hl = editor.getAttributes("highlight") as { color?: string | null }; const hl = editor.getAttributes("highlight") as { color?: string | null };
@@ -70,7 +122,7 @@ function getToolbarState(editor: Editor): ToolbarState {
}; };
} }
export function KriEditorWysiwyg(props: KriEditorProps) { export function KriEditorWysiwyg(props: Readonly<KriEditorProps>) {
const { const {
label, label,
@@ -134,6 +186,9 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
}, [view]); }, [view]);
const htmlDraftRef = useRef<string>(value ?? ""); const htmlDraftRef = useRef<string>(value ?? "");
// HTML textarea는 비제어 컴포넌트다. 렌더 중 ref를 읽지 않도록, HTML 보기로 전환하는 시점의
// 초안을 state로 보관해 textarea가 마운트될 때의 초기값(defaultValue)으로만 사용한다.
const [htmlTextareaSeed, setHtmlTextareaSeed] = useState<string>(value ?? "");
const canImageUpload = Boolean(onImageUpload); const canImageUpload = Boolean(onImageUpload);
const selectionRef = useRef<{ from: number; to: number } | null>(null); const selectionRef = useRef<{ from: number; to: number } | null>(null);
@@ -471,6 +526,7 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
if (viewRef.current === "wysiwyg") { if (viewRef.current === "wysiwyg") {
const raw = editor.getHTML(); const raw = editor.getHTML();
htmlDraftRef.current = raw; htmlDraftRef.current = raw;
setHtmlTextareaSeed(raw);
setView("html"); setView("html");
// WYSIWYG에서 막 넘어온, 사용자가 직접 타이핑하지 않은 HTML이므로 // WYSIWYG에서 막 넘어온, 사용자가 직접 타이핑하지 않은 HTML이므로
@@ -492,14 +548,12 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
toast.message(compatibility.reason ?? "현재 HTML은 WYSIWYG로 전환할 수 없습니다."); toast.message(compatibility.reason ?? "현재 HTML은 WYSIWYG로 전환할 수 없습니다.");
return; return;
} }
const safe = htmlSanitizer const safe = sanitizeEditorHtml(raw, htmlSanitizer, sanitizeHtmlOpt, allowedCustomHtml);
? htmlSanitizer(raw)
: sanitizeHtmlOpt ? sanitizeHtml(raw, allowedCustomHtml) : raw;
editor.commands.setContent(safe, { emitUpdate: false, parseOptions: { preserveWhitespace: "full" } }); editor.commands.setContent(safe, { emitUpdate: false, parseOptions: { preserveWhitespace: "full" } });
flushChange(preserveEmptyParagraphs(editor.getHTML())); flushChange(preserveEmptyParagraphs(editor.getHTML()));
setView("wysiwyg"); setView("wysiwyg");
}, [allowedCustomHtml, editor, flushChange, getCompatibility, htmlSanitizer, sanitizeHtmlOpt]); }, [allowedCustomHtml, editor, flushChange, getCompatibility, htmlSanitizer, sanitizeHtmlOpt, setView, setPreviewSource, setHtmlTextareaSeed]);
const formatHtmlView = useCallback(async () => { const formatHtmlView = useCallback(async () => {
try { try {
@@ -512,7 +566,7 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
toast.error("HTML 정렬에 실패했습니다."); toast.error("HTML 정렬에 실패했습니다.");
console.error(err); console.error(err);
} }
}, [scheduleChange]); }, [scheduleChange, setPreviewSource]);
useEffect(() => { useEffect(() => {
if (!editor) return; if (!editor) return;
@@ -544,46 +598,28 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
useEffect(() => { useEffect(() => {
setPreviewSource(value ?? ""); setPreviewSource(value ?? "");
if (!editor) return; if (!editor || value == null) return;
if (value == null) return;
const compatibility = getCompatibility(value); // WYSIWYG로 손실 없이 편집할 수 없는 값은 HTML 보기로 전환해 원문을 유지한다.
if (showHtmlToggle && !compatibility.compatible) { if (showHtmlToggle && !getCompatibility(value).compatible) {
htmlDraftRef.current = value; writeHtmlDraft(htmlDraftRef, htmlTextareaRef, value);
if (htmlTextareaRef.current) htmlTextareaRef.current.value = value;
if (viewRef.current !== "html") { if (viewRef.current !== "html") {
viewRef.current = "html"; viewRef.current = "html";
setHtmlTextareaSeed(value);
setView("html"); setView("html");
} }
return; return;
} }
if (viewRef.current === "html") { if (viewRef.current === "html") {
if (getWysiwygCompatibility && value !== optimisticHtmlRef.current && value !== htmlDraftRef.current) { const isExternalChange = value !== optimisticHtmlRef.current && value !== htmlDraftRef.current;
htmlDraftRef.current = value; if (getWysiwygCompatibility && isExternalChange) {
if (htmlTextareaRef.current) htmlTextareaRef.current.value = value; writeHtmlDraft(htmlDraftRef, htmlTextareaRef, value);
} }
return; return;
} }
// 빈 문자열("")은 ProseMirror 스키마상 유효한 문서가 아니라 setContent가 조용히 실패해 syncEditorContent(editor, value, optimisticHtmlRef.current);
// 이전 템플릿 본문이 그대로 남는 문제가 있었음 -> 빈 값은 빈 문단으로 정규화해서 비교/설정.
const normalizedValue = value || "<p></p>";
const current = editor.getHTML();
if (normalizedValue !== current && normalizedValue !== optimisticHtmlRef.current) {
// 외부에서 본문이 변경된 경우에만 기존 editor 문서를 갱신한다.
editor.commands.setContent(normalizedValue, {
emitUpdate: false,
parseOptions: {preserveWhitespace: "full"},
});
// resize가 활성화된 TipTap 이미지 NodeView는 노드의 src 변경을 기존 DOM에 반영하지 않는다.
// editor 전체 대신 NodeView만 다시 생성해 이미지를 갱신하고 편집 포커스는 유지한다.
if (normalizedValue.includes("<img")) {
editor.createNodeViews();
}
}
}, [value, editor, view, getCompatibility, getWysiwygCompatibility, showHtmlToggle]); }, [value, editor, view, getCompatibility, getWysiwygCompatibility, showHtmlToggle]);
useEffect(() => { useEffect(() => {
@@ -648,14 +684,13 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
const previewHtml = useMemo(() => { const previewHtml = useMemo(() => {
const preserved = preserveEmptyParagraphs(previewSource); const preserved = preserveEmptyParagraphs(previewSource);
const sanitized = htmlSanitizer const sanitized = sanitizeEditorHtml(preserved, htmlSanitizer, sanitizeHtmlOpt, allowedCustomHtml);
? htmlSanitizer(preserved)
: sanitizeHtmlOpt ? sanitizeHtml(preserved, allowedCustomHtml) : preserved;
const withLinkStyle = applyLinkPreviewClass(sanitized); const withLinkStyle = applyLinkPreviewClass(sanitized);
return transformPreviewHtml ? transformPreviewHtml(withLinkStyle) : withLinkStyle; return transformPreviewHtml ? transformPreviewHtml(withLinkStyle) : withLinkStyle;
}, [allowedCustomHtml, htmlSanitizer, previewSource, sanitizeHtmlOpt, transformPreviewHtml]); }, [allowedCustomHtml, htmlSanitizer, previewSource, sanitizeHtmlOpt, transformPreviewHtml]);
const imageMapOverlayBoxes = useImageMapOverlay(previewContainerRef, previewHtml); // 이미지맵을 사용할 때만 미리보기에 <area> 영역을 표시한다.
const imageMapOverlayBoxes = useImageMapOverlay(previewContainerRef, previewHtml, enableImageMap && showPreview);
const wysiwygCompatibility = useMemo( const wysiwygCompatibility = useMemo(
() => getCompatibility(view === "html" ? previewSource : (editor?.getHTML() ?? previewSource)), () => getCompatibility(view === "html" ? previewSource : (editor?.getHTML() ?? previewSource)),
@@ -704,7 +739,11 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
onAddRow={addRow} onAddRow={addRow}
onAddColumn={addColumn} onAddColumn={addColumn}
onDeleteTable={deleteTable} onDeleteTable={deleteTable}
customContent={props.renderToolbarEnd?.({ editor, command, view })} customContent={
props.renderToolbarEnd ? (
<ToolbarEndSlot renderToolbarEnd={props.renderToolbarEnd} editor={editor} command={command} view={view} />
) : undefined
}
/> />
</div> </div>
) : null} ) : null}
@@ -718,7 +757,7 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
<textarea <textarea
ref={htmlTextareaRef} ref={htmlTextareaRef}
className="h-[220px] w-full resize-y rounded-md border bg-background p-3 font-mono text-sm outline-none" className="h-[220px] w-full resize-y rounded-md border bg-background p-3 font-mono text-sm outline-none"
defaultValue={htmlDraftRef.current} defaultValue={htmlTextareaSeed}
onMouseDown={(e) => e.stopPropagation()} onMouseDown={(e) => e.stopPropagation()}
onChange={(e) => { onChange={(e) => {
htmlDraftRef.current = e.target.value; htmlDraftRef.current = e.target.value;
@@ -730,9 +769,9 @@ export function KriEditorWysiwyg(props: KriEditorProps) {
{...htmlTi.bindSelectionHandlers} {...htmlTi.bindSelectionHandlers}
/> />
{!wysiwygCompatibility.compatible ? ( {!wysiwygCompatibility.compatible ? (
<p className="mt-2 text-xs text-amber-700" role="status"> <output className="mt-2 block text-xs text-amber-700">
{wysiwygCompatibility.reason ?? "현재 HTML은 WYSIWYG에서 손실 없이 편집할 수 없습니다."} {wysiwygCompatibility.reason ?? "현재 HTML은 WYSIWYG에서 손실 없이 편집할 수 없습니다."}
</p> </output>
) : null} ) : null}
</div> </div>
)} )}

View File

@@ -2,16 +2,18 @@ import { useLayoutEffect, useRef, useState } from "react"
import { computeImageMapOverlayBoxes, type ImageMapOverlayBox } from "../utils/imageMapOverlay" import { computeImageMapOverlayBoxes, type ImageMapOverlayBox } from "../utils/imageMapOverlay"
// previewHtml이 바뀔 때마다(이미지 로드/리사이즈 포함) <map>/<area> 오버레이 위치를 다시 계산한다. // previewHtml이 바뀔 때마다(이미지 로드/리사이즈 포함) <map>/<area> 오버레이 위치를 다시 계산한다.
// enabled가 false이면 계산·관찰하지 않는다.
export function useImageMapOverlay( export function useImageMapOverlay(
containerRef: React.RefObject<HTMLElement | null>, containerRef: React.RefObject<HTMLElement | null>,
previewHtml: string, previewHtml: string,
enabled = true,
): ImageMapOverlayBox[] { ): ImageMapOverlayBox[] {
const [boxes, setBoxes] = useState<ImageMapOverlayBox[]>([]) const [boxes, setBoxes] = useState<ImageMapOverlayBox[]>([])
const frameRef = useRef<number | null>(null) const frameRef = useRef<number | null>(null)
useLayoutEffect(() => { useLayoutEffect(() => {
const container = containerRef.current const container = containerRef.current
if (!container) { if (!enabled || !container) {
setBoxes([]) setBoxes([])
return return
} }
@@ -40,7 +42,7 @@ export function useImageMapOverlay(
resizeObserver.disconnect() resizeObserver.disconnect()
window.removeEventListener("resize", scheduleRecompute) window.removeEventListener("resize", scheduleRecompute)
} }
}, [containerRef, previewHtml]) }, [containerRef, previewHtml, enabled])
return boxes return boxes
} }

View File

@@ -80,12 +80,13 @@ export type KriEditorProps = {
onImageUploadError?: (error: unknown) => void onImageUploadError?: (error: unknown) => void
debounceMs?: number debounceMs?: number
smsTitle?: string smsTitle?: string
changeSmsType?: (type: 'SMS' | 'LMS') => void /** Preview only; consumers must handle MMS. Actual delivery type is determined by the server. */
changeSmsType?: (type: 'SMS' | 'LMS' | 'MMS') => void
isSmsReadOnly?: boolean isSmsReadOnly?: boolean
smsMaxBytes?: number smsMaxBytes?: number
lmsMaxBytes?: number lmsMaxBytes?: number
smsPreviewSuffix?: string smsPreviewSuffix?: string
/** 첨부파일이 있으면 길이·제목과 무관하게 LMS/MMS로 판정한다. */ /** 첨부파일이 있으면 길이·제목과 무관하게 MMS로 판정한다. */
smsHasAttachment?: boolean smsHasAttachment?: boolean
/** 문자 미리보기의 제목과 본문 사이에 표시할 첨부 이미지 */ /** 문자 미리보기의 제목과 본문 사이에 표시할 첨부 이미지 */
smsImages?: KriEditorSmsImage[] smsImages?: KriEditorSmsImage[]

View File

@@ -23,10 +23,11 @@ const CollapsibleHistorySection = ({
return ( return (
<div className={`space-y-2 ${showDivider ? 'border-t pt-3' : ''}`}> <div className={`space-y-2 ${showDivider ? 'border-t pt-3' : ''}`}>
<div className="flex w-full items-center justify-between gap-2"> {/* 제목과 headerExtra가 한 줄에 들어가지 않으면 headerExtra를 다음 줄 오른쪽으로 내린다. */}
<div className="flex w-full flex-wrap items-center justify-between gap-2">
<button <button
type="button" type="button"
className="flex min-w-0 flex-1 items-center gap-2 text-left text-sm font-semibold cursor-pointer" className="flex min-w-0 flex-auto items-center gap-2 whitespace-nowrap text-left text-sm font-semibold cursor-pointer"
aria-expanded={open} aria-expanded={open}
aria-controls={contentId} aria-controls={contentId}
onClick={() => setOpen((prev) => !prev)} onClick={() => setOpen((prev) => !prev)}
@@ -34,7 +35,7 @@ const CollapsibleHistorySection = ({
{open ? <ChevronDown className="h-4 w-4" /> : <ChevronRight className="h-4 w-4" />} {open ? <ChevronDown className="h-4 w-4" /> : <ChevronRight className="h-4 w-4" />}
{title} {title}
</button> </button>
{headerExtra} {headerExtra ? <div className="ml-auto">{headerExtra}</div> : null}
</div> </div>
{open ? <div id={contentId}>{children}</div> : null} {open ? <div id={contentId}>{children}</div> : null}
</div> </div>

View File

@@ -10,8 +10,10 @@ import { useAddListEventMutation, useDeleteListEventMutation, useListEventHistor
import { useSendResultBySidQuery } from '@/query/message' import { useSendResultBySidQuery } from '@/query/message'
import { useInternalInfoQuery } from '@/query/internal' import { useInternalInfoQuery } from '@/query/internal'
import { clientEnv } from '@/lib/env.client' import { clientEnv } from '@/lib/env.client'
import { ChannelType } from '@kri/common/noti-hub' import { ChannelType, isSendCancelable } from '@kri/common/noti-hub'
import { MESSAGE_TYPE_LABEL } from '@/const/messageTemplateConst'
import type { SendResultInfo } from '@kri/common/noti-hub' import type { SendResultInfo } from '@kri/common/noti-hub'
import { useSendCancel } from '@/hooks/useSendCancel'
import { formatKst } from '@kri/common' import { formatKst } from '@kri/common'
import { type ResultCode, ResultCodeType } from '@/types/project' import { type ResultCode, ResultCodeType } from '@/types/project'
import { CONTACT_INTERVIEWER_ROLE, FIELD_INTERVIEWER_ROLE } from '@/const/userConst' import { CONTACT_INTERVIEWER_ROLE, FIELD_INTERVIEWER_ROLE } from '@/const/userConst'
@@ -239,6 +241,8 @@ const ContactEventSection = ({
} }
const SendResultTable = ({ isLoading, results }: { isLoading: boolean; results: SendResultInfo[] }) => { const SendResultTable = ({ isLoading, results }: { isLoading: boolean; results: SendResultInfo[] }) => {
const { canCancel: canCancelSend, cancel, isPending: cancelPending } = useSendCancel()
if (isLoading) { if (isLoading) {
return <div className="rounded-md border p-4 text-center text-sm text-muted-foreground">불러오는 중...</div> return <div className="rounded-md border p-4 text-center text-sm text-muted-foreground">불러오는 중...</div>
} }
@@ -252,19 +256,42 @@ const SendResultTable = ({ isLoading, results }: { isLoading: boolean; results:
<table className="w-full text-sm"> <table className="w-full text-sm">
<thead className="sticky top-0 bg-muted"> <thead className="sticky top-0 bg-muted">
<tr> <tr>
<th className="p-2 text-left">유형</th>
<th className="p-2 text-left">수신처</th> <th className="p-2 text-left">수신처</th>
<th className="p-2 text-left">결과</th> <th className="p-2 text-left">결과</th>
<th className="p-2 text-left">발송일시</th> <th className="p-2 text-left">발송일시</th>
{canCancelSend ? <th className="p-2 text-left"><span className="sr-only">예약 취소</span></th> : null}
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{results.map((item) => ( {results.map((item) => {
<tr key={item.cmid} className="border-t"> const { sendIdx } = item
// 버튼은 서버의 cancelable로만 판단한다(값이 없는 구버전 응답은 취소 불가). 최종 결과는 취소 API 응답 건수로 안내한다.
const canCancel = isSendCancelable(item) && !!sendIdx
return (
<tr key={sendIdx ?? item.cmid} className="border-t">
<td className="p-2">{MESSAGE_TYPE_LABEL[item.sendTy] ?? String(item.sendTy)}</td>
<td className="p-2">{item.destEml || item.destTel || '-'}</td> <td className="p-2">{item.destEml || item.destTel || '-'}</td>
<td className="p-2">{item.resultViewLabel || item.resultLabel || item.resultCode}</td> <td className="p-2">{item.resultViewLabel || item.resultLabel || item.resultCode}</td>
<td className="p-2">{formatKst(item.sendDt, 'dateHourMin')}</td> <td className="p-2">{formatKst(item.sendDt, 'dateHourMin')}</td>
{canCancelSend ? (
<td className="p-2 text-right">
{canCancel && sendIdx ? (
<Button
type="button"
size="sm"
variant="outline"
disabled={cancelPending}
onClick={() => cancel({ type: 'single', sendIdx })}
>
예약 취소
</Button>
) : null}
</td>
) : null}
</tr> </tr>
))} )
})}
</tbody> </tbody>
</table> </table>
</div> </div>

View File

@@ -1,11 +1,12 @@
'use client' 'use client'
import { useEffect, useRef, useState, type ReactNode } from 'react' import { useRef, useState, type ReactNode } from 'react'
import { Mail, MessageCircle, MessageSquare, Paperclip, Phone, QrCode } from 'lucide-react' import { Mail, MessageCircle, 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 { LIST_IS_USE_LABEL } from '@/components/table-column/ListTableColumn'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
import { useDownloadListItemFileByHeaderMutation, useUploadListItemFileMutation } from '@/query/list' import { useDownloadListItemFileByHeaderMutation, useUploadListItemFileMutation } from '@/query/list'
import { ListHeaderConst } from '@/const/listConst' import { ListHeaderConst } from '@/const/listConst'
@@ -16,6 +17,7 @@ import { formatKst } from '@kri/common'
import { isListFieldEditableForContact, isListFieldVisibleForContact } from '@/utils/listAccess' import { isListFieldEditableForContact, isListFieldVisibleForContact } from '@/utils/listAccess'
import { substituteVariables } from '@/lib/variableSubstitution' import { substituteVariables } from '@/lib/variableSubstitution'
import { formatKoreanPhoneNumber } from '@/utils/phone' import { formatKoreanPhoneNumber } from '@/utils/phone'
import { isLightHexColor, normalizeHexColor } from '@/components/common/color-palette/color'
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'
@@ -51,42 +53,60 @@ export const buildInitialValues = (listHeaders: listHeader[], detail?: ListSearc
for (const header of listHeaders) { for (const header of listHeaders) {
if (header.listHderTy === ListHeaderConst.SID) continue if (header.listHderTy === ListHeaderConst.SID) continue
if (!isListFieldVisibleForContact(header)) continue if (!isListFieldVisibleForContact(header)) continue
// 사용 허용은 저장 시 코드("0"/"1"/"9")로 보내야 하므로 폼 값은 코드로 둔다.
// 문자·알림톡 변수 치환은 resolveListHeaderValue의 라벨을 그대로 사용한다.
if (header.listHderTy === ListHeaderConst.IS_USE) {
values[header.listHderId] = detail?.use != null ? String(detail.use) : ''
continue
}
values[header.listHderId] = resolveListHeaderValue(header, detail) values[header.listHderId] = resolveListHeaderValue(header, detail)
} }
return values return values
} }
const IS_USE_OPTIONS = Object.entries(LIST_IS_USE_LABEL).map(([value, label]) => ({ value, label }))
const disabledContrastClass = 'bg-white disabled:opacity-100 disabled:text-foreground disabled:bg-muted/60' const disabledContrastClass = 'bg-white disabled:opacity-100 disabled:text-foreground disabled:bg-muted/60'
// Input/textarea는 수정 불가 상태에서도 드래그 선택/복사가 가능해야 해서 disabled 대신 readOnly를 쓴다. // Input/textarea는 수정 불가 상태에서도 드래그 선택/복사가 가능해야 해서 disabled 대신 readOnly를 쓴다.
// disabled는 공용 Input 컴포넌트의 disabled:pointer-events-none 때문에 마우스 이벤트 자체를 못 받는다. // disabled는 공용 Input 컴포넌트의 disabled:pointer-events-none 때문에 마우스 이벤트 자체를 못 받는다.
const readOnlyContrastClass = 'bg-white read-only:text-foreground read-only:bg-muted/60' const readOnlyContrastClass = 'bg-white read-only:text-foreground read-only:bg-muted/60'
const getCallButtonLabel = (isDialing: boolean, isOnCall: boolean) => { const getCallButtonLabel = (isDialing: boolean, isOnCall: boolean, isEnding: boolean) => {
if (isEnding) return '종료 요청 중'
if (isDialing) return '거는 중' if (isDialing) return '거는 중'
if (isOnCall) return '전화 끊기' if (isOnCall) return '전화 끊기'
return '전화' return '전화'
} }
const getCallButtonTitle = (isCtiReady: boolean, isDialing: boolean) => { const getCallButtonTitle = (isCtiReady: boolean, isDialing: boolean, isEnding: boolean) => {
if (!isCtiReady) return '전화 시스템에 연결되어 있지 않습니다.' if (!isCtiReady) return '전화 시스템에 연결되어 있지 않습니다.'
if (isDialing) return '전화를 거는 중입니다.' if (isDialing) return '전화를 거는 중입니다.'
if (isEnding) return '통화 종료를 확인하고 있습니다.'
return undefined return undefined
} }
const FieldRow = ({ label, editable, children }: { label: string; editable?: boolean; children: ReactNode }) => ( const FieldRow = ({ label, color, children }: { label: string; color?: string | null; children: ReactNode }) => {
// 헤더에 지정한 색상(투명도 포함)이 기본색보다 우선한다. 형식이 잘못된 값은 기본색으로 표시한다.
const headerColor = normalizeHexColor(color)
const isDarkHeaderColor = headerColor !== null && !isLightHexColor(headerColor)
return (
<div className="flex items-center gap-3"> <div className="flex items-center gap-3">
<Label <Label
className={cn( className={cn(
'w-24 shrink-0 rounded-md px-2 py-2.5 text-sm font-bold text-foreground', 'w-24 shrink-0 wrap-anywhere rounded-md px-2 py-2.5 text-sm leading-snug font-bold',
editable && 'bg-blue-100', headerColor === null && 'bg-blue-100',
isDarkHeaderColor ? 'text-white' : 'text-foreground',
)} )}
style={headerColor ? { backgroundColor: headerColor } : undefined}
> >
{label} {label}
</Label> </Label>
<div className="min-w-0 flex-1">{children}</div> <div className="min-w-0 flex-1">{children}</div>
</div> </div>
) )
}
const ListContactInfoPanel = ({ const ListContactInfoPanel = ({
prjctIdx, prjctIdx,
@@ -114,7 +134,8 @@ const ListContactInfoPanel = ({
const isCtiReady = ctiConnectionStatus === 'open' const isCtiReady = ctiConnectionStatus === 'open'
const ctiCallPhase = useCtiCallPhase() const ctiCallPhase = useCtiCallPhase()
const isDialing = ctiCallPhase === 'dialing' const isDialing = ctiCallPhase === 'dialing'
const isOnCall = ctiCallPhase === 'active' const isEnding = ctiCallPhase === 'ending'
const isOnCall = ctiCallPhase === 'active' || isEnding
const visibleHeaders = listHeaders const visibleHeaders = listHeaders
.filter((header) => isListFieldVisibleForContact(header)) .filter((header) => isListFieldVisibleForContact(header))
@@ -147,8 +168,7 @@ const ListContactInfoPanel = ({
} }
const handleCall = (telNum: string, listHderId: number) => { const handleCall = (telNum: string, listHderId: number) => {
if (!isCtiReady || isDialing) return if (!isCtiReady || isDialing || isEnding) return
// CTI_HANGUP_PENDING_VENDOR: 외주사 Hangup 명령 동작 확인 후 통화 중 버튼을 활성화하면 즉시 사용할 수 있다.
if (isOnCall) { if (isOnCall) {
ctiClient.hangup() ctiClient.hangup()
return return
@@ -199,9 +219,9 @@ const ListContactInfoPanel = ({
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)
if (header.listHderTy === ListHeaderConst.MEMO) { if (header.listHderTy === ListHeaderConst.MEMO || header.listHderTy === ListHeaderConst.MULTILINE_TEXT) {
return ( return (
<FieldRow key={header.listHderId} label={header.listHderNm} editable={canEditField}> <FieldRow key={header.listHderId} label={header.listHderNm} color={header.listHderColor}>
<textarea <textarea
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 ${readOnlyContrastClass}`} 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 ${readOnlyContrastClass}`}
value={value} value={value}
@@ -214,7 +234,7 @@ const ListContactInfoPanel = ({
if (header.listHderTy === ListHeaderConst.TEL_NUM) { if (header.listHderTy === ListHeaderConst.TEL_NUM) {
return ( return (
<FieldRow key={header.listHderId} label={header.listHderNm} editable={canEditField}> <FieldRow key={header.listHderId} label={header.listHderNm} color={header.listHderColor}>
{/* 모바일(md 미만)은 버튼을 입력란 아래 줄로 내린다. */} {/* 모바일(md 미만)은 버튼을 입력란 아래 줄로 내린다. */}
<div className="flex flex-col gap-2 md:flex-row"> <div className="flex flex-col gap-2 md:flex-row">
<Input <Input
@@ -228,12 +248,12 @@ const ListContactInfoPanel = ({
type="button" type="button"
variant="outline" variant="outline"
className={cn('shrink-0 gap-2', isOnCall && 'bg-accent text-accent-foreground')} className={cn('shrink-0 gap-2', isOnCall && 'bg-accent text-accent-foreground')}
disabled={isEditing || !isCtiReady || isDialing} disabled={isEditing || !isCtiReady || isDialing || isEnding}
title={getCallButtonTitle(isCtiReady, isDialing)} title={getCallButtonTitle(isCtiReady, isDialing, isEnding)}
onClick={() => handleCall(value, header.listHderId)} onClick={() => handleCall(value, header.listHderId)}
> >
<Phone className="h-4 w-4" /> <Phone className="h-4 w-4" />
{getCallButtonLabel(isDialing, isOnCall)} {getCallButtonLabel(isDialing, isOnCall, isEnding)}
</Button> </Button>
<Button <Button
type="button" type="button"
@@ -268,7 +288,7 @@ const ListContactInfoPanel = ({
if (header.listHderTy === ListHeaderConst.EMAIL) { if (header.listHderTy === ListHeaderConst.EMAIL) {
return ( return (
<FieldRow key={header.listHderId} label={header.listHderNm} editable={canEditField}> <FieldRow key={header.listHderId} label={header.listHderNm} color={header.listHderColor}>
<div className="flex flex-col gap-2 md:flex-row"> <div className="flex flex-col gap-2 md:flex-row">
<Input <Input
value={value} value={value}
@@ -295,7 +315,7 @@ const ListContactInfoPanel = ({
if (header.listHderTy === ListHeaderConst.FILE) { if (header.listHderTy === ListHeaderConst.FILE) {
return ( return (
<FieldRow key={header.listHderId} label={header.listHderNm} editable={canEditField}> <FieldRow key={header.listHderId} label={header.listHderNm} color={header.listHderColor}>
<div className="flex items-center gap-2"> <div className="flex items-center gap-2">
<div className="min-w-0 flex-1 truncate text-sm"> <div className="min-w-0 flex-1 truncate text-sm">
{value ? ( {value ? (
@@ -334,9 +354,29 @@ const ListContactInfoPanel = ({
) )
} }
if (header.listHderTy === ListHeaderConst.IS_USE) {
return (
<FieldRow key={header.listHderId} label={header.listHderNm} color={header.listHderColor}>
<KriSingleSelect
items={IS_USE_OPTIONS}
value={value}
disabled={!editable}
onChange={onChange}
getValue={(item) => item.value}
getLabel={(item) => item.label}
searchable={false}
preventDeselect
widthClassName="w-full"
heightClassName="h-9"
className={disabledContrastClass}
/>
</FieldRow>
)
}
if (header.listHderTy === ListHeaderConst.CONTENT_ITEM && (header.filterContents?.length ?? 0) > 0) { if (header.listHderTy === ListHeaderConst.CONTENT_ITEM && (header.filterContents?.length ?? 0) > 0) {
return ( return (
<FieldRow key={header.listHderId} label={header.listHderNm} editable={canEditField}> <FieldRow key={header.listHderId} label={header.listHderNm} color={header.listHderColor}>
<KriSingleSelect <KriSingleSelect
items={header.filterContents ?? []} items={header.filterContents ?? []}
value={value} value={value}
@@ -353,7 +393,7 @@ const ListContactInfoPanel = ({
} }
return ( return (
<FieldRow key={header.listHderId} label={header.listHderNm} editable={canEditField}> <FieldRow key={header.listHderId} label={header.listHderNm} color={header.listHderColor}>
<Input <Input
value={value} value={value}
readOnly={!editable} readOnly={!editable}

View File

@@ -0,0 +1,157 @@
'use client'
import { useEffect } from 'react'
import { useAtom } from 'jotai'
import { Button } from '@/components/ui/button'
import { ListJobProgress } from '@/components/list/ListJobProgress'
import { useAuth } from '@/hooks/useAuth'
import { isAvailabilityUnsupported, isListJobGone, useListJob, useListJobAvailability, useUploadResetActive } from '@/query/list-job'
import { findTrackedListJob, trackListJob, untrackListJob, useTrackedListJobs } from '@/store/list-job-tracker'
import { listJobLabel } from '@/const/listJobConst'
import { blockerJobLabel, blockerPhaseLabel, blockerUserLabel, describeListJobAvailability } from '@/utils/listJobAvailability'
import { isActiveListJob, type ListJobType } from '@/types/list-job'
import { listJobOpenRequestAtom } from '@/store/jotai/list-job'
export type ListJobGateStatus = 'idle' | 'checking' | 'allowed' | 'blocked' | 'error' | 'unsupported'
/**
* 작업 다이얼로그(또는 배정 버튼 영역)에서 쓰는 접수 가능 여부와 내 현재 작업 상태.
* - availability: 다이얼로그는 차단 중 3초, 페이지는 평상시 10초·차단 중 3초 조회한다.
* - 내 현재 작업: localStorage 기록(사용자·프로젝트·jobType)의 작업 상세를 보여준다.
* requestLabel은 같은 jobType 안에서 이름이 갈리는 경우(배정/배정 초기화)에 넘긴다.
*/
export function useListJobGate({ prjctIdx, jobType, active, requestLabel, pollWhileIdle = false }: {
prjctIdx: number
jobType: ListJobType
active: boolean
requestLabel?: string
pollWhileIdle?: boolean
}) {
const { auth } = useAuth()
const userId = auth.user?.userId
const [openRequest, setOpenRequest] = useAtom(listJobOpenRequestAtom)
const requestMatches = openRequest?.userId === userId && openRequest?.prjctIdx === prjctIdx && openRequest?.jobType === jobType
const availability = useListJobAvailability(prjctIdx, jobType, active, pollWhileIdle)
const uploadResetBlockers = availability.isSuccess && !availability.data.allowed
? availability.data.blockers.filter(blocker => blocker.blockingPhase === 'ACTIVE' && (blocker.jobType === 'LIST_UPLOAD' || blocker.jobType === 'LIST_RESET'))
: []
const uploadResetActive = useUploadResetActive(prjctIdx, active && uploadResetBlockers.length > 0)
const uploadResetJob = uploadResetActive.isSuccess && uploadResetActive.data.active
&& uploadResetBlockers.some(blocker => blocker.jobType === uploadResetActive.data.job?.jobType)
? uploadResetActive.data.job : null
const tracked = findTrackedListJob(useTrackedListJobs(), userId ?? '', prjctIdx, jobType)
const jobKey = requestMatches ? openRequest.jobKey : tracked?.jobKey ?? null
const detail = useListJob(prjctIdx, jobKey, active)
const job = detail.data?.jobKey === jobKey ? detail.data : undefined
const finishedJob = job && !isActiveListJob(job.jobStatus) ? job : undefined
const detailNotFound = isListJobGone(detail.error)
useEffect(() => {
if (!active && requestMatches && openRequest.opened) setOpenRequest(null)
}, [active, openRequest, requestMatches, setOpenRequest])
// 다른 탭·기기에서 접수한 내 작업이면 기록을 채워 진행 상태를 보여준다.
useEffect(() => {
const mine = availability.data?.blockers.find(blocker =>
blocker.mine && blocker.jobKey && blocker.jobType === jobType && blocker.blockingPhase === 'ACTIVE')
if (mine?.jobKey && userId) trackListJob({ userId, prjctIdx, jobType, jobKey: mine.jobKey })
}, [availability.data, jobType, prjctIdx, userId])
const status: ListJobGateStatus = !active ? 'idle'
: isAvailabilityUnsupported(availability.error) ? 'unsupported'
: availability.isError ? 'error'
// 재조회 중에는 직전 결과를 유지한다. 같은 쿼리를 페이지가 주기적으로 재조회하므로 isFetching을 '확인 중'으로
// 보면 그때마다 다이얼로그가 깜빡인다. 접수 직전에는 useSubmitListJob이 다시 확인한다.
: !availability.data ? 'checking'
: availability.data.allowed ? 'allowed' : 'blocked'
return {
prjctIdx,
jobType,
requestLabel: requestLabel ?? listJobLabel(jobType),
status,
availability: availability.data,
availabilityUpdatedAt: availability.dataUpdatedAt,
availabilitySucceeded: availability.isSuccess,
refetch: () => void availability.refetch(),
job,
hasCurrentJob: !!jobKey,
detailPending: active && !!jobKey && detail.isPending,
detailError: active && !!jobKey && detail.isError,
detailNotFound,
refetchDetail: () => void detail.refetch(),
uploadResetJob,
finishedJob,
// 확인 중·조회 실패·차단이면 실행 버튼을 막는다. 404(미배포)는 서버 판단에 맡긴다.
submitBlocked: status === 'checking' || status === 'error' || status === 'blocked' || (!!job && isActiveListJob(job.jobStatus)),
/** 완료 상태를 본 뒤 닫거나 확인을 누르면 기록을 지운다. 진행 중이면 유지한다. */
acknowledge: () => {
if (!finishedJob && !detailNotFound) return
if (jobKey) untrackListJob(jobKey)
if (requestMatches) setOpenRequest(null)
},
}
}
export type ListJobGate = ReturnType<typeof useListJobGate>
export function ListJobGatePanel({ gate, className = '', showCurrentJob = true, acknowledgeLabel = '확인' }: { gate: ListJobGate; className?: string; showCurrentJob?: boolean; acknowledgeLabel?: string }) {
const { status, availability, job, uploadResetJob } = gate
// 내 현재 작업으로 이미 보여주는 항목은 차단 목록에서 뺀다.
const listedBlockers = availability?.blockers.filter(blocker => !(showCurrentJob && blocker.mine && blocker.jobKey && blocker.jobKey === job?.jobKey)) ?? []
const remainingBlockerCount = availability ? Math.max(0, availability.blockerCount - (availability.blockers.length - listedBlockers.length)) : 0
const description = status === 'blocked' && availability && remainingBlockerCount > 0
? describeListJobAvailability({ ...availability, blockers: listedBlockers, blockerCount: remainingBlockerCount }, gate.jobType, gate.requestLabel)
: null
const uploadResetDetailShown = showCurrentJob && uploadResetJob?.mine && !!uploadResetJob.jobKey && job?.jobKey === uploadResetJob.jobKey
if (!(showCurrentJob && (job || gate.detailPending || gate.detailError)) && status !== 'checking' && status !== 'error' && !description) return null
return (
<div className={`${className} space-y-3`}>
{showCurrentJob && gate.detailPending && <p role="status" className="text-sm text-muted-foreground">현재 작업 상태를 조회하는 중입니다.</p>}
{showCurrentJob && gate.detailError && <div role="alert" className="text-sm space-y-2">
<p>{gate.detailNotFound ? '작업을 찾을 수 없습니다. 보관 기간이 지났거나 접근할 수 없는 작업입니다.' : '현재 작업 상태를 불러오지 못했습니다.'}</p>
<Button type="button" variant="outline" size="sm" onClick={gate.detailNotFound ? gate.acknowledge : gate.refetchDetail}>{gate.detailNotFound ? '확인' : '다시 조회'}</Button>
</div>}
{showCurrentJob && job && (
<section className="rounded-md border p-3 space-y-2" aria-label="내 현재 작업">
<div className="flex items-center justify-between gap-2">
<p className="font-semibold">내 현재 작업 · {listJobLabel(job.jobType, job.operation)}</p>
{gate.finishedJob && <Button type="button" size="sm" onClick={gate.acknowledge}>{acknowledgeLabel}</Button>}
</div>
<ListJobProgress prjctIdx={gate.prjctIdx} job={job} />
</section>
)}
{status === 'checking' && <p role="status" className="text-sm text-muted-foreground">작업 가능 여부를 확인하는 중입니다.</p>}
{status === 'error' && (
<p role="alert" className="text-sm text-red-600">
작업 가능 여부를 확인하지 못했습니다.{' '}
<Button type="button" variant="outline" size="sm" onClick={gate.refetch}>다시 조회</Button>
</p>
)}
{description && (
<div role="alert" className="rounded-md border border-amber-300 bg-amber-50 p-3 space-y-2 text-sm">
<p className="font-medium text-amber-800">{description.message}</p>
{listedBlockers.length > 0 && (
<ul className="space-y-1">
{listedBlockers.map((blocker, index) => (
<li key={`${blocker.requestUserId}-${blocker.regDt}-${index}`}>
{blockerJobLabel(blocker)} · {blocker.mine ? '나' : blockerUserLabel(blocker)} · {blockerPhaseLabel(blocker)} · 접수 {blocker.regDt.replace('T', ' ').slice(0, 19)}
</li>
))}
</ul>
)}
{description.omittedCount > 0 && <p className="text-muted-foreground">외 {description.omittedCount.toLocaleString()}건은 표시하지 않았습니다.</p>}
</div>
)}
{status === 'blocked' && uploadResetJob && !uploadResetDetailShown && (
<div role="status" className="text-sm text-muted-foreground space-y-1">
<p>{listJobLabel(uploadResetJob.jobType)} 처리 {uploadResetJob.processedSidCnt.toLocaleString()}
{uploadResetJob.totalSidCnt === null ? '건 · 전체 집계 중' : ` / ${uploadResetJob.totalSidCnt.toLocaleString()}건`}</p>
{uploadResetJob.totalSidCnt !== null && uploadResetJob.totalSidCnt > 0 && <progress className="w-full" aria-label={`${listJobLabel(uploadResetJob.jobType)} 진행률`} max={uploadResetJob.totalSidCnt} value={Math.min(uploadResetJob.totalSidCnt, uploadResetJob.processedSidCnt)} />}
</div>
)}
</div>
)
}

View File

@@ -0,0 +1,200 @@
'use client'
import { useState } from 'react'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { toast } from 'sonner'
import { Button } from '@/components/ui/button'
import { nextApi } from '@/lib/http-client'
import { useAuth } from '@/hooks/useAuth'
import { clientEnv } from '@/lib/env.client'
import { LIST_JOB_STAGE_LABEL, LIST_JOB_STATUS_LABEL, listJobLabel } from '@/const/listJobConst'
import { isActiveListJob, type ListJob, type ListJobFailurePage } from '@/types/list-job'
import { formatMessageJobResult } from '@/utils/listJobResult'
type JobDetailPath = 'validation-errors' | 'sid-failures' | 'range-failures' | 'message-report/batches' | 'message-report/preparation-failures'
type JobDetailSection = { path: JobDetailPath; label: string }
function getDetailSections(job: ListJob): JobDetailSection[] {
const p = job.progress ?? {}
const positive = (value: unknown) => typeof value === 'number' && value > 0
if (job.jobType === 'LIST_UPLOAD') {
const sections: JobDetailSection[] = []
if (positive(p.validationErrorCnt) || job.jobStage === 'VALIDATION_FAILED' || job.errorCode === 'LIST_UPLOAD_VALIDATION_FAILED') {
sections.push({ path: 'validation-errors', label: '파일 검증 오류' })
}
if (positive(p.deleteFailedRangeCnt) || positive(p.insertFailedRangeCnt) || job.errorCode === 'PARTIAL_RANGE_FAILURE') {
sections.push({ path: 'range-failures', label: '구간 실패' })
}
return sections
}
if (['LIST_RESET', 'LIST_UPDATE', 'LIST_ASSIGN'].includes(job.jobType)) {
return job.failedSidCnt > 0 ? [{ path: 'sid-failures', label: '실패한 리스트' }] : []
}
if (['EMAIL_BULK', 'SMS_BULK', 'KKO_BULK'].includes(job.jobType)) {
const sections: JobDetailSection[] = []
if (positive(p.recordedBatchCnt)) sections.push({ path: 'message-report/batches', label: '발송 접수 결과' })
if (positive(p.preparationFailedSidCnt)) sections.push({ path: 'message-report/preparation-failures', label: '발송 준비 실패' })
return sections
}
return []
}
const DETAIL_FIELDS: Record<JobDetailPath, readonly (readonly [string, string])[]> = {
'validation-errors': [['rowNumber', '행'], ['sid', 'SID'], ['fieldName', '항목'], ['errorMessage', '사유']],
'sid-failures': [['sid', 'SID'], ['code', '사유'], ['chunkNo', '처리 구간']],
'range-failures': [['stage', '단계'], ['attempt', '처리 순번'], ['code', '사유']],
'message-report/batches': [
['batchNo', '접수 묶음'], ['status', '접수 상태'], ['targetRecipientCnt', '대상 수신처'],
['acceptedRecipientCnt', '접수'], ['failedRecipientCnt', '실패'], ['unknownRecipientCnt', '접수 여부 불명'],
],
'message-report/preparation-failures': [['code', '사유']],
}
const DETAIL_VALUE_LABEL: Record<string, string> = {
LIST_NOT_FOUND: '대상 리스트가 삭제되었거나 존재하지 않습니다.',
RANGE_EXECUTION_FAILED: '구간 처리 실패', TARGET_READ_FAILED: '대상 리스트 조회 실패',
ROW_PREPARATION_FAILED: '발송 내용 준비 실패', NO_DESTINATION: '수신처 없음', INVALID_DESTINATION: '수신처 형식 오류',
ACCEPTED: '접수 완료', PARTIAL: '일부 접수', REJECTED: '접수 거절', UNKNOWN: '접수 여부 불명',
INVALID_RESPONSE: '접수 응답 확인 불가', BULK_CREATION_FAILED: '발송 작업 생성 실패', CANCELLED_BEFORE_SEND: '발송 요청 전 중단',
}
const n = (value: unknown) => typeof value === 'number' && Number.isFinite(value) ? value.toLocaleString() : '-'
const text = (value: unknown) => typeof value === 'string' || typeof value === 'number' ? String(value).slice(0, 500) : ''
const stageLabel = (jobStage: string) => LIST_JOB_STAGE_LABEL[jobStage] ?? '처리 중'
function SidProgress({ total, processed }: { total: number | null; processed: number }) {
if (total === null || total <= 0) return null
return <progress aria-label="SID 처리 진행률" className="w-full" max={total} value={Math.min(total, processed)} />
}
function Progress({ job }: { job: ListJob }) {
const p = job.progress ?? {}
if (job.jobType.endsWith('_BULK')) return (
<div className="text-sm space-y-1">
<p>{formatMessageJobResult(job.progress)}</p>
<p>처리 수신자 {n(p.processedRecipientCnt)}건 / 준비된 수신자 {n(p.preparedRecipientCnt)}건</p>
<p className="text-muted-foreground">발송 요청의 접수 결과입니다. 실제 전달 결과는 발송 이력에서 확인하세요. 일부 접수 또는 접수 여부 불명이 있으면 중복 발송될 수 있으므로 전체 재발송 전에 내역을 확인해야 합니다.</p>
</div>
)
if (job.jobType.endsWith('_DOWNLOAD')) return <p className="text-sm">파일 처리 대상 {n(p.processedSidCnt)} · 작성 행 {n(p.writtenRowCnt)} · 작성 파일 {n(p.writtenFileCnt)}</p>
return (
<div className="text-sm space-y-1">
<p>전체 {job.totalSidCnt === null ? '집계 중' : n(job.totalSidCnt)} · 반영 완료 {n(job.completedSidCnt)} · SID 실패 {n(job.failedSidCnt)} · 완료 구간 {n(job.completedChunkCnt)}</p>
{typeof p.deleteTotalSidCnt === 'number' && <p>기존 데이터 삭제 {n(p.deleteCompletedSidCnt)} / {n(p.deleteTotalSidCnt)} · 삭제 실패 구간 {n(p.deleteFailedRangeCnt)}</p>}
{typeof p.insertTotalSidCnt === 'number' && <p>신규 등록 {n(p.insertCompletedSidCnt)} / {n(p.insertTotalSidCnt)} · 등록 실패 구간 {n(p.insertFailedRangeCnt)}</p>}
<SidProgress total={job.totalSidCnt} processed={job.processedSidCnt} />
</div>
)
}
function JobDetailItem({ path, item }: { path: JobDetailPath; item: Record<string, unknown> }) {
const sids = Array.isArray(item.sids) ? item.sids.filter((sid): sid is string => typeof sid === 'string') : []
const fields = DETAIL_FIELDS[path].flatMap(([field, label]) => {
const value = text(item[field])
if (!value) return []
const displayed = field === 'stage' ? stageLabel(value)
: field === 'code' || field === 'status' ? DETAIL_VALUE_LABEL[value] ?? value : value
return [`${label}: ${displayed}`]
})
return (
<div className="space-y-1 break-words">
<p>{fields.join(' · ') || '표시할 상세 정보가 없습니다.'}</p>
{sids.length > 0 && <details><summary className="cursor-pointer">대상 SID {sids.length.toLocaleString()}건</summary><p className="break-all">{sids.join(', ')}</p></details>}
</div>
)
}
function JobFailures({ prjctIdx, job, sections }: { prjctIdx: number; job: ListJob; sections: JobDetailSection[] }) {
const { auth } = useAuth()
const [selectedPath, setSelectedPath] = useState(sections[0].path)
const section = sections.find(item => item.path === selectedPath) ?? sections[0]
const [offset, setOffset] = useState(0)
const failures = useQuery({
queryKey: ['listJobFailures', auth.user?.userId, prjctIdx, job.jobKey, section.path, offset, job.jobStatus],
queryFn: async (): Promise<ListJobFailurePage> => {
const value = await nextApi.get<unknown>(`/list-jobs/${prjctIdx}/${job.jobKey}/${section.path}?offset=${offset}&limit=100`, { skipResponseErrorHandler: true })
if (!value || typeof value !== 'object' || !('total' in value) || typeof value.total !== 'number'
|| !Number.isInteger(value.total) || value.total < 0
|| !('items' in value) || !Array.isArray(value.items) || !value.items.every(item => item && typeof item === 'object' && !Array.isArray(item))) throw new Error('상세 내역 응답이 올바르지 않습니다.')
return { total: value.total, offset, items: value.items }
},
refetchInterval: query => isActiveListJob(job.jobStatus) && query.state.status === 'success' ? 3000 : false,
retry: false,
meta: { ignoreGlobalLoading: true },
})
return (
<section className="rounded border p-3 space-y-3" aria-label="작업 상세 내역">
{sections.length > 1 ? <label className="flex gap-2 items-center text-sm">조회 항목
<select className="rounded border p-2" value={section.path} onChange={event => {
const next = sections.find(item => item.path === event.target.value)
if (next) { setSelectedPath(next.path); setOffset(0) }
}}>
{sections.map(item => <option key={item.path} value={item.path}>{item.label}</option>)}
</select>
</label> : <p className="text-sm font-medium">{section.label}</p>}
{failures.isPending && <p role="status" className="text-sm">상세 내역을 조회하는 중입니다.</p>}
{failures.isError && <div role="alert" className="text-sm space-y-2">
<p>상세 내역을 불러오지 못했습니다.</p>
<Button type="button" variant="outline" size="sm" onClick={() => void failures.refetch()}>다시 조회</Button>
</div>}
{!failures.isError && failures.data && <>
<p className="text-sm">전체 {failures.data.total.toLocaleString()}건</p>
{failures.data.items.length === 0 ? <p className="text-sm text-muted-foreground">조회된 내역이 없습니다.</p> : <ul className="max-h-60 overflow-auto text-sm space-y-2">
{failures.data.items.map((item, index) => <li key={offset + index} className="border-b pb-1"><JobDetailItem path={section.path} item={item} /></li>)}
</ul>}
{failures.data.total > 100 && <div className="flex gap-2">
<Button type="button" variant="outline" disabled={offset === 0 || failures.isFetching} onClick={() => setOffset(Math.max(0, offset - 100))}>이전 100건</Button>
<Button type="button" variant="outline" disabled={offset + 100 >= failures.data.total || failures.isFetching} onClick={() => setOffset(offset + 100)}>다음 100건</Button>
</div>}
</>}
</section>
)
}
export function ListJobProgress({ prjctIdx, job }: { prjctIdx: number; job: ListJob }) {
const qc = useQueryClient()
const [detailJobKey, setDetailJobKey] = useState<string | null>(null)
const detailOpen = detailJobKey === job.jobKey
const sections = getDetailSections(job)
const detailLabel = job.jobType === 'LIST_UPLOAD' ? '업로드 오류' : job.jobType.endsWith('_BULK') ? '발송 접수 내역' : '실패한 리스트'
const active = isActiveListJob(job.jobStatus)
const cancel = useMutation({
mutationFn: () => nextApi.post(`/list-jobs/${prjctIdx}/${job.jobKey}/cancel`),
retry: false,
onSuccess: () => {
toast.info('중단을 요청했습니다. 이미 반영된 내용은 유지됩니다.')
for (const key of [['listJob'], ['listJobAvailability'], ['listJobMyActive'], ['listJobUploadResetActive']]) {
void qc.invalidateQueries({ queryKey: key })
}
},
})
// 배정 작업은 진행 중일 때 operation에 따라 "배정 중"/"배정 초기화 중"으로 표시한다.
let statusText = LIST_JOB_STATUS_LABEL[job.jobStatus]
if (job.jobType === 'LIST_ASSIGN' && job.operation && job.jobStatus === 'RUNNING') {
statusText = `${listJobLabel(job.jobType, job.operation)} 중`
} else if (job.jobType.endsWith('_BULK') && job.jobStatus === 'SUCCEEDED') {
statusText = '접수 완료'
}
return (
<div className="space-y-3">
{active && <p className="text-sm text-muted-foreground">창을 닫아도 작업은 계속되며, 완료 시 알림을 드립니다.</p>}
<p><strong>{statusText}</strong> · 단계: {stageLabel(job.jobStage)} · 접수 {job.regDt.replace('T', ' ').slice(0, 19)}</p>
<Progress job={job} />
{job.jobStatus === 'PARTIALLY_SUCCEEDED' && <p className="text-sm text-amber-700">일부 대상은 접수되지 않았거나 접수 여부를 확인하지 못했습니다. 아래 접수 내역과 준비 실패 내역을 확인해 주세요.</p>}
{job.jobStatus !== 'SUCCEEDED' && job.jobStatus !== 'PARTIALLY_SUCCEEDED' && !active && <p className="text-sm text-red-600">{job.errorMessage || (job.cancelReason === 'USER_REQUEST' ? '사용자 요청으로 중단됐습니다.' : '처리가 종료됐습니다.')} {job.jobStage === 'VALIDATION_FAILED' ? '파일 검증 단계에서 중단되어 리스트 데이터는 변경되지 않았습니다.' : '이미 반영된 내용이 있을 수 있으니 확인 후 다시 요청하세요.'}</p>}
{job.jobStatus === 'FAILED' && job.failedChunkNo != null && <p className="text-sm text-red-600">실패한 처리 구간: {n(job.failedChunkNo)}번째</p>}
{(job.resultFiles.length > 0 || job.jobType === 'LIST_UPLOAD') && <div className="flex flex-wrap gap-3 text-sm">
{job.resultFiles.map(file => file.ready
? <a className="underline" key={file.index} href={`${clientEnv.API_BASE}/list-jobs/${prjctIdx}/${job.jobKey}/files/${file.index}`} download={file.fileName} target="_blank" rel="noopener noreferrer">{file.fileName} 다운로드</a>
: <span key={file.index}>{file.fileName}: 다운로드 완료 또는 보관기간 종료</span>)}
{job.jobType === 'LIST_UPLOAD' && <a className="underline" href={`${clientEnv.API_BASE}/list-jobs/${prjctIdx}/${job.jobKey}/source-file`} download target="_blank" rel="noopener noreferrer">업로드 원본</a>}
</div>}
{job.resultFiles.length > 0 && <p className="text-sm text-muted-foreground">파일은 다운로드 후 또는 보관 기간 만료 시 삭제됩니다.</p>}
<div className="flex flex-wrap gap-2">
{active && <Button variant="outline" disabled={cancel.isPending || job.jobStatus === 'CANCEL_REQUESTED'} onClick={() => {
if (confirm('작업을 중단할까요? 이미 반영된 구간은 유지됩니다.')) cancel.mutate()
}}>중단 요청</Button>}
{sections.length > 0 && <Button type="button" variant="outline" onClick={() => setDetailJobKey(detailOpen ? null : job.jobKey)}>{detailLabel} {detailOpen ? '닫기' : '보기'}</Button>}
</div>
{detailOpen && sections.length > 0 && <JobFailures key={`${job.jobKey}-${sections.map(section => section.path).join('|')}`} prjctIdx={prjctIdx} job={job} sections={sections} />}
</div>
)
}

View File

@@ -0,0 +1,22 @@
'use client'
import { Button } from '@/components/ui/button'
import type { ListJobPageMonitor } from '@/hooks/useListJobPageMonitor'
export function ListJobRefreshNotice({ monitor, clearsSelection = false }: {
monitor: ListJobPageMonitor
clearsSelection?: boolean
}) {
if (!monitor.pendingRefresh) return null
return (
<div role="status" className="flex items-center justify-between gap-3 rounded-md border bg-muted/30 p-3 text-sm">
<p>{monitor.refreshError ? '목록을 새로 불러오지 못했습니다. 다시 시도해 주세요.'
: clearsSelection ? '목록이 변경되었습니다. 새로고침하면 선택한 행이 해제됩니다.'
: '목록이 변경되었습니다. 작업을 마친 뒤 새로고침해 주세요.'}</p>
<Button type="button" variant="outline" size="sm" disabled={monitor.refreshBlocked || monitor.refreshing}
onClick={() => void monitor.refresh()}>
{monitor.refreshing ? '새로고침 중…' : '새로고침'}
</Button>
</div>
)
}

View File

@@ -0,0 +1,113 @@
'use client'
import { useEffect } from 'react'
import { usePathname, useRouter } from 'next/navigation'
import { useAtom } from 'jotai'
import { useQueries, useQueryClient } from '@tanstack/react-query'
import { toast } from 'sonner'
import { nextApi } from '@/lib/http-client'
import { isListJobGone, listJobKeys, useMyActiveListJobs } from '@/query/list-job'
import { listJobOpenRequestAtom } from '@/store/jotai/list-job'
import { useSelectedProject } from '@/hooks/useSelectedProject'
import { useDialog } from '@/hooks/useDialog'
import type { SelectedProject } from '@/store/jotai/project'
import { markListJobNotified, trackListJob, untrackListJob, useTrackedListJobs } from '@/store/list-job-tracker'
import { LIST_JOB_VIEW } from '@/const/listJobConst'
import { getListJobResultNotification } from '@/utils/listJobResult'
import { isActiveListJob, isListJobType, parseListJob, type ListJob } from '@/types/list-job'
function isProjectSelection(value: unknown, projectId: number): value is SelectedProject {
if (!value || typeof value !== 'object') return false
const project = value as Record<string, unknown>
return project.prjctIdx === projectId && typeof project.ff === 'boolean'
&& ['prjctCd', 'prjctName', 'itrntPrjctCd', 'ownerDept', 'ownerFw'].every(key => typeof project[key] === 'string')
}
/**
* 화면 없이 동작하는 전역 감시.
* - 현재 프로젝트의 진행 중인 내 작업을 서버에서 가져와 기록이 없으면 채운다(다른 탭·기기 보완).
* - 기록된 작업이 끝나면 완료 toast를 1회 띄우고 관련 데이터를 갱신한다.
*/
export function ListJobWatcher({ userId, prjctIdx }: { userId: string; prjctIdx: number }) {
const qc = useQueryClient()
const [openRequest, setOpenRequest] = useAtom(listJobOpenRequestAtom)
const { selectedProject, setSelectedProject } = useSelectedProject()
const router = useRouter()
const pathname = usePathname()
const { hideAll } = useDialog()
const trackedJobs = useTrackedListJobs().filter(job => job.userId === userId)
const myActive = useMyActiveListJobs(prjctIdx, prjctIdx > 0)
useEffect(() => {
if (!openRequest) return
if (openRequest.userId !== userId) { setOpenRequest(null); return }
if (openRequest.opened) {
if (selectedProject?.prjctIdx !== openRequest.prjctIdx || pathname !== LIST_JOB_VIEW[openRequest.jobType].path) setOpenRequest(null)
return
}
if (selectedProject?.prjctIdx === openRequest.prjctIdx) {
const path = LIST_JOB_VIEW[openRequest.jobType].path
if (pathname !== path) router.push(path)
return
}
let cancelled = false
void (async () => {
try {
const value = await nextApi.get<unknown>(`/project/info/${openRequest.prjctIdx}`, { skipResponseErrorHandler: true })
if (cancelled) return
if (!isProjectSelection(value, openRequest.prjctIdx)) throw new Error('Invalid project selection')
setSelectedProject({
prjctIdx: value.prjctIdx, prjctCd: value.prjctCd, prjctName: value.prjctName,
itrntPrjctCd: value.itrntPrjctCd, ownerDept: value.ownerDept, ownerFw: value.ownerFw, ff: value.ff,
})
} catch {
if (cancelled) return
toast.error('작업의 프로젝트를 열 수 없습니다. 접근 권한과 프로젝트 상태를 확인해 주세요.')
setOpenRequest(null)
}
})()
return () => { cancelled = true }
}, [openRequest, pathname, router, selectedProject?.prjctIdx, setOpenRequest, setSelectedProject, userId])
useEffect(() => {
for (const job of myActive.data ?? []) {
if (isListJobType(job.jobType)) trackListJob({ userId, prjctIdx, jobType: job.jobType, jobKey: job.jobKey })
}
}, [myActive.data, prjctIdx, userId])
const details = useQueries({
queries: trackedJobs.map(job => ({
queryKey: listJobKeys.detail(userId, job.prjctIdx, job.jobKey),
queryFn: async () => parseListJob(await nextApi.get(`/list-jobs/${job.prjctIdx}/${job.jobKey}`, { skipResponseErrorHandler: true })),
refetchInterval: (query: { state: { data?: ListJob } }) => query.state.data && !isActiveListJob(query.state.data.jobStatus) ? false : 3000,
retry: false,
meta: { ignoreGlobalLoading: true },
})),
})
useEffect(() => {
details.forEach((result, index) => {
const tracked = trackedJobs[index]
if (!tracked) return
if (isListJobGone(result.error)) {
untrackListJob(tracked.jobKey)
return
}
const job = result.data
if (!job || isActiveListJob(job.jobStatus) || !markListJobNotified(tracked.jobKey)) return
// 일부 실패·중단이어도 앞 구간은 반영됐을 수 있으므로 항상 갱신한다.
for (const key of [['list'], ['assign'], ['project'], ['message-report'], ['listJobMyActive'], ['listJobUploadResetActive'], ['listJobAvailability']]) {
void qc.invalidateQueries({ queryKey: key })
}
if (openRequest?.opened && openRequest.jobKey === tracked.jobKey) return
const open = { label: '보기', onClick: () => {
hideAll()
setOpenRequest({ userId, prjctIdx: tracked.prjctIdx, jobType: tracked.jobType, jobKey: tracked.jobKey, opened: false })
} }
const notification = getListJobResultNotification(job)
toast[notification.kind](notification.message, { action: open, description: notification.description })
})
}, [details, trackedJobs, openRequest, setOpenRequest, qc, userId, hideAll])
return null
}

View File

@@ -3,19 +3,27 @@
import { import {
Download, Download,
FileClock, FileClock,
Loader2,
Mail, Mail,
MessageCircle, MessageCircle,
MessageSquareMore, MessageSquareMore,
RotateCcw, RotateCcw,
Upload, Upload,
type LucideIcon,
} from 'lucide-react' } from 'lucide-react'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import type { ListDownloadMode } from '@/types/list' import type { ListDownloadMode } from '@/types/list'
import type { MessageSendMode } from '@/components/dialog/MessageSendDialog' import type { MessageSendMode } from '@/components/dialog/MessageSendDialog'
export type ListManageActionKey = 'reset' | 'upload' | ListDownloadMode | MessageSendMode
export type ListManageActionsProps = { export type ListManageActionsProps = {
/** 리스트 초기화/헤더 관리/업로드처럼 내부 관리자 전용 버튼 노출 여부 (외주사 계정에는 숨겨야 함) */ /** 리스트 초기화/헤더 관리/업로드처럼 내부 관리자 전용 버튼 노출 여부 (외주사 계정에는 숨겨야 함) */
showAdminActions: boolean showAdminActions: boolean
/** 비동기 작업이 진행 중인 버튼. 아이콘을 진행 표시로 바꾸고, 누르면 진행 다이얼로그가 열린다. */
runningActions?: ReadonlySet<ListManageActionKey>
disabledActions?: ReadonlySet<ListManageActionKey>
headerManageDisabled?: boolean
onReset: () => void onReset: () => void
onHeaderManage: () => void onHeaderManage: () => void
onUpload: () => void onUpload: () => void
@@ -26,6 +34,9 @@ export type ListManageActionsProps = {
export function ListManageActions({ export function ListManageActions({
showAdminActions, showAdminActions,
runningActions,
disabledActions,
headerManageDisabled = false,
onReset, onReset,
onHeaderManage, onHeaderManage,
onUpload, onUpload,
@@ -33,51 +44,56 @@ export function ListManageActions({
onMessageSend, onMessageSend,
onMessageHistory, onMessageHistory,
}: ListManageActionsProps) { }: ListManageActionsProps) {
const icon = (key: ListManageActionKey, Icon: LucideIcon) =>
runningActions?.has(key)
? <Loader2 className="w-4 h-4 animate-spin" aria-label="진행 중" />
: <Icon className="w-4 h-4" />
return ( return (
<div className="flex gap-2 items-center"> <div className="flex gap-2 items-center">
<div className="flex flex-1 items-center gap-2 flex-wrap"> <div className="flex flex-1 items-center gap-2 flex-wrap">
{showAdminActions && ( {showAdminActions && (
<> <>
<Button variant="destructive" className="text-base gap-2" onClick={onReset}> <Button variant="destructive" className="text-base gap-2" onClick={onReset} disabled={disabledActions?.has('reset')}>
<RotateCcw className="w-4 h-4" /> {icon('reset', RotateCcw)}
리스트 초기화 리스트 초기화
</Button> </Button>
<Button className="text-base" onClick={onHeaderManage}> <Button className="text-base" onClick={onHeaderManage} disabled={headerManageDisabled}>
헤더 관리 헤더 관리
</Button> </Button>
<Button className="text-base gap-2" onClick={onUpload}> <Button className="text-base gap-2" onClick={onUpload} disabled={disabledActions?.has('upload')}>
<Upload className="w-4 h-4" /> {icon('upload', Upload)}
리스트 업로드 리스트 업로드
</Button> </Button>
</> </>
)} )}
<Button className="text-base bg-excel gap-2" onClick={() => onDownload('list')}> <Button className="text-base bg-excel gap-2" onClick={() => onDownload('list')} disabled={disabledActions?.has('list')}>
<Download className="w-4 h-4" /> {icon('list', Download)}
리스트 리스트
</Button> </Button>
<Button className="text-base bg-excel gap-2" onClick={() => onDownload('contact-history')}> <Button className="text-base bg-excel gap-2" onClick={() => onDownload('contact-history')} disabled={disabledActions?.has('contact-history')}>
<Download className="w-4 h-4" /> {icon('contact-history', Download)}
컨택 이력 컨택 이력
</Button> </Button>
<Button className="text-base bg-excel gap-2" onClick={() => onDownload('list-change-history')}> <Button className="text-base bg-excel gap-2" onClick={() => onDownload('list-change-history')} disabled={disabledActions?.has('list-change-history')}>
<Download className="w-4 h-4" /> {icon('list-change-history', Download)}
리스트 변경 이력 리스트 변경 이력
</Button> </Button>
<Button className="text-base gap-2" onClick={() => onDownload('upload-file')}> <Button className="text-base gap-2" onClick={() => onDownload('upload-file')} disabled={disabledActions?.has('upload-file')}>
<Download className="w-4 h-4" /> {icon('upload-file', Download)}
업로드 파일(.zip) 업로드 파일(.zip)
</Button> </Button>
</div> </div>
<Button className="text-base bg-blue gap-2" onClick={() => onMessageSend('email')}> <Button className="text-base bg-blue gap-2" onClick={() => onMessageSend('email')} disabled={disabledActions?.has('email')}>
<Mail className="w-4 h-4" /> {icon('email', Mail)}
이메일 발송 이메일 발송
</Button> </Button>
<Button className="text-base bg-blue gap-2" onClick={() => onMessageSend('sms')}> <Button className="text-base bg-blue gap-2" onClick={() => onMessageSend('sms')} disabled={disabledActions?.has('sms')}>
<MessageSquareMore className="w-4 h-4" /> {icon('sms', MessageSquareMore)}
문자 발송 문자 발송
</Button> </Button>
<Button className="text-base bg-blue gap-2" onClick={() => onMessageSend('kko')}> <Button className="text-base bg-blue gap-2" onClick={() => onMessageSend('kko')} disabled={disabledActions?.has('kko')}>
<MessageCircle className="w-4 h-4" /> {icon('kko', MessageCircle)}
알림톡 발송 알림톡 발송
</Button> </Button>
<Button className="text-base gap-2" onClick={onMessageHistory}> <Button className="text-base gap-2" onClick={onMessageHistory}>

View File

@@ -15,7 +15,8 @@ import ListBatchEditDialog, { type BatchEditPayload, type BatchEditResultCodes,
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 { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import { useListSearchQuery, useUpdateListMutation } from '@/query/list' import { useListSearchQuery } from '@/query/list'
import { useSubmitListJob } from '@/query/list-job'
import { getListColumns, LIST_IS_USE_LABEL, type ListTableRow } from '@/components/table-column/ListTableColumn' import { getListColumns, LIST_IS_USE_LABEL, type ListTableRow } from '@/components/table-column/ListTableColumn'
import { useAssignTargetRows } from '@/components/assign/AssignTargetList' import { useAssignTargetRows } from '@/components/assign/AssignTargetList'
import { ListHeaderAssignConst, ListHeaderConst } from '@/const/listConst' import { ListHeaderAssignConst, ListHeaderConst } from '@/const/listConst'
@@ -56,6 +57,8 @@ export type ListSearchTableProps = {
listHeaders: listHeader[] listHeaders: listHeader[]
fieldInterviewEnabled?: boolean fieldInterviewEnabled?: boolean
enableBatchEdit?: boolean enableBatchEdit?: boolean
batchEditDisabled?: boolean
dataRevision?: number
refreshKey?: number refreshKey?: number
selectMode?: SelectMode selectMode?: SelectMode
filterActions?: ReactNode filterActions?: ReactNode
@@ -184,6 +187,8 @@ export function ListSearchTable({
listHeaders, listHeaders,
fieldInterviewEnabled = true, fieldInterviewEnabled = true,
enableBatchEdit = false, enableBatchEdit = false,
batchEditDisabled = false,
dataRevision = 0,
refreshKey = 0, refreshKey = 0,
selectMode = 'multi', selectMode = 'multi',
filterActions, filterActions,
@@ -228,7 +233,7 @@ export function ListSearchTable({
[selectedRows], [selectedRows],
) )
const updateListMutation = useUpdateListMutation(prjctIdx) const updateListMutation = useSubmitListJob(prjctIdx)
const outsourceTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType: ListHeaderAssignConst.OUTSOURCE }) const outsourceTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType: ListHeaderAssignConst.OUTSOURCE })
const contactTargetRows = useAssignTargetRows({ const contactTargetRows = useAssignTargetRows({
@@ -530,6 +535,17 @@ export function ListSearchTable({
const totalCount = listSearchQuery.data?.totalElements ?? 0 const totalCount = listSearchQuery.data?.totalElements ?? 0
const pageCount = listSearchQuery.data?.totalPages ?? 0 const pageCount = listSearchQuery.data?.totalPages ?? 0
useEffect(() => {
if (!dataRevision) return
handleRowSelectionChange([])
}, [dataRevision, handleRowSelectionChange])
useEffect(() => {
if (!listSearchQuery.isSuccess || listSearchQuery.isFetching || listSearchQuery.isPlaceholderData) return
const lastPage = Math.max(0, pageCount - 1)
if (pagination.pageIndex > lastPage) setPagination(previous => ({ ...previous, pageIndex: lastPage }))
}, [listSearchQuery.isSuccess, listSearchQuery.isFetching, listSearchQuery.isPlaceholderData, pageCount, pagination.pageIndex])
const headerOptions = useMemo( const headerOptions = useMemo(
() => () =>
accessibleListHeaders accessibleListHeaders
@@ -625,12 +641,15 @@ export function ListSearchTable({
setBatchSurveyResultCodes(Object.fromEntries(surveyResultCodes.map((item) => [item.prjctSurveyIdx, item.resultCd]))) 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({
jobType: 'LIST_UPDATE',
path: 'mutations/update',
body: {
updateContents, updateContents,
updateResultCodes: resultCodeSelections, updateResultCodes: resultCodeSelections,
updateSurveyResultCodes: surveyResultCodes, updateSurveyResultCodes: surveyResultCodes,
listFilter: buildTargetFilter(target), listFilter: buildTargetFilter(target),
},
}) })
await listSearchQuery.refetch()
} }
useEffect(() => { useEffect(() => {
@@ -836,7 +855,7 @@ export function ListSearchTable({
</Button> </Button>
{filterActions} {filterActions}
{enableBatchEdit ? ( {enableBatchEdit ? (
<Button type="button" variant="outline" className="gap-2" onClick={() => showDialog('listBatchEditDialog')}> <Button type="button" variant="outline" className="gap-2" onClick={() => showDialog('listBatchEditDialog')} disabled={batchEditDisabled}>
<PencilLine className="w-4 h-4" /> <PencilLine className="w-4 h-4" />
일괄 수정 일괄 수정
</Button> </Button>
@@ -848,6 +867,7 @@ export function ListSearchTable({
<div className="bg-white rounded-lg border border-gray-200 overflow-hidden"> <div className="bg-white rounded-lg border border-gray-200 overflow-hidden">
<DataTable<ListTableRow> <DataTable<ListTableRow>
key={dataRevision}
columns={columns} columns={columns}
data={viewList} data={viewList}
getRowId={(row) => String(row.sid)} getRowId={(row) => String(row.sid)}
@@ -871,6 +891,7 @@ export function ListSearchTable({
<ListFilterDialog headerOptions={filterHeaderOptions} initialRows={filterRows} onConfirm={handleFilterConfirm} /> <ListFilterDialog headerOptions={filterHeaderOptions} initialRows={filterRows} onConfirm={handleFilterConfirm} />
{enableBatchEdit ? ( {enableBatchEdit ? (
<ListBatchEditDialog <ListBatchEditDialog
prjctIdx={prjctIdx}
headerOptions={headerOptions} headerOptions={headerOptions}
resultCodes={resultCodes} resultCodes={resultCodes}
surveys={surveys} surveys={surveys}

View File

@@ -8,7 +8,6 @@ import {
TemplatePurpose, TemplatePurpose,
type KkoTemplateDetail, type KkoTemplateDetail,
type KkoTemplateSummary, type KkoTemplateSummary,
type TemplateKko,
} from "@kri/common/noti-hub"; } from "@kri/common/noti-hub";
import { isBlank, type DataVerification } from "@kri/common"; import { isBlank, type DataVerification } from "@kri/common";
import { RefreshCw } from "lucide-react"; import { RefreshCw } from "lucide-react";
@@ -22,8 +21,11 @@ import { KriEditor } from "@/components/kri-editor";
import { useSelectedProject } from "@/hooks/useSelectedProject"; import { useSelectedProject } from "@/hooks/useSelectedProject";
import { import {
fetchKkoTemplateDetail, fetchKkoTemplateDetail,
resolveDeleteTemplateErrorMessage,
useDeleteTemplateMutation,
useKkoTemplateDetailQuery, useKkoTemplateDetailQuery,
useKkoTemplateListQuery, useKkoTemplateListQuery,
useKkoSenderProfilesQuery,
useMainTemplateIdxQuery, useMainTemplateIdxQuery,
useSaveTemplateMutation, useSaveTemplateMutation,
useTemplateListQuery, useTemplateListQuery,
@@ -38,7 +40,7 @@ import {
} from "@/const/messageTemplateConst"; } from "@/const/messageTemplateConst";
import { formatKoreanPhoneNumber } from "@/utils/phone"; import { formatKoreanPhoneNumber } from "@/utils/phone";
import {ProjectMainTemplateUpdateRequest, ProjectSurvey} from "@/types/project"; import {ProjectMainTemplateUpdateRequest, ProjectSurvey} from "@/types/project";
import type { TemplateSummaryWithPurpose, TemplateWithPurpose } from "@/types/message"; import type { KkoSenderProfile, KkoTemplateWithProfile, TemplateSummaryWithPurpose, TemplateWithPurpose } from "@/types/message";
import {MessageVariableList} from "@/components/message-template/MessageVariableList"; import {MessageVariableList} from "@/components/message-template/MessageVariableList";
import {listHeader} from "@/types/list"; import {listHeader} from "@/types/list";
import {useListHeaderQuery} from "@/query/list"; import {useListHeaderQuery} from "@/query/list";
@@ -50,6 +52,7 @@ type KkoTemplateDraft = {
tmplatNm: string; tmplatNm: string;
sendTel: string; sendTel: string;
kkoTmplatCd: string; kkoTmplatCd: string;
senderKey: string;
}; };
const EMPTY_DRAFT: KkoTemplateDraft = { const EMPTY_DRAFT: KkoTemplateDraft = {
@@ -57,6 +60,7 @@ const EMPTY_DRAFT: KkoTemplateDraft = {
tmplatNm: "", tmplatNm: "",
sendTel: "", sendTel: "",
kkoTmplatCd: "", kkoTmplatCd: "",
senderKey: "",
}; };
const CHNNL_TY = ChannelType.KKO; const CHNNL_TY = ChannelType.KKO;
@@ -65,7 +69,7 @@ const KEYWORD_DEBOUNCE_MS = 400;
const isValidKeyword = (keyword: string) => const isValidKeyword = (keyword: string) =>
keyword === "" || (keyword.length >= KKO_TEMPLATE_KEYWORD_MIN_LENGTH && keyword.length <= KKO_TEMPLATE_KEYWORD_MAX_LENGTH); keyword === "" || (keyword.length >= KKO_TEMPLATE_KEYWORD_MIN_LENGTH && keyword.length <= KKO_TEMPLATE_KEYWORD_MAX_LENGTH);
const isKkoTemplate = (template: TemplateWithPurpose | undefined | null): template is TemplateKko & { tmplatPurpose: TemplatePurpose } => const isKkoTemplate = (template: TemplateWithPurpose | undefined | null): template is KkoTemplateWithProfile & { tmplatPurpose: TemplatePurpose } =>
template?.tmplatTy === MessageType.KKO; template?.tmplatTy === MessageType.KKO;
// 저장 불가 안내. 공용 isKkoTemplateSavable 기준으로 판단하고, 해당하면 저장 요청을 보내지 않는다. // 저장 불가 안내. 공용 isKkoTemplateSavable 기준으로 판단하고, 해당하면 저장 요청을 보내지 않는다.
@@ -78,7 +82,7 @@ const getUnsavableWarning = (detail: KkoTemplateDetail): string | null => {
detail.block ? "차단" : null, detail.block ? "차단" : null,
detail.dormant ? "휴면" : null, detail.dormant ? "휴면" : null,
].filter(Boolean).join(", "); ].filter(Boolean).join(", ");
return `저장할 수 없는 템플릿입니다. 승인·사용 상태가 아니거나 지원하지 않는 형식(버튼·이미지·강조 등 추가 요소 포함)입니다. (${status})`; return `저장할 수 없는 템플릿입니다. 승인 상태가 아니거나 지원하지 않는 형식(버튼·이미지·강조 등 추가 요소 포함)입니다. (${status})`;
}; };
const KkoMessageTemplate = () => { const KkoMessageTemplate = () => {
@@ -103,13 +107,17 @@ const KkoMessageTemplate = () => {
const [mainDesired, setMainDesired] = useState(false); const [mainDesired, setMainDesired] = useState(false);
const mainTemplateAppliedRef = useRef(false); const mainTemplateAppliedRef = useRef(false);
const templateDetailAppliedRef = useRef<number | null>(null);
const selectionRevisionRef = useRef(0);
const [checkingTemplate, setCheckingTemplate] = useState(false);
// Queries // Queries
const templateListQuery = useTemplateListQuery(CHNNL_TY, itrntPrjctCd, enabled); const templateListQuery = useTemplateListQuery(CHNNL_TY, itrntPrjctCd, enabled);
const mainTemplateQuery = useMainTemplateIdxQuery(prjctIdx, CHNNL_TY, enabled); const mainTemplateQuery = useMainTemplateIdxQuery(prjctIdx, CHNNL_TY, enabled);
const templateDetailQuery = useTemplateQuery(selectedTemplateIdx ?? 0, enabled && !!selectedTemplateIdx); const templateDetailQuery = useTemplateQuery(selectedTemplateIdx ?? 0, enabled && !!selectedTemplateIdx);
const kkoListQuery = useKkoTemplateListQuery(searchKeyword, enabled); const profilesQuery = useKkoSenderProfilesQuery(enabled);
const kkoDetailQuery = useKkoTemplateDetailQuery(selectedCode, enabled); const kkoListQuery = useKkoTemplateListQuery(draft.senderKey, searchKeyword, enabled);
const kkoDetailQuery = useKkoTemplateDetailQuery(draft.senderKey, selectedCode, enabled);
const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled) const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled)
const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled) const projectInfoQuery = useProjectInfoQuery(prjctIdx, enabled)
@@ -128,8 +136,13 @@ const KkoMessageTemplate = () => {
// Mutations // Mutations
const saveTemplateMutation = useSaveTemplateMutation(CHNNL_TY, itrntPrjctCd); const saveTemplateMutation = useSaveTemplateMutation(CHNNL_TY, itrntPrjctCd);
const updateMainTemplateMutation = useUpdateMainTemplateMutation(prjctIdx, CHNNL_TY); const updateMainTemplateMutation = useUpdateMainTemplateMutation(prjctIdx, CHNNL_TY);
const deleteTemplateMutation = useDeleteTemplateMutation(CHNNL_TY, itrntPrjctCd, prjctIdx);
const isSaving = checkingTemplate || saveTemplateMutation.isPending;
const resetToNew = () => { const resetToNew = () => {
selectionRevisionRef.current += 1;
templateDetailAppliedRef.current = null;
setSelectedTemplateIdx(null); setSelectedTemplateIdx(null);
setDraft(EMPTY_DRAFT); setDraft(EMPTY_DRAFT);
setSavedPreview(null); setSavedPreview(null);
@@ -164,16 +177,21 @@ const KkoMessageTemplate = () => {
useEffect(() => { useEffect(() => {
const d = templateDetailQuery.data; const d = templateDetailQuery.data;
if (!isKkoTemplate(d) || !selectedTemplateIdx || d.tmplatIdx !== selectedTemplateIdx) return; if (!isKkoTemplate(d) || !selectedTemplateIdx || d.tmplatIdx !== selectedTemplateIdx) return;
if (templateDetailAppliedRef.current === selectedTemplateIdx) return;
templateDetailAppliedRef.current = selectedTemplateIdx;
const senderKey = typeof d.senderKey === "string" ? d.senderKey.trim() : "";
setDraft({ setDraft({
tmplatIdx: d.tmplatIdx, tmplatIdx: d.tmplatIdx,
tmplatNm: d.tmplatNm ?? "", tmplatNm: d.tmplatNm ?? "",
sendTel: d.sendTel ?? "", sendTel: d.sendTel ?? "",
kkoTmplatCd: d.kkoTmplatCd ?? "", kkoTmplatCd: senderKey ? d.kkoTmplatCd ?? "" : "",
senderKey,
}); });
setSavedPreview({ body: d.tmplatBody ?? "", title: d.tmplatTitle ?? "" }); selectionRevisionRef.current += 1;
setSelectedCode(""); setSavedPreview(senderKey ? { body: d.tmplatBody ?? "", title: d.tmplatTitle ?? "" } : null);
setSelectedCode(senderKey ? d.kkoTmplatCd ?? "" : "");
setSelectedSummary( setSelectedSummary(
d.kkoTmplatCd senderKey && d.kkoTmplatCd
? { templateCode: d.kkoTmplatCd, templateName: d.tmplatNm ?? "", serviceStatus: null, createdAt: null, modifiedAt: null } ? { templateCode: d.kkoTmplatCd, templateName: d.tmplatNm ?? "", serviceStatus: null, createdAt: null, modifiedAt: null }
: null, : null,
); );
@@ -191,6 +209,12 @@ const KkoMessageTemplate = () => {
} }
const idx = Number(value); const idx = Number(value);
if (!Number.isFinite(idx)) return; if (!Number.isFinite(idx)) return;
selectionRevisionRef.current += 1;
templateDetailAppliedRef.current = null;
setDraft(EMPTY_DRAFT);
setSelectedCode("");
setSelectedSummary(null);
setSavedPreview(null);
setSelectedTemplateIdx(idx); setSelectedTemplateIdx(idx);
}; };
@@ -214,8 +238,21 @@ const KkoMessageTemplate = () => {
await updateMainTemplateMutation.mutateAsync(req); await updateMainTemplateMutation.mutateAsync(req);
}; };
const handleSelectProfile = (senderKey: string) => {
if (senderKey === draft.senderKey) return;
selectionRevisionRef.current += 1;
setDraft((prev) => ({ ...prev, senderKey, kkoTmplatCd: "", tmplatNm: "" }));
setSelectedCode("");
setSelectedSummary(null);
setSavedPreview(null);
setKeywordInput("");
setSearchKeyword("");
};
const handleSelectExternal = (item: KkoTemplateSummary | null) => { const handleSelectExternal = (item: KkoTemplateSummary | null) => {
if (!item) return; if (!item || !draft.senderKey) return;
selectionRevisionRef.current += 1;
setSavedPreview(null);
setSelectedSummary(item); setSelectedSummary(item);
setSelectedCode(item.templateCode); setSelectedCode(item.templateCode);
// 템플릿 명은 선택한 알림톡 템플릿 명을 그대로 쓴다. // 템플릿 명은 선택한 알림톡 템플릿 명을 그대로 쓴다.
@@ -227,16 +264,20 @@ const KkoMessageTemplate = () => {
const fail = (fieldName: string, errMessage: string): DataVerification => ({ success: false, fieldName, errMessage }); const fail = (fieldName: string, errMessage: string): DataVerification => ({ success: false, fieldName, errMessage });
if (isBlank(itrntPrjctCd)) return fail("itrntPrjctCd", "인트라넷 프로젝트 코드가 없습니다."); if (isBlank(itrntPrjctCd)) return fail("itrntPrjctCd", "인트라넷 프로젝트 코드가 없습니다.");
if (isBlank(d.senderKey)) return fail("senderKey", "발신 프로필을 선택해 주세요.");
if (!profilesQuery.data?.some((profile) => profile.senderKey === d.senderKey)) return fail("senderKey", "사용 가능한 발신 프로필을 다시 선택해 주세요.");
if (!d.kkoTmplatCd) return fail("kkoTmplatCd", "알림톡 템플릿을 선택해 주세요."); if (!d.kkoTmplatCd) return fail("kkoTmplatCd", "알림톡 템플릿을 선택해 주세요.");
if (!KKO_TEMPLATE_CODE_REGEX.test(d.kkoTmplatCd)) return fail("kkoTmplatCd", "알림톡 템플릿 코드 형식이 올바르지 않습니다."); if (!KKO_TEMPLATE_CODE_REGEX.test(d.kkoTmplatCd)) return fail("kkoTmplatCd", "알림톡 템플릿 코드 형식이 올바르지 않습니다.");
if (isBlank(d.tmplatNm)) return fail("tmplatNm", "알림톡 템플릿 명이 없습니다."); 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 (isBlank(d.sendTel)) return fail("sendTel", "발신 전화번호를 입력해 주세요.");
if (d.sendTel.length > 16) return fail("sendTel", "발신 전화번호는 16자 이하로 입력해주세요."); if (d.sendTel.length > 16) return fail("sendTel", "발신 전화번호는 16자 이하로 입력해주세요.");
return ok(); return ok();
}; };
const submitTemplate = async (method: "put" | "patch") => { const submitTemplate = async (method: "put" | "patch") => {
if (isSaving) return;
const revision = selectionRevisionRef.current;
const v = validateDraft(draft); const v = validateDraft(draft);
if (!v.success) { if (!v.success) {
alert(v.errMessage); alert(v.errMessage);
@@ -244,9 +285,11 @@ const KkoMessageTemplate = () => {
} }
// 저장 직전에 외부 상세를 다시 조회해 저장 가능 여부를 확인한다. // 저장 직전에 외부 상세를 다시 조회해 저장 가능 여부를 확인한다.
// 화면에서 고른 뒤 상태가 바뀌었을 수 있고, 저장된 템플릿을 수정할 때는 상세를 아직 조회하지 않았기 때문이다. // 화면에서 고른 뒤 상태가 바뀌었을 수 있으므로 최신 상태를 확인한다.
setCheckingTemplate(true);
try { try {
const latestDetail = await fetchKkoTemplateDetail(draft.kkoTmplatCd); const latestDetail = await fetchKkoTemplateDetail(draft.senderKey, draft.kkoTmplatCd);
if (revision !== selectionRevisionRef.current) return;
const warning = getUnsavableWarning(latestDetail); const warning = getUnsavableWarning(latestDetail);
if (warning) { if (warning) {
alert(warning); alert(warning);
@@ -256,10 +299,12 @@ const KkoMessageTemplate = () => {
// 조회 오류는 공통 HTTP 오류 처리로 안내된다. 입력값은 유지한다. // 조회 오류는 공통 HTTP 오류 처리로 안내된다. 입력값은 유지한다.
console.log(e); console.log(e);
return; return;
} finally {
setCheckingTemplate(false);
} }
// 본문·제목·senderKey·첨부는 보내지 않는다. 서버가 저장 시 외부 상세를 재조회해 채운다. // 본문·제목·첨부는 서버가 선택한 프로필의 외부 상세를 재조회해 채운다.
const template: TemplateKko & { tmplatPurpose: TemplatePurpose } = { const template: KkoTemplateWithProfile & { tmplatPurpose: TemplatePurpose } = {
...(method === "patch" ? { tmplatIdx: draft.tmplatIdx } : {}), ...(method === "patch" ? { tmplatIdx: draft.tmplatIdx } : {}),
itrntPrjctCd, itrntPrjctCd,
tmplatTy: MessageType.KKO, tmplatTy: MessageType.KKO,
@@ -268,11 +313,12 @@ const KkoMessageTemplate = () => {
sendNm: KKO_SENDER_NAME, sendNm: KKO_SENDER_NAME,
sendTel: draft.sendTel, sendTel: draft.sendTel,
kkoTmplatCd: draft.kkoTmplatCd, kkoTmplatCd: draft.kkoTmplatCd,
senderKey: draft.senderKey,
}; };
try { try {
const res = await saveTemplateMutation.mutateAsync({ method, template }); const res = await saveTemplateMutation.mutateAsync({ method, template });
if (!isKkoTemplate(res)) return; if (!isKkoTemplate(res) || revision !== selectionRevisionRef.current) return;
// 저장 응답의 본문·제목·코드를 최종 화면 값으로 쓴다. // 저장 응답의 본문·제목·코드를 최종 화면 값으로 쓴다.
setDraft({ setDraft({
@@ -280,10 +326,11 @@ const KkoMessageTemplate = () => {
tmplatNm: res.tmplatNm ?? draft.tmplatNm, tmplatNm: res.tmplatNm ?? draft.tmplatNm,
sendTel: res.sendTel ?? draft.sendTel, sendTel: res.sendTel ?? draft.sendTel,
kkoTmplatCd: res.kkoTmplatCd ?? draft.kkoTmplatCd, kkoTmplatCd: res.kkoTmplatCd ?? draft.kkoTmplatCd,
senderKey: res.senderKey ?? draft.senderKey,
}); });
setSavedPreview({ body: res.tmplatBody ?? "", title: res.tmplatTitle ?? "" }); setSavedPreview({ body: res.tmplatBody ?? "", title: res.tmplatTitle ?? "" });
setSelectedTemplateIdx(res.tmplatIdx ?? null); setSelectedTemplateIdx(res.tmplatIdx ?? null);
setSelectedCode(""); setSelectedCode(res.kkoTmplatCd ?? draft.kkoTmplatCd);
if (mainDesired && selectedProject?.prjctIdx && res.tmplatIdx) { if (mainDesired && selectedProject?.prjctIdx && res.tmplatIdx) {
await updateMainTemplateMutation.mutateAsync({ await updateMainTemplateMutation.mutateAsync({
@@ -300,6 +347,21 @@ const KkoMessageTemplate = () => {
} }
}; };
const handleDelete = async () => {
const tmplatIdx = draft.tmplatIdx;
if (!tmplatIdx) return;
if (!window.confirm(`'${draft.tmplatNm}' 템플릿을 삭제하시겠습니까?`)) return;
try {
await deleteTemplateMutation.mutateAsync(tmplatIdx);
resetToNew();
alert("삭제되었습니다.");
} catch (e) {
// 삭제 불가·권한 없음 등은 안내만 하고 선택 템플릿과 대표 상태는 유지한다.
alert(resolveDeleteTemplateErrorMessage(e));
}
};
const previewBody = externalDetail ? externalDetail.templateContent : savedPreview?.body ?? ""; const previewBody = externalDetail ? externalDetail.templateContent : savedPreview?.body ?? "";
const previewTitle = externalDetail ? externalDetail.templateTitle ?? "" : savedPreview?.title ?? ""; const previewTitle = externalDetail ? externalDetail.templateTitle ?? "" : savedPreview?.title ?? "";
const unsavableWarning = externalDetail ? getUnsavableWarning(externalDetail) : null; const unsavableWarning = externalDetail ? getUnsavableWarning(externalDetail) : null;
@@ -310,7 +372,7 @@ const KkoMessageTemplate = () => {
<CardHeader className="border-b"> <CardHeader className="border-b">
<CardTitle className="text-center text-lg font-bold">알림톡 템플릿 관리</CardTitle> <CardTitle className="text-center text-lg font-bold">알림톡 템플릿 관리</CardTitle>
<p className="text-center text-base text-red-600 font-medium"> <p className="text-center text-base text-red-600 font-medium">
⚠️ 알림톡 템플릿에 대한 수정 및 등록은 비즈 뿌리오에서 가능하며 여기서는 템플릿 프로젝트에 등록만 가능합니다. ⚠️ 알림톡 템플릿에 대한 수정 및 등록은 비즈 뿌리오에서 가능하며 여기서는 템플릿을 프로젝트에 등록만 가능합니다.
</p> </p>
</CardHeader> </CardHeader>
@@ -329,6 +391,7 @@ const KkoMessageTemplate = () => {
</div> </div>
<KriSingleSelect <KriSingleSelect
items={templateList} items={templateList}
disabled={isSaving}
value={String(draft.tmplatIdx || "")} value={String(draft.tmplatIdx || "")}
onChange={handleSelectTemplate} onChange={handleSelectTemplate}
placeholder="템플릿을 선택해 주세요" placeholder="템플릿을 선택해 주세요"
@@ -343,9 +406,43 @@ const KkoMessageTemplate = () => {
</div> </div>
<div className="space-y-2"> <div className="space-y-2">
<Label className="text-base">알림톡 템플릿</Label> <Label className="text-base">발신 프로필 (필수)</Label>
<KriSingleSelect<KkoSenderProfile>
items={profilesQuery.data ?? []}
value={draft.senderKey}
onChange={handleSelectProfile}
placeholder="발신 프로필을 선택해 주세요"
heightClassName="h-9"
widthClassName="w-full"
getLabel={(item) => item.uuid}
getValue={(item) => item.senderKey}
disabled={!enabled || isSaving || profilesQuery.isFetching || templateDetailQuery.isFetching}
preventDeselect
/>
<p className="text-xs text-muted-foreground" role="status">
{profilesQuery.isFetching
? "발신 프로필을 조회하는 중입니다."
: profilesQuery.isError
? "발신 프로필을 불러오지 못했습니다."
: !profilesQuery.data?.length
? "선택할 발신 프로필이 없습니다."
: draft.senderKey && !profilesQuery.data.some((profile) => profile.senderKey === draft.senderKey)
? "저장된 발신 프로필을 사용할 수 없습니다. 프로필을 다시 선택해 주세요."
: "발신 프로필을 선택한 뒤 알림톡 템플릿을 선택해 주세요."}
</p>
{profilesQuery.isError && (
<Button type="button" variant="outline" size="sm" onClick={() => void profilesQuery.refetch()}>
발신 프로필 다시 조회
</Button>
)}
</div>
<div className="space-y-2">
<Label className="text-base">알림톡 템플릿 (필수)</Label>
<KriSingleSelect<KkoTemplateSummary> <KriSingleSelect<KkoTemplateSummary>
key={draft.senderKey}
items={externalList} items={externalList}
disabled={!draft.senderKey || isSaving || templateDetailQuery.isFetching}
value={draft.kkoTmplatCd} value={draft.kkoTmplatCd}
onChange={() => {}} onChange={() => {}}
onItemChange={handleSelectExternal} onItemChange={handleSelectExternal}
@@ -381,10 +478,11 @@ const KkoMessageTemplate = () => {
id="kkoSendTel" id="kkoSendTel"
placeholder="발신 번호를 입력하세요" placeholder="발신 번호를 입력하세요"
value={formatKoreanPhoneNumber(draft.sendTel)} value={formatKoreanPhoneNumber(draft.sendTel)}
disabled={isSaving}
onChange={(e) => setDraft((prev) => ({ ...prev, sendTel: e.target.value.replace(/\D/g, "") }))} onChange={(e) => setDraft((prev) => ({ ...prev, sendTel: e.target.value.replace(/\D/g, "") }))}
/> />
<p className="text-sm text-red-600 font-medium"> <p className="text-sm text-red-600 font-medium">
⚠️ 비즈 뿌리오에 등록된 발신 번호가 아니면 전송되지 않습니다. ⚠️ 비즈 뿌리오(KRi 계정)에 등록된 발신 번호가 아니면 전송되지 않습니다.
</p> </p>
</div> </div>
@@ -438,14 +536,24 @@ const KkoMessageTemplate = () => {
</div> </div>
<div className="flex justify-center gap-3 pt-6"> <div className="flex justify-center gap-3 pt-6">
<Button onClick={() => void submitTemplate("put")} className="w-32 h-10" disabled={saveTemplateMutation.isPending || !!unsavableWarning}> {draft.tmplatIdx && (
<Button
variant="destructive"
onClick={() => void handleDelete()}
className="w-32 h-10"
disabled={deleteTemplateMutation.isPending || isSaving}
>
삭제
</Button>
)}
<Button onClick={() => void submitTemplate("put")} className="w-32 h-10" disabled={isSaving || !draft.senderKey || !draft.kkoTmplatCd || !!unsavableWarning}>
{draft.tmplatIdx ? "복사 후 저장" : "저장"} {draft.tmplatIdx ? "복사 후 저장" : "저장"}
</Button> </Button>
{draft.tmplatIdx && ( {draft.tmplatIdx && (
<Button <Button
onClick={() => void submitTemplate("patch")} onClick={() => void submitTemplate("patch")}
className="w-32 h-10 bg-blue-500 text-white hover:bg-blue-600" className="w-32 h-10 bg-blue-500 text-white hover:bg-blue-600"
disabled={saveTemplateMutation.isPending || !!unsavableWarning} disabled={isSaving || !draft.senderKey || !draft.kkoTmplatCd || !!unsavableWarning}
> >
수정 수정
</Button> </Button>

View File

@@ -34,7 +34,7 @@ import { downloadFile } from "@kri/common/browser";
import {cn} from "@/lib/utils"; import {cn} from "@/lib/utils";
import {ProjectMainTemplateUpdateRequest, ProjectSurvey} 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, EMAIL_REGEX} from "@/const/validationConst"; import {COMMON_TEXT_REGEX, EMAIL_REGEX, TEMPLATE_TEXT_REGEX} from "@/const/validationConst";
import {formatKoreanPhoneNumber} from "@/utils/phone"; import {formatKoreanPhoneNumber} from "@/utils/phone";
import { import {
getTemplateAttachmentNames, getTemplateAttachmentNames,
@@ -51,6 +51,8 @@ import {
useUploadTemplateBodyImageMutation, useUploadTemplateBodyImageMutation,
useDownloadTemplateAttachmentMutation, useDownloadTemplateAttachmentMutation,
useTemplateAttachmentImagesQuery, useTemplateAttachmentImagesQuery,
useDeleteTemplateMutation,
resolveDeleteTemplateErrorMessage,
} 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";
@@ -145,6 +147,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
const downloadAttachmentMutation = useDownloadTemplateAttachmentMutation(selectedTemplate.tmplatIdx ?? 0); const downloadAttachmentMutation = useDownloadTemplateAttachmentMutation(selectedTemplate.tmplatIdx ?? 0);
const updateMainTemplateMutation = useUpdateMainTemplateMutation(prjctIdx, chnnlTy); const updateMainTemplateMutation = useUpdateMainTemplateMutation(prjctIdx, chnnlTy);
const uploadBodyImageMutation = useUploadTemplateBodyImageMutation(itrntPrjctCd); const uploadBodyImageMutation = useUploadTemplateBodyImageMutation(itrntPrjctCd);
const deleteTemplateMutation = useDeleteTemplateMutation(chnnlTy, itrntPrjctCd, prjctIdx);
// 문자 미리보기 첨부 이미지: 유지되는 기존 첨부는 서버에서, 새 파일은 로컬 Object URL로 표시한다. // 문자 미리보기 첨부 이미지: 유지되는 기존 첨부는 서버에서, 새 파일은 로컬 Object URL로 표시한다.
const keptAttachmentImages = useTemplateAttachmentImagesQuery( const keptAttachmentImages = useTemplateAttachmentImagesQuery(
@@ -221,8 +224,8 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
setSelectedTemplate((prev) => ({ ...prev, tmplatBody: newString })); setSelectedTemplate((prev) => ({ ...prev, tmplatBody: newString }));
}; };
const setSmsType = (smsTypeString: "SMS" | "LMS") => { const setSmsType = (smsTypeString: "SMS" | "LMS" | "MMS") => {
const smsType = smsTypeString === "SMS" ? MessageType.SMS : MessageType.LMS_MMS; const smsType = MessageType[smsTypeString];
setSelectedTemplate((prev) => { setSelectedTemplate((prev) => {
if (!isSmsTemplate(prev)) return prev; if (!isSmsTemplate(prev)) return prev;
@@ -240,16 +243,17 @@ 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 (tpl.tmplatNm.length > 128) return fail("tmplatNm", "템플릿명은 128자 이하로 입력해주세요.");
if (!COMMON_TEXT_REGEX.test(tpl.tmplatNm)) return fail("tmplatNm", "템플릿명에 허용되지 않는 문자가 포함되어 있습니다."); if (!TEMPLATE_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 (tpl.sendNm.length > 32) return fail("sendNm", "발신자명은 32자 이하로 입력해주세요.");
if (!COMMON_TEXT_REGEX.test(tpl.sendNm)) return fail("sendNm", "발신자명에 허용되지 않는 문자가 포함되어 있습니다."); if (!TEMPLATE_TEXT_REGEX.test(tpl.sendNm)) return fail("sendNm", "발신자명에 허용되지 않는 문자가 포함되어 있습니다.");
if (!isBlank(tpl.tmplatTitle)) { if (!isBlank(tpl.tmplatTitle)) {
if (tpl.tmplatTitle!.length > 128) return fail("tmplatTitle", "제목은 128자 이하로 입력해주세요."); const titleMaxLength = isSmsTemplate(tpl) ? 64 : 128;
if (!COMMON_TEXT_REGEX.test(tpl.tmplatTitle!)) return fail("tmplatTitle", "제목에 허용되지 않는 문자가 포함되어 있습니다."); if (tpl.tmplatTitle!.length > titleMaxLength) return fail("tmplatTitle", `제목은 ${titleMaxLength}자 이하로 입력해주세요.`);
if (!TEMPLATE_TEXT_REGEX.test(tpl.tmplatTitle!)) return fail("tmplatTitle", "제목에 허용되지 않는 문자가 포함되어 있습니다.");
} }
if (tpl.tmplatTy === MessageType.EMAIL) { if (tpl.tmplatTy === MessageType.EMAIL) {
@@ -471,6 +475,21 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
await submitTemplate("patch"); await submitTemplate("patch");
}; };
const handleDelete = async () => {
const tmplatIdx = selectedTemplate.tmplatIdx;
if (!tmplatIdx) return;
if (!window.confirm(`'${selectedTemplate.tmplatNm}' 템플릿을 삭제하시겠습니까?`)) return;
try {
await deleteTemplateMutation.mutateAsync(tmplatIdx);
handleSelectTemplate("");
alert("삭제되었습니다.");
} catch (e) {
// 삭제 불가·권한 없음 등은 안내만 하고 선택 템플릿과 대표 상태는 유지한다.
alert(resolveDeleteTemplateErrorMessage(e));
}
};
return ( return (
<div <div
className={cn( className={cn(
@@ -570,7 +589,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
/> />
{isSmsTemplate(selectedTemplate) && {isSmsTemplate(selectedTemplate) &&
<p className="text-sm text-red-600 font-medium"> <p className="text-sm text-red-600 font-medium">
⚠️ 제목이 있으면 본문 길이와 상관없이 LMS/MMS로 발송 됩니다. ⚠️ 제목이 있으면 본문 길이와 상관없이 LMS로 발송됩니다. 이미지가 있으면 MMS로 발송됩니다.
</p> </p>
} }
</div> </div>
@@ -591,7 +610,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
className="w-full" className="w-full"
/> />
<p className="text-sm text-red-600 font-medium"> <p className="text-sm text-red-600 font-medium">
⚠️ 비즈 뿌리오에 등록된 발신 번호가 아니면 전송되지 않습니다. ⚠️ 비즈 뿌리오(KRi 계정)에 등록된 발신 번호가 아니면 전송되지 않습니다.
</p> </p>
</div> </div>
) : ( ) : (
@@ -749,7 +768,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
)} )}
{isSms && attachmentCount > 0 && ( {isSms && attachmentCount > 0 && (
<p className="text-xs text-red-600"> <p className="text-xs text-red-600">
⚠️ 이미지가 첨부되면 본문 길이와 상관없이 LMS/MMS로 저장됩니다. ⚠️ 이미지가 첨부되면 본문 길이와 상관없이 MMS로 저장됩니다.
</p> </p>
)} )}
{selectedTemplate.tmplatIdx && ( {selectedTemplate.tmplatIdx && (
@@ -767,7 +786,7 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
</p> </p>
<KriEditor <KriEditor
mode="sms" mode="sms"
label={selectedTemplate.tmplatTy === MessageType.SMS ? "️️* 발송 시 길이에 따라 LMS/MMS로 발송 될 수 있음" : undefined} label="미리보기 유형은 예상값이며, 실제 유형은 수신자별 변수 치환 후 결정됩니다."
value={selectedTemplate.tmplatBody ?? ""} value={selectedTemplate.tmplatBody ?? ""}
onChange={(html: string) => setTemplateBody(html)} onChange={(html: string) => setTemplateBody(html)}
placeholder="문자 내용을 입력해 주세요" placeholder="문자 내용을 입력해 주세요"
@@ -791,6 +810,17 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
</div> </div>
<div className="flex justify-center gap-3 pt-4"> <div className="flex justify-center gap-3 pt-4">
{selectedTemplate.tmplatIdx && (
<Button
variant="destructive"
onClick={handleDelete}
className="w-32 h-10"
disabled={deleteTemplateMutation.isPending || saveTemplateMutation.isPending}
>
삭제
</Button>
)}
<Button onClick={handleCreate} className="w-32 h-10"> <Button onClick={handleCreate} className="w-32 h-10">
{selectedTemplate.tmplatIdx ? "복사 후 저장" : "저장"} {selectedTemplate.tmplatIdx ? "복사 후 저장" : "저장"}
</Button> </Button>

View File

@@ -202,6 +202,17 @@ export const getListColumns = (
}; };
} }
if (header.listHderTy === ListHeaderConst.MULTILINE_TEXT) {
return {
accessorKey: String(header.listHderId),
header: header.listHderNm,
meta: {
maxWidth: 200,
},
enableSorting: true,
};
}
return { return {
accessorKey: String(header.listHderId), accessorKey: String(header.listHderId),
header: header.listHderNm, header: header.listHderNm,

View File

@@ -5,3 +5,5 @@ export const FONT_SIZE = {
} as const; } as const;
export const ALLOW_REDIRECT = new Set(["complete", "screen", "quota"]); export const ALLOW_REDIRECT = new Set(["complete", "screen", "quota"]);
export const AUTH_COOKIE_MAX_AGE = 24 * 60 * 60;

View File

@@ -4,11 +4,12 @@ export const CTI_AGENT_GROUP = "KRI_CONTACT";
export const CTI_CALL_PHASE: CtiCallPhase[] = [ export const CTI_CALL_PHASE: CtiCallPhase[] = [
'dialing', 'dialing',
'active' 'active',
'ending'
] as const; ] as const;
// WS 서버가 보내는 CTIAgentStatus 값 중 통화 중 또는 통화 중 재로그인 대기로 간주할 값들 // WS 서버가 보내는 발신·통화 중 상태. None(0)은 통화 중 상태가 아니다.
export const CTI_ON_CALL_STATUSES = ["0", "2", "3"] as const; export const CTI_ON_CALL_STATUSES = ["2", "3", "8"] as const;
// localStorage에 저장한 CTI 상태의 만료 시간. 마지막 저장(updatedAt) 기준이며 복원 시점에만 검사한다. // localStorage에 저장한 CTI 상태의 만료 시간. 마지막 저장(updatedAt) 기준이며 복원 시점에만 검사한다.
export const CTI_STATE_TTL_MS = 2 * 60 * 60 * 1000; export const CTI_STATE_TTL_MS = 2 * 60 * 60 * 1000;
@@ -20,3 +21,13 @@ export const CTI_DIALING_TIMEOUT_MS = 30 * 1000;
// 처리하지 않는 오류(ZCommand에 Error 포함) alert를 같은 ZCommand에 대해 다시 띄우기까지의 최소 간격 // 처리하지 않는 오류(ZCommand에 Error 포함) alert를 같은 ZCommand에 대해 다시 띄우기까지의 최소 간격
export const CTI_ERROR_ALERT_THROTTLE_MS = 10 * 1000; export const CTI_ERROR_ALERT_THROTTLE_MS = 10 * 1000;
// 예상치 못한 소켓 끊김(onclose) 시 자동 재연결 간격. 1초부터 2배씩 늘려 최대 15초까지 무제한 재시도하며,
// 서버 재시작 시 동시 접속이 몰리지 않도록 매번 0~1초 jitter를 더한다.
export const CTI_AUTO_RECONNECT_BASE_MS = 1000;
export const CTI_AUTO_RECONNECT_MAX_MS = 15 * 1000;
export const CTI_AUTO_RECONNECT_JITTER_MS = 1000;
// 종료 명령의 응답이 없으면 재요청할 수 있게 하되, 실제 종료로 판정하지 않는다.
export const CTI_HANGUP_TIMEOUT_MS = 10 * 1000;
export const CTI_LOGIN_TIMEOUT_MS = 15 * 1000;

View File

@@ -32,6 +32,8 @@ export const ListHeaderSpecificConst = {
EMAIL: 31, EMAIL: 31,
FILE: 81, FILE: 81,
CONTENT_ITEM: 91, CONTENT_ITEM: 91,
// 장문(여러 줄 입력 텍스트). 저장·필터·다운로드는 서버에서 일반 텍스트(99)와 같게 처리한다.
MULTILINE_TEXT: 98,
} as const; } as const;
export const ListHeaderConst = { export const ListHeaderConst = {
@@ -44,6 +46,7 @@ type ListHeaderType = (typeof ListHeaderConst)[keyof typeof ListHeaderConst];
export const LIST_HEADER_TYPE_ORDER = [ export const LIST_HEADER_TYPE_ORDER = [
ListHeaderConst.TEXT, ListHeaderConst.TEXT,
ListHeaderConst.MULTILINE_TEXT,
ListHeaderConst.CONTENT_ITEM, ListHeaderConst.CONTENT_ITEM,
ListHeaderConst.TEL_NUM, ListHeaderConst.TEL_NUM,
ListHeaderConst.EMAIL, ListHeaderConst.EMAIL,
@@ -60,6 +63,7 @@ export const LIST_HEADER_TYPE_LABEL = {
[ListHeaderConst.FIELD_INTERVIEWER]: "면접원", [ListHeaderConst.FIELD_INTERVIEWER]: "면접원",
[ListHeaderConst.MEMO]: "중요 메모", [ListHeaderConst.MEMO]: "중요 메모",
[ListHeaderConst.TEXT]: "일반", [ListHeaderConst.TEXT]: "일반",
[ListHeaderConst.MULTILINE_TEXT]: "장문",
[ListHeaderConst.TEL_NUM]: "전화번호", [ListHeaderConst.TEL_NUM]: "전화번호",
[ListHeaderConst.EMAIL]: "이메일", [ListHeaderConst.EMAIL]: "이메일",
[ListHeaderConst.FILE]: "파일 업로드", [ListHeaderConst.FILE]: "파일 업로드",

74
src/const/listJobConst.ts Normal file
View File

@@ -0,0 +1,74 @@
import type { ListDownloadMode } from '@/types/list'
import type { MessageSendChannel } from '@/types/message'
import type { DialogId } from '@/store/jotai/dialog'
import { isListJobType, type ListJobOperation, type ListJobType } from '@/types/list-job'
export const LIST_JOB_TYPE_LABEL: Record<ListJobType, string> = {
LIST_UPLOAD: '리스트 업로드',
LIST_RESET: '리스트 초기화',
LIST_UPDATE: '리스트 일괄 수정',
LIST_ASSIGN: '배정 작업',
LIST_DOWNLOAD: '리스트 다운로드',
CONTACT_HISTORY_DOWNLOAD: '컨택 이력 다운로드',
UPDATE_HISTORY_DOWNLOAD: '리스트 수정 이력 다운로드',
ITEM_ZIP_DOWNLOAD: '첨부파일 ZIP 다운로드',
EMAIL_BULK: '이메일 일괄 발송',
SMS_BULK: '문자 일괄 발송',
KKO_BULK: '알림톡 일괄 발송',
}
export const LIST_ASSIGN_OPERATION_LABEL: Record<ListJobOperation, string> = {
ASSIGN: '배정',
RESET: '배정 초기화',
}
/** 작업 표시 이름. LIST_ASSIGN은 operation(배정/배정 초기화)으로 구분한다. */
export const listJobLabel = (jobType: string, operation?: ListJobOperation | null) => {
if (jobType === 'LIST_ASSIGN' && operation) return LIST_ASSIGN_OPERATION_LABEL[operation]
return isListJobType(jobType) ? LIST_JOB_TYPE_LABEL[jobType] : '리스트 작업'
}
export const LIST_JOB_STATUS_LABEL: Record<string, string> = {
QUEUED: '대기', RUNNING: '진행 중', CANCEL_REQUESTED: '중단 요청 중', SUCCEEDED: '완료', PARTIALLY_SUCCEEDED: '일부 접수 완료',
FAILED: '실패', CANCELLED: '중단', REJECTED: '접수 거절',
}
export const LIST_JOB_STAGE_LABEL: Record<string, string> = {
ACCEPTED: '접수', VALIDATING: '파일 검증', VALIDATION_FAILED: '파일 검증 실패',
FREEZING_SIDS: '대상 확정', PROCESSING: '처리 중', INSERTING: '데이터 등록',
RESETTING: '기존 데이터 초기화', RESETTING_ALL: '기존 데이터 전체 초기화',
POST_PROCESSING: '후처리', COMPLETED: '처리 종료', GENERATING: '파일 생성', GENERATING_FILE: '파일 생성',
WRITING_FILE: '파일 저장', RESET_CHECK: '전체 초기화 확인', PREPARING: '발송 준비', SENDING: '발송 요청',
}
export const LIST_DOWNLOAD_JOB_TYPE: Record<ListDownloadMode, ListJobType> = {
list: 'LIST_DOWNLOAD',
'contact-history': 'CONTACT_HISTORY_DOWNLOAD',
'list-change-history': 'UPDATE_HISTORY_DOWNLOAD',
'upload-file': 'ITEM_ZIP_DOWNLOAD',
}
export const MESSAGE_JOB_TYPE: Record<MessageSendChannel, ListJobType> = {
email: 'EMAIL_BULK',
sms: 'SMS_BULK',
kko: 'KKO_BULK',
}
export const LIST_JOB_VIEW: Record<ListJobType, {
path: '/list/manage' | '/assign/list'
dialogId?: DialogId
downloadMode?: ListDownloadMode
messageMode?: MessageSendChannel
}> = {
LIST_UPLOAD: { path: '/list/manage', dialogId: 'listUploadDialog' },
LIST_RESET: { path: '/list/manage', dialogId: 'listResetDialog' },
LIST_UPDATE: { path: '/list/manage', dialogId: 'listBatchEditDialog' },
LIST_ASSIGN: { path: '/assign/list' },
LIST_DOWNLOAD: { path: '/list/manage', dialogId: 'listDownloadDialog', downloadMode: 'list' },
CONTACT_HISTORY_DOWNLOAD: { path: '/list/manage', dialogId: 'listDownloadDialog', downloadMode: 'contact-history' },
UPDATE_HISTORY_DOWNLOAD: { path: '/list/manage', dialogId: 'listDownloadDialog', downloadMode: 'list-change-history' },
ITEM_ZIP_DOWNLOAD: { path: '/list/manage', dialogId: 'listDownloadDialog', downloadMode: 'upload-file' },
EMAIL_BULK: { path: '/list/manage', dialogId: 'messageSendDialog', messageMode: 'email' },
SMS_BULK: { path: '/list/manage', dialogId: 'messageSendDialog', messageMode: 'sms' },
KKO_BULK: { path: '/list/manage', dialogId: 'messageSendDialog', messageMode: 'kko' },
}

View File

@@ -18,19 +18,28 @@ export const KKO_TEMPLATE_KEYWORD_MAX_LENGTH = 50;
export const SMS_TYPE_ORDER = [ export const SMS_TYPE_ORDER = [
MessageType.SMS, MessageType.SMS,
MessageType.LMS_MMS, MessageType.LMS,
MessageType.MMS,
] as const; ] as const;
export const SMS_TYPE_LABEL = { export const SMS_TYPE_LABEL = {
[MessageType.SMS]: "SMS", [MessageType.SMS]: "SMS",
[MessageType.LMS_MMS]: "LMS/MMS", [MessageType.LMS]: "LMS",
[MessageType.MMS]: "MMS",
} as const satisfies Record<SmsType, string>; } as const satisfies Record<SmsType, string>;
export const SMS_TYPE_OPTIONS = [ export const SMS_TYPE_OPTIONS = [
{ value: MessageType.SMS, label: SMS_TYPE_LABEL[MessageType.SMS] }, { value: MessageType.SMS, label: SMS_TYPE_LABEL[MessageType.SMS] },
{ value: MessageType.LMS_MMS, label: SMS_TYPE_LABEL[MessageType.LMS_MMS] }, { value: MessageType.LMS, label: SMS_TYPE_LABEL[MessageType.LMS] },
{ value: MessageType.MMS, label: SMS_TYPE_LABEL[MessageType.MMS] },
] as const; ] as const;
export const MESSAGE_TYPE_LABEL: Record<number, string> = {
...SMS_TYPE_LABEL,
[MessageType.EMAIL]: "메일",
[MessageType.KKO]: "알림톡",
};
export const TEMPLATE_PURPOSE = { export const TEMPLATE_PURPOSE = {
NORMAL: TemplatePurpose.NORMAL, NORMAL: TemplatePurpose.NORMAL,
PHONE_VERIFICATION: TemplatePurpose.PHONE_VERIFICATION, PHONE_VERIFICATION: TemplatePurpose.PHONE_VERIFICATION,
@@ -47,7 +56,7 @@ export const PHONE_VERIFICATION_PREVIEW_SUFFIX = "인증번호는 [######] 입
export const EMAIL_TEMPLATE_ATTACHMENT_MAX_COUNT = 5; export const EMAIL_TEMPLATE_ATTACHMENT_MAX_COUNT = 5;
export const EMAIL_TEMPLATE_ATTACHMENT_MAX_BYTES = 1_000_000; export const EMAIL_TEMPLATE_ATTACHMENT_MAX_BYTES = 1_000_000;
// 문자 템플릿 첨부파일 제한 (JPG만 허용, 파일당 이하 기준, 첨부 시 LMS/MMS로 저장됨) // 문자 템플릿 첨부파일 제한 (JPG만 허용, 파일당 이하 기준, 첨부 시 MMS로 저장됨)
export const SMS_TEMPLATE_ATTACHMENT_MAX_COUNT = 3; export const SMS_TEMPLATE_ATTACHMENT_MAX_COUNT = 3;
export const SMS_TEMPLATE_ATTACHMENT_MAX_BYTES = 61_440; export const SMS_TEMPLATE_ATTACHMENT_MAX_BYTES = 61_440;
export const SMS_TEMPLATE_ATTACHMENT_EXTENSION = ".jpg"; export const SMS_TEMPLATE_ATTACHMENT_EXTENSION = ".jpg";

View File

@@ -6,6 +6,14 @@
// 그 외 문자(이모지, 다른 언어 문자, 제어문자 등)는 전부 거부한다. // 그 외 문자(이모지, 다른 언어 문자, 제어문자 등)는 전부 거부한다.
export const COMMON_TEXT_REGEX = /^[가-힣A-Za-z0-9 !@#$%^&*()_+\-={}\[\]:;"'<>,.?/·~]+$/ export const COMMON_TEXT_REGEX = /^[가-힣A-Za-z0-9 !@#$%^&*()_+\-={}\[\]:;"'<>,.?/·~]+$/
// 메시지 템플릿의 제목·템플릿명·발신자명용. 다국어(스페인어, 일본어 등)와 기호는 허용하고
// 제어·서식 문자, 줄/문단 구분자, 이모지만 거부한다.
// tsconfig target(ES2017)에서 \p{...} 리터럴 대신 RegExp 생성자로 만든다.
export const TEMPLATE_TEXT_REGEX = new RegExp(
"^[^\\p{C}\\p{Zl}\\p{Zp}\\p{Emoji_Presentation}\\u{FE0F}\\u{20E3}]+$",
"u",
)
// 이메일 기본 형식(로컬@도메인.최상위도메인)만 확인한다. 세부 규칙은 백엔드 검증을 따른다. // 이메일 기본 형식(로컬@도메인.최상위도메인)만 확인한다. 세부 규칙은 백엔드 검증을 따른다.
export const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/ export const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/

View File

@@ -0,0 +1,77 @@
"use client";
import { useEffect } from "react";
import { useAtomValue, useStore } from "jotai";
import { useQuery, useQueryClient } from "@tanstack/react-query";
import { useRouter } from "next/navigation";
import { apiError } from "@kri/common/http";
import { authStateAtom, useAuth } from "@/hooks/useAuth";
import { selectedProjectAtom, selectedProjectHydratedAtom } from "@/store/jotai/project";
import { nextApi } from "@/lib/http-client";
import { isLoginUser } from "@/lib/auth-user";
const SESSION_QUERY_KEY = ["auth-session"] as const;
export function useAuthSession() {
const store = useStore();
const queryClient = useQueryClient();
const router = useRouter();
const { setAuth } = useAuth();
useAtomValue(selectedProjectAtom);
const projectHydrated = useAtomValue(selectedProjectHydratedAtom);
const otherQueries = { predicate: (query: { queryKey: readonly unknown[] }) => query.queryKey[0] !== SESSION_QUERY_KEY[0] };
useEffect(() => {
const refresh = () => {
void queryClient.refetchQueries({ queryKey: SESSION_QUERY_KEY, exact: true, type: "active" }, { cancelRefetch: false });
};
window.addEventListener("focus", refresh);
return () => window.removeEventListener("focus", refresh);
}, [queryClient]);
return useQuery({
queryKey: SESSION_QUERY_KEY,
enabled: projectHydrated,
staleTime: 0,
gcTime: 0,
retry: false,
refetchOnMount: "always",
refetchOnWindowFocus: "always",
meta: { ignoreGlobalLoading: true },
queryFn: async ({ signal }) => {
const previous = store.get(authStateAtom);
try {
const user = await nextApi.get<unknown>("/auth/my-info", {
cache: "no-store",
skipUnauthorizedHandler: true, skipForbiddenHandler: true, skipResponseErrorHandler: true,
});
signal.throwIfAborted();
if (!isLoginUser(user)) throw new Error("Invalid user response");
const before = previous.user;
const changed = !before || before.userId !== user.userId || before.userRole !== user.userRole ||
before.userTeam !== user.userTeam || before.userCmpn !== user.userCmpn;
if (changed) {
await queryClient.cancelQueries(otherQueries);
signal.throwIfAborted();
queryClient.removeQueries(otherQueries);
queryClient.getMutationCache().clear();
}
if (changed || before?.userName !== user.userName) setAuth({ user });
return user;
} catch (reason) {
signal.throwIfAborted();
const status = apiError(reason).status;
if (status === 401 || status === 403) {
await queryClient.cancelQueries(otherQueries);
signal.throwIfAborted();
queryClient.removeQueries(otherQueries);
queryClient.getMutationCache().clear();
store.set(selectedProjectAtom, null);
setAuth({ user: null });
router.replace("/login");
}
throw reason;
}
},
});
}

View File

@@ -0,0 +1,108 @@
'use client'
import { useCallback, useEffect, useRef, useState } from 'react'
import { useQueryClient } from '@tanstack/react-query'
import { useAuth } from '@/hooks/useAuth'
import { useDialog } from '@/hooks/useDialog'
import { useListJobGate } from '@/components/list/ListJobGate'
import { observeListMutations } from '@/utils/listJobAvailability'
import type { ListJobType } from '@/types/list-job'
/** 두 목록 화면의 공용 감시. 타인의 변경 작업도 종료 시 현재 프로젝트 데이터를 갱신한다. */
export function useListJobPageMonitor(prjctIdx: number, jobType: ListJobType, active: boolean,
{ hasSelection = false, isSubmitting = false }: { hasSelection?: boolean; isSubmitting?: boolean } = {}) {
const gate = useListJobGate({ prjctIdx, jobType, active, pollWhileIdle: true, requestLabel: jobType === 'LIST_ASSIGN' ? '배정' : '업로드·초기화·일괄 수정' })
const qc = useQueryClient()
const { auth } = useAuth()
const { openDialogIds } = useDialog()
const userId = auth.user?.userId
const scope = JSON.stringify([userId, prjctIdx])
const previous = useRef<{ scope: string; snapshot: ReturnType<typeof observeListMutations>['snapshot'] } | null>(null)
const sequence = useRef(0)
const generation = useRef(0)
const [pendingChange, setPendingChange] = useState<{ scope: string; id: number } | null>(null)
const inFlight = useRef<{ scope: string; id: number } | null>(null)
const [refreshingScope, setRefreshingScope] = useState<string | null>(null)
const [errorScope, setErrorScope] = useState<string | null>(null)
const [isEditing, setIsEditing] = useState(false)
const [dataRevision, setDataRevision] = useState(0)
useEffect(() => {
if (!active || !userId) {
generation.current += 1
previous.current = null
setPendingChange(null)
setErrorScope(null)
return
}
if (previous.current?.scope !== scope) {
generation.current += 1
previous.current = null
setPendingChange(null)
setErrorScope(null)
}
const availability = gate.availability
if (!gate.availabilitySucceeded || !availability) return
const observation = observeListMutations(previous.current?.snapshot, availability)
previous.current = { scope, snapshot: observation.snapshot }
if (!observation.changed) return
sequence.current += 1
setPendingChange({ scope, id: sequence.current })
setErrorScope(null)
}, [active, userId, scope, gate.availability, gate.availabilitySucceeded, gate.availabilityUpdatedAt])
useEffect(() => {
if (!active) return
const editing = (element: EventTarget | null) => element instanceof HTMLElement
&& (element.matches('input, textarea, [contenteditable="true"], [role="combobox"]')
|| !!element.closest('[role="listbox"]'))
const focusIn = (event: FocusEvent) => setIsEditing(editing(event.target))
const focusOut = (event: FocusEvent) => setIsEditing(editing(event.relatedTarget))
setIsEditing(editing(document.activeElement))
document.addEventListener('focusin', focusIn)
document.addEventListener('focusout', focusOut)
return () => {
document.removeEventListener('focusin', focusIn)
document.removeEventListener('focusout', focusOut)
}
}, [active])
const pendingRefresh = active && !!userId && pendingChange?.scope === scope
const refreshing = refreshingScope === scope
const refreshError = errorScope === scope
const refreshBlocked = openDialogIds.length > 0 || isSubmitting
|| !gate.availabilitySucceeded || gate.status !== 'allowed'
const refresh = useCallback(async () => {
if (!pendingRefresh || !pendingChange || refreshBlocked || inFlight.current?.scope === scope) return
const request = pendingChange
const requestGeneration = generation.current
inFlight.current = request
setRefreshingScope(scope)
setErrorScope(null)
try {
await qc.invalidateQueries({ predicate: query =>
(query.queryKey[0] === 'list' || query.queryKey[0] === 'assign') && query.queryKey[2] === prjctIdx },
{ throwOnError: true })
if (previous.current?.scope !== scope || generation.current !== requestGeneration) return
// 조회 중 새 변경이 감지됐다면 다음 갱신 대상으로 남긴다.
setPendingChange(current => current === request ? null : current)
setDataRevision(revision => revision + 1)
} catch {
if (previous.current?.scope === scope && generation.current === requestGeneration) setErrorScope(scope)
} finally {
if (inFlight.current === request) {
inFlight.current = null
setRefreshingScope(current => current === scope ? null : current)
}
}
}, [pendingRefresh, pendingChange, refreshBlocked, scope, prjctIdx, qc])
useEffect(() => {
if (pendingRefresh && !hasSelection && !isEditing && !refreshing && !refreshError) void refresh()
}, [pendingRefresh, hasSelection, isEditing, refreshing, refreshError, refresh])
return { gate, dataRevision, pendingRefresh, refreshing, refreshError, refreshBlocked, refresh }
}
export type ListJobPageMonitor = ReturnType<typeof useListJobPageMonitor>

View File

@@ -0,0 +1,36 @@
"use client";
import { useAuth } from "@/hooks/useAuth";
import { formatSendCancelResult, resolveSendCancelErrorMessage, useCancelSendMutation } from "@/query/message";
import type { SendCancelRequest } from "@/types/message";
import { isFieldWorkUser } from "@/utils/userRole";
/**
* 예약 취소 확인 → 요청 → 결과 안내.
* 최종 취소 가능 여부는 서버 응답 건수로 판단하며, 요청 중에는 isPending으로 중복 요청을 막는다.
* 면접원(FW 역할 그룹)에게는 취소 기능을 제공하지 않는다(canCancel=false).
*/
export function useSendCancel() {
const { auth } = useAuth();
const cancelMutation = useCancelSendMutation();
const canCancel = auth.user != null && !isFieldWorkUser(auth.user.userRole);
const cancel = async (request: SendCancelRequest) => {
if (!canCancel || cancelMutation.isPending) return;
const confirmMessage =
request.type === "bulk"
? "이 대량발송의 예약 건을 모두 취소하시겠습니까?\n이미 발송이 시작된 건은 취소되지 않습니다."
: "이 예약 발송을 취소하시겠습니까?\n이미 발송이 시작된 건은 취소되지 않습니다.";
if (!window.confirm(confirmMessage)) return;
try {
const res = await cancelMutation.mutateAsync(request);
alert(`예약 취소 요청이 처리되었습니다.\n${formatSendCancelResult(res)}`);
} catch (error: unknown) {
alert(resolveSendCancelErrorMessage(error));
}
};
return { canCancel, cancel, isPending: cancelMutation.isPending } as const;
}

33
src/lib/auth-cookie.ts Normal file
View File

@@ -0,0 +1,33 @@
import "server-only";
import { NextResponse } from "next/server";
import { AUTH_COOKIE_MAX_AGE } from "@/const/commonConst";
import { serverEnv } from "@/lib/env.server";
import { CookieKeys } from "@/store/cookie/cookie-keys";
/** Issue/renew the normal-login cookie, or expire it when the token is empty. */
export function setAuthCookie(response: NextResponse, token: string): void {
const production = serverEnv.ENV === "prod";
const domain = serverEnv.AUTH_COOKIE_DOMAIN;
const options = {
httpOnly: true,
secure: production,
sameSite: "lax" as const,
path: "/",
};
// Serialize each cookie separately: ResponseCookies indexes cookies by name,
// so setting the shared and host-only variants on one instance loses a header.
const append = (value: string, cookieDomain: string | undefined, maxAge: number) => {
const cookieResponse = new NextResponse(null);
cookieResponse.cookies.set(CookieKeys.AuthToken, value, {
...options,
...(cookieDomain ? { domain: cookieDomain } : {}),
maxAge,
});
for (const header of cookieResponse.headers.getSetCookie())
response.headers.append("Set-Cookie", header);
};
if (domain) append("", undefined, 0);
append(token, domain, token ? AUTH_COOKIE_MAX_AGE : 0);
}

10
src/lib/auth-user.ts Normal file
View File

@@ -0,0 +1,10 @@
import {LoginUser} from "@kri/common";
export function isLoginUser(value: unknown): value is LoginUser {
if (!value || typeof value !== "object" || Array.isArray(value)) return false;
return "userId" in value && typeof value.userId === "string" && value.userId.length > 0 &&
"userName" in value && typeof value.userName === "string" &&
"userCmpn" in value && typeof value.userCmpn === "string" &&
"userTeam" in value && typeof value.userTeam === "string" &&
"userRole" in value && typeof value.userRole === "number" && Number.isSafeInteger(value.userRole);
}

File diff suppressed because it is too large Load Diff

View File

@@ -32,3 +32,9 @@ const KST_DATE_TIME_FORMAT = new Intl.DateTimeFormat('sv-SE', {
// 이메일·문자·알림톡 공통 형식이다. // 이메일·문자·알림톡 공통 형식이다.
export const toReserveSendDt = (localDateTime: string): string => export const toReserveSendDt = (localDateTime: string): string =>
KST_DATE_TIME_FORMAT.format(new Date(localDateTime)) 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()
}

View File

@@ -3,6 +3,8 @@ import { createEnv, env } from "@kri/common/config";
export const clientEnv = createEnv({ export const clientEnv = createEnv({
ENV: env.required("NEXT_PUBLIC_ENV", process.env.NEXT_PUBLIC_ENV), ENV: env.required("NEXT_PUBLIC_ENV", process.env.NEXT_PUBLIC_ENV),
KART_URL: env.required("NEXT_PUBLIC_KART_URL", process.env.NEXT_PUBLIC_KART_URL),
API_BASE: env.required("NEXT_PUBLIC_API_BASE", process.env.NEXT_PUBLIC_API_BASE), API_BASE: env.required("NEXT_PUBLIC_API_BASE", process.env.NEXT_PUBLIC_API_BASE),
API_INTERNAL: env.required("NEXT_PUBLIC_API_INTERNAL", process.env.NEXT_PUBLIC_API_INTERNAL), API_INTERNAL: env.required("NEXT_PUBLIC_API_INTERNAL", process.env.NEXT_PUBLIC_API_INTERNAL),

View File

@@ -5,13 +5,11 @@ import { createEnv, env } from "@kri/common/config";
export const serverEnv = createEnv({ export const serverEnv = createEnv({
ENV: env.required("ENV", process.env.ENV), ENV: env.required("ENV", process.env.ENV),
AUTH_COOKIE_DOMAIN: env.optional("AUTH_COOKIE_DOMAIN", process.env.AUTH_COOKIE_DOMAIN),
CONTACT_SERVER: env.required("CONTACT_SERVER", process.env.CONTACT_SERVER), CONTACT_SERVER: env.required("CONTACT_SERVER", process.env.CONTACT_SERVER),
API_CONTACT_SERVER: env.required("API_CONTACT_SERVER", process.env.API_CONTACT_SERVER), API_CONTACT_SERVER: env.required("API_CONTACT_SERVER", process.env.API_CONTACT_SERVER),
API_INTRANET_SERVER: env.required("API_INTRANET_SERVER", process.env.API_INTRANET_SERVER), API_INTRANET_SERVER: env.required("API_INTRANET_SERVER", process.env.API_INTRANET_SERVER),
API_KART_SERVER: env.required("API_KART_SERVER", process.env.API_KART_SERVER),
KART_API_KEY: env.required("KART_API_KEY", process.env.KART_API_KEY),
}); });

View File

@@ -32,10 +32,3 @@ export const createContactApiWithApiKey = (apiKey: string) => {
export const createIntranetApi = () => { export const createIntranetApi = () => {
return createServerApi(serverEnv.API_INTRANET_SERVER); return createServerApi(serverEnv.API_INTRANET_SERVER);
}; };
//Todo: Front에서 바로 붙지 말고 Backend를 통해서 처리 하도록 수정 필요
export const createKartApi = () => {
return createServerApi(serverEnv.API_KART_SERVER, {
"X-API-Key": serverEnv.KART_API_KEY,
});
};

View File

@@ -15,14 +15,14 @@ export const Security = createSecurity({
} }
const target = window as Window & { const target = window as Window & {
__kfpaCryptoConfigAlerted?: boolean; __kriContactCryptoConfigAlerted?: boolean;
}; };
if (target.__kfpaCryptoConfigAlerted) { if (target.__kriContactCryptoConfigAlerted) {
return; return;
} }
target.__kfpaCryptoConfigAlerted = true; target.__kriContactCryptoConfigAlerted = true;
window.alert(message); window.alert(message);
}, },
}); });

View File

@@ -1,42 +0,0 @@
"use client";
import { useMutation, useQueryClient } from "@tanstack/react-query";
import { nextApi } from "@/lib/http-client";
import { qk } from "@/query/key/keys";
import type { ListAssignRequest, ListAssignResetRequest } from "@/types/list";
const invalidateAssignSummaries = (qc: ReturnType<typeof useQueryClient>, prjctIdx: number) =>
Promise.all([
qc.invalidateQueries({ queryKey: qk.projectAssignCmpnSummary(prjctIdx) }),
qc.invalidateQueries({ queryKey: ["assign", "prjct-fieldwork-summary", prjctIdx] }),
]);
export function useUpsertListAssignMutation(prjctIdx: number) {
const qc = useQueryClient();
return useMutation({
mutationFn: ({ assignId, request }: { assignId: string; request: ListAssignRequest }) =>
nextApi.put<number>(`/assign/list/${prjctIdx}/${encodeURIComponent(assignId)}`, request),
onSuccess: async () => {
await Promise.all([
qc.invalidateQueries({ queryKey: ["list", "search-filter"] }),
invalidateAssignSummaries(qc, prjctIdx),
]);
},
});
}
export function useResetListAssignMutation(prjctIdx: number) {
const qc = useQueryClient();
return useMutation({
mutationFn: (request: ListAssignResetRequest) =>
nextApi.del<number>(`/assign/list/reset/${prjctIdx}`, { json: request }),
onSuccess: async () => {
await Promise.all([
qc.invalidateQueries({ queryKey: ["list", "search-filter"] }),
invalidateAssignSummaries(qc, prjctIdx),
]);
},
});
}

View File

@@ -1,9 +1,12 @@
"use client"; "use client";
import { useMutation, useQueryClient } from "@tanstack/react-query"; import { useMutation, useQueryClient } from "@tanstack/react-query";
import { useSetAtom } from "jotai";
import { nextApi } from "@/lib/http-client"; import { nextApi } from "@/lib/http-client";
import { useAuth } from "@/hooks/useAuth"; import { useAuth } from "@/hooks/useAuth";
import { useSelectedProject } from "@/hooks/useSelectedProject"; import { useSelectedProject } from "@/hooks/useSelectedProject";
import { clearTrackedListJobs } from "@/store/list-job-tracker";
import { listJobOpenRequestAtom } from "@/store/jotai/list-job";
import type { LoginUser } from "@kri/common"; import type { LoginUser } from "@kri/common";
export const useLoginMutation = () => { export const useLoginMutation = () => {
@@ -31,6 +34,7 @@ export const useLogoutMutation = () => {
const qc = useQueryClient(); const qc = useQueryClient();
const { auth, logout } = useAuth(); const { auth, logout } = useAuth();
const { clearSelectedProject } = useSelectedProject(); const { clearSelectedProject } = useSelectedProject();
const setListJobOpenRequest = useSetAtom(listJobOpenRequestAtom);
return useMutation({ return useMutation({
mutationFn: async () => { mutationFn: async () => {
@@ -49,6 +53,8 @@ export const useLogoutMutation = () => {
}, },
onSettled: () => { onSettled: () => {
clearSelectedProject(); clearSelectedProject();
clearTrackedListJobs();
setListJobOpenRequest(null);
logout(); logout();
qc.clear(); // 다음 사용자/세션에 서버상태 남지 않게 qc.clear(); // 다음 사용자/세션에 서버상태 남지 않게
}, },

View File

@@ -38,8 +38,6 @@ export const qk = {
/********** KON, KIWI 프로젝트 관련 KART에서 받아옴 **********/ /********** KON, KIWI 프로젝트 관련 KART에서 받아옴 **********/
kartProjectList: (itrntPrjctCd: string, userTeam: string, isKiwi: number, keyword: string) => kartProjectList: (itrntPrjctCd: string, userTeam: string, isKiwi: number, keyword: string) =>
["kart", "project-list", itrntPrjctCd, userTeam, isKiwi, keyword] as const, ["kart", "project-list", itrntPrjctCd, userTeam, isKiwi, keyword] as const,
surveyRedirectUrl: (isKiwi: number, pkey: string) =>
["kart", "survey-redirect-url", isKiwi, pkey] as const,
/********** KON, KIWI 프로젝트 관련 KART에서 받아옴 **********/ /********** KON, KIWI 프로젝트 관련 KART에서 받아옴 **********/
/********** 찐 인트라넷 관련 **********/ /********** 찐 인트라넷 관련 **********/
@@ -77,8 +75,9 @@ export const qk = {
templateAttachments: (tmplatIdx: number) => ["message-template", "attachment", tmplatIdx] as const, templateAttachments: (tmplatIdx: number) => ["message-template", "attachment", tmplatIdx] as const,
templateAttachment: (tmplatIdx: number, fileName: string) => templateAttachment: (tmplatIdx: number, fileName: string) =>
["message-template", "attachment", tmplatIdx, fileName] as const, ["message-template", "attachment", tmplatIdx, fileName] as const,
kkoTemplateList: (keyword: string) => ["message-template", "kko", "list", keyword] as const, kkoSenderProfiles: ["message-template", "kko", "profiles"] as const,
kkoTemplateDetail: (templateCode: string) => ["message-template", "kko", "detail", templateCode] as const, kkoTemplateList: (senderKey: string, keyword: string) => ["message-template", "kko", "list", senderKey, keyword] as const,
kkoTemplateDetail: (senderKey: string, templateCode: string) => ["message-template", "kko", "detail", senderKey, templateCode] as const,
bulkSendList: (sendTy: number, reqstSvc: string, prjctCd: string) => bulkSendList: (sendTy: number, reqstSvc: string, prjctCd: string) =>
["message-report", "bulk-list", sendTy, reqstSvc, prjctCd] as const, ["message-report", "bulk-list", sendTy, reqstSvc, prjctCd] as const,

160
src/query/list-job.ts Normal file
View File

@@ -0,0 +1,160 @@
'use client'
import { createContext, useContext } from 'react'
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useSetAtom } from 'jotai'
import { apiError, HttpError } from '@kri/common/http'
import { toast } from 'sonner'
import { nextApi } from '@/lib/http-client'
import { useAuth } from '@/hooks/useAuth'
import { trackListJob } from '@/store/list-job-tracker'
import { listJobOpenRequestAtom } from '@/store/jotai/list-job'
import { describeListJobAvailability } from '@/utils/listJobAvailability'
import {
parseListJob,
parseListJobAvailability,
parseMyActiveListJobs,
parseUploadResetActive,
type ListJobAvailability,
type ListJobType,
} from '@/types/list-job'
export const listJobKeys = {
detail: (userId: string | undefined, prjctIdx: number, jobKey: string | null) => ['listJob', userId, prjctIdx, jobKey] as const,
myActive: (userId: string | undefined, prjctIdx: number) => ['listJobMyActive', userId, prjctIdx] as const,
uploadResetActive: (userId: string | undefined, prjctIdx: number) => ['listJobUploadResetActive', userId, prjctIdx] as const,
availability: (userId: string | undefined, prjctIdx: number, jobType: ListJobType) => ['listJobAvailability', userId, prjctIdx, jobType] as const,
}
/** 페이지와 동일한 조회를 사용하는 다이얼로그는 별도 폴링을 만들지 않는다. */
export const ListJobPageQueryContext = createContext<ListJobType | null>(null)
/** 접수 직전 재확인에서 다른 작업이 막고 있어 요청을 보내지 않은 경우. */
class ListJobBlockedError extends Error {}
const fetchAvailability = async (prjctIdx: number, jobType: ListJobType) =>
parseListJobAvailability(await nextApi.get(`/list-jobs/${prjctIdx}/availability?jobType=${jobType}`, { skipResponseErrorHandler: true }))
/** 신규 API 미배포·롤백 상태. 반복 호출하지 않고 사전 안내만 중단한다. */
export const isAvailabilityUnsupported = (error: unknown) => error instanceof HttpError && error.status === 404
/**
* 작업을 더 이상 조회할 수 없는 경우. 기록을 지우고 반복 조회를 멈춘다.
* - 404: 작업이 만료됐거나 내 작업이 아니다.
* - 403 PROJECT_ACCESS_DENIED: 프로젝트가 삭제됐거나 접근 권한·배정·상태가 바뀌었다.
*/
export const isListJobGone = (error: unknown) => error instanceof HttpError
&& (error.status === 404 || (error.status === 403 && apiError(error).code === 'PROJECT_ACCESS_DENIED'))
export function useSubmitListJob(prjctIdx: number) {
const qc = useQueryClient()
const { auth } = useAuth()
const setOpenRequest = useSetAtom(listJobOpenRequestAtom)
const userId = auth.user?.userId
const invalidate = () => {
void qc.invalidateQueries({ queryKey: ['listJobAvailability', userId, prjctIdx] })
void qc.invalidateQueries({ queryKey: listJobKeys.myActive(userId, prjctIdx) })
void qc.invalidateQueries({ queryKey: listJobKeys.uploadResetActive(userId, prjctIdx) })
}
return useMutation({
retry: false,
mutationFn: async ({ jobType, path, body, file }: { jobType: ListJobType; path: string; body?: unknown; file?: File }) => {
// 조회 결과는 예약이 아니므로 접수 직전에 다시 확인한다. 404(미배포)면 서버 판단에 맡긴다.
let availability: ListJobAvailability | null = null
try {
availability = await fetchAvailability(prjctIdx, jobType)
} catch (error) {
if (!isAvailabilityUnsupported(error)) throw new ListJobBlockedError('작업 가능 여부를 확인하지 못했습니다. 잠시 후 다시 시도해 주세요.')
}
if (availability && !availability.allowed) throw new ListJobBlockedError(describeListJobAvailability(availability, jobType).message)
const url = `/list-jobs/${prjctIdx}/${path}`
const options = { skipResponseErrorHandler: true, timeoutMs: 120_000 }
let value: unknown
if (file) {
const form = new FormData()
form.append('file', file)
form.append('request', new Blob([JSON.stringify(body)], { type: 'application/json' }))
value = await nextApi.postForm(url, form, options)
} else value = await nextApi.post(url, body, options)
if (!value || typeof value !== 'object' || !('jobKey' in value)
|| typeof value.jobKey !== 'string' || !/^[a-f0-9]{32}$/.test(value.jobKey)) throw new Error('접수 응답을 확인할 수 없습니다.')
return { jobKey: value.jobKey }
},
onSuccess: ({ jobKey }, { jobType }) => {
setOpenRequest(previous => previous && previous.userId === userId && previous.prjctIdx === prjctIdx && previous.jobType === jobType ? null : previous)
if (userId) trackListJob({ userId, prjctIdx, jobType, jobKey })
invalidate()
},
onError: (error) => {
invalidate()
if (error instanceof ListJobBlockedError) {
toast.error(error.message)
return
}
const { code, message } = apiError(error)
// 충돌 메시지에는 거절 당시 요청자와 작업이 들어 있으므로 서버 detail을 그대로 보여준다.
if (code === 'LIST_JOB_PROJECT_CONFLICT' || code === 'LIST_JOB_USER_BUSY') toast.error(message)
else if (code === 'LIST_JOB_CAPACITY') toast.error('작업 대기 용량이 가득 찼습니다. 잠시 후 다시 시도해 주세요.')
else if (code === 'LIST_JOBS_UNAVAILABLE') toast.error('작업 접수를 준비 중입니다. 잠시 후 다시 시도해 주세요.')
else toast.error('작업 접수를 확인하지 못했습니다. 다시 요청하기 전에 진행 중인 작업이 있는지 확인해 주세요.')
},
meta: { ignoreGlobalLoading: true },
})
}
export function useListJob(prjctIdx: number, jobKey: string | null, enabled: boolean) {
const { auth } = useAuth()
return useQuery({
queryKey: listJobKeys.detail(auth.user?.userId, prjctIdx, jobKey),
queryFn: async () => parseListJob(await nextApi.get(`/list-jobs/${prjctIdx}/${jobKey}`, { skipResponseErrorHandler: true })),
enabled: enabled && !!jobKey && !!auth.user,
retry: false,
meta: { ignoreGlobalLoading: true },
})
}
export function useMyActiveListJobs(prjctIdx: number, enabled: boolean) {
const { auth } = useAuth()
return useQuery({
queryKey: listJobKeys.myActive(auth.user?.userId, prjctIdx),
queryFn: async () => parseMyActiveListJobs(await nextApi.get(`/list-jobs/${prjctIdx}/my-active`, { skipResponseErrorHandler: true })),
enabled: enabled && prjctIdx > 0 && !!auth.user,
refetchInterval: 5000,
retry: false,
meta: { ignoreGlobalLoading: true },
})
}
export function useUploadResetActive(prjctIdx: number, enabled: boolean) {
const { auth } = useAuth()
const pageQuery = useContext(ListJobPageQueryContext)
return useQuery({
queryKey: listJobKeys.uploadResetActive(auth.user?.userId, prjctIdx),
queryFn: async () => parseUploadResetActive(await nextApi.get(`/list-jobs/${prjctIdx}/upload-reset-active`, { skipResponseErrorHandler: true })),
enabled: enabled && prjctIdx > 0 && !!auth.user,
refetchInterval: pageQuery ? false : 3000,
retry: false,
meta: { ignoreGlobalLoading: true },
})
}
/** 페이지는 평상시 10초·차단 중 3초, 다이얼로그는 차단 중에만 3초 조회한다. */
export function useListJobAvailability(prjctIdx: number, jobType: ListJobType, enabled: boolean, pollWhileIdle = false) {
const { auth } = useAuth()
const pageQuery = useContext(ListJobPageQueryContext)
const qc = useQueryClient()
const queryKey = listJobKeys.availability(auth.user?.userId, prjctIdx, jobType)
return useQuery({
queryKey,
queryFn: () => fetchAvailability(prjctIdx, jobType),
enabled: enabled && prjctIdx > 0 && !!auth.user && !isAvailabilityUnsupported(qc.getQueryState(queryKey)?.error),
refetchInterval: query => {
if (query.state.status !== 'success' || (pageQuery === jobType && !pollWhileIdle)) return false
return query.state.data?.allowed === false ? 3000 : pollWhileIdle ? 10000 : false
},
retry: false,
retryOnMount: false,
meta: { ignoreGlobalLoading: true },
})
}

View File

@@ -3,22 +3,18 @@ import {qk} from "@/query/key/keys";
import {nextApi} from "@/lib/http-client"; import {nextApi} from "@/lib/http-client";
import { import {
listHeader, listHeader,
ListEventHistDownloadRequest,
ListEventHistory, ListEventHistory,
ListEventInsertRequest, ListEventInsertRequest,
ListFilter,
ListReserve, ListReserve,
ListReserveRequest, ListReserveRequest,
ListResetRequest,
ListSearchRequest, ListSearchRequest,
ListSearchWithFullResult, ListSearchWithFullResult,
ListUpdateHistory, ListUpdateHistory,
ListUpdateRequest, ListUpdateRequest,
ListUploadHistory, ListUploadHistory,
ListUploadRequest,
} from "@/types/list"; } from "@/types/list";
import type { ExcelUploadResult, PageResponse } from "@kri/common"; import type { PageResponse } from "@kri/common";
import {LIST_EXCEL_TIMEOUT_MS, ListHeaderAssignConst} from "@/const/listConst"; import {ListHeaderAssignConst} from "@/const/listConst";
import {ResultCodeType} from "@/types/project"; import {ResultCodeType} from "@/types/project";
export function useListHeaderQuery(prjctIdx: number, enabled: boolean) { export function useListHeaderQuery(prjctIdx: number, enabled: boolean) {
@@ -187,28 +183,6 @@ export function useListUploadHistoryQuery(prjctIdx: number, enabled: boolean) {
}); });
} }
export function useUploadListExcelMutation(prjctIdx: number) {
const queryClient = useQueryClient();
return useMutation({
mutationFn: ({ file, request }: { file: File; request: ListUploadRequest }) => {
const formData = new FormData();
formData.append("file", file);
formData.append("request", new Blob([JSON.stringify(request)], { type: "application/json" }));
return nextApi.postForm<ExcelUploadResult>(`/list/excel-upload/${prjctIdx}`, formData, {
timeoutMs: LIST_EXCEL_TIMEOUT_MS,
});
},
onSuccess: async () => {
await Promise.all([
queryClient.invalidateQueries({ queryKey: qk.listHeader(prjctIdx) }),
queryClient.invalidateQueries({ queryKey: qk.listUploadHistory(prjctIdx) }),
queryClient.invalidateQueries({ queryKey: ["list", "search-filter"] }),
]);
},
});
}
export function useUpdateListHeaderMutation(prjctIdx: number) { export function useUpdateListHeaderMutation(prjctIdx: number) {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@@ -220,17 +194,6 @@ export function useUpdateListHeaderMutation(prjctIdx: number) {
}); });
} }
export function useResetListMutation(prjctIdx: number) {
const queryClient = useQueryClient();
return useMutation({
mutationFn: (request: ListResetRequest) => nextApi.del<number>(`/list/${prjctIdx}`, { json: request }),
onSuccess: async () => {
await queryClient.invalidateQueries({ queryKey: ["list"] });
},
});
}
export function useUpdateListMutation(prjctIdx: number) { export function useUpdateListMutation(prjctIdx: number) {
const queryClient = useQueryClient(); const queryClient = useQueryClient();
@@ -275,40 +238,6 @@ export function useDeleteListEventMutation(prjctIdx: number, sid: string) {
}); });
} }
export function useDownloadListMutation(prjctIdx: number) {
return useMutation({
mutationFn: ({ listFilter, includeResult }: { listFilter: ListFilter; includeResult: boolean }) =>
nextApi.post<ArrayBuffer>(`/list/excel-download/${prjctIdx}?includeResult=${includeResult}`, listFilter, {
expectBinary: true,
timeoutMs: LIST_EXCEL_TIMEOUT_MS,
}),
});
}
export function useDownloadListUpdateHistoryMutation(prjctIdx: number) {
return useMutation({
mutationFn: (listFilter: ListFilter) =>
nextApi.post<ArrayBuffer>(`/list/excel-download-update/${prjctIdx}`, listFilter, { expectBinary: true }),
});
}
export function useDownloadListEventHistoryMutation(prjctIdx: number) {
return useMutation({
mutationFn: ({ includeResult, ...request }: ListEventHistDownloadRequest & { includeResult: boolean }) =>
nextApi.post<ArrayBuffer>(`/list/event-history-download/${prjctIdx}?includeResult=${includeResult}`, request, {
expectBinary: true,
timeoutMs: LIST_EXCEL_TIMEOUT_MS,
}),
});
}
export function useDownloadListItemFileMutation(prjctIdx: number) {
return useMutation({
mutationFn: (listFilter: ListFilter) =>
nextApi.post<ArrayBuffer>(`/list/item-file-download/${prjctIdx}`, listFilter, { expectBinary: true }),
});
}
export function useDownloadUploadHistoryFileMutation(prjctIdx: number) { export function useDownloadUploadHistoryFileMutation(prjctIdx: number) {
return useMutation({ return useMutation({
mutationFn: (listUploadLogId: string) => mutationFn: (listUploadLogId: string) =>

View File

@@ -5,20 +5,23 @@ import { nextApi } from "@/lib/http-client";
import { qk } from "@/query/key/keys"; import { qk } from "@/query/key/keys";
import type { import type {
BulkSendInfo, BulkSendInfo,
BulkSendResult,
ChannelType, ChannelType,
KkoTemplateDetail, KkoTemplateDetail,
KkoTemplateListResponse, KkoTemplateListResponse,
SendCancelResponse,
SendResultInfo, SendResultInfo,
SendResultSummaryRequest, SendResultSummaryRequest,
SendResultSummaryResponse, SendResultSummaryResponse,
} from "@kri/common/noti-hub"; } from "@kri/common/noti-hub";
import { parseSendCancelResponse } from "@kri/common/noti-hub";
import type { FileResponse, PageRequest, PageResponse } from "@kri/common"; import type { FileResponse, PageRequest, PageResponse } from "@kri/common";
import { apiError, HttpError } from "@kri/common/http";
import type { ProjectMainTemplateUpdateRequest } from "@/types/project"; import type { ProjectMainTemplateUpdateRequest } from "@/types/project";
import type { import type {
MessageSendBulkRequest, KkoSenderProfile,
MessageSendChannel, MessageSendChannel,
MessageSendSingleRequest, MessageSendSingleRequest,
SendCancelRequest,
SendSingleResponse, SendSingleResponse,
} from "@/types/message"; } from "@/types/message";
import type { TemplateAttachmentImage, TemplateSummaryWithPurpose, TemplateWithPurpose } from "@/types/message"; import type { TemplateAttachmentImage, TemplateSummaryWithPurpose, TemplateWithPurpose } from "@/types/message";
@@ -89,6 +92,42 @@ export function useSaveTemplateMutation(chnnlTy: ChannelType, itrntPrjctCd: stri
}); });
} }
export const resolveDeleteTemplateErrorMessage = (error: unknown) => {
if (error instanceof HttpError) {
const { code, message } = apiError(error, { fallbackMessage: "템플릿을 삭제하지 못했습니다." });
if (error.status === 409 || code === "TEMPLATE_IN_USE") return "사용 중인 템플릿이라 삭제할 수 없습니다.";
if (error.status === 403 || code === "MESSAGE_TEMPLATE_FORBIDDEN") return "템플릿 관리 권한이 없습니다.";
return message;
}
return "템플릿을 삭제하지 못했습니다.";
};
/**
* 템플릿 삭제 (DELETE /message-template/{tmplatIdx})
* 403으로 전역 로그아웃되지 않도록 기본 오류 처리를 건너뛰고, 화면에서 resolveDeleteTemplateErrorMessage로 안내한다.
* 해당 템플릿의 대표 연결은 서버에서 제거하므로 성공 시 목록과 대표 템플릿을 다시 불러온다.
*/
export function useDeleteTemplateMutation(chnnlTy: ChannelType, itrntPrjctCd: string, prjctIdx: number) {
const qc = useQueryClient();
return useMutation({
mutationFn: async (tmplatIdx: number) => {
await nextApi.del(`/message-template/${tmplatIdx}`, {
expectText: true,
skipForbiddenHandler: true,
skipResponseErrorHandler: true,
});
},
retry: false,
onSuccess: (_data, tmplatIdx) => {
qc.removeQueries({ queryKey: qk.template(tmplatIdx) });
qc.removeQueries({ queryKey: qk.templateAttachments(tmplatIdx) });
qc.invalidateQueries({ queryKey: qk.templateList(chnnlTy, itrntPrjctCd) });
qc.invalidateQueries({ queryKey: qk.mainTemplate(prjctIdx, chnnlTy) });
},
});
}
/** /**
* 템플릿 첨부파일 단건 다운로드 (GET /message-template/{tmplatIdx}/attachment?fileName=...) * 템플릿 첨부파일 단건 다운로드 (GET /message-template/{tmplatIdx}/attachment?fileName=...)
*/ */
@@ -166,19 +205,41 @@ export function useUploadTemplateBodyImageMutation(itrntPrjctCd: string) {
}); });
} }
/** /** 외부 알림톡 발신 프로필 조회 */
* 외부 알림톡 템플릿 목록 (POST /message-template/kko/list) export function useKkoSenderProfilesQuery(enabled: boolean) {
* keyword가 빈 값이면 기본 목록(ACT 상태 첫 페이지 최대 10개)을 조회한다.
*/
export function useKkoTemplateListQuery(keyword: string, enabled: boolean) {
return useQuery({ return useQuery({
queryKey: qk.kkoTemplateList(keyword), queryKey: qk.kkoSenderProfiles,
queryFn: async () => { queryFn: async () => {
const res = await nextApi.post<KkoTemplateListResponse>(`/message-template/kko/list`, keyword ? { keyword } : {}); const profiles: unknown = await nextApi.get("/message-template/kko/profiles");
if (!Array.isArray(profiles) || !profiles.every((profile) =>
profile && typeof profile.senderKey === "string" && profile.senderKey.trim() &&
typeof profile.name === "string" && typeof profile.uuid === "string" && profile.uuid.trim(),
)) throw new Error("발신 프로필 응답 형식이 올바르지 않습니다.");
return profiles as KkoSenderProfile[];
},
enabled,
retry: false,
meta: { ignoreGlobalLoading: true },
});
}
/** keyword가 빈 값이면 선택한 프로필의 기본 목록을 조회한다. */
export function useKkoTemplateListQuery(senderKey: string, keyword: string, enabled: boolean) {
return useQuery({
queryKey: qk.kkoTemplateList(senderKey, keyword),
queryFn: async () => {
const res = await nextApi
.post<KkoTemplateListResponse>(`/message-template/kko/list`, { senderKey, ...(keyword ? { keyword } : {}) }, {
skipResponseErrorHandler: true,
})
.catch((error: unknown) => {
console.log("[useKkoTemplateListQuery] Failed to load templates:", error instanceof Error ? error.message : "Unknown error");
throw error;
});
// 외부 응답이므로 list가 배열이 아닌 경우를 빈 목록으로 다룬다. // 외부 응답이므로 list가 배열이 아닌 경우를 빈 목록으로 다룬다.
return Array.isArray(res?.list) ? res.list : []; return Array.isArray(res?.list) ? res.list : [];
}, },
enabled, enabled: enabled && !!senderKey,
staleTime: 0, staleTime: 0,
retry: false, retry: false,
meta: { ignoreGlobalLoading: true }, meta: { ignoreGlobalLoading: true },
@@ -188,14 +249,14 @@ export function useKkoTemplateListQuery(keyword: string, enabled: boolean) {
/** /**
* 외부 알림톡 템플릿 상세 (POST /message-template/kko/detail) * 외부 알림톡 템플릿 상세 (POST /message-template/kko/detail)
*/ */
export const fetchKkoTemplateDetail = (templateCode: string) => export const fetchKkoTemplateDetail = (senderKey: string, templateCode: string) =>
nextApi.post<KkoTemplateDetail>(`/message-template/kko/detail`, { templateCode }); nextApi.post<KkoTemplateDetail>(`/message-template/kko/detail`, { senderKey, templateCode });
export function useKkoTemplateDetailQuery(templateCode: string, enabled: boolean) { export function useKkoTemplateDetailQuery(senderKey: string, templateCode: string, enabled: boolean) {
return useQuery({ return useQuery({
queryKey: qk.kkoTemplateDetail(templateCode), queryKey: qk.kkoTemplateDetail(senderKey, templateCode),
queryFn: () => fetchKkoTemplateDetail(templateCode), queryFn: () => fetchKkoTemplateDetail(senderKey, templateCode),
enabled: enabled && !!templateCode, enabled: enabled && !!senderKey && !!templateCode,
staleTime: 0, staleTime: 0,
retry: false, retry: false,
meta: { ignoreGlobalLoading: true }, meta: { ignoreGlobalLoading: true },
@@ -268,16 +329,6 @@ export function useSendSingleMessageMutation(channel: MessageSendChannel, prjctI
}); });
} }
/**
* 대량 발송 (POST /message-send/{channel}/bulk/{prjctIdx}, contactServer 경유)
*/
export function useSendBulkMessageMutation(channel: MessageSendChannel, prjctIdx: number) {
return useMutation({
mutationFn: (req: MessageSendBulkRequest) =>
nextApi.post<BulkSendResult>(`/message-send/${channel}/bulk/${prjctIdx}`, req),
});
}
/** /**
* SID 단위 발송 결과 목록 조회 (GET /message-report/send-result/{sid}/{prjctCd}/{reqstSvc}) * SID 단위 발송 결과 목록 조회 (GET /message-report/send-result/{sid}/{prjctCd}/{reqstSvc})
*/ */
@@ -302,3 +353,37 @@ export function useSendResultBySidQuery(
meta: { ignoreGlobalLoading: true }, meta: { ignoreGlobalLoading: true },
}); });
} }
export const formatSendCancelResult = (res: SendCancelResponse) =>
`취소 ${res.canceledCount.toLocaleString()}건 / 이미 취소 ${res.alreadyCanceledCount.toLocaleString()}건 / 취소 불가 ${res.notCancelableCount.toLocaleString()}건`;
// 타임아웃·연결 오류·게이트웨이 오류는 서버에서 취소가 처리됐을 수 있으므로 실패로 확정하지 않는다.
const UNCONFIRMED_CANCEL_STATUSES = new Set([0, 408, 502, 503, 504]);
export const resolveSendCancelErrorMessage = (error: unknown) => {
if (error instanceof HttpError && !UNCONFIRMED_CANCEL_STATUSES.has(error.status)) {
return apiError(error, { fallbackMessage: "예약 취소를 처리하지 못했습니다." }).message;
}
return "취소 처리 결과를 확인하지 못했습니다. 다시 조회된 목록에서 취소 상태를 확인해 주세요.";
};
/**
* 예약 취소 (POST /message-send/cancel/{single|bulk}, contactServer 경유)
* 취소 불가 건이 있어도 200으로 응답하므로 건수로 결과를 안내하고, 성공·실패와 무관하게 발송 조회를 다시 불러온다.
* 타임아웃 시 결과를 알 수 없으므로 자동 재시도하지 않는다.
*/
export function useCancelSendMutation() {
const queryClient = useQueryClient();
return useMutation({
mutationFn: async (req: SendCancelRequest) => {
const body = req.type === "single" ? { sendIdx: req.sendIdx } : { bulkSendKey: req.bulkSendKey };
const res = await nextApi.post<unknown>(`/message-send/cancel/${req.type}`, body, {
skipResponseErrorHandler: true,
});
return parseSendCancelResponse(res);
},
retry: false,
onSettled: () => queryClient.invalidateQueries({ queryKey: ["message-report"] }),
});
}

View File

@@ -121,8 +121,8 @@ export function useKartProjectListQuery(args: {
queryKey: qk.kartProjectList(args.itrntPrjctCd, args.userTeam, args.isKiwi, kw), queryKey: qk.kartProjectList(args.itrntPrjctCd, args.userTeam, args.isKiwi, kw),
queryFn: () => queryFn: () =>
nextApi.get<KonKiwiProjectInfo[]>( nextApi.get<KonKiwiProjectInfo[]>(
`/kart/project-list/${args.itrntPrjctCd}/${args.userTeam}/${args.isKiwi}`, `/kart/project-list/${encodeURIComponent(args.itrntPrjctCd)}/${args.isKiwi}`,
{ query: kw ? { keyword: kw } : {} } { query: kw ? { keyword: kw } : {}, skipForbiddenHandler: true }
), ),
enabled: args.enabled, enabled: args.enabled,
staleTime: 0, staleTime: 0,
@@ -131,19 +131,6 @@ export function useKartProjectListQuery(args: {
}); });
} }
/**
* KON/KIWI 설문 현황(리포트) 바로가기 URL
*/
export function useSurveyRedirectUrlQuery(isKiwi: number, pkey: string, enabled: boolean) {
return useQuery({
queryKey: qk.surveyRedirectUrl(isKiwi, pkey),
queryFn: () => nextApi.get<string>(`/kart/survey-redirect-url/${isKiwi}/${encodeURIComponent(pkey)}`),
enabled: enabled && !!pkey,
staleTime: 0,
meta: { ignoreGlobalLoading: true },
});
}
/** /**
* 프로젝트에 배정된 회사 ID 목록 * 프로젝트에 배정된 회사 ID 목록
*/ */
@@ -273,7 +260,7 @@ export function useDeleteProjectMutation(prjctIdx: number) {
/** /**
* 시나리오 이미지 업로드 (엔드포인트 spelling은 너 서버 기준으로) * 시나리오 이미지 업로드 (엔드포인트 spelling은 너 서버 기준으로)
*/ */
export function useUploadScenarioImageMutation(prjctIdx: number, prjctCd: string) { export function useUploadScenarioImageMutation(prjctCd: string) {
return useMutation({ return useMutation({
mutationFn: async (file: File): Promise<string> => { mutationFn: async (file: File): Promise<string> => {
const formData = new FormData(); const formData = new FormData();

View File

@@ -1,6 +1,6 @@
export const CookieKeys = { export const CookieKeys = {
FontSize: "kri_fontSize", FontSize: "kri_fontSize",
AuthToken: "kri_authToken", AuthToken: "kri_internal_authToken",
// 필요하면 여기 계속 추가 (예: Theme: "kri_theme", ...) // 필요하면 여기 계속 추가 (예: Theme: "kri_theme", ...)
} as const; } as const;

View File

@@ -0,0 +1,15 @@
"use client";
import { atom } from "jotai";
import type { ListJobType } from "@/types/list-job";
/** 완료 알림에서 원래 작업 화면을 열고, 해당 작업의 결과를 선택한다. */
export type ListJobOpenRequest = {
userId: string;
prjctIdx: number;
jobType: ListJobType;
jobKey: string;
opened: boolean;
};
export const listJobOpenRequestAtom = atom<ListJobOpenRequest | null>(null);

View File

@@ -0,0 +1,105 @@
'use client'
import { useSyncExternalStore } from 'react'
import { getLocalStorage, removeLocalStorage, setLocalStorage } from '@/store/storage/secure-storage'
import { StorageKeys } from '@/store/storage/storage-keys'
import { isListJobType, type ListJobType } from '@/types/list-job'
/**
* 사용자가 요청한 "현재" 비동기 작업 기록. 사용자·프로젝트·jobType별로 1건만 유지한다.
* 완료 상태를 표시한 다이얼로그를 사용자가 닫으면(확인) 기록을 지운다.
*/
export type TrackedListJob = {
userId: string
prjctIdx: number
jobType: ListJobType
jobKey: string
savedAt: number
/** 완료 toast를 이미 띄웠는지. 새로고침 후 중복 알림을 막는다. */
notified: boolean
}
// 다른 브라우저에서 이미 확인했을 수 있어 오래된 기록은 버린다.
const TTL_MS = 24 * 60 * 60 * 1000
const CHANGE_EVENT = 'kri:list-jobs-change'
const EMPTY: TrackedListJob[] = []
let cache: TrackedListJob[] | null = null
const isTrackedListJob = (value: unknown): value is TrackedListJob => {
if (!value || typeof value !== 'object') return false
const job = value as Record<string, unknown>
return typeof job.userId === 'string' && job.userId.length > 0
&& typeof job.prjctIdx === 'number' && Number.isInteger(job.prjctIdx) && job.prjctIdx > 0
&& isListJobType(job.jobType)
&& typeof job.jobKey === 'string' && /^[a-f0-9]{32}$/.test(job.jobKey)
&& typeof job.savedAt === 'number' && typeof job.notified === 'boolean'
}
const read = (): TrackedListJob[] => {
const stored = getLocalStorage<unknown>(StorageKeys.ListJobs)
if (!Array.isArray(stored)) return EMPTY
const now = Date.now()
return stored.filter(isTrackedListJob).filter((job) => now - job.savedAt < TTL_MS)
}
const write = (jobs: TrackedListJob[]) => {
setLocalStorage(StorageKeys.ListJobs, jobs)
cache = jobs
window.dispatchEvent(new Event(CHANGE_EVENT))
}
export const getTrackedListJobs = (): TrackedListJob[] => {
if (typeof window === 'undefined') return EMPTY
if (cache === null) cache = read()
return cache
}
export const trackListJob = (entry: Pick<TrackedListJob, 'userId' | 'prjctIdx' | 'jobType' | 'jobKey'>) => {
const jobs = getTrackedListJobs()
if (jobs.some((job) => job.jobKey === entry.jobKey)) return
write([
...jobs.filter((job) => !(job.userId === entry.userId && job.prjctIdx === entry.prjctIdx && job.jobType === entry.jobType)),
{ ...entry, savedAt: Date.now(), notified: false },
])
}
/** 아직 알리지 않은 기록이면 알림 처리하고 true를 반환한다. 중복 toast 방지용. */
export const markListJobNotified = (jobKey: string) => {
const jobs = getTrackedListJobs()
if (!jobs.some((job) => job.jobKey === jobKey && !job.notified)) return false
write(jobs.map((job) => (job.jobKey === jobKey ? { ...job, notified: true } : job)))
return true
}
export const untrackListJob = (jobKey: string) => {
const jobs = getTrackedListJobs()
if (!jobs.some((job) => job.jobKey === jobKey)) return
write(jobs.filter((job) => job.jobKey !== jobKey))
}
/** 로그아웃 시 다음 사용자에게 기록이 남지 않게 모두 지운다. 진행 중인 작업은 재로그인 후 my-active 조회로 다시 채워진다. */
export const clearTrackedListJobs = () => {
if (typeof window === 'undefined') return
removeLocalStorage(StorageKeys.ListJobs)
cache = EMPTY
window.dispatchEvent(new Event(CHANGE_EVENT))
}
export const findTrackedListJob = (jobs: TrackedListJob[], userId: string, prjctIdx: number, jobType: ListJobType) =>
jobs.find((job) => job.userId === userId && job.prjctIdx === prjctIdx && job.jobType === jobType)
const subscribe = (onChange: () => void) => {
const handleStorage = (event: StorageEvent) => {
if (event.key !== null && event.key !== StorageKeys.ListJobs) return
cache = null
onChange()
}
window.addEventListener(CHANGE_EVENT, onChange)
window.addEventListener('storage', handleStorage)
return () => {
window.removeEventListener(CHANGE_EVENT, onChange)
window.removeEventListener('storage', handleStorage)
}
}
export const useTrackedListJobs = () => useSyncExternalStore(subscribe, getTrackedListJobs, () => EMPTY)

Some files were not shown because too many files have changed in this diff Show More