diff --git a/.env.development b/.env.development index 0e6a086..24139b2 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,6 @@ NEXT_PUBLIC_ENV=dev NEXT_PUBLIC_API_BASE=http://localhost:4000/api +NEXT_PUBLIC_API_INTERNAL=https://intranet.kric.com ENV=dev CONTACT_SERVER=http://localhost:4001 diff --git a/.env.local b/.env.local index cbe9726..418479f 100644 --- a/.env.local +++ b/.env.local @@ -1,5 +1,6 @@ NEXT_PUBLIC_ENV=local NEXT_PUBLIC_API_BASE=http://localhost:4000/api +NEXT_PUBLIC_API_INTERNAL=https://intranet.kric.com ENV=local CONTACT_SERVER=http://localhost:4001 diff --git a/.env.production b/.env.production index 35495cc..a5d3aaf 100644 --- a/.env.production +++ b/.env.production @@ -1,5 +1,6 @@ NEXT_PUBLIC_ENV=prod NEXT_PUBLIC_API_BASE=http://localhost:4000/api +NEXT_PUBLIC_API_INTERNAL=https://intranet.kric.com ENV=prod CONTACT_SERVER=http://localhost:4001 diff --git a/.idea/dictionaries/project.xml b/.idea/dictionaries/project.xml new file mode 100644 index 0000000..57f93e8 --- /dev/null +++ b/.idea/dictionaries/project.xml @@ -0,0 +1,8 @@ + + + + Hder + prjct + + + \ No newline at end of file diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..a1ee02d --- /dev/null +++ b/.npmrc @@ -0,0 +1,2 @@ +@kri:registry=https://gitea.kric.com/api/packages/KRi/npm/ +//gitea.kric.com/api/packages/KRi/npm/:_authToken=${GITEA_NPM_TOKEN} \ No newline at end of file diff --git a/next.config.ts b/next.config.ts index e55cbaf..fdef1bb 100644 --- a/next.config.ts +++ b/next.config.ts @@ -1,15 +1,16 @@ import type { NextConfig } from "next"; +import { createEnv, createKriNextConfig, env } from "@kri/common/config"; -const nextConfig: NextConfig = { - /* config options here */ - output: "standalone", - reactCompiler: true, +const nextEnv = createEnv({ + CONTACT_SERVER: env.required("CONTACT_SERVER", process.env.CONTACT_SERVER), +}); +const nextConfig = createKriNextConfig({ async rewrites() { return [ { source: "/contact-senario/:path*", - destination: `${process.env.CONTACT_SERVER}/contact-senario/:path*`, + destination: `${nextEnv.CONTACT_SERVER}/contact-senario/:path*`, }, ]; }, @@ -19,17 +20,17 @@ const nextConfig: NextConfig = { { source: "/api/external/:path*", headers: [ - {key: "Access-Control-Allow-Credentials", value: "true"}, - {key: "Access-Control-Allow-Origin", value: "*"}, - {key: "Access-Control-Allow-Methods", value: "GET,POST,PUT,PATCH,DELETE"}, + { key: "Access-Control-Allow-Credentials", value: "true" }, + { key: "Access-Control-Allow-Origin", value: "*" }, + { key: "Access-Control-Allow-Methods", value: "GET,POST,PUT,PATCH,DELETE" }, { key: "Access-Control-Allow-Headers", value: "Content-Type, Authorization, X-Requested-With", }, ], }, - ] + ]; }, -}; +}) satisfies NextConfig; export default nextConfig; diff --git a/package-lock.json b/package-lock.json index a52df42..026aa4b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,10 @@ "name": "contact-front", "version": "0.1.0", "dependencies": { + "@dnd-kit/core": "^6.3.1", + "@dnd-kit/sortable": "^10.0.0", + "@dnd-kit/utilities": "^3.2.2", + "@kri/common": "^0.12.0", "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-dropdown-menu": "^2.1.16", @@ -34,11 +38,9 @@ "@tiptap/extension-underline": "^3.13.0", "@tiptap/react": "^3.12.0", "@tiptap/starter-kit": "^3.12.0", - "@types/lodash": "^4.17.21", "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", "cmdk": "^1.1.1", - "crypto-js": "^4.2.0", + "dompurify": "^3.4.10", "jotai": "^2.15.1", "lucide-react": "^0.553.0", "next": "^16.0.7", @@ -46,12 +48,10 @@ "react": "^19.2.1", "react-dom": "^19.2.1", "sonner": "^2.0.7", - "tailwind-merge": "^3.4.0" + "xlsx": "^0.18.5" }, "devDependencies": { "@tailwindcss/postcss": "^4", - "@tanstack/react-query-devtools": "^5.91.3", - "@types/crypto-js": "^4.2.2", "@types/node": "^20", "@types/react": "^19", "@types/react-dom": "^19", @@ -103,6 +103,7 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz", "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==", "devOptional": true, + "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/generator": "^7.28.5", @@ -259,6 +260,7 @@ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", "devOptional": true, + "peer": true, "dependencies": { "@babel/code-frame": "^7.27.1", "@babel/parser": "^7.27.2", @@ -299,6 +301,60 @@ "node": ">=6.9.0" } }, + "node_modules/@dnd-kit/accessibility": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz", + "integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0" + } + }, + "node_modules/@dnd-kit/core": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz", + "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==", + "license": "MIT", + "peer": true, + "dependencies": { + "@dnd-kit/accessibility": "^3.1.1", + "@dnd-kit/utilities": "^3.2.2", + "tslib": "^2.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" + } + }, + "node_modules/@dnd-kit/sortable": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz", + "integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==", + "license": "MIT", + "dependencies": { + "@dnd-kit/utilities": "^3.2.2", + "tslib": "^2.0.0" + }, + "peerDependencies": { + "@dnd-kit/core": "^6.3.0", + "react": ">=16.8.0" + } + }, + "node_modules/@dnd-kit/utilities": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz", + "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==", + "license": "MIT", + "dependencies": { + "tslib": "^2.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0" + } + }, "node_modules/@emnapi/core": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.0.tgz", @@ -475,6 +531,7 @@ "version": "1.7.4", "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz", "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==", + "peer": true, "dependencies": { "@floating-ui/core": "^1.7.3", "@floating-ui/utils": "^0.2.10" @@ -1031,6 +1088,33 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@kri/common": { + "version": "0.12.0", + "resolved": "https://gitea.kric.com/api/packages/KRi/npm/%40kri%2Fcommon/-/0.12.0/common-0.12.0.tgz", + "integrity": "sha512-VRtV1leu9OTHr/M9tK4duk8DXjf+NvT8bm98isSYml/oCbgYrKGm2ji33bG9ukPdk0wqhyM8XI0RQ9fvo0Evtg==", + "license": "UNLICENSED", + "dependencies": { + "clsx": "^2.1.1", + "crypto-js": "^4.2.0", + "tailwind-merge": "^3.4.0" + }, + "peerDependencies": { + "@tanstack/react-query": ">=5 <6", + "jotai": ">=2", + "react": ">=18" + }, + "peerDependenciesMeta": { + "@tanstack/react-query": { + "optional": true + }, + "jotai": { + "optional": true + }, + "react": { + "optional": true + } + } + }, "node_modules/@napi-rs/wasm-runtime": { "version": "0.2.12", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.12.tgz", @@ -1044,9 +1128,9 @@ } }, "node_modules/@next/env": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/@next/env/-/env-16.1.6.tgz", - "integrity": "sha512-N1ySLuZjnAtN3kFnwhAwPvZah8RJxKasD7x1f8shFqhncnWZn4JMfg37diLNuoHsLAlrDfM3g4mawVdtAG8XLQ==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/env/-/env-16.2.4.tgz", + "integrity": "sha512-dKkkOzOSwFYe5RX6y26fZgkSpVAlIOJKQHIiydQcrWH6y/97+RceSOAdjZ14Qa3zLduVUy0TXcn+EiM6t4rPgw==", "license": "MIT" }, "node_modules/@next/eslint-plugin-next": { @@ -1059,9 +1143,9 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.1.6.tgz", - "integrity": "sha512-wTzYulosJr/6nFnqGW7FrG3jfUUlEf8UjGA0/pyypJl42ExdVgC6xJgcXQ+V8QFn6niSG2Pb8+MIG1mZr2vczw==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.2.4.tgz", + "integrity": "sha512-OXTFFox5EKN1Ym08vfrz+OXxmCcEjT4SFMbNRsWZE99dMqt2Kcusl5MqPXcW232RYkMLQTy0hqgAMEsfEd/l2A==", "cpu": [ "arm64" ], @@ -1075,9 +1159,9 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.1.6.tgz", - "integrity": "sha512-BLFPYPDO+MNJsiDWbeVzqvYd4NyuRrEYVB5k2N3JfWncuHAy2IVwMAOlVQDFjj+krkWzhY2apvmekMkfQR0CUQ==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.2.4.tgz", + "integrity": "sha512-XhpVnUfmYWvD3YrXu55XdcAkQtOnvaI6wtQa8fuF5fGoKoxIUZ0kWPtcOfqJEWngFF/lOS9l3+O9CcownhiQxQ==", "cpu": [ "x64" ], @@ -1091,9 +1175,9 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.1.6.tgz", - "integrity": "sha512-OJYkCd5pj/QloBvoEcJ2XiMnlJkRv9idWA/j0ugSuA34gMT6f5b7vOiCQHVRpvStoZUknhl6/UxOXL4OwtdaBw==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.2.4.tgz", + "integrity": "sha512-Mx/tjlNA3G8kg14QvuGAJ4xBwPk1tUHq56JxZ8CXnZwz1Etz714soCEzGQQzVMz4bEnGPowzkV6Xrp6wAkEWOQ==", "cpu": [ "arm64" ], @@ -1107,9 +1191,9 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.1.6.tgz", - "integrity": "sha512-S4J2v+8tT3NIO9u2q+S0G5KdvNDjXfAv06OhfOzNDaBn5rw84DGXWndOEB7d5/x852A20sW1M56vhC/tRVbccQ==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.2.4.tgz", + "integrity": "sha512-iVMMp14514u7Nup2umQS03nT/bN9HurK8ufylC3FZNykrwjtx7V1A7+4kvhbDSCeonTVqV3Txnv0Lu+m2oDXNg==", "cpu": [ "arm64" ], @@ -1123,9 +1207,9 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.1.6.tgz", - "integrity": "sha512-2eEBDkFlMMNQnkTyPBhQOAyn2qMxyG2eE7GPH2WIDGEpEILcBPI/jdSv4t6xupSP+ot/jkfrCShLAa7+ZUPcJQ==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.2.4.tgz", + "integrity": "sha512-EZOvm1aQWgnI/N/xcWOlnS3RQBk0VtVav5Zo7n4p0A7UKyTDx047k8opDbXgBpHl4CulRqRfbw3QrX2w5UOXMQ==", "cpu": [ "x64" ], @@ -1139,9 +1223,9 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.1.6.tgz", - "integrity": "sha512-oicJwRlyOoZXVlxmIMaTq7f8pN9QNbdes0q2FXfRsPhfCi8n8JmOZJm5oo1pwDaFbnnD421rVU409M3evFbIqg==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.2.4.tgz", + "integrity": "sha512-h9FxsngCm9cTBf71AR4fGznDEDx1hS7+kSEiIRjq5kO1oXWm07DxVGZjCvk0SGx7TSjlUqhI8oOyz7NfwAdPoA==", "cpu": [ "x64" ], @@ -1155,9 +1239,9 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.1.6.tgz", - "integrity": "sha512-gQmm8izDTPgs+DCWH22kcDmuUp7NyiJgEl18bcr8irXA5N2m2O+JQIr6f3ct42GOs9c0h8QF3L5SzIxcYAAXXw==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.2.4.tgz", + "integrity": "sha512-3NdJV5OXMSOeJYijX+bjaLge3mJBlh4ybydbT4GFoB/2hAojWHtMhl3CYlYoMrjPuodp0nzFVi4Tj2+WaMg+Ow==", "cpu": [ "arm64" ], @@ -1171,9 +1255,9 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.1.6.tgz", - "integrity": "sha512-NRfO39AIrzBnixKbjuo2YiYhB6o9d8v/ymU9m/Xk8cyVk+k7XylniXkHwjs4s70wedVffc6bQNbufk5v0xEm0A==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.2.4.tgz", + "integrity": "sha512-kMVGgsqhO5YTYODD9IPGGhA6iprWidQckK3LmPeW08PIFENRmgfb4MjXHO+p//d+ts2rpjvK5gXWzXSMrPl9cw==", "cpu": [ "x64" ], @@ -2455,22 +2539,12 @@ "url": "https://github.com/sponsors/tannerlinsley" } }, - "node_modules/@tanstack/query-devtools": { - "version": "5.93.0", - "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.93.0.tgz", - "integrity": "sha512-+kpsx1NQnOFTZsw6HAFCW3HkKg0+2cepGtAWXjiiSOJJ1CtQpt72EE2nyZb+AjAbLRPoeRmPJ8MtQd8r8gsPdg==", - "dev": true, - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - } - }, "node_modules/@tanstack/react-query": { "version": "5.90.21", "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.90.21.tgz", "integrity": "sha512-0Lu6y5t+tvlTJMTO7oh5NSpJfpg/5D41LlThfepTixPYkJ0sE2Jj0m0f6yYqujBwIXlId87e234+MxG3D3g7kg==", "license": "MIT", + "peer": true, "dependencies": { "@tanstack/query-core": "5.90.20" }, @@ -2482,24 +2556,6 @@ "react": "^18 || ^19" } }, - "node_modules/@tanstack/react-query-devtools": { - "version": "5.91.3", - "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.91.3.tgz", - "integrity": "sha512-nlahjMtd/J1h7IzOOfqeyDh5LNfG0eULwlltPEonYy0QL+nqrBB+nyzJfULV+moL7sZyxc2sHdNJki+vLA9BSA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@tanstack/query-devtools": "5.93.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "peerDependencies": { - "@tanstack/react-query": "^5.90.20", - "react": "^18 || ^19" - } - }, "node_modules/@tanstack/react-table": { "version": "8.21.3", "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz", @@ -2535,6 +2591,7 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/core/-/core-3.13.0.tgz", "integrity": "sha512-iUelgiTMgPVMpY5ZqASUpk8mC8HuR9FWKaDzK27w9oWip9tuB54Z8mePTxNcQaSPb6ErzEaC8x8egrRt7OsdGQ==", + "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -2777,6 +2834,7 @@ "version": "3.12.0", "resolved": "https://registry.npmjs.org/@tiptap/extension-list/-/extension-list-3.12.0.tgz", "integrity": "sha512-RCQb3MPsTsKZZ8Wf0maMnfcICcmYEbMfWJMUNwVUJCfEv1hGiA5J7jMEJWr7z6kH2ULDHmrkhg6BYCdLrJap/w==", + "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -2862,6 +2920,7 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/extension-table/-/extension-table-3.13.0.tgz", "integrity": "sha512-LcH9KE4QBUJ6IPwt1Uo5iU7zatFjUUvXbctIu2fKQ9nqJ7nNSFxRhkNyporVFkTWYH7/rb0qMoF1VxSUGefG5w==", + "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -2935,6 +2994,7 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/extension-text-style/-/extension-text-style-3.13.0.tgz", "integrity": "sha512-M7ob3pfYNYgFPihncEp33r9477hXQgC8j3iU8BsewvPlSx2bMSy5jp2XHDXyEX8dV6flr7acH4GkXXw+DHpaPA==", + "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -2959,6 +3019,7 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/extensions/-/extensions-3.13.0.tgz", "integrity": "sha512-i7O0ptSibEtTy+2PIPsNKEvhTvMaFJg1W4Oxfnbuxvaigs7cJV9Q0lwDUcc7CPsNw2T1+44wcxg431CzTvdYoA==", + "peer": true, "funding": { "type": "github", "url": "https://github.com/sponsors/ueberdosis" @@ -2972,6 +3033,7 @@ "version": "3.13.0", "resolved": "https://registry.npmjs.org/@tiptap/pm/-/pm-3.13.0.tgz", "integrity": "sha512-WKR4ucALq+lwx0WJZW17CspeTpXorbIOpvKv5mulZica6QxqfMhn8n1IXCkDws/mCoLRx4Drk5d377tIjFNsvQ==", + "peer": true, "dependencies": { "prosemirror-changeset": "^2.3.0", "prosemirror-collab": "^1.3.1", @@ -3068,12 +3130,6 @@ "tslib": "^2.4.0" } }, - "node_modules/@types/crypto-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@types/crypto-js/-/crypto-js-4.2.2.tgz", - "integrity": "sha512-sDOLlVbHhXpAUAL0YHDUUwDZf3iN4Bwi4W6a0W0b+QcAezUbRtH4FVb+9J4h+XFPW7l/gQ9F8qC7P+Ec4k8QVQ==", - "dev": true - }, "node_modules/@types/estree": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", @@ -3097,11 +3153,6 @@ "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz", "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==" }, - "node_modules/@types/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-FOvQ0YPD5NOfPgMzJihoT+Za5pdkDJWcbpuj1DjaKZIr/gxodQjY/uWEFlTNqW2ugXHUiL8lRQgw63dzKHZdeQ==" - }, "node_modules/@types/markdown-it": { "version": "14.1.2", "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz", @@ -3129,6 +3180,7 @@ "version": "19.2.4", "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.4.tgz", "integrity": "sha512-tBFxBp9Nfyy5rsmefN+WXc1JeW/j2BpBHFdLZbEVfs9wn3E3NRFxwV0pJg8M1qQAexFpvz73hJXFofV0ZAu92A==", + "peer": true, "dependencies": { "csstype": "^3.0.2" } @@ -3137,10 +3189,18 @@ "version": "19.2.3", "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.3.tgz", "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", + "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } }, + "node_modules/@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "license": "MIT", + "optional": true + }, "node_modules/@types/use-sync-external-store": { "version": "0.0.6", "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz", @@ -3189,6 +3249,7 @@ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.4.tgz", "integrity": "sha512-tK3GPFWbirvNgsNKto+UmB/cRtn6TZfyw0D6IKrW55n6Vbs7KJoZtI//kpTKzE/DUmmnAFD8/Ca46s7Obs92/w==", "dev": true, + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.46.4", "@typescript-eslint/types": "8.46.4", @@ -3338,9 +3399,9 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.3.tgz", - "integrity": "sha512-fy6KJm2RawA5RcHkLa1z/ScpBeA762UF9KmZQxwIbDtRJrgLzM10depAiEQ+CXYcoiqW1/m96OAAoke2nE9EeA==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.5.tgz", + "integrity": "sha512-VZznLgtwhn+Mact9tfiwx64fA9erHH/MCXEUfB/0bX/6Fz6ny5EGTXYltMocqg4xFAQZtnO3DHWWXi8RiuN7cQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3701,6 +3762,7 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "dev": true, + "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3717,6 +3779,15 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/adler-32": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/adler-32/-/adler-32-1.3.1.tgz", + "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/ajv": { "version": "6.14.0", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", @@ -3979,6 +4050,7 @@ "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-1.0.0.tgz", "integrity": "sha512-Ixm8tFfoKKIPYdCCKYTsqv+Fd4IJ0DQqMyEimo+pxUOMUR9cVPlwTrFt9Avu+3cb6Zp3mAzl+t1MrG2fxxKsxw==", "devOptional": true, + "peer": true, "dependencies": { "@babel/types": "^7.26.0" } @@ -3990,18 +4062,23 @@ "dev": true }, "node_modules/baseline-browser-mapping": { - "version": "2.8.27", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.27.tgz", - "integrity": "sha512-2CXFpkjVnY2FT+B6GrSYxzYf65BJWEqz5tIRHCvNsZZ2F3CmsCB37h8SpYgKG7y9C4YAeTipIPWG7EmFmhAeXA==", + "version": "2.10.23", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.23.tgz", + "integrity": "sha512-xwVXGqevyKPsiuQdLj+dZMVjidjJV508TBqexND5HrF89cGdCYCJFB3qhcxRHSeMctdCfbR1jrxBajhDy7o29g==", + "license": "Apache-2.0", "bin": { - "baseline-browser-mapping": "dist/cli.js" + "baseline-browser-mapping": "dist/cli.cjs" + }, + "engines": { + "node": ">=6.0.0" } }, "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", + "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4038,6 +4115,7 @@ "url": "https://github.com/sponsors/ai" } ], + "peer": true, "dependencies": { "baseline-browser-mapping": "^2.8.25", "caniuse-lite": "^1.0.30001754", @@ -4127,6 +4205,19 @@ } ] }, + "node_modules/cfb": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cfb/-/cfb-1.2.2.tgz", + "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==", + "license": "Apache-2.0", + "dependencies": { + "adler-32": "~1.3.0", + "crc-32": "~1.2.0" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", @@ -4182,6 +4273,15 @@ "react-dom": "^18 || ^19 || ^19.0.0-rc" } }, + "node_modules/codepage": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/codepage/-/codepage-1.15.0.tgz", + "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -4212,6 +4312,18 @@ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "devOptional": true }, + "node_modules/crc-32": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", + "license": "Apache-2.0", + "bin": { + "crc32": "bin/crc32.njs" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/crelt": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", @@ -4381,6 +4493,15 @@ "node": ">=0.10.0" } }, + "node_modules/dompurify": { + "version": "3.4.10", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.10.tgz", + "integrity": "sha512-0xzNv0e7oYC6yyuOGZIABPM4qtg3QxLFniDNPP4ZP90wR8Yq3zgwpRbrNiT4N3IKqDbbYFEJLV+JWEs19aZ//w==", + "license": "(MPL-2.0 OR Apache-2.0)", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -4625,6 +4746,7 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz", "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", "dev": true, + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", "@eslint-community/regexpp": "^4.12.1", @@ -4802,6 +4924,7 @@ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz", "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==", "dev": true, + "peer": true, "dependencies": { "@rtsao/scc": "^1.1.0", "array-includes": "^3.1.9", @@ -5140,10 +5263,11 @@ } }, "node_modules/flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", - "dev": true + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", + "dev": true, + "license": "ISC" }, "node_modules/for-each": { "version": "0.3.5", @@ -5160,6 +5284,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/frac": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/frac/-/frac-1.1.2.tgz", + "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", @@ -5934,6 +6067,7 @@ "version": "2.15.1", "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.15.1.tgz", "integrity": "sha512-yHT1HAZ3ba2Q8wgaUQ+xfBzEtcS8ie687I8XVCBinfg4bNniyqLIN+utPXWKQE93LMF5fPbQSVRZqgpcN5yd6Q==", + "peer": true, "engines": { "node": ">=12.20.0" }, @@ -6514,14 +6648,14 @@ "dev": true }, "node_modules/next": { - "version": "16.1.6", - "resolved": "https://registry.npmjs.org/next/-/next-16.1.6.tgz", - "integrity": "sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==", + "version": "16.2.4", + "resolved": "https://registry.npmjs.org/next/-/next-16.2.4.tgz", + "integrity": "sha512-kPvz56wF5frc+FxlHI5qnklCzbq53HTwORaWBGdT0vNoKh1Aya9XC8aPauH4NJxqtzbWsS5mAbctm4cr+EkQ2Q==", "license": "MIT", "dependencies": { - "@next/env": "16.1.6", + "@next/env": "16.2.4", "@swc/helpers": "0.5.15", - "baseline-browser-mapping": "^2.8.3", + "baseline-browser-mapping": "^2.9.19", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" @@ -6533,15 +6667,15 @@ "node": ">=20.9.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "16.1.6", - "@next/swc-darwin-x64": "16.1.6", - "@next/swc-linux-arm64-gnu": "16.1.6", - "@next/swc-linux-arm64-musl": "16.1.6", - "@next/swc-linux-x64-gnu": "16.1.6", - "@next/swc-linux-x64-musl": "16.1.6", - "@next/swc-win32-arm64-msvc": "16.1.6", - "@next/swc-win32-x64-msvc": "16.1.6", - "sharp": "^0.34.4" + "@next/swc-darwin-arm64": "16.2.4", + "@next/swc-darwin-x64": "16.2.4", + "@next/swc-linux-arm64-gnu": "16.2.4", + "@next/swc-linux-arm64-musl": "16.2.4", + "@next/swc-linux-x64-gnu": "16.2.4", + "@next/swc-linux-x64-musl": "16.2.4", + "@next/swc-win32-arm64-msvc": "16.2.4", + "@next/swc-win32-x64-msvc": "16.2.4", + "sharp": "^0.34.5" }, "peerDependencies": { "@opentelemetry/api": "^1.1.0", @@ -6834,10 +6968,11 @@ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", + "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -6855,9 +6990,9 @@ } }, "node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", + "version": "8.5.12", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.12.tgz", + "integrity": "sha512-W62t/Se6rA0Az3DfCL0AqJwXuKwBeYg6nOaIgzP+xZ7N5BFCI7DYi1qs6ygUYT6rvfi6t9k65UMLJC+PHZpDAA==", "dev": true, "funding": [ { @@ -6873,6 +7008,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { "nanoid": "^3.3.11", "picocolors": "^1.1.1", @@ -7003,6 +7139,7 @@ "version": "1.25.4", "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.25.4.tgz", "integrity": "sha512-PIM7E43PBxKce8OQeezAs9j4TP+5yDpZVbuurd1h5phUxEKIu+G2a+EUZzIC5nS1mJktDJWzbqS23n1tsAf5QA==", + "peer": true, "dependencies": { "orderedmap": "^2.0.0" } @@ -7029,6 +7166,7 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.4.tgz", "integrity": "sha512-6jiYHH2CIGbCfnxdHbXZ12gySFY/fz/ulZE333G6bPqIZ4F+TXo9ifiR86nAHpWnfoNjOb3o5ESi7J8Uz1jXHw==", + "peer": true, "dependencies": { "prosemirror-model": "^1.0.0", "prosemirror-transform": "^1.0.0", @@ -7073,6 +7211,7 @@ "version": "1.41.4", "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.41.4.tgz", "integrity": "sha512-WkKgnyjNncri03Gjaz3IFWvCAE94XoiEgvtr0/r2Xw7R8/IjK3sKLSiDoCHWcsXSAinVaKlGRZDvMCsF1kbzjA==", + "peer": true, "dependencies": { "prosemirror-model": "^1.20.0", "prosemirror-state": "^1.0.0", @@ -7120,6 +7259,7 @@ "version": "19.2.1", "resolved": "https://registry.npmjs.org/react/-/react-19.2.1.tgz", "integrity": "sha512-DGrYcCWK7tvYMnWh79yrPHt+vdx9tY+1gPZa7nJQtO/p8bLTDaHp4dzwEhQB7pZ4Xe3ok4XKuEPrVuc+wlpkmw==", + "peer": true, "engines": { "node": ">=0.10.0" } @@ -7128,6 +7268,7 @@ "version": "19.2.1", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.1.tgz", "integrity": "sha512-ibrK8llX2a4eOskq1mXKu/TGZj9qzomO+sNfO98M6d9zIPOEhlBkMkBUBLd1vgS0gQsLDBzA+8jJBVXDnfHmJg==", + "peer": true, "dependencies": { "scheduler": "^0.27.0" }, @@ -7603,6 +7744,18 @@ "node": ">=0.10.0" } }, + "node_modules/ssf": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/ssf/-/ssf-0.11.2.tgz", + "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==", + "license": "Apache-2.0", + "dependencies": { + "frac": "~1.1.2" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/stable-hash": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.5.tgz", @@ -7858,10 +8011,12 @@ } }, "node_modules/tinyglobby/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, + "license": "MIT", + "peer": true, "engines": { "node": ">=12" }, @@ -8022,6 +8177,7 @@ "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "dev": true, + "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -8309,6 +8465,24 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/wmf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wmf/-/wmf-1.0.2.tgz", + "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/word": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/word/-/word-0.3.0.tgz", + "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==", + "license": "Apache-2.0", + "engines": { + "node": ">=0.8" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -8318,6 +8492,27 @@ "node": ">=0.10.0" } }, + "node_modules/xlsx": { + "version": "0.18.5", + "resolved": "https://registry.npmjs.org/xlsx/-/xlsx-0.18.5.tgz", + "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==", + "license": "Apache-2.0", + "dependencies": { + "adler-32": "~1.3.0", + "cfb": "~1.2.1", + "codepage": "~1.15.0", + "crc-32": "~1.2.1", + "ssf": "~0.11.2", + "wmf": "~1.0.1", + "word": "~0.3.0" + }, + "bin": { + "xlsx": "bin/xlsx.njs" + }, + "engines": { + "node": ">=0.8" + } + }, "node_modules/yallist": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", @@ -8341,6 +8536,7 @@ "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz", "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==", "dev": true, + "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } diff --git a/package.json b/package.json index 9fd1d36..8f904b2 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,10 @@ "lint": "eslint" }, "dependencies": { + "@dnd-kit/core": "^6.3.1", + "@dnd-kit/sortable": "^10.0.0", + "@dnd-kit/utilities": "^3.2.2", + "@kri/common": "^0.12.0", "@radix-ui/react-checkbox": "^1.3.3", "@radix-ui/react-dialog": "^1.1.15", "@radix-ui/react-dropdown-menu": "^2.1.16", @@ -35,11 +39,9 @@ "@tiptap/extension-underline": "^3.13.0", "@tiptap/react": "^3.12.0", "@tiptap/starter-kit": "^3.12.0", - "@types/lodash": "^4.17.21", "class-variance-authority": "^0.7.1", - "clsx": "^2.1.1", "cmdk": "^1.1.1", - "crypto-js": "^4.2.0", + "dompurify": "^3.4.10", "jotai": "^2.15.1", "lucide-react": "^0.553.0", "next": "^16.0.7", @@ -47,12 +49,10 @@ "react": "^19.2.1", "react-dom": "^19.2.1", "sonner": "^2.0.7", - "tailwind-merge": "^3.4.0" + "xlsx": "^0.18.5" }, "devDependencies": { "@tailwindcss/postcss": "^4", - "@tanstack/react-query-devtools": "^5.91.3", - "@types/crypto-js": "^4.2.2", "@types/node": "^20", "@types/react": "^19", "@types/react-dom": "^19", diff --git a/public/file.svg b/public/file.svg deleted file mode 100644 index 004145c..0000000 --- a/public/file.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/globe.svg b/public/globe.svg deleted file mode 100644 index 567f17b..0000000 --- a/public/globe.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/next.svg b/public/next.svg deleted file mode 100644 index 5174b28..0000000 --- a/public/next.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/vercel.svg b/public/vercel.svg deleted file mode 100644 index 7705396..0000000 --- a/public/vercel.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/window.svg b/public/window.svg deleted file mode 100644 index b2b2a44..0000000 --- a/public/window.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/app/(pages)/(main)/assign/project/page.tsx b/src/app/(pages)/(main)/assign/project/page.tsx index d5fd0b2..a4abd30 100644 --- a/src/app/(pages)/(main)/assign/project/page.tsx +++ b/src/app/(pages)/(main)/assign/project/page.tsx @@ -8,24 +8,22 @@ import { ChevronLeft, ChevronRight } from 'lucide-react' import { KriSingleSelect } from '@/components/common/KriAutoComplete' import { ProjectInfo } from "@/types/project"; import { PROJECT_SEARCH_COUNT } from "@/const/projectConst"; -import { useDebouncedValue } from "@/hooks/useDebouncedValue"; -import { useMounted } from "@/hooks/useMounted"; +import { useDebouncedValue, useMounted } from "@kri/common/hooks"; import { UserInfo } from "@/types/user"; import { useSelectedProject } from "@/hooks/useSelectedProject"; import { KriSelect, KriSelectItem } from "@/components/common/KriSelect"; import { useAuth } from "@/hooks/useAuth"; -import { CONTACT_USER_ROLE, FW_USER_ROLE } from "@/const/userConst"; +import {CONTACT_USER_ROLE, DEFAULT_COMPANY_NAME, FW_USER_ROLE} from "@/const/userConst"; import { - useFieldworkUsersQuery, + useFieldworkUsersQuery, useOutsourceUsersQuery, useRoleListQuery, - useUserCompaniesQuery, } from "@/query/user"; import { useAssignedFieldworkIdsQuery, useSaveAssignedFieldworkMutation, - useProjectTopQuery, + useProjectTopQuery, useAssignedOutsourceIdsQuery, } from "@/query/project"; const ProjectAssignPage = () => { @@ -36,18 +34,27 @@ const ProjectAssignPage = () => { const prjctIdx = selectedProject?.prjctIdx ?? 0; const enabled = mounted && prjctIdx > 0; + const companyQuery = useOutsourceUsersQuery(enabled); const fwUsersQuery = useFieldworkUsersQuery(enabled); + const assignedCompanyQuery = useAssignedOutsourceIdsQuery(prjctIdx, enabled); const assignedIdsQuery = useAssignedFieldworkIdsQuery(prjctIdx, enabled); const saveAssignMutation = useSaveAssignedFieldworkMutation(prjctIdx); - const companyQuery = useUserCompaniesQuery(); const roleQuery = useRoleListQuery(); const [searchKeyword, setSearchKeyword] = useState(""); const debouncedKeyword = useDebouncedValue(searchKeyword, 500); const projectTopQuery = useProjectTopQuery(PROJECT_SEARCH_COUNT, debouncedKeyword, mounted); const projectArray = projectTopQuery.data ?? []; - const companyArray = companyQuery.data ?? []; + const companyArray = useMemo(() => { + const companies = companyQuery.data ?? []; + const assigned = assignedCompanyQuery.data ?? []; + const assignedCompanies = companies + .filter(c => !assigned.includes(c.userCmpn)) + .map(c => c.userCmpn); + + return [DEFAULT_COMPANY_NAME, ...assignedCompanies]; + }, [companyQuery.data, assignedCompanyQuery.data]); const roleArray: KriSelectItem[] = useMemo(() => { const roles = roleQuery.data ?? []; @@ -252,12 +259,12 @@ const ProjectAssignPage = () => { if (!mounted || !selectedProject) return null; return ( -
+
-
+
-
회사
+
회사
{
-
대상
+
대상
{
-
+
{assignInfoString}
-
+
{ />
-
+
- - @@ -324,14 +331,14 @@ const ProjectAssignPage = () => { }`} onClick={() => handleToggleUnassign(userInfo.userId)} > - - @@ -346,7 +353,7 @@ const ProjectAssignPage = () => {
+ 0} onCheckedChange={handleSelectAllLeft} className="border-white" /> + 배정된 {roleFilter?.label} ( {assignBase.length}명 )
+ e.stopPropagation()} checked={selectedAssignUser.includes(userInfo.userId)} onCheckedChange={() => handleToggleUnassign(userInfo.userId)} /> + {userInfo.userName} ({userInfo.userId})
- - @@ -417,14 +424,14 @@ const ProjectAssignPage = () => { }`} onClick={() => handleToggleAssign(user.userId)} > - - @@ -439,7 +446,7 @@ const ProjectAssignPage = () => {
@@ -449,4 +456,4 @@ const ProjectAssignPage = () => { ) } -export default ProjectAssignPage; \ No newline at end of file +export default ProjectAssignPage; diff --git a/src/app/(pages)/(main)/layout.tsx b/src/app/(pages)/(main)/layout.tsx index 50bcbb4..11a8db7 100644 --- a/src/app/(pages)/(main)/layout.tsx +++ b/src/app/(pages)/(main)/layout.tsx @@ -5,10 +5,10 @@ import {CookieKeys} from "@/store/cookie/cookie-keys"; import {FONT_SIZE} from "@/const/commonConst"; function parseFontSize(raw: string | undefined | null) { - if (!raw) return FONT_SIZE.MIN; + if (!raw) return FONT_SIZE.DEFAULT; const parsed = parseInt(raw, 10); - if (Number.isNaN(parsed)) return FONT_SIZE.MIN; + if (Number.isNaN(parsed)) return FONT_SIZE.DEFAULT; return Math.min( FONT_SIZE.MAX, @@ -23,7 +23,7 @@ export default async function MainLayoutWrapper({ }) { const cookieStore = await cookies(); const fontSize = cookieStore.get(CookieKeys.FontSize); - const accessToken = cookieStore.get("access_token")?.value; + const accessToken = cookieStore.get(CookieKeys.AuthToken)?.value; const initialFontSize = parseFontSize(fontSize?.value); if (!accessToken) { @@ -35,4 +35,4 @@ export default async function MainLayoutWrapper({ {children} ); -} \ No newline at end of file +} diff --git a/src/app/(pages)/(main)/list/manage/page.tsx b/src/app/(pages)/(main)/list/manage/page.tsx index 9446b2e..588439f 100644 --- a/src/app/(pages)/(main)/list/manage/page.tsx +++ b/src/app/(pages)/(main)/list/manage/page.tsx @@ -1,4 +1,4 @@ -'use client' +'use client' import { useMemo, useState } from 'react' import { PaginationState, SortingState } from '@tanstack/react-table' @@ -18,34 +18,57 @@ import { DataTable } from '@/components/data-table/DataTable' import type { DataTableColumn } from '@/components/data-table/DataTable.type' import { KriMultiSelect } from '@/components/common/KriAutoComplete' import { LoadingOverlay } from '@/components/common/LoadingOverlay' -import { useMounted } from '@/hooks/useMounted' +import { useMounted } from "@kri/common/hooks"; import { useAuth } from '@/hooks/useAuth' import { useDialog } from '@/hooks/useDialog' import { useSelectedProject } from '@/hooks/useSelectedProject' -import { useListHeaderQuery, useListSearchQuery } from '@/query/list' +import { + useDownloadListEventHistoryMutation, + useDownloadListExcelTemplateMutation, + useDownloadListItemFileMutation, + useDownloadListMutation, + useDownloadListUpdateHistoryMutation, + useDownloadUploadHistoryFileMutation, + useListHeaderQuery, + useListSearchQuery, + useListUploadHistoryQuery, + useResetListMutation, + useUpdateListHeaderMutation, + useUpdateListMutation, + useUploadListExcelMutation, +} from '@/query/list' import { useResultCodesQuery } from '@/query/project' import { getListColumns, ListTableRow } from '@/components/table-column/ListTableColumn' -import { ListSearchRequest } from '@/types/list' +import { + createEmptyListFilter, + FilterRow, + ListEventHistoryBase, + ListDownloadMode, + ListDownloadPayload, + listHeader, + ListFilterMatchType, + ListFilterOperator, + ListFilterTarget, + ListOtherItemFilterCondition, + ListResetMode, + ListResetScope, + ListSearchRequest, + ListUploadRequest, +} from '@/types/list' import { ResultCode, ResultCodeType } from '@/types/project' -import { ListHeaderAssignConst } from '@/const/listConst' -import ListResetDialog, { ListResetScope, ListResetTarget } from '@/components/dialog/ListResetDialog' -import ListUploadDialog, { ListUploadHistory, ValidationOption } from '@/components/dialog/ListUploadDialog' -import ListHeaderManageDialog, { ListHeaderManageRow } from '@/components/dialog/ListHeaderManageDialog' +import ListResetDialog from '@/components/dialog/ListResetDialog' +import ListUploadDialog from '@/components/dialog/ListUploadDialog' +import ListHeaderManageDialog from '@/components/dialog/ListHeaderManageDialog' import ListBatchEditDialog, { BatchEditRow } from '@/components/dialog/ListBatchEditDialog' -import ListFilterDialog, { FilterRow } from '@/components/dialog/ListFilterDialog' -import ListDownloadDialog, { ListDownloadMode } from '@/components/dialog/ListDownloadDialog' +import ListFilterDialog from '@/components/dialog/ListFilterDialog' +import ListDownloadDialog from '@/components/dialog/ListDownloadDialog' import MessageSendDialog, { MessageSendMode, MessageSendPayload, MessageTemplateOption, } from '@/components/dialog/MessageSendDialog' import MessageHistoryDialog, { MessageHistoryRow } from '@/components/dialog/MessageHistoryDialog' - -const uploadHistoryMock: ListUploadHistory[] = [ - { round: 1, fileName: 'a.xlsx', userId: 'admin', uploadCount: 3500, uploadAt: '2025-10-30T11:00:00Z' }, - { round: 2, fileName: '1.xlsx', userId: 'admin', uploadCount: 100, uploadAt: '2025-10-30T12:00:00Z' }, - { round: 3, fileName: '2.xlsx', userId: 'admin', uploadCount: 2000, uploadAt: '2025-10-30T13:00:00Z' }, -] +import { downloadBase64File, downloadFile, XLSX_MIME_TYPE } from '@kri/common/browser' const messageTemplateMock: MessageTemplateOption[] = [ { @@ -84,7 +107,7 @@ const messageHistoryMock: MessageHistoryRow[] = [ { id: 2, type: 'email', - title: 'Please answer this survey', + title: 'Survey Answer Request', templateName: 'EMAIL Template A', sendInfo: 'info@kric.com', targetHeader: 'Email', @@ -101,6 +124,39 @@ const messageHistoryMock: MessageHistoryRow[] = [ }, ] +const toSidSet = (value: string) => + value + .split(',') + .map((item) => item.trim()) + .filter((item) => item.length > 0) + +const toFilterCondition = (row: FilterRow, usesListValue: boolean): Omit => { + const values = usesListValue ? row.multiValues : [row.textValue.trim()] + + if (row.operator === 'eq') { + return { operator: ListFilterOperator.POSITIVE, matchType: ListFilterMatchType.EXACT, values } + } + if (row.operator === 'neq') { + return { operator: ListFilterOperator.NEGATIVE, matchType: ListFilterMatchType.EXACT, values } + } + if (row.operator === 'contains') { + return { operator: ListFilterOperator.POSITIVE, matchType: ListFilterMatchType.CONTAINS, values } + } + return { operator: ListFilterOperator.NEGATIVE, matchType: ListFilterMatchType.CONTAINS, values } +} + +const toDateTimeRange = (from?: string, to?: string) => { + if (!from || !to) return undefined + return { + startDate: `${from}T00:00:00`, + endDate: `${to}T23:59:59`, + } +} + +const downloadArrayBuffer = (buffer: ArrayBuffer, filename: string, type = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet') => { + downloadFile(new Blob([buffer], { type }), filename) +} + const ListManagePage = () => { const mounted = useMounted() const { auth } = useAuth() @@ -118,30 +174,49 @@ const ListManagePage = () => { const [messageSendMode, setMessageSendMode] = useState('email') const [filterRows, setFilterRows] = useState([]) const [batchRows, setBatchRows] = useState([]) + const [selectedRows, setSelectedRows] = useState([]) const userRole = auth?.user?.userRole ?? 9000 + const prjctName = selectedProject?.prjctName ?? ''; const prjctIdx = selectedProject?.prjctIdx ?? 0 const enabled = mounted && prjctIdx > 0 const resultCodesQuery = useResultCodesQuery(prjctIdx, enabled) const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled) + const uploadHistoryQuery = useListUploadHistoryQuery(prjctIdx, enabled) + const downloadListExcelTemplateMutation = useDownloadListExcelTemplateMutation() + const uploadListExcelMutation = useUploadListExcelMutation(prjctIdx) + const updateListHeaderMutation = useUpdateListHeaderMutation(prjctIdx) + const resetListMutation = useResetListMutation(prjctIdx) + const updateListMutation = useUpdateListMutation(prjctIdx) + const downloadListMutation = useDownloadListMutation(prjctIdx) + const downloadListUpdateHistoryMutation = useDownloadListUpdateHistoryMutation(prjctIdx) + const downloadListEventHistoryMutation = useDownloadListEventHistoryMutation(prjctIdx) + const downloadListItemFileMutation = useDownloadListItemFileMutation(prjctIdx) + const downloadUploadHistoryFileMutation = useDownloadUploadHistoryFileMutation(prjctIdx) const resultCodeArray = useMemo(() => resultCodesQuery.data ?? [], [resultCodesQuery.data]) const listSearchRequest = useMemo(() => { - const sort = sorting?.[0] ?? { id: 'sid', desc: true as const } + const sort = sorting?.[0] ?? { id: 'sid', desc: false as const } + const listFilter = createEmptyListFilter() + listFilter.sidSet = toSidSet(searchText) + listFilter.memoConditions = [] + listFilter.otherItemConditions = filterRows + .map((row) => { + const usesListValue = (listHeaderQuery.data ?? []).some( + (header) => header.listHderId === row.headerId && (header.filterContents?.length ?? 0) > 0, + ) + + return { + listHderId: row.headerId, + ...toFilterCondition(row, usesListValue), + } + }) + .filter((item) => item.values.some((value) => value.trim().length > 0)) + return { - listFilter: { - sidSet: [], - listUseSet: [], - assignUserMap: { - [ListHeaderAssignConst.OUTSOURCE]: [], - [ListHeaderAssignConst.CONTACT_INTERVIEWER]: [], - [ListHeaderAssignConst.FIELD_INTERVIEWER]: [], - }, - memo: '', - otherItems: {}, - }, + listFilter, pageRequest: { pageIndex: pagination.pageIndex, pageSize: pagination.pageSize, @@ -149,7 +224,7 @@ const ListManagePage = () => { sortDir: sort.desc ? 'desc' : 'asc', }, } - }, [pagination, sorting]) + }, [filterRows, listHeaderQuery.data, pagination.pageIndex, pagination.pageSize, searchText, sorting]) const listSearchQuery = useListSearchQuery(prjctIdx, listSearchRequest, enabled) @@ -163,6 +238,26 @@ const ListManagePage = () => { [listSearchQuery.data], ) + const selectedSidSet = useMemo( + () => + selectedRows + .map((row) => row.sid) + .filter((sid): sid is string | number => typeof sid === 'string' || typeof sid === 'number') + .map(String), + [selectedRows], + ) + + const buildTargetFilter = (target: ListFilterTarget) => { + if (target === 'all') return createEmptyListFilter() + if (target === 'selected') { + return { + ...createEmptyListFilter(), + sidSet: selectedSidSet, + } + } + return listSearchRequest.listFilter + } + const totalCount = listSearchQuery.data?.totalElements ?? 0 const pageCount = listSearchQuery.data?.totalPages ?? 0 @@ -175,20 +270,18 @@ const ListManagePage = () => { [listHeaderQuery.data], ) - const headerManageRows = useMemo( - () => - (listHeaderQuery.data ?? []).map((header) => ({ - id: header.listHderId, - name: header.listHderNm, - visible: header.useColView, - locked: header.listHderGrad === 0, - })), - [listHeaderQuery.data], - ) + const headerManageRows = useMemo(() => listHeaderQuery.data ?? [], [listHeaderQuery.data]) const filterHeaderOptions = useMemo( - () => headerOptions.map((item) => ({ ...item, values: ['A', 'B', 'C'] })), - [headerOptions], + () => + (listHeaderQuery.data ?? []) + .filter((header) => header.useFilter) + .map((header) => ({ + id: header.listHderId, + label: header.listHderNm, + values: header.filterContents ?? [], + })), + [listHeaderQuery.data], ) const messageTargetHeaders = useMemo(() => { @@ -210,39 +303,85 @@ const ListManagePage = () => { showDialog('messageSendDialog') } - const handleResetConfirm = async (payload: { target: ListResetTarget; scope: ListResetScope }) => { - void payload - alert('List reset action callback placeholder.') + const handleResetConfirm = async (payload: { target: ListFilterTarget; scope: ListResetScope }) => { + const listFilter = buildTargetFilter(payload.target) + await resetListMutation.mutateAsync({ + resetMode: payload.scope === 'result-and-history' ? ListResetMode.HIST : ListResetMode.ALL, + listFilter, + }) + await listSearchQuery.refetch() } - const handleUploadConfirm = async (file: File, validation: ValidationOption) => { - void file - void validation - alert('List upload action callback placeholder.') + const handleUploadConfirm = async (file: File, request: ListUploadRequest) => { + const res = await uploadListExcelMutation.mutateAsync({ file, request }) + + if (res.hasErrorFile && res.errorFileBase64) { + alert("업로드 중 오류가 발생하여 오류 파일을 다운로드합니다."); + downloadBase64File(res.errorFileBase64, res.errorFileName ?? "error.xlsx", XLSX_MIME_TYPE); + } + else{ + alert(`${res.successCount}개의 리스트를 업로드했습니다.`); + } + + await listSearchQuery.refetch() } const handleDownloadTemplate = async () => { - alert('Template download callback placeholder.') + if (!prjctIdx) { + alert("프로젝트를 선택해주세요.") + return + } + + const buffer = await downloadListExcelTemplateMutation.mutateAsync(prjctIdx) + downloadArrayBuffer(buffer, `${prjctName} list-upload-template.xlsx`) } - const handleHeaderManageConfirm = async (rows: ListHeaderManageRow[]) => { - void rows - alert('Header manage action callback placeholder.') + const handleHeaderManageConfirm = async (rows: listHeader[]) => { + await updateListHeaderMutation.mutateAsync(rows) } const handleFilterConfirm = async (rows: FilterRow[]) => { setFilterRows(rows) - alert('Filter action callback placeholder.') } const handleBatchConfirm = async (rows: BatchEditRow[]) => { setBatchRows(rows) - alert('Batch edit action callback placeholder.') + const updateContents = Object.fromEntries(rows.map((row) => [String(row.headerId), row.value])) + await updateListMutation.mutateAsync({ + updateContents, + listFilter: buildTargetFilter('filtered'), + }) + await listSearchQuery.refetch() } - const handleDownloadConfirm = async (payload: { mode: ListDownloadMode; onlyFiltered: boolean }) => { - void payload - alert('Download action callback placeholder.') + const handleDownloadConfirm = async (payload: ListDownloadPayload) => { + const listFilter = buildTargetFilter(payload.target) + + if (payload.mode === 'list') { + const buffer = await downloadListMutation.mutateAsync(listFilter) + downloadArrayBuffer(buffer, `${prjctName} list.xlsx`) + return + } + + if (payload.mode === 'list-change-history') { + const buffer = await downloadListUpdateHistoryMutation.mutateAsync(listFilter) + downloadArrayBuffer(buffer, `${prjctName} update-history.xlsx`) + return + } + + if (payload.mode === 'upload-file') { + const buffer = await downloadListItemFileMutation.mutateAsync(listFilter) + downloadArrayBuffer(buffer, `${prjctName} upload-files.zip`, 'application/zip') + return + } + + const buffer = await downloadListEventHistoryMutation.mutateAsync({ + listFilter, + resultCodeTypes: [ResultCodeType.CONTACT, ResultCodeType.INTERVIEW, ResultCodeType.SURVEY], + searchBase: payload.contactHistoryType === 'latest' ? ListEventHistoryBase.LATEST : ListEventHistoryBase.ALL, + dateRange: toDateTimeRange(payload.contactHistoryDateFrom, payload.contactHistoryDateTo), + }) + downloadArrayBuffer(buffer, `${prjctName} contact-history.xlsx`) } const handleMessageSendConfirm = async (payload: MessageSendPayload) => { @@ -253,55 +392,55 @@ const ListManagePage = () => { if (!mounted) return return ( -
+
- - - - - - -
- - -
-
-
+
+
setSearchText(e.target.value)} @@ -336,9 +475,12 @@ const ListManagePage = () => { widthClassName="w-70" heightClassName="h-9" /> - +
+ +
- + { + const buffer = await downloadUploadHistoryFileMutation.mutateAsync(item.listUploadLogId) + downloadArrayBuffer(buffer, item.fileName) + }} + headerRows={headerManageRows} + /> { templateOptions={messageTemplateMock} targetHeaderOptions={messageTargetHeaders} defaultSenderEmail="info@kric.com" - defaultSenderName="Korea Research" + defaultSenderName="코리아리서치" defaultSenderNumber="02-0000-0000" onConfirm={handleMessageSendConfirm} /> diff --git a/src/app/(pages)/(main)/manage/user/page.tsx b/src/app/(pages)/(main)/manage/user/page.tsx index fdaeb91..4ef74f2 100644 --- a/src/app/(pages)/(main)/manage/user/page.tsx +++ b/src/app/(pages)/(main)/manage/user/page.tsx @@ -1,4 +1,4 @@ -'use client' +'use client' import { useMemo, useState } from "react"; import {Button} from "@/components/ui/button"; @@ -10,11 +10,11 @@ import UserUpsertDialog from "@/components/dialog/UserUpsertDialog"; import {UserInfoSaveRequest} from "@/types/user"; import UserUploadDialog from "@/components/dialog/UserUploadDialog"; import {useDialog} from "@/hooks/useDialog"; -import {downloadBase64File, downloadFile} from "@/lib/utils"; +import { downloadBase64File, downloadFile, XLSX_MIME_TYPE } from "@kri/common/browser"; import {KriMultiSelect} from "@/components/common/KriAutoComplete"; import {useAuth} from "@/hooks/useAuth"; import {MultiSelectOption} from "@/components/ui/multi-select"; -import {useMounted} from "@/hooks/useMounted"; +import { useMounted } from "@kri/common/hooks"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {DEFAULT_COMPANY_NAME, EXTERNAL_USER_ROLE} from "@/const/userConst"; import {Upload} from "lucide-react"; @@ -101,9 +101,9 @@ const UserManagePage = () => { await upsertMutation.mutateAsync({ mode: dialogMode, data }); if (dialogMode === "create") { - alert("등록 됐습니다."); + alert("등록되었습니다."); } else { - alert("수정 됐습니다."); + alert("수정되었습니다."); } }; @@ -117,17 +117,18 @@ const UserManagePage = () => { if (!confirm("정말 삭제하시겠습니까?")) return; await deleteMutation.mutateAsync(userId); - alert("삭제 됐습니다."); + alert("삭제되었습니다."); }; const uploadFile = async (file: File) => { const res = await uploadMutation.mutateAsync(file); if (res.hasErrorFile && res.errorFileBase64) { - downloadBase64File(res.errorFileBase64, res.errorFileName ?? "error.xlsx"); + alert("업로드 중 오류가 발생하여 오류 파일을 다운로드합니다."); + downloadBase64File(res.errorFileBase64, res.errorFileName ?? "error.xlsx", XLSX_MIME_TYPE); } else{ - alert(`${res.successCount}개의 계정을 생성했습니다.`); + alert(`${res.successCount}개의 계정이 생성되었습니다.`); } }; @@ -138,8 +139,8 @@ const UserManagePage = () => { const blob = new Blob([buffer], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", }); - downloadFile(blob, "사용자 업로드 양식.xlsx"); - alert("다운로드 됐습니다."); + downloadFile(blob, "사용자_업로드_양식.xlsx"); + alert("다운로드되었습니다."); } else { console.log("빈 파일입니다."); } @@ -163,13 +164,13 @@ const UserManagePage = () => { if (!mounted) return ; return ( -
- +
+
setSearchText(e.target.value)} @@ -197,14 +198,14 @@ const UserManagePage = () => { />
-
+ 0} onCheckedChange={handleSelectAllRight} className="border-white" /> + 배정 가능 {roleFilter?.label} ({ableBase.length}명 )
+ e.stopPropagation()} checked={selectedAbleUser.includes(user.userId)} onCheckedChange={() => handleToggleAssign(user.userId)} /> + {user.userName} ({user.userId})
- +
+
+ - - - - - - + + + + + + {normalizedHistory.length === 0 && ( - )} {normalizedHistory.map((item) => ( - - - - - - - + + + + + + @@ -287,7 +391,7 @@ const ListUploadDialog = ({ - diff --git a/src/components/dialog/MessageHistoryDialog.tsx b/src/components/dialog/MessageHistoryDialog.tsx index 7b31647..9d348a5 100644 --- a/src/components/dialog/MessageHistoryDialog.tsx +++ b/src/components/dialog/MessageHistoryDialog.tsx @@ -91,7 +91,7 @@ const MessageHistoryDialog = ({ - 발송 이력 + 발송 이력
@@ -165,7 +165,7 @@ const MessageHistoryDialog = ({
-

+

{detailType === null && '상세 이력'} {detailType === 'template' && '미리보기'} {detailType === 'target' && '수신 대상'} diff --git a/src/components/dialog/MessageSendDialog.tsx b/src/components/dialog/MessageSendDialog.tsx index 6c7a4c0..e82c269 100644 --- a/src/components/dialog/MessageSendDialog.tsx +++ b/src/components/dialog/MessageSendDialog.tsx @@ -170,13 +170,13 @@ const MessageSendDialog = ({

- {titleMap[mode]} + {titleMap[mode]}
- + handleInputChange('prjctName', e.target.value)} /> @@ -211,7 +210,7 @@ const ProjectCreateDialog = ({ items={deptArray} value={formData.ownerDept || ''} onChange={(value) => handleInputChange('ownerDept', value)} - placeholder="담당 그룹을 선택하세요" + placeholder="Select owner department" heightClassName="h-9" widthClassName="w-full" /> @@ -226,7 +225,7 @@ const ProjectCreateDialog = ({ onChange={(value) => handleInputChange('ownerFw', value)} getValue={(item) => item.value} getLabel={(item) => item.label} - placeholder="담당 실사를 선택하세요" + placeholder="Select owner department" heightClassName="h-9" widthClassName="w-full" /> @@ -253,4 +252,4 @@ const ProjectCreateDialog = ({ ); } -export default ProjectCreateDialog \ No newline at end of file +export default ProjectCreateDialog diff --git a/src/components/dialog/ResultCodeDialog.tsx b/src/components/dialog/ResultCodeDialog.tsx index 32bf7c1..0699872 100644 --- a/src/components/dialog/ResultCodeDialog.tsx +++ b/src/components/dialog/ResultCodeDialog.tsx @@ -13,7 +13,7 @@ import { Input } from '@/components/ui/input' import {Trash2, Plus, Download} from 'lucide-react' import {ProjectInfo, ResultCode, ResultCodeType} from "@/types/project"; import {PROJECT_SEARCH_COUNT, RESULT_CODE_TYPE_OPTIONS} from "@/const/projectConst"; -import {useDebouncedValue} from "@/hooks/useDebouncedValue"; +import { useDebouncedValue } from "@kri/common/hooks"; import {SelectedProject} from "@/store/jotai/project"; import {KriSingleSelect} from "@/components/common/KriAutoComplete"; import {useSelectedProject} from "@/hooks/useSelectedProject"; diff --git a/src/components/dialog/UserUploadDialog.tsx b/src/components/dialog/UserUploadDialog.tsx index da2216f..22becb0 100644 --- a/src/components/dialog/UserUploadDialog.tsx +++ b/src/components/dialog/UserUploadDialog.tsx @@ -1,4 +1,4 @@ -'use client' +'use client' import { Dialog, @@ -12,13 +12,13 @@ import { useState, useRef } from 'react' import {Download, Upload, X} from 'lucide-react' import { useDialog } from '@/hooks/useDialog' import type { DialogId } from '@/store/jotai/dialog' -import {apiError} from "@/lib/http-util"; +import {apiError} from "@kri/common/http"; export type UserUploadDialogProps = { - /** jotai로 관리할 dialog id (기본값: 'userUploadDialog') */ + /** jotai로 관리할 dialog id */ dialogId?: DialogId - /** 필요하면 부모에서 직접 제어도 가능 */ + /** 필요한 경우 부모에서 직접 제어 */ open?: boolean onOpenChange?: (open: boolean) => void @@ -39,15 +39,13 @@ const UserUploadDialog = ({ const [selectedFile, setSelectedFile] = useState(null); const fileInputRef = useRef(null); - //실제 Dialog에 넘길 open값 (props 우선, 없으면 jotai 사용) + // 실제 Dialog에 전달할 open 값 const resolvedOpen = open ?? isDialogOpen(dialogId); - // open change 공통 처리 (부모 콜백 + jotai 동시 반영) + // 부모 콜백과 jotai 상태를 함께 처리 const handleOpenChange = (nextOpen: boolean) => { - // 1) 부모 콜백 먼저 onOpenChange?.(nextOpen) - // 2) jotai 상태 업데이트 if (nextOpen) { showDialog(dialogId) } else { @@ -72,7 +70,7 @@ const UserUploadDialog = ({ ) { setSelectedFile(file) } else { - alert('엑셀 파일만 업로드 가능합니다. (.xlsx, .xls, .csv)') + alert("엑셀 파일만 업로드 가능합니다. (.xlsx, .xls, .csv)") } } } @@ -100,7 +98,9 @@ const UserUploadDialog = ({ handleRemoveFile(); handleOpenChange(false); } catch (e) { - const err = apiError(e); + const err = apiError(e, { + fallbackMessage: "File upload failed.", + }); console.error(err.status, err.code, err.message); alert("업로드에 실패했습니다."); } finally { @@ -108,7 +108,7 @@ const UserUploadDialog = ({ } }; - // ✅ Dialog에서 닫힐 때: 파일도 초기화 + 상태 닫기 + // Dialog가 닫힐 때 파일 선택 상태 초기화 const handleDialogOpenChange = (nextOpen: boolean) => { if (!nextOpen) { handleRemoveFile() @@ -120,7 +120,7 @@ const UserUploadDialog = ({ - 엑셀 업로드 + User upload
@@ -129,7 +129,7 @@ const UserUploadDialog = ({
{selectedFile && ( diff --git a/src/components/dialog/UserUpsertDialog.tsx b/src/components/dialog/UserUpsertDialog.tsx index 31e0d4b..78d7860 100644 --- a/src/components/dialog/UserUpsertDialog.tsx +++ b/src/components/dialog/UserUpsertDialog.tsx @@ -1,4 +1,4 @@ -'use client' +'use client' import { useState, useEffect } from 'react' import { @@ -18,16 +18,16 @@ import { UserInfoSaveRequest } from '@/types/user' import KriPassword from "@/components/common/KriPassword"; import {KriSelect, KriSelectItem} from "@/components/common/KriSelect"; import {DataVerification} from "@/types/common"; -import {apiError} from "@/lib/http-util"; +import {apiError} from "@kri/common/http"; import {KriSingleSelect} from "@/components/common/KriAutoComplete"; import {FW_TEAM, USER_NAME_REGEX} from "@/const/userConst"; -import {NONE_HTTP_ERROR, UNKNOWN_HTTP_ERROR} from "@/const/commonConst"; +import {NONE_HTTP_ERROR, UNKNOWN_HTTP_ERROR} from "@kri/common/http"; export type UserUpsertDialogProps = { - /** Jotai로 관리할 다이얼로그 ID (기본값: 'userUpsertDialog') */ + /** Jotai로 관리할 다이얼로그 ID */ dialogId?: DialogId - /** 필요하면 여전히 외부에서 open 제어도 가능하게 */ + /** 필요한 경우 부모에서 직접 open 제어 */ open?: boolean onOpenChange?: (open: boolean) => void @@ -71,15 +71,13 @@ const UserUpsertDialog = ({ const [isCheckedDuplicate, setIsCheckedDuplicate] = useState(false); const [isSubmitting, setIsSubmitting] = useState(false); - // 🔹 실제로 Dialog에 넘길 open 값 (외부 open 있으면 우선) + // 실제 Dialog에 전달할 open 값 const resolvedOpen = open ?? isDialogOpen(dialogId); - // 🔹 실제 onOpenChange 핸들러 (외부 콜백 + jotai 둘 다 처리) + // 부모 콜백과 jotai 상태를 함께 처리 const handleOpenChange = (nextOpen: boolean) => { - // 1) 외부에서 넘겨준 onOpenChange 먼저 호출 onOpenChange?.(nextOpen); - // 2) jotai 전역 상태도 함께 업데이트 if (nextOpen) { showDialog(dialogId); } else { @@ -117,7 +115,7 @@ const UserUpsertDialog = ({ const handleCheckDuplicate = async () => { if (!formData.userId.trim()) { - alert('아이디를 입력해주세요.'); + alert("아이디를 입력해주세요."); return } @@ -127,7 +125,7 @@ const UserUpsertDialog = ({ alert(isDuplicate.errMessage); setIsCheckedDuplicate(false); } else { - alert('사용 가능한 아이디입니다.'); + alert("사용 가능한 아이디입니다."); setIsCheckedDuplicate(true); } } else { @@ -137,23 +135,23 @@ const UserUpsertDialog = ({ const handleSubmit = async () => { if (!formData.userId.trim()) { - alert('아이디를 입력해주세요.'); + alert("아이디를 입력해주세요."); return; } if (mode === 'create' && !isCheckedDuplicate) { - alert('아이디 중복체크를 해주세요.'); + alert("아이디 중복체크를 해주세요."); return; } if (!formData.userPw.trim()) { - alert('비밀번호를 입력해주세요.'); + alert("비밀번호를 입력해주세요."); return; } if (!formData.userName.trim()) { - alert('이름을 입력해주세요.'); + alert("이름을 입력해주세요."); return; } if(!USER_NAME_REGEX.test(formData.userName)){ - alert('올바르지 않은 이름입니다.'); + alert("올바르지 않은 이름입니다."); return; } @@ -165,13 +163,15 @@ const UserUpsertDialog = ({ await onSubmit(formData as UserInfoSaveRequest); handleOpenChange(false); } catch (e) { - const err = apiError(e); + const err = apiError(e, { + fallbackMessage: "Save failed.", + }); console.error(err.status, err.code, err.message); if(err.code !== NONE_HTTP_ERROR && err.code !== UNKNOWN_HTTP_ERROR){ alert(err.message); } else{ - alert('저장에 실패했습니다.'); + alert("저장에 실패했습니다."); } } finally { setIsSubmitting(false); @@ -180,9 +180,9 @@ const UserUpsertDialog = ({ return ( - + - + {mode === 'create' ? '계정 등록' : '계정 수정'} 면접원 계정 정보를 입력해주세요. @@ -195,7 +195,7 @@ const UserUpsertDialog = ({
handleInputChange('userId', e.target.value)} disabled={mode === 'edit'} @@ -206,7 +206,7 @@ const UserUpsertDialog = ({ onClick={handleCheckDuplicate} disabled={!formData.userId.trim() || isCheckedDuplicate} > - {isCheckedDuplicate ? '확인완료' : '중복체크'} + {isCheckedDuplicate ? "확인완료" : "중복체크"} )}
@@ -219,7 +219,7 @@ const UserUpsertDialog = ({ id="password" value={formData.userPw} onChange={(v) => handleInputChange('userPw', v)} - placeholder="비밀번호를 입력하세요" + placeholder="Enter password" />
@@ -228,7 +228,7 @@ const UserUpsertDialog = ({ handleInputChange('userName', e.target.value)} /> @@ -240,7 +240,7 @@ const UserUpsertDialog = ({ value={String(formData.userRole)} onChange={(e) => { if(mode !== 'create'){ - alert("권한이 변경되면 해당 계정에 배정된 리스트 정보가 초기화 됩니다."); + alert("권한이 변경되면 해당 계정에 배정된 리스트 정보가 초기화됩니다."); } handleInputChange('userRole', Number(e)); @@ -267,7 +267,7 @@ const UserUpsertDialog = ({ : handleInputChange('userCmpn', e.target.value)} @@ -279,7 +279,7 @@ const UserUpsertDialog = ({
회차파일명사용자 ID업로드 건수업로드 일시다운로드회차파일명사용자 ID업로드 건수업로드 일시다운로드
+ 업로드 이력이 없습니다.
{item.round}{item.fileName}{item.userId}{item.uploadCount.toLocaleString()}{item.uploadAtLabel} -
{item.wave}{item.fileName}{item.regUser}{item.listCount.toLocaleString()}{item.uploadAtLabel} +