Compare commits

...

31 Commits

Author SHA1 Message Date
afb9ff8fa8 Merge pull request '261119_01_ENH: 리스트 필터 다이얼로그에 필터 초기화 버튼 추가' (#78) from develop into master
Reviewed-on: #78
2026-11-20 15:50:05 +09:00
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
a1835bd63a Merge pull request 'develop' (#77) from develop into master
Reviewed-on: #77
2026-11-19 06:59:29 +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
f0cf4a3f71 Merge pull request '261112_02_ENH: CTI 통화 이력 복구·재시도 로직 제거 및 시작·종료 저장 단일 요청으로 간소화' (#76) from develop into master
Reviewed-on: #76
2026-11-12 15:20:09 +09:00
606b6e30d0 261112_02_ENH: CTI 통화 이력 복구·재시도 로직 제거 및 시작·종료 저장 단일 요청으로 간소화 2026-11-12 14:01:28 +09:00
d76176ef5b Merge pull request '261112_01_FIX: CTI 종료 이력 저장 404 시 재시도 중단 및 오류 팝업 미노출' (#75) from develop into master
Reviewed-on: #75
2026-11-12 12:08:09 +09:00
4daf2daf9c 261112_01_FIX: CTI 종료 이력 저장 404 시 재시도 중단 및 오류 팝업 미노출 2026-11-12 12:07:13 +09:00
939a112513 Merge pull request 'develop' (#74) from develop into master
Reviewed-on: #74
2026-11-11 08:29:47 +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
679a5f4b19 Merge pull request '261105_02_ENH: 문자·이메일·알림톡 예약 발송 시 과거 일시 선택 차단' (#73) from develop into master
Reviewed-on: #73
2026-11-05 12:37:00 +09:00
d595ea8b8c 261105_02_ENH: 문자·이메일·알림톡 예약 발송 시 과거 일시 선택 차단 2026-11-05 12:36:08 +09:00
2338c991d9 Merge pull request '261105_01_FIX: 리스트 헤더 저장 및 업로드 헤더 비교 시 Trim 적용' (#72) from develop into master
Reviewed-on: #72
2026-11-05 11:51:01 +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
052fb97a51 Merge pull request 'develop' (#71) from develop into master
Reviewed-on: #71
2026-11-03 16:57:20 +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
8ef8de9dae Merge pull request '261103_01_FIX: KriAutoComplete 기본 검색을 contains 방식으로 변경' (#70) from develop into master
Reviewed-on: #70
2026-11-03 09:03:23 +09:00
d91fc8f5a8 261103_01_FIX: KriAutoComplete 기본 검색을 contains 방식으로 변경 2026-11-03 08:37:04 +09:00
3b7377a5ab Merge pull request 'develop' (#69) from develop into master
Reviewed-on: #69
2026-11-02 18:35:31 +09:00
491b5a5e9f 261102_07_FIX: 통화 중 새로고침 시 컨택 페이지 이탈 방지 및 CTI 송수신 로그 추가 2026-11-02 18:28:43 +09:00
c575094aad Merge pull request 'develop' (#67) from develop into master
Reviewed-on: #67
2026-11-02 12:12:55 +09:00
45 changed files with 2735 additions and 444 deletions

View File

@@ -6,3 +6,4 @@ 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
AUTH_COOKIE_DOMAIN=

163
package-lock.json generated
View File

@@ -11,7 +11,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.5", "@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",
@@ -41,13 +41,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",
@@ -60,13 +61,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"
@@ -1194,14 +1195,13 @@
} }
}, },
"node_modules/@kri/common": { "node_modules/@kri/common": {
"version": "0.19.5", "version": "0.20.0",
"resolved": "https://gitea.kric.com/api/packages/KRi/npm/%40kri%2Fcommon/-/0.19.5/common-0.19.5.tgz", "resolved": "https://gitea.kric.com/api/packages/KRi/npm/%40kri%2Fcommon/-/0.20.0/common-0.20.0.tgz",
"integrity": "sha512-Ib+fO3cak17pcRbmxME7m9XwmiWYN8LM4gA8ZhCmRvEv4dopCTY0b2qO80CJXqUybFV4jRRh50+OajANIRyw4w==", "integrity": "sha512-v6pLvFxePWmdSqG5cK63XwFNrmu4aiZQ1WprKktKVz9CQLpKAKPauQ2mvlQkSn70HXRaJmdwQXUpZHQBFZoE0Q==",
"license": "UNLICENSED", "license": "UNLICENSED",
"dependencies": { "dependencies": {
"clsx": "^2.1.1", "cn": "0.5.2",
"crypto-js": "^4.2.0", "crypto-js": "^4.2.0"
"tailwind-merge": "^3.4.0"
}, },
"peerDependencies": { "peerDependencies": {
"@tanstack/react-query": ">=5 <6", "@tanstack/react-query": ">=5 <6",
@@ -1233,15 +1233,15 @@
} }
}, },
"node_modules/@next/env": { "node_modules/@next/env": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/env/-/env-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/env/-/env-16.4.6.tgz",
"integrity": "sha512-nTUTFH7G5/J/fmpkjVLegOkqyKOP0CEsJcMsyO4UCYeN1su+YMW/MfaSErnJskL7XM+UDK6aTvslxsRCyya/sA==", "integrity": "sha512-SunBjJ6t+oBtecS3dTjdVuMhUogP5wD/vrGL5EVuQYM1iS4O5ilL51HkiJ3sPjMzRHiCChvr4dbaSJbR7F3lxA==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/@next/eslint-plugin-next": { "node_modules/@next/eslint-plugin-next": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/eslint-plugin-next/-/eslint-plugin-next-16.4.6.tgz",
"integrity": "sha512-gCTWlw0e+Y6kajpFyKKgA195jUJCRhlzJE0lV7ufe8a+ghIsANWZ0/FiJwg6DuOG1+OvRbcZDcFBoRh3mNJx0g==", "integrity": "sha512-HdqERVOafOD8JaUSAkwf9aSu/1rsHlkN8C5GcXYBH3C/z1MxBhZFxB5rz/xqMMRiIj7r9tIv8OCLQ9JWUxCvWA==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
@@ -1250,9 +1250,9 @@
} }
}, },
"node_modules/@next/swc-darwin-arm64": { "node_modules/@next/swc-darwin-arm64": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.4.6.tgz",
"integrity": "sha512-ONkhFvZNFWlsEHOM/81AtxdyuJP2KRYKYR0JxPwvcu1AuPMMMgcL+wW2luldJvMtZwKtUxoSkCychW5wIeoYSw==", "integrity": "sha512-kJ4VVZkley17xKaJx72QN2IBqjrj7zenCQZaUF0l9ShS/1Mt2kW4+Z5KGG6vgr3L/J562xTOizVyM1iA/u5nlg==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -1266,9 +1266,9 @@
} }
}, },
"node_modules/@next/swc-darwin-x64": { "node_modules/@next/swc-darwin-x64": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.4.6.tgz",
"integrity": "sha512-luPCMbOsCoaF+kXJEUjmjmOZg1lC3BflhmUu+ZmW4tBu2vW/4AXak8JBFvePizGkxVmNiAw/r9ra+6UviCWtWQ==", "integrity": "sha512-eIPGZIqC+8JKaeZmvnCANJQF4xWkkHqSnAAajtFxgwDMAOnCgxNvP52SeWZ41PyVwoe+Le/NQuZSaQ8j7YshSA==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -1282,12 +1282,15 @@
} }
}, },
"node_modules/@next/swc-linux-arm64-gnu": { "node_modules/@next/swc-linux-arm64-gnu": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.4.6.tgz",
"integrity": "sha512-xhwFTAncJyaCNy5KqKKuKaIIdCy1/1ZV1s5S1G0hhT7wGMkDTlfJ6aQbfRFnIG/s3/kDrxQ8aycVe+c5QnP8ow==", "integrity": "sha512-9nI6O8vvczH2D9ZNdMGqb/3NuT15T9ksOZnAmx9/gjF2cOi74+xxyf1Hk96uIMfm14c9y6wHeBq6SH8g6udvcA==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1298,12 +1301,15 @@
} }
}, },
"node_modules/@next/swc-linux-arm64-musl": { "node_modules/@next/swc-linux-arm64-musl": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.4.6.tgz",
"integrity": "sha512-T1PNmfbPcxr5ndtWUL/3wQtLXsz808lq6sc2GrNT5k2oquF7UyqZddHSuAewHVsWsGXe6nsl9HoN1YNriVjuSg==", "integrity": "sha512-7/qPhTxDp2ScluOJOhLuhWmlA17o1yZ0SIgpISBCpBxXgtnK4+KGywBpFkfLPiU1rnSM1faFGzYkH6i7JdTrqA==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1314,12 +1320,15 @@
} }
}, },
"node_modules/@next/swc-linux-x64-gnu": { "node_modules/@next/swc-linux-x64-gnu": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.4.6.tgz",
"integrity": "sha512-N9cDUOCGtkJG5PNKDFZUF3xXndrJJcpLp121uAGjIGvO/U2p9tfdNOM9htj7+5f72l0m8rMw/cvYacUJBQoudg==", "integrity": "sha512-oOpbNa8XOW1qCGd9VvzC4fbkkRxEls7/WI6tz+YHC0xRA7KpV1U7DrAnCPjzVyOk/karzWEepCOcTIDmwK8FwQ==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"libc": [
"glibc"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1330,12 +1339,15 @@
} }
}, },
"node_modules/@next/swc-linux-x64-musl": { "node_modules/@next/swc-linux-x64-musl": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.4.6.tgz",
"integrity": "sha512-yY2uh1YhX6ufuYy2FCbw1dqblbhI57GLYAJfCkqD9auTv6pLrH67Uccjc3QMKBeCYAG6lkgu08ExmX1bbjejjQ==", "integrity": "sha512-aM8CZ+OR2EwXaAYw7KGkW2GDmNDsLBIRe1MMRZCJPTdw/xhTD0IMUVO4sf3KqrzuRouGzwwLZn34+gFeVXiUQA==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
"libc": [
"musl"
],
"license": "MIT", "license": "MIT",
"optional": true, "optional": true,
"os": [ "os": [
@@ -1346,9 +1358,9 @@
} }
}, },
"node_modules/@next/swc-win32-arm64-msvc": { "node_modules/@next/swc-win32-arm64-msvc": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.4.6.tgz",
"integrity": "sha512-j/ArWRIHpMMB6wYLMhr2puTguBt70lNU/Cmjl9p6dTDE8DGknYJMP9PdwPk2dqpCNL/KIX9yfngDvIesxJPmsg==", "integrity": "sha512-U0p7/tEtqvHX2crhd841CDwKtp5CFkKXVjOhmfccR3Pvp64sj8KBwRqsvltqLOwVBbj0NtkxwXSDpEHYGbxeXQ==",
"cpu": [ "cpu": [
"arm64" "arm64"
], ],
@@ -1362,9 +1374,9 @@
} }
}, },
"node_modules/@next/swc-win32-x64-msvc": { "node_modules/@next/swc-win32-x64-msvc": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.4.2.tgz", "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.4.6.tgz",
"integrity": "sha512-AA4edyWHDko3NCSo0x6GomsdgFb0oR1J3MXU1b5xt6FRFg4AucrMPW3S0hCe/9onU0O1BbpGQBsqo1r0Gneu1g==", "integrity": "sha512-3ZG15/5WIdlTQsIEvc9sPTTSL5XFrlLklIKmfF4fwsDnoAhu6NcBDXsk3mbGxNyo6aVLEGex+fHCv2MahY7a9g==",
"cpu": [ "cpu": [
"x64" "x64"
], ],
@@ -3811,12 +3823,13 @@
"dev": true "dev": true
}, },
"node_modules/@types/node": { "node_modules/@types/node": {
"version": "20.19.25", "version": "24.19.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.25.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-24.19.2.tgz",
"integrity": "sha512-ZsJzA5thDQMSQO788d7IocwwQbI8B5OPzmqNvpf3NY/+MHDAS759Wo0gd2WQeXYt5AAAQjzcrTVC6SKCuYgoCQ==", "integrity": "sha512-93d49wCWJkCyN87MxLpNN6KXPCwFw7bVUg79mGUV1OS40JGWwVCr8n61DXCSqz7CV6/VfPkb7xec7uP2M+QHWQ==",
"dev": true, "dev": true,
"license": "MIT",
"dependencies": { "dependencies": {
"undici-types": "~6.21.0" "undici-types": ">=7.24.0 <7.24.7"
} }
}, },
"node_modules/@types/qrcode": { "node_modules/@types/qrcode": {
@@ -4947,6 +4960,18 @@
"react-dom": "^18 || ^19 || ^19.0.0-rc" "react-dom": "^18 || ^19 || ^19.0.0-rc"
} }
}, },
"node_modules/cn": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/cn/-/cn-0.5.2.tgz",
"integrity": "sha512-wm10E6iuJ37rALOw3D+3cfaXXZSLNMh2uxpQn3dNICqfJM59yXqgbA9/9Iiz155j5kYNLdK6WreNdW3NQtx3OQ==",
"license": "MIT",
"bin": {
"cn": "bin/cn.mjs"
},
"engines": {
"node": ">=22"
}
},
"node_modules/codepage": { "node_modules/codepage": {
"version": "1.15.0", "version": "1.15.0",
"resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz", "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz",
@@ -5516,13 +5541,13 @@
} }
}, },
"node_modules/eslint-config-next": { "node_modules/eslint-config-next": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-16.4.2.tgz", "resolved": "https://registry.npmjs.org/eslint-config-next/-/eslint-config-next-16.4.6.tgz",
"integrity": "sha512-P33vjcETMXc+qBjpF77TeJHZLzk6cPcTy8KjpxLucYB3mCIFIORMcZ+cBXcAiIYjE5RM7jyknEEOwMNdnx/ADQ==", "integrity": "sha512-IBGGrVf9E6pL0NGL0hmeicVGeSyv1VEzIWq6IecDqkw+YFByhEtDJS9u1r6s6a1VxK6rssh69KyNFQUgfaacqw==",
"dev": true, "dev": true,
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@next/eslint-plugin-next": "16.4.2", "@next/eslint-plugin-next": "16.4.6",
"eslint-import-resolver-node": "^0.3.6", "eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^3.5.2", "eslint-import-resolver-typescript": "^3.5.2",
"eslint-plugin-import": "^2.32.0", "eslint-plugin-import": "^2.32.0",
@@ -7367,12 +7392,12 @@
"dev": true "dev": true
}, },
"node_modules/next": { "node_modules/next": {
"version": "16.4.2", "version": "16.4.6",
"resolved": "https://registry.npmjs.org/next/-/next-16.4.2.tgz", "resolved": "https://registry.npmjs.org/next/-/next-16.4.6.tgz",
"integrity": "sha512-r+oBJojfefUjOiWkBhXgLS+igxX/7BWyK59uHnyOyplMSLtBZ+QLP3okrdYTbrfrbrmNTVWLBPaHDX9KRaIt3w==", "integrity": "sha512-QZJiYhaZLJMo2KpkQGQIwvmd79WVsAWeYIU554a8d7zArS3si/IRy3lBNV/rtYhE70oLwdLYhPAXLPx8HwcwtA==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@next/env": "16.4.2", "@next/env": "16.4.6",
"@swc/helpers": "0.5.23", "@swc/helpers": "0.5.23",
"baseline-browser-mapping": "^2.9.19", "baseline-browser-mapping": "^2.9.19",
"caniuse-lite": "^1.0.30001579", "caniuse-lite": "^1.0.30001579",
@@ -7386,14 +7411,14 @@
"node": ">=20.9.0" "node": ">=20.9.0"
}, },
"optionalDependencies": { "optionalDependencies": {
"@next/swc-darwin-arm64": "16.4.2", "@next/swc-darwin-arm64": "16.4.6",
"@next/swc-darwin-x64": "16.4.2", "@next/swc-darwin-x64": "16.4.6",
"@next/swc-linux-arm64-gnu": "16.4.2", "@next/swc-linux-arm64-gnu": "16.4.6",
"@next/swc-linux-arm64-musl": "16.4.2", "@next/swc-linux-arm64-musl": "16.4.6",
"@next/swc-linux-x64-gnu": "16.4.2", "@next/swc-linux-x64-gnu": "16.4.6",
"@next/swc-linux-x64-musl": "16.4.2", "@next/swc-linux-x64-musl": "16.4.6",
"@next/swc-win32-arm64-msvc": "16.4.2", "@next/swc-win32-arm64-msvc": "16.4.6",
"@next/swc-win32-x64-msvc": "16.4.2", "@next/swc-win32-x64-msvc": "16.4.6",
"sharp": "^0.35.5" "sharp": "^0.35.5"
}, },
"peerDependencies": { "peerDependencies": {
@@ -8816,15 +8841,6 @@
"url": "https://github.com/sponsors/ljharb" "url": "https://github.com/sponsors/ljharb"
} }
}, },
"node_modules/tailwind-merge": {
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.4.0.tgz",
"integrity": "sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==",
"funding": {
"type": "github",
"url": "https://github.com/sponsors/dcastil"
}
},
"node_modules/tailwindcss": { "node_modules/tailwindcss": {
"version": "4.1.17", "version": "4.1.17",
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.17.tgz", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.17.tgz",
@@ -9096,10 +9112,11 @@
} }
}, },
"node_modules/undici-types": { "node_modules/undici-types": {
"version": "6.21.0", "version": "7.24.6",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.24.6.tgz",
"integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "integrity": "sha512-WRNW+sJgj5OBN4/0JpHFqtqzhpbnV0GuB+OozA9gCL7a993SmU+1JBZCzLNxYsbMfIeDL+lTsphD5jN5N+n0zg==",
"dev": true "dev": true,
"license": "MIT"
}, },
"node_modules/unrs-resolver": { "node_modules/unrs-resolver": {
"version": "1.11.1", "version": "1.11.1",

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.5", "@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,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

@@ -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

@@ -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

@@ -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

@@ -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>
<span>값</span> <div className="flex items-center justify-between gap-2">
<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'
@@ -44,6 +45,7 @@ export type ListHeaderManageDialogProps = {
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
@@ -62,13 +64,23 @@ const isInterviewerEditDisabled = (row: listHeader) =>
row.listHderTy === ListHeaderConst.CONTACT_INTERVIEWER || row.listHderTy === ListHeaderConst.CONTACT_INTERVIEWER ||
row.listHderTy === ListHeaderConst.FIELD_INTERVIEWER row.listHderTy === ListHeaderConst.FIELD_INTERVIEWER
const ListHeaderRow = ({ row, activeId, onHeaderNameChange, onHeaderTypeChange, onFlagChange, onDelete }: ListHeaderRowProps) => { 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),
@@ -86,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',
)} )}
> >
@@ -131,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}`}
@@ -256,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) => {
@@ -302,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]
@@ -311,6 +340,10 @@ const ListHeaderManageDialog = ({
const handleConfirm = async () => { const handleConfirm = async () => {
if (saveDisabled || submitting) return 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(', ')}`)
@@ -344,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)
@@ -382,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>
@@ -407,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

@@ -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,

View File

@@ -14,7 +14,7 @@ import {
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'
@@ -183,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('수신 대상이 없습니다.')

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

@@ -8,10 +8,25 @@ 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 new TextEncoder().encode(value).byteLength 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({
label, label,
value, value,
@@ -34,12 +49,12 @@ 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' | 'MMS' | 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' | 'MMS' = smsHasAttachment ? 'MMS' : byteSize >= smsMaxBytes || Boolean(smsTitle) ? 'LMS' : 'SMS' const messageType = getSmsMessageType(smsHasAttachment, byteSize, smsMaxBytes, smsTitle)
const maxBytes = messageType === 'SMS' ? smsMaxBytes : lmsMaxBytes const maxBytes = messageType === 'SMS' ? smsMaxBytes : lmsMaxBytes
function getBadgeColor(): string { function getBadgeColor(): string {
@@ -127,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

@@ -17,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'
@@ -52,12 +53,20 @@ 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 때문에 마우스 이벤트 자체를 못 받는다.
@@ -77,19 +86,27 @@ const getCallButtonTitle = (isCtiReady: boolean, isDialing: boolean, isEnding: b
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 }) => {
<div className="flex items-center gap-3"> // 헤더에 지정한 색상(투명도 포함)이 기본색보다 우선한다. 형식이 잘못된 값은 기본색으로 표시한다.
<Label const headerColor = normalizeHexColor(color)
className={cn( const isDarkHeaderColor = headerColor !== null && !isLightHexColor(headerColor)
'w-24 shrink-0 wrap-anywhere rounded-md px-2 py-2.5 text-sm leading-snug font-bold text-foreground',
editable && 'bg-blue-100', return (
)} <div className="flex items-center gap-3">
> <Label
{label} className={cn(
</Label> 'w-24 shrink-0 wrap-anywhere rounded-md px-2 py-2.5 text-sm leading-snug font-bold',
<div className="min-w-0 flex-1">{children}</div> headerColor === null && 'bg-blue-100',
</div> isDarkHeaderColor ? 'text-white' : 'text-foreground',
) )}
style={headerColor ? { backgroundColor: headerColor } : undefined}
>
{label}
</Label>
<div className="min-w-0 flex-1">{children}</div>
</div>
)
}
const ListContactInfoPanel = ({ const ListContactInfoPanel = ({
prjctIdx, prjctIdx,
@@ -202,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}
@@ -217,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
@@ -271,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}
@@ -298,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 ? (
@@ -339,14 +356,14 @@ const ListContactInfoPanel = ({
if (header.listHderTy === ListHeaderConst.IS_USE) { if (header.listHderTy === ListHeaderConst.IS_USE) {
return ( return (
<FieldRow key={header.listHderId} label={header.listHderNm} editable={canEditField}> <FieldRow key={header.listHderId} label={header.listHderNm} color={header.listHderColor}>
<KriSingleSelect <KriSingleSelect
items={Object.values(LIST_IS_USE_LABEL)} items={IS_USE_OPTIONS}
value={value} value={value}
disabled={!editable} disabled={!editable}
onChange={onChange} onChange={onChange}
getValue={(item) => item} getValue={(item) => item.value}
getLabel={(item) => item} getLabel={(item) => item.label}
searchable={false} searchable={false}
preventDeselect preventDeselect
widthClassName="w-full" widthClassName="w-full"
@@ -359,7 +376,7 @@ const ListContactInfoPanel = ({
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}
@@ -376,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

@@ -2,11 +2,10 @@
import { useEffect } from 'react' import { useEffect } from 'react'
import { useAtom } from 'jotai' import { useAtom } from 'jotai'
import { HttpError } from '@kri/common/http'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import { ListJobProgress } from '@/components/list/ListJobProgress' import { ListJobProgress } from '@/components/list/ListJobProgress'
import { useAuth } from '@/hooks/useAuth' import { useAuth } from '@/hooks/useAuth'
import { isAvailabilityUnsupported, useListJob, useListJobAvailability, useUploadResetActive } from '@/query/list-job' import { isAvailabilityUnsupported, isListJobGone, useListJob, useListJobAvailability, useUploadResetActive } from '@/query/list-job'
import { findTrackedListJob, trackListJob, untrackListJob, useTrackedListJobs } from '@/store/list-job-tracker' import { findTrackedListJob, trackListJob, untrackListJob, useTrackedListJobs } from '@/store/list-job-tracker'
import { listJobLabel } from '@/const/listJobConst' import { listJobLabel } from '@/const/listJobConst'
import { blockerJobLabel, blockerPhaseLabel, blockerUserLabel, describeListJobAvailability } from '@/utils/listJobAvailability' import { blockerJobLabel, blockerPhaseLabel, blockerUserLabel, describeListJobAvailability } from '@/utils/listJobAvailability'
@@ -45,7 +44,7 @@ export function useListJobGate({ prjctIdx, jobType, active, requestLabel, pollWh
const detail = useListJob(prjctIdx, jobKey, active) const detail = useListJob(prjctIdx, jobKey, active)
const job = detail.data?.jobKey === jobKey ? detail.data : undefined const job = detail.data?.jobKey === jobKey ? detail.data : undefined
const finishedJob = job && !isActiveListJob(job.jobStatus) ? job : undefined const finishedJob = job && !isActiveListJob(job.jobStatus) ? job : undefined
const detailNotFound = detail.error instanceof HttpError && detail.error.status === 404 const detailNotFound = isListJobGone(detail.error)
useEffect(() => { useEffect(() => {
if (!active && requestMatches && openRequest.opened) setOpenRequest(null) if (!active && requestMatches && openRequest.opened) setOpenRequest(null)

View File

@@ -4,10 +4,9 @@ import { useEffect } from 'react'
import { usePathname, useRouter } from 'next/navigation' import { usePathname, useRouter } from 'next/navigation'
import { useAtom } from 'jotai' import { useAtom } from 'jotai'
import { useQueries, useQueryClient } from '@tanstack/react-query' import { useQueries, useQueryClient } from '@tanstack/react-query'
import { HttpError } from '@kri/common/http'
import { toast } from 'sonner' import { toast } from 'sonner'
import { nextApi } from '@/lib/http-client' import { nextApi } from '@/lib/http-client'
import { listJobKeys, useMyActiveListJobs } from '@/query/list-job' import { isListJobGone, listJobKeys, useMyActiveListJobs } from '@/query/list-job'
import { listJobOpenRequestAtom } from '@/store/jotai/list-job' import { listJobOpenRequestAtom } from '@/store/jotai/list-job'
import { useSelectedProject } from '@/hooks/useSelectedProject' import { useSelectedProject } from '@/hooks/useSelectedProject'
import { useDialog } from '@/hooks/useDialog' import { useDialog } from '@/hooks/useDialog'
@@ -90,7 +89,7 @@ export function ListJobWatcher({ userId, prjctIdx }: { userId: string; prjctIdx:
details.forEach((result, index) => { details.forEach((result, index) => {
const tracked = trackedJobs[index] const tracked = trackedJobs[index]
if (!tracked) return if (!tracked) return
if (result.error instanceof HttpError && result.error.status === 404) { if (isListJobGone(result.error)) {
untrackListJob(tracked.jobKey) untrackListJob(tracked.jobKey)
return return
} }

View File

@@ -269,7 +269,7 @@ const KkoMessageTemplate = () => {
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();

View File

@@ -243,7 +243,7 @@ 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 (!TEMPLATE_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", "발신자명을 입력해 주세요.");
@@ -251,7 +251,8 @@ const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) =
if (!TEMPLATE_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 (tpl.tmplatTitle!.length > titleMaxLength) return fail("tmplatTitle", `제목은 ${titleMaxLength}자 이하로 입력해주세요.`);
if (!TEMPLATE_TEXT_REGEX.test(tpl.tmplatTitle!)) return fail("tmplatTitle", "제목에 허용되지 않는 문자가 포함되어 있습니다."); if (!TEMPLATE_TEXT_REGEX.test(tpl.tmplatTitle!)) return fail("tmplatTitle", "제목에 허용되지 않는 문자가 포함되어 있습니다.");
} }

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

@@ -30,5 +30,4 @@ export const CTI_AUTO_RECONNECT_JITTER_MS = 1000;
// 종료 명령의 응답이 없으면 재요청할 수 있게 하되, 실제 종료로 판정하지 않는다. // 종료 명령의 응답이 없으면 재요청할 수 있게 하되, 실제 종료로 판정하지 않는다.
export const CTI_HANGUP_TIMEOUT_MS = 10 * 1000; export const CTI_HANGUP_TIMEOUT_MS = 10 * 1000;
export const CTI_LOGIN_TIMEOUT_MS = 15 * 1000; export const CTI_LOGIN_TIMEOUT_MS = 15 * 1000;
export const CTI_HISTORY_RETRY_MS = 5 * 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]: "파일 업로드",

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;
}
},
});
}

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);
}

View File

@@ -9,7 +9,6 @@ import {
CTI_DIALING_TIMEOUT_MS, CTI_DIALING_TIMEOUT_MS,
CTI_ERROR_ALERT_THROTTLE_MS, CTI_ERROR_ALERT_THROTTLE_MS,
CTI_HANGUP_TIMEOUT_MS, CTI_HANGUP_TIMEOUT_MS,
CTI_HISTORY_RETRY_MS,
CTI_LOGIN_TIMEOUT_MS, CTI_LOGIN_TIMEOUT_MS,
CTI_ON_CALL_STATUSES, CTI_ON_CALL_STATUSES,
CTI_STATE_TTL_MS, CTI_STATE_TTL_MS,
@@ -50,28 +49,19 @@ type CtiCall = {
agentSessionId: string | null; agentSessionId: string | null;
// makeCall 시각. 이 값이 없는 dialing 상태(이전 버전 저장분)는 복원 시 만료된 것으로 본다. // makeCall 시각. 이 값이 없는 dialing 상태(이전 버전 저장분)는 복원 시 만료된 것으로 본다.
dialStartedAt?: number; dialStartedAt?: number;
pendingStart?: ListCallCloseRequest;
};
type PendingCallClose = {
call: CtiCall;
// null은 재로그인 11로 확인한 종료 이벤트 유실 통화다.
body: ListCallCloseRequest | null;
attempted?: boolean;
}; };
// 이전 버전이 저장한 closingCall·pendingCallCloses 필드는 복원 시 무시한다.
type PersistedCtiState = { type PersistedCtiState = {
version: 3; version: 3;
agentLoginId: string; agentLoginId: string;
agentStatus: string | null; agentStatus: string | null;
activeCall: CtiCall | null; activeCall: CtiCall | null;
closingCall: CtiCall | null;
lastCallContext: CtiCallContext | null; lastCallContext: CtiCallContext | null;
lastCallHistId: number | null; lastCallHistId: number | null;
hangupRequested: boolean; hangupRequested: boolean;
callClosedReceived: boolean; callClosedReceived: boolean;
updatedAt: number; updatedAt: number;
pendingCallCloses?: PendingCallClose[];
completedSessionIds?: string[]; completedSessionIds?: string[];
latestCall?: CtiCall | null; latestCall?: CtiCall | null;
}; };
@@ -86,11 +76,10 @@ type LegacyCtiCall = Omit<CtiCall, "context"> & {
type LegacyPersistedCtiState = Omit< type LegacyPersistedCtiState = Omit<
PersistedCtiState, PersistedCtiState,
"version" | "activeCall" | "closingCall" | "lastCallContext" "version" | "activeCall" | "lastCallContext"
> & { > & {
version: 2; version: 2;
activeCall: LegacyCtiCall | null; activeCall: LegacyCtiCall | null;
closingCall: LegacyCtiCall | null;
lastCallContext: LegacyCtiCallContext | null; lastCallContext: LegacyCtiCallContext | null;
}; };
@@ -103,7 +92,6 @@ let currentConnectionKey: string | null = null;
let currentLoginParams: CtiLoginParams | null = null; let currentLoginParams: CtiLoginParams | null = null;
let agentStatus: string | null = null; let agentStatus: string | null = null;
let activeCall: CtiCall | null = null; let activeCall: CtiCall | null = null;
let closingCall: CtiCall | null = null;
let lastCallContext: CtiCallContext | null = null; let lastCallContext: CtiCallContext | null = null;
let lastCallHistId: number | null = null; let lastCallHistId: number | null = null;
let hangupRequested = false; let hangupRequested = false;
@@ -113,17 +101,13 @@ let autoReconnectAttempt = 0;
let dialingTimeoutId: ReturnType<typeof setTimeout> | null = null; let dialingTimeoutId: ReturnType<typeof setTimeout> | null = null;
let loginTimeoutId: ReturnType<typeof setTimeout> | null = null; let loginTimeoutId: ReturnType<typeof setTimeout> | null = null;
let hangupTimeoutId: ReturnType<typeof setTimeout> | null = null; let hangupTimeoutId: ReturnType<typeof setTimeout> | null = null;
let historyRetryTimeoutId: ReturnType<typeof setTimeout> | null = null;
let pendingCallCloses: PendingCallClose[] = [];
let completedSessionIds: string[] = []; let completedSessionIds: string[] = [];
let latestCall: CtiCall | null = null; let latestCall: CtiCall | null = null;
let loginCompleted = false; let loginCompleted = false;
let recoveryCall: CtiCall | null = null; let recoveryCall: CtiCall | null = null;
let ownerGeneration = 0; let ownerGeneration = 0;
const closingRequests = new Set<PendingCallClose>(); // 같은 통화의 StartSessionRecord가 중복 수신돼도 시작 저장은 한 번만 보낸다.
const notifiedCloseFailures = new WeakSet<PendingCallClose>(); const startRequestedCalls = new WeakSet<CtiCall>();
const startingRequests = new Map<CtiCall, Promise<void>>();
let savedStarts = new WeakSet<CtiCall>();
const lastErrorAlertAt = new Map<string, number>(); const lastErrorAlertAt = new Map<string, number>();
const listeners = new Set<() => void>(); const listeners = new Set<() => void>();
@@ -205,9 +189,7 @@ const isCtiCall = (value: unknown): value is CtiCall => {
return ( return (
isCallContext(call.context) && isCallContext(call.context) &&
(call.agentSessionId === null || typeof call.agentSessionId === "string") && (call.agentSessionId === null || typeof call.agentSessionId === "string") &&
(call.dialStartedAt === undefined || typeof call.dialStartedAt === "number") && (call.dialStartedAt === undefined || typeof call.dialStartedAt === "number")
(call.pendingStart === undefined ||
(isCloseRequest(call.pendingStart) && call.pendingStart.agentSessionId === call.agentSessionId))
); );
}; };
@@ -235,15 +217,6 @@ const isCloseRequest = (value: unknown): value is ListCallCloseRequest => {
); );
}; };
const isPendingCallClose = (value: unknown): value is PendingCallClose => {
if (typeof value !== "object" || value === null) return false;
const pending = value as Partial<PendingCallClose>;
return isCtiCall(pending.call) && pending.call.agentSessionId !== null &&
(pending.body === null ||
(isCloseRequest(pending.body) && pending.body.agentSessionId === pending.call.agentSessionId)) &&
(pending.attempted === undefined || typeof pending.attempted === "boolean");
};
const isPersistedCtiState = (value: unknown): value is PersistedCtiState => { const isPersistedCtiState = (value: unknown): value is PersistedCtiState => {
if (typeof value !== "object" || value === null) return false; if (typeof value !== "object" || value === null) return false;
const state = value as Partial<PersistedCtiState>; const state = value as Partial<PersistedCtiState>;
@@ -252,14 +225,11 @@ const isPersistedCtiState = (value: unknown): value is PersistedCtiState => {
typeof state.agentLoginId === "string" && typeof state.agentLoginId === "string" &&
(state.agentStatus === null || typeof state.agentStatus === "string") && (state.agentStatus === null || typeof state.agentStatus === "string") &&
(state.activeCall === null || isCtiCall(state.activeCall)) && (state.activeCall === null || isCtiCall(state.activeCall)) &&
(state.closingCall === null || isCtiCall(state.closingCall)) &&
(state.lastCallContext === null || isCallContext(state.lastCallContext)) && (state.lastCallContext === null || isCallContext(state.lastCallContext)) &&
(state.lastCallHistId === null || typeof state.lastCallHistId === "number") && (state.lastCallHistId === null || typeof state.lastCallHistId === "number") &&
typeof state.hangupRequested === "boolean" && typeof state.hangupRequested === "boolean" &&
typeof state.callClosedReceived === "boolean" && typeof state.callClosedReceived === "boolean" &&
typeof state.updatedAt === "number" && typeof state.updatedAt === "number" &&
(state.pendingCallCloses === undefined ||
(Array.isArray(state.pendingCallCloses) && state.pendingCallCloses.every(isPendingCallClose))) &&
(state.completedSessionIds === undefined || (state.completedSessionIds === undefined ||
(Array.isArray(state.completedSessionIds) && state.completedSessionIds.every((id) => typeof id === "string"))) && (Array.isArray(state.completedSessionIds) && state.completedSessionIds.every((id) => typeof id === "string"))) &&
(state.latestCall === undefined || state.latestCall === null || isCtiCall(state.latestCall)) (state.latestCall === undefined || state.latestCall === null || isCtiCall(state.latestCall))
@@ -274,7 +244,6 @@ const isLegacyPersistedCtiState = (value: unknown): value is LegacyPersistedCtiS
typeof state.agentLoginId === "string" && typeof state.agentLoginId === "string" &&
(state.agentStatus === null || typeof state.agentStatus === "string") && (state.agentStatus === null || typeof state.agentStatus === "string") &&
(state.activeCall === null || isLegacyCtiCall(state.activeCall)) && (state.activeCall === null || isLegacyCtiCall(state.activeCall)) &&
(state.closingCall === null || isLegacyCtiCall(state.closingCall)) &&
(state.lastCallContext === null || isLegacyCallContext(state.lastCallContext)) && (state.lastCallContext === null || isLegacyCallContext(state.lastCallContext)) &&
(state.lastCallHistId === null || typeof state.lastCallHistId === "number") && (state.lastCallHistId === null || typeof state.lastCallHistId === "number") &&
typeof state.hangupRequested === "boolean" && typeof state.hangupRequested === "boolean" &&
@@ -303,7 +272,6 @@ const toPersistedCtiState = (value: unknown): PersistedCtiState | null => {
...value, ...value,
version: CTI_STATE_VERSION, version: CTI_STATE_VERSION,
activeCall: migrateLegacyCall(value.activeCall), activeCall: migrateLegacyCall(value.activeCall),
closingCall: migrateLegacyCall(value.closingCall),
lastCallContext: value.lastCallContext ? migrateLegacyCallContext(value.lastCallContext) : null, lastCallContext: value.lastCallContext ? migrateLegacyCallContext(value.lastCallContext) : null,
}; };
}; };
@@ -315,13 +283,11 @@ const persistCtiState = () => {
agentLoginId: currentAgentLoginId, agentLoginId: currentAgentLoginId,
agentStatus, agentStatus,
activeCall, activeCall,
closingCall,
lastCallContext, lastCallContext,
lastCallHistId, lastCallHistId,
hangupRequested, hangupRequested,
callClosedReceived, callClosedReceived,
updatedAt: Date.now(), updatedAt: Date.now(),
pendingCallCloses,
completedSessionIds, completedSessionIds,
latestCall, latestCall,
} satisfies PersistedCtiState); } satisfies PersistedCtiState);
@@ -341,21 +307,13 @@ const restoreCtiState = (agentLoginId: string) => {
agentStatus = persistedState.agentStatus; agentStatus = persistedState.agentStatus;
activeCall = persistedState.activeCall; activeCall = persistedState.activeCall;
closingCall = persistedState.closingCall;
lastCallContext = persistedState.lastCallContext; lastCallContext = persistedState.lastCallContext;
lastCallHistId = persistedState.lastCallHistId; lastCallHistId = persistedState.lastCallHistId;
// 이전 연결에서 보낸 종료 명령은 새 연결에서 재시도할 수 있다. // 이전 연결에서 보낸 종료 명령은 새 연결에서 재시도할 수 있다.
hangupRequested = false; hangupRequested = false;
callClosedReceived = false; callClosedReceived = false;
pendingCallCloses = persistedState.pendingCallCloses ?? [];
completedSessionIds = persistedState.completedSessionIds ?? []; completedSessionIds = persistedState.completedSessionIds ?? [];
const storedLatest = persistedState.latestCall; latestCall = activeCall ?? persistedState.latestCall ?? null;
latestCall = activeCall ??
(storedLatest
? [closingCall, ...pendingCallCloses.map((pending) => pending.call)].find(
(call) => call?.agentSessionId === storedLatest.agentSessionId,
) ?? storedLatest
: closingCall ?? pendingCallCloses.at(-1)?.call ?? null);
// 거는 중 새로고침은 dialing을 유지해 재발신을 막고, 타임아웃이 지난 dialing만 정리한다. // 거는 중 새로고침은 dialing을 유지해 재발신을 막고, 타임아웃이 지난 dialing만 정리한다.
const isDialingExpired = const isDialingExpired =
activeCall !== null && activeCall.agentSessionId == null && getDialingRemainingMs(activeCall) === 0; activeCall !== null && activeCall.agentSessionId == null && getDialingRemainingMs(activeCall) === 0;
@@ -369,8 +327,8 @@ const restoreCtiState = (agentLoginId: string) => {
return true; return true;
}; };
const fetchCallHistBySession = (agentSessionId: string) => // 통화 이력 저장 실패는 화면 동작을 막지 않도록 공통 오류 팝업 없이 콘솔에만 남긴다.
nextApi.get<ListCallHist>(`/list-call-hist/session/${encodeURIComponent(agentSessionId)}`); const silentErrorOptions = { skipResponseErrorHandler: true } as const;
const matchesHistory = (call: CtiCall, result: ListCallHist) => const matchesHistory = (call: CtiCall, result: ListCallHist) =>
result.agentSessionId === call.agentSessionId && result.agentSessionId === call.agentSessionId &&
@@ -385,16 +343,27 @@ const updateCallHistoryId = (call: CtiCall, result: ListCallHist) => {
notify(); notify();
}; };
// 404는 권한 부족이나 저장 지연일 수도 있어 통화 정보를 삭제하지 않는다. const describeHistoryError = (error: unknown) => {
const recoverLastCallHistId = async (call: CtiCall) => { if (!(error instanceof HttpError)) return { message: error instanceof Error ? error.message : String(error) };
if (!call.agentSessionId) return; const data: unknown = error.data;
const code = typeof data === "object" && data !== null && "code" in data ? data.code : undefined;
return { status: error.status, code };
};
// 통화 시작·종료 이력은 이벤트마다 한 번만 저장한다. 실패해도 재시도하지 않는다.
const saveCallHistory = (call: CtiCall, action: "call-start" | "call-close", body: ListCallCloseRequest) => {
const { prjctIdx, sid } = call.context;
const generation = ownerGeneration; const generation = ownerGeneration;
try { void nextApi.put<ListCallHist>(
const result = await fetchCallHistBySession(call.agentSessionId); `/list-call-hist/${prjctIdx}/${encodeURIComponent(sid)}/${action}`, body, silentErrorOptions,
if (ownerGeneration === generation) updateCallHistoryId(call, result); ).then((result) => {
} catch { if (ownerGeneration !== generation) return;
console.warn("[CTI] 통화 이력 조회 실패: 통화 상태를 유지합니다."); if (!matchesHistory(call, result)) throw new Error("저장 응답이 통화 정보와 일치하지 않습니다.");
} updateCallHistoryId(call, result);
}).catch((error: unknown) => {
if (ownerGeneration !== generation) return;
console.warn(`[CTI] ${action} 이력 저장 실패`, { agentSessionId: body.agentSessionId, ...describeHistoryError(error) });
});
}; };
const setConnectionState = (next: CtiConnectionState) => { const setConnectionState = (next: CtiConnectionState) => {
@@ -440,126 +409,6 @@ const rememberCompletedSession = (id: string) => {
completedSessionIds = [...completedSessionIds.filter((item) => item !== id), id].slice(-50); completedSessionIds = [...completedSessionIds.filter((item) => item !== id), id].slice(-50);
}; };
const scheduleHistoryRetry = () => {
if (historyRetryTimeoutId !== null || !currentAgentLoginId) return;
historyRetryTimeoutId = setTimeout(() => {
historyRetryTimeoutId = null;
if (loginCompleted) flushPendingCallCloses();
}, CTI_HISTORY_RETRY_MS);
};
const finishPendingClose = (pending: PendingCallClose) => {
if (pending.call.agentSessionId) rememberCompletedSession(pending.call.agentSessionId);
pendingCallCloses = pendingCallCloses.filter((item) => item !== pending);
persistCtiState();
notify();
};
// 실패한 종료 저장은 세션별로 보존하고 새 통화 상태와 독립적으로 재처리한다.
const savePendingClose = async (pending: PendingCallClose) => {
if (closingRequests.has(pending)) return;
const agentSessionId = pending.call.agentSessionId;
if (!agentSessionId) return;
const generation = ownerGeneration;
const isCurrent = () => ownerGeneration === generation && pendingCallCloses.includes(pending);
closingRequests.add(pending);
try {
await startingRequests.get(pending.call);
if (!isCurrent()) return;
if (pending.body === null) {
// 시작 저장도 실패했었다면 보존한 요청을 먼저 복구한다. GET 404만으로 새 이력을 만들지는 않는다.
if (pending.call.pendingStart) {
const { prjctIdx, sid } = pending.call.context;
const restored = await nextApi.put<ListCallHist>(
`/list-call-hist/${prjctIdx}/${encodeURIComponent(sid)}/call-start`, pending.call.pendingStart);
if (!isCurrent()) return;
if (!matchesHistory(pending.call, restored)) throw new Error("통화 시작 복구 응답 불일치");
delete pending.call.pendingStart;
updateCallHistoryId(pending.call, restored);
persistCtiState();
}
const result = await fetchCallHistBySession(agentSessionId);
if (!isCurrent()) return;
if (!matchesHistory(pending.call, result)) throw new Error("통화 이력 불일치");
updateCallHistoryId(pending.call, result);
// 조회 중 Talking/CallClosed가 도착했다면 이전 판단을 사용하지 않는다.
if (pending.body === null && activeCall?.agentSessionId !== agentSessionId) {
if (result.callStatus !== 4 && result.callStatus !== 9) {
const updated = await nextApi.patch<boolean>(`/list-call-hist/hangup/${encodeURIComponent(agentSessionId)}`);
if (!isCurrent()) return;
if (!updated && pending.body === null) {
const checked = await fetchCallHistBySession(agentSessionId);
if (!isCurrent()) return;
if (!matchesHistory(pending.call, checked) || (checked.callStatus !== 4 && checked.callStatus !== 9)) {
throw new Error("종료 이력 보정 미완료");
}
}
}
if (pending.body === null) {
finishPendingClose(pending);
return;
}
}
}
const body = pending.body;
if (!body || !isCurrent()) return;
// 응답만 유실된 재시도는 중복 PUT에 의한 endDt 변경을 줄인다.
if (pending.attempted) {
try {
const result = await fetchCallHistBySession(agentSessionId);
if (!isCurrent()) return;
if (matchesHistory(pending.call, result) && result.callStatus === 4 &&
result.totalTime === body.totalTime && result.talkTime === body.talkTime &&
result.recordFileName === body.recordFileName) {
updateCallHistoryId(pending.call, result);
finishPendingClose(pending);
return;
}
} catch (error) {
if (!(error instanceof HttpError && error.status === 404)) throw error;
}
}
if (!isCurrent()) return;
pending.attempted = true;
persistCtiState();
const { prjctIdx, sid } = pending.call.context;
const result = await nextApi.put<ListCallHist>(
`/list-call-hist/${prjctIdx}/${encodeURIComponent(sid)}/call-close`, body);
if (!isCurrent()) return;
if (!matchesHistory(pending.call, result)) throw new Error("종료 저장 응답 불일치");
updateCallHistoryId(pending.call, result);
finishPendingClose(pending);
} catch {
if (isCurrent()) {
console.warn("[CTI] 종료 이력 저장 실패: 재시도할 정보를 보존합니다.");
if (!notifiedCloseFailures.has(pending)) {
notifiedCloseFailures.add(pending);
alertUnhandledError("CallHistory", "종료 이력 저장을 재시도합니다.");
}
scheduleHistoryRetry();
}
} finally {
closingRequests.delete(pending);
}
};
const flushPendingCallCloses = () => {
pendingCallCloses.forEach((pending) => void savePendingClose(pending));
};
const queueCallClose = (call: CtiCall, body: ListCallCloseRequest | null) => {
let pending = pendingCallCloses.find((item) => item.call.agentSessionId === call.agentSessionId);
if (pending) {
// 실제 종료 이벤트는 재로그인 11에 의한 판단보다 우선한다.
if (body) pending.body = body;
} else {
pending = { call, body };
pendingCallCloses.push(pending);
}
persistCtiState();
void savePendingClose(pending);
};
const buildCallBody = (parsed: Record<string, unknown>, call: CtiCall): ListCallCloseRequest | null => { const buildCallBody = (parsed: Record<string, unknown>, call: CtiCall): ListCallCloseRequest | null => {
const text = (key: string) => typeof parsed[key] === "string" ? parsed[key] : ""; const text = (key: string) => typeof parsed[key] === "string" ? parsed[key] : "";
const body: ListCallCloseRequest = { const body: ListCallCloseRequest = {
@@ -575,37 +424,21 @@ const buildCallBody = (parsed: Record<string, unknown>, call: CtiCall): ListCall
}; };
const saveCallStart = (parsed: Record<string, unknown>, call: CtiCall) => { const saveCallStart = (parsed: Record<string, unknown>, call: CtiCall) => {
if (savedStarts.has(call) || startingRequests.has(call)) return; if (startRequestedCalls.has(call)) return;
const body = buildCallBody(parsed, call); const body = buildCallBody(parsed, call);
if (!body) { if (!body) {
alertUnhandledError("StartSessionRecord", "통화 시작 정보가 올바르지 않습니다."); alertUnhandledError("StartSessionRecord", "통화 시작 정보가 올바르지 않습니다.");
return; return;
} }
const { prjctIdx, sid } = call.context; startRequestedCalls.add(call);
const generation = ownerGeneration; saveCallHistory(call, "call-start", body);
call.pendingStart = body;
persistCtiState();
const request = nextApi.put<ListCallHist>(
`/list-call-hist/${prjctIdx}/${encodeURIComponent(sid)}/call-start`, body,
).then((result) => {
if (ownerGeneration !== generation) return;
if (!matchesHistory(call, result)) throw new Error("통화 시작 저장 응답 불일치");
savedStarts.add(call);
delete call.pendingStart;
updateCallHistoryId(call, result);
persistCtiState();
}).catch(() => {
if (ownerGeneration === generation) alertUnhandledError("CallHistory", "통화 시작 이력을 저장하지 못했습니다.");
}).finally(() => { startingRequests.delete(call); });
startingRequests.set(call, request);
}; };
// 재로그인 11로 화면 상태만 해제된 통화도 이후 CallClosed로 마감할 수 있도록 마지막 통화를 함께 찾는다.
const findEventCall = (agentSessionId: string): CtiCall | null => { const findEventCall = (agentSessionId: string): CtiCall | null => {
if (!agentSessionId || completedSessionIds.includes(agentSessionId)) return null; if (!agentSessionId || completedSessionIds.includes(agentSessionId)) return null;
if (activeCall?.agentSessionId === agentSessionId) return activeCall; if (activeCall?.agentSessionId === agentSessionId) return activeCall;
if (closingCall?.agentSessionId === agentSessionId) return closingCall; if (latestCall?.agentSessionId === agentSessionId) return latestCall;
const pending = pendingCallCloses.find((item) => item.call.agentSessionId === agentSessionId);
if (pending) return pending.call;
return activeCall?.agentSessionId === null ? activeCall : null; return activeCall?.agentSessionId === null ? activeCall : null;
}; };
@@ -663,19 +496,13 @@ const handleIncomingMessage = (raw: unknown) => {
setAgentStatus(status); setAgentStatus(status);
const call = recoveryCall; const call = recoveryCall;
recoveryCall = null; recoveryCall = null;
if (status === "11" && call?.agentSessionId && if (status === "11" && call?.agentSessionId && activeCall === call) {
(activeCall === call || closingCall === call)) { // 통화가 유지됐다면 Talking이 재전송된다. 11이면 화면의 통화 상태만 해제하고 이력은 CallClosed로만 마감한다.
// 통화가 유지됐다면 Talking이 재전송된다. 11은 단절 중 종료된 복원 대상에만 적용한다. activeCall = null;
if (activeCall === call) activeCall = null;
if (closingCall === call) closingCall = null;
clearDialingTimeout(); clearDialingTimeout();
queueCallClose(call, null);
} else if (call?.agentSessionId) {
void recoverLastCallHistId(call);
} }
persistCtiState(); persistCtiState();
setConnectionState("open"); setConnectionState("open");
flushPendingCallCloses();
return; return;
} }
if (!loginCompleted) return; if (!loginCompleted) return;
@@ -708,18 +535,13 @@ const handleIncomingMessage = (raw: unknown) => {
alertUnhandledError("Talking", "통화 대상 정보를 복원할 수 없습니다."); alertUnhandledError("Talking", "통화 대상 정보를 복원할 수 없습니다.");
break; break;
} }
// 종료 데이터가 이미 있으면 지연된 Talking으로 통화를 재개하지 않는다. // 종료된 세션은 findEventCall에서 제외되므로 지연된 Talking으로 통화를 재개하지 않는다.
const pending = pendingCallCloses.find((item) => item.call === call);
if (pending?.body) break;
if (activeCall && activeCall !== call) break; if (activeCall && activeCall !== call) break;
pendingCallCloses = pendingCallCloses.filter((item) => item !== pending);
activeCall = call; activeCall = call;
if (closingCall === call) closingCall = null;
latestCall = call; latestCall = call;
clearDialingTimeout(); clearDialingTimeout();
callClosedReceived = false; callClosedReceived = false;
setAgentStatus("3"); setAgentStatus("3");
void recoverLastCallHistId(call);
break; break;
} }
case "CallClosed": { case "CallClosed": {
@@ -737,9 +559,10 @@ const handleIncomingMessage = (raw: unknown) => {
callClosedReceived = true; callClosedReceived = true;
agentStatus = "4"; agentStatus = "4";
} }
if (closingCall === call) closingCall = null; rememberCompletedSession(body.agentSessionId);
queueCallClose(call, body); persistCtiState();
notify(); notify();
saveCallHistory(call, "call-close", body);
break; break;
} }
case "HangUp": case "HangUp":
@@ -756,6 +579,7 @@ const send = (command: Record<string, string>): boolean => {
if (!socket || socket.readyState !== WebSocket.OPEN) return false; if (!socket || socket.readyState !== WebSocket.OPEN) return false;
try { try {
socket.send(JSON.stringify(command)); socket.send(JSON.stringify(command));
console.log("[CTI][TEMP_LOG] send ->", command); // TEMP_CTI_LOG
return true; return true;
} catch { } catch {
return false; return false;
@@ -784,20 +608,13 @@ const logout = () => {
teardownSocket(); teardownSocket();
clearAutoReconnect(); clearAutoReconnect();
clearDialingTimeout(); clearDialingTimeout();
if (historyRetryTimeoutId !== null) clearTimeout(historyRetryTimeoutId);
historyRetryTimeoutId = null;
currentAgentLoginId = null; currentAgentLoginId = null;
currentConnectionKey = null; currentConnectionKey = null;
currentLoginParams = null; currentLoginParams = null;
activeCall = null; activeCall = null;
closingCall = null;
recoveryCall = null; recoveryCall = null;
latestCall = null; latestCall = null;
pendingCallCloses = [];
completedSessionIds = []; completedSessionIds = [];
startingRequests.clear();
savedStarts = new WeakSet<CtiCall>();
closingRequests.clear();
lastCallContext = null; lastCallContext = null;
lastCallHistId = null; lastCallHistId = null;
callClosedReceived = false; callClosedReceived = false;
@@ -817,7 +634,10 @@ const openSocketAndLogin = (params: CtiLoginParams) => {
AgentGroup: CTI_AGENT_GROUP, ANINumber: params.aniNumber, AgentPhone: params.agentPhone }); AgentGroup: CTI_AGENT_GROUP, ANINumber: params.aniNumber, AgentPhone: params.agentPhone });
}; };
ws.onmessage = (event) => { ws.onmessage = (event) => {
if (socket === ws) handleIncomingMessage(event.data); if (socket === ws) {
console.log("[CTI][TEMP_LOG] message <-", event.data); // TEMP_CTI_LOG
handleIncomingMessage(event.data);
}
}; };
ws.onerror = () => console.warn("[CTI] WebSocket 연결 오류"); ws.onerror = () => console.warn("[CTI] WebSocket 연결 오류");
ws.onclose = () => { ws.onclose = () => {
@@ -849,7 +669,7 @@ const connectAndLogin = (params: CtiLoginParams) => {
currentConnectionKey = key; currentConnectionKey = key;
currentLoginParams = params; currentLoginParams = params;
if (shouldRestore) restoreCtiState(params.agentLoginId); if (shouldRestore) restoreCtiState(params.agentLoginId);
recoveryCall = activeCall ?? closingCall; recoveryCall = activeCall;
openSocketAndLogin(params); openSocketAndLogin(params);
}; };

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

@@ -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,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,6 +38,14 @@ const fetchAvailability = async (prjctIdx: number, jobType: ListJobType) =>
/** 신규 API 미배포·롤백 상태. 반복 호출하지 않고 사전 안내만 중단한다. */ /** 신규 API 미배포·롤백 상태. 반복 호출하지 않고 사전 안내만 중단한다. */
export const isAvailabilityUnsupported = (error: unknown) => error instanceof HttpError && error.status === 404 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) { export function useSubmitListJob(prjctIdx: number) {
const qc = useQueryClient() const qc = useQueryClient()
const { auth } = useAuth() const { auth } = useAuth()

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

@@ -1,7 +1,7 @@
'use client' 'use client'
import { useSyncExternalStore } from 'react' import { useSyncExternalStore } from 'react'
import { getLocalStorage, setLocalStorage } from '@/store/storage/secure-storage' import { getLocalStorage, removeLocalStorage, setLocalStorage } from '@/store/storage/secure-storage'
import { StorageKeys } from '@/store/storage/storage-keys' import { StorageKeys } from '@/store/storage/storage-keys'
import { isListJobType, type ListJobType } from '@/types/list-job' import { isListJobType, type ListJobType } from '@/types/list-job'
@@ -77,6 +77,14 @@ export const untrackListJob = (jobKey: string) => {
write(jobs.filter((job) => job.jobKey !== jobKey)) 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) => export const findTrackedListJob = (jobs: TrackedListJob[], userId: string, prjctIdx: number, jobType: ListJobType) =>
jobs.find((job) => job.userId === userId && job.prjctIdx === prjctIdx && job.jobType === jobType) jobs.find((job) => job.userId === userId && job.prjctIdx === prjctIdx && job.jobType === jobType)

View File

@@ -121,6 +121,11 @@ export type listHeader = {
useIntrvwerView: boolean; useIntrvwerView: boolean;
useIntrvwerEdit: boolean; useIntrvwerEdit: boolean;
filterContents?: string[]; filterContents?: string[];
/**
* 헤더 색상(`#RRGGBB` 또는 `#RRGGBBAA`). null/빈 문자열은 기본색.
* 헤더 저장은 전체 덮어쓰기라 조회한 값을 그대로 다시 보내야 기존 색상이 유지된다.
*/
listHderColor?: string | null;
}; };
export type SurveyResultCondition = { export type SurveyResultCondition = {
@@ -308,8 +313,6 @@ export type ListCallHist = ListCallCloseRequest & {
regDt: string; regDt: string;
}; };
export type ListCallHistSession = ListCallHist;
export type ListReserveRequest = { export type ListReserveRequest = {
prjctIdx: number; prjctIdx: number;
sid: string; sid: string;