diff --git a/package-lock.json b/package-lock.json index 2f1f922..a52df42 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "@radix-ui/react-separator": "^1.1.8", "@radix-ui/react-slot": "^1.2.4", "@radix-ui/react-tabs": "^1.1.13", + "@tanstack/react-query": "^5.90.21", "@tanstack/react-table": "^8.21.3", "@tiptap/extension-color": "^3.13.0", "@tiptap/extension-highlight": "^3.13.0", @@ -39,7 +40,6 @@ "cmdk": "^1.1.1", "crypto-js": "^4.2.0", "jotai": "^2.15.1", - "lodash": "^4.17.21", "lucide-react": "^0.553.0", "next": "^16.0.7", "next-themes": "^0.4.6", @@ -50,6 +50,7 @@ }, "devDependencies": { "@tailwindcss/postcss": "^4", + "@tanstack/react-query-devtools": "^5.91.3", "@types/crypto-js": "^4.2.2", "@types/node": "^20", "@types/react": "^19", @@ -1043,9 +1044,10 @@ } }, "node_modules/@next/env": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/@next/env/-/env-16.0.10.tgz", - "integrity": "sha512-8tuaQkyDVgeONQ1MeT9Mkk8pQmZapMKFh5B+OrFUlG3rVmYTXcXlBetBgTurKXGaIZvkoqRT9JL5K3phXcgang==" + "version": "16.1.6", + "resolved": "https://registry.npmjs.org/@next/env/-/env-16.1.6.tgz", + "integrity": "sha512-N1ySLuZjnAtN3kFnwhAwPvZah8RJxKasD7x1f8shFqhncnWZn4JMfg37diLNuoHsLAlrDfM3g4mawVdtAG8XLQ==", + "license": "MIT" }, "node_modules/@next/eslint-plugin-next": { "version": "16.0.7", @@ -1057,12 +1059,13 @@ } }, "node_modules/@next/swc-darwin-arm64": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-16.0.10.tgz", - "integrity": "sha512-4XgdKtdVsaflErz+B5XeG0T5PeXKDdruDf3CRpnhN+8UebNa5N2H58+3GDgpn/9GBurrQ1uWW768FfscwYkJRg==", + "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==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -1072,12 +1075,13 @@ } }, "node_modules/@next/swc-darwin-x64": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-16.0.10.tgz", - "integrity": "sha512-spbEObMvRKkQ3CkYVOME+ocPDFo5UqHb8EMTS78/0mQ+O1nqE8toHJVioZo4TvebATxgA8XMTHHrScPrn68OGw==", + "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==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "darwin" @@ -1087,12 +1091,13 @@ } }, "node_modules/@next/swc-linux-arm64-gnu": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-16.0.10.tgz", - "integrity": "sha512-uQtWE3X0iGB8apTIskOMi2w/MKONrPOUCi5yLO+v3O8Mb5c7K4Q5KD1jvTpTF5gJKa3VH/ijKjKUq9O9UhwOYw==", + "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==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -1102,12 +1107,13 @@ } }, "node_modules/@next/swc-linux-arm64-musl": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-16.0.10.tgz", - "integrity": "sha512-llA+hiDTrYvyWI21Z0L1GiXwjQaanPVQQwru5peOgtooeJ8qx3tlqRV2P7uH2pKQaUfHxI/WVarvI5oYgGxaTw==", + "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==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -1117,12 +1123,13 @@ } }, "node_modules/@next/swc-linux-x64-gnu": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-16.0.10.tgz", - "integrity": "sha512-AK2q5H0+a9nsXbeZ3FZdMtbtu9jxW4R/NgzZ6+lrTm3d6Zb7jYrWcgjcpM1k8uuqlSy4xIyPR2YiuUr+wXsavA==", + "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==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -1132,12 +1139,13 @@ } }, "node_modules/@next/swc-linux-x64-musl": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-16.0.10.tgz", - "integrity": "sha512-1TDG9PDKivNw5550S111gsO4RGennLVl9cipPhtkXIFVwo31YZ73nEbLjNC8qG3SgTz/QZyYyaFYMeY4BKZR/g==", + "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==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" @@ -1147,12 +1155,13 @@ } }, "node_modules/@next/swc-win32-arm64-msvc": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-16.0.10.tgz", - "integrity": "sha512-aEZIS4Hh32xdJQbHz121pyuVZniSNoqDVx1yIr2hy+ZwJGipeqnMZBJHyMxv2tiuAXGx6/xpTcQJ6btIiBjgmg==", + "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==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -1162,12 +1171,13 @@ } }, "node_modules/@next/swc-win32-x64-msvc": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-16.0.10.tgz", - "integrity": "sha512-E+njfCoFLb01RAFEnGZn6ERoOqhK1Gl3Lfz1Kjnj0Ulfu7oJbuMyvBKNj/bw8XZnenHDASlygTjZICQW+rYW1Q==", + "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==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -2435,6 +2445,61 @@ "tailwindcss": "4.1.17" } }, + "node_modules/@tanstack/query-core": { + "version": "5.90.20", + "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.90.20.tgz", + "integrity": "sha512-OMD2HLpNouXEfZJWcKeVKUgQ5n+n3A2JFmBaScpNDUqSrQSjiveC7dKMe53uJUg1nDG16ttFPz2xfilz6i2uVg==", + "license": "MIT", + "funding": { + "type": "github", + "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", + "dependencies": { + "@tanstack/query-core": "5.90.20" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "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", @@ -3262,13 +3327,27 @@ "typescript": ">=4.8.4 <6.0.0" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "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==", + "dev": true, + "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/fast-glob": { @@ -3300,12 +3379,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.8.tgz", + "integrity": "sha512-reYkDYtj/b19TeqbNZCV4q9t+Yxylf/rYBsLb42SXJatTv4/ylq5lEiAmhA/IToxO7NI2UzNMghHoHuaqDkAjw==", "dev": true, + "license": "ISC", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.2" }, "engines": { "node": ">=16 || 14 >=14.17" @@ -3638,10 +3718,11 @@ } }, "node_modules/ajv": { - "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "version": "6.14.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", + "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3912,7 +3993,6 @@ "version": "2.8.27", "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.27.tgz", "integrity": "sha512-2CXFpkjVnY2FT+B6GrSYxzYf65BJWEqz5tIRHCvNsZZ2F3CmsCB37h8SpYgKG7y9C4YAeTipIPWG7EmFmhAeXA==", - "devOptional": true, "bin": { "baseline-browser-mapping": "dist/cli.js" } @@ -6270,11 +6350,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lodash": { - "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" - }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", @@ -6320,9 +6395,10 @@ } }, "node_modules/markdown-it": { - "version": "14.1.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", - "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", + "version": "14.1.1", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz", + "integrity": "sha512-BuU2qnTti9YKgK5N+IeMubp14ZUKUUw7yeJbkjtosvHiP0AZ5c8IAgEMk79D0eC8F23r4Ac/q8cAIFdm2FtyoA==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1", "entities": "^4.4.0", @@ -6372,10 +6448,11 @@ } }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", + "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -6437,12 +6514,14 @@ "dev": true }, "node_modules/next": { - "version": "16.0.10", - "resolved": "https://registry.npmjs.org/next/-/next-16.0.10.tgz", - "integrity": "sha512-RtWh5PUgI+vxlV3HdR+IfWA1UUHu0+Ram/JBO4vWB54cVPentCD0e+lxyAYEsDTqGGMg7qpjhKh6dc6aW7W/sA==", + "version": "16.1.6", + "resolved": "https://registry.npmjs.org/next/-/next-16.1.6.tgz", + "integrity": "sha512-hkyRkcu5x/41KoqnROkfTm2pZVbKxvbZRuNvKXLRXxs3VfyO0WhY50TQS40EuKO9SW3rBj/sF3WbVwDACeMZyw==", + "license": "MIT", "dependencies": { - "@next/env": "16.0.10", + "@next/env": "16.1.6", "@swc/helpers": "0.5.15", + "baseline-browser-mapping": "^2.8.3", "caniuse-lite": "^1.0.30001579", "postcss": "8.4.31", "styled-jsx": "5.1.6" @@ -6454,14 +6533,14 @@ "node": ">=20.9.0" }, "optionalDependencies": { - "@next/swc-darwin-arm64": "16.0.10", - "@next/swc-darwin-x64": "16.0.10", - "@next/swc-linux-arm64-gnu": "16.0.10", - "@next/swc-linux-arm64-musl": "16.0.10", - "@next/swc-linux-x64-gnu": "16.0.10", - "@next/swc-linux-x64-musl": "16.0.10", - "@next/swc-win32-arm64-msvc": "16.0.10", - "@next/swc-win32-x64-msvc": "16.0.10", + "@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" }, "peerDependencies": { diff --git a/package.json b/package.json index 65f6fae..520034c 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "@radix-ui/react-separator": "^1.1.8", "@radix-ui/react-slot": "^1.2.4", "@radix-ui/react-tabs": "^1.1.13", + "@tanstack/react-query": "^5.90.21", "@tanstack/react-table": "^8.21.3", "@tiptap/extension-color": "^3.13.0", "@tiptap/extension-highlight": "^3.13.0", @@ -40,7 +41,6 @@ "cmdk": "^1.1.1", "crypto-js": "^4.2.0", "jotai": "^2.15.1", - "lodash": "^4.17.21", "lucide-react": "^0.553.0", "next": "^16.0.7", "next-themes": "^0.4.6", @@ -51,6 +51,7 @@ }, "devDependencies": { "@tailwindcss/postcss": "^4", + "@tanstack/react-query-devtools": "^5.91.3", "@types/crypto-js": "^4.2.2", "@types/node": "^20", "@types/react": "^19", diff --git a/src/app/(pages)/(main)/manage/user/page.tsx b/src/app/(pages)/(main)/manage/user/page.tsx index 76d8f97..4be0f3c 100644 --- a/src/app/(pages)/(main)/manage/user/page.tsx +++ b/src/app/(pages)/(main)/manage/user/page.tsx @@ -1,138 +1,137 @@ 'use client' -import {useEffect, useState} from "react"; +import { useMemo, useState } from "react"; import {Button} from "@/components/ui/button"; import {Input} from "@/components/ui/input"; import BodyTitle from "@/components/layout/BodyTitle"; import { DataTable } from "@/components/data-table/DataTable"; -import { getUserColumns } from "../../../../../components/table-column/UserTableColumn"; -import _ from "lodash"; +import { getUserColumns } from "@/components/table-column/UserTableColumn"; import UserUpsertDialog from "@/components/dialog/UserUpsertDialog"; -import {UserInfo, UserInfoSaveRequest, UserUploadResponse} from "@/types/user"; +import {UserInfo, UserInfoSaveRequest} from "@/types/user"; import UserUploadDialog from "@/components/dialog/UserUploadDialog"; import {useDialog} from "@/hooks/useDialog"; import {downloadBase64File, downloadFile} from "@/lib/utils"; -import {nextApi} from "@/lib/http-client"; -import {useLoading} from "@/hooks/useLoading"; -import {RoleInfo} from "@/types/role"; -import {DataVerification} from "@/types/common"; -import {apiError} from "@/lib/http-util"; import {KriMultiSelect} from "@/components/common/KriAutoComplete"; import {useAuth} from "@/hooks/useAuth"; import {MultiSelectOption} from "@/components/ui/multi-select"; import {useMounted} from "@/hooks/useMounted"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {DEFAULT_COMPANY_NAME, EXTERNAL_USER_ROLE} from "@/const/userConst"; +import { + useRoleListQuery, + useUserCompaniesQuery, + useUsersQuery, + useUserDetailQuery, + useCheckUserIdDuplicateMutation, + useUpsertUserMutation, + useDeleteUserMutation, + useUploadUsersExcelMutation, + useDownloadUserExcelTemplateMutation, +} from "@/query/user"; const UserManagePage = () => { const { showDialog } = useDialog(); const mounted = useMounted(); - const { withLoadingAsync } = useLoading(); - const { auth } = useAuth(); - const [userList, setUserList] = useState([]); - const [viewList, setViewList] = useState([]); - const [selectedUserArray, setSelectedUserArray] = useState([]); - const [userCmpnArray, setUserCmpnArray] = useState([]); - const [userRoleArray, setUserRoleArray] = useState([]); + const { auth } = useAuth(); + const roleQuery = useRoleListQuery(); + const cmpnQuery = useUserCompaniesQuery(); + const usersQuery = useUsersQuery(); + + const checkDupMutation = useCheckUserIdDuplicateMutation(); + const upsertMutation = useUpsertUserMutation(); + const deleteMutation = useDeleteUserMutation(); + const uploadMutation = useUploadUsersExcelMutation(); + const downloadTemplateMutation = useDownloadUserExcelTemplateMutation(); + + const [editUserId, setEditUserId] = useState(null); + const userDetailQuery = useUserDetailQuery(editUserId ?? "", !!editUserId); + + const userRoleArray: MultiSelectOption[] = useMemo(() => { + const roles = roleQuery.data ?? []; + return roles.map((r) => ({ value: String(r.roleCd), label: r.roleNm })); + }, [roleQuery.data]); + + const userCmpnArray = cmpnQuery.data ?? []; + const userList = usersQuery.data ?? []; const [searchText, setSearchText] = useState(''); const [searchCmpn, setSearchCmpn] = useState([]); const [searchRole, setSearchRole] = useState([]); const [dialogMode, setDialogMode] = useState<'create' | 'edit'>('create') - const [editData, setEditData] = useState>(); - const setUserData = async () => { - const roleList = await nextApi.get("/role"); - setUserRoleArray( - roleList.map((role) => ({ - value: String(role.roleCd), - label: role.roleNm, - })) - ); + const viewList = useMemo(() => { + let temp = userList; - const cmpnList = await nextApi.get("/user/cmpn"); - setUserCmpnArray(cmpnList); + const keyword = searchText.trim(); + if (keyword) { + const kw = keyword.toLowerCase(); + temp = temp.filter((row) => + [row.userId, row.userName].some((v) => (v ?? "").toLowerCase().includes(kw)) + ); + } - const userData = await nextApi.get("/user"); - setUserList(userData); - } + if (searchCmpn.length > 0) { + temp = temp.filter((row) => searchCmpn.includes(row.userCmpn)); + } + + if (searchRole.length > 0) { + temp = temp.filter((row) => searchRole.includes(String(row.userRole))); + } + + return temp; + }, [userList, searchText, searchCmpn, searchRole]); // 등록 버튼 클릭 const handleCreateClick = () => { - setDialogMode('create'); - setEditData(undefined); - showDialog('userUpsertDialog'); - } + setDialogMode("create"); + setEditUserId(null); + showDialog("userUpsertDialog"); + }; // 중복 체크 - const handleCheckDuplicate = async (userId: string): Promise => { - return nextApi.get("/user/check-user-id", { - query: { userId }, - }); - } + const handleCheckDuplicate = (userId: string) => { + return checkDupMutation.mutateAsync(userId); + }; const handleSubmit = async (data: UserInfoSaveRequest): Promise => { - if (dialogMode === 'create') { - await nextApi.put("/user", data); + await upsertMutation.mutateAsync({ mode: dialogMode, data }); + + if (dialogMode === "create") { + alert("등록 됐습니다."); } else { - await nextApi.patch("/user", data); + alert("수정 됐습니다."); } - await setUserData(); - } + }; const handleEdit = (userId: string) => { - setDialogMode('edit'); - nextApi.get(`/user/${userId}`) - .then((data) => { - setEditData(data); - showDialog('userUpsertDialog'); - }) - .catch((e) => { - const err = apiError(e); - console.error(err.status, err.code, err.message); - }); - // 수정 로직 또는 모달 열기 - } + setDialogMode("edit"); + setEditUserId(userId); + showDialog("userUpsertDialog"); + }; - const handleDelete = (userId: string) => { - // 삭제 확인 후 데이터 삭제 - if (confirm('정말 삭제하시겠습니까?')) { - //삭제 - nextApi.del(`/user/${encodeURIComponent(userId)}`) - .then(async () => { - alert("삭제 됐습니다."); - await setUserData(); - }) - .catch((e) => { - const err = apiError(e); - console.error(err.status, err.code, err.message); - }); - } - } + const handleDelete = async (userId: string) => { + if (!confirm("정말 삭제하시겠습니까?")) return; + + await deleteMutation.mutateAsync(userId); + alert("삭제 됐습니다."); + }; const uploadFile = async (file: File) => { - const formData = new FormData(); - formData.append("file", file); // key 이름은 백엔드 @RequestPart("file") 와 동일해야 함 - - const res = await nextApi.postForm("/user/excel", formData); + const res = await uploadMutation.mutateAsync(file); if (res.hasErrorFile && res.errorFileBase64) { downloadBase64File(res.errorFileBase64, res.errorFileName ?? "error.xlsx"); } else{ - await setUserData(); + alert(`${res.successCount}개의 계정을 생성했습니다.`); } - } + }; const downloadTemplate = async () => { - const buffer = await nextApi.post( - "/user/excel-template", - undefined, - { expectBinary: true } - ); + const buffer = await downloadTemplateMutation.mutateAsync(); if (buffer.byteLength > 0) { const blob = new Blob([buffer], { @@ -143,7 +142,7 @@ const UserManagePage = () => { } else { console.log("빈 파일입니다."); } - } + }; const columns = getUserColumns( { @@ -153,30 +152,6 @@ const UserManagePage = () => { userRoleArray ); - useEffect(() => { - withLoadingAsync(setUserData); - }, []); - - useEffect(() => { - let tempData = _.cloneDeep(userList); - const keyword = searchText.trim(); - if (keyword){ - tempData = tempData.filter((row) => - [row.userId, row.userName].some((v) => v.toLowerCase().includes(keyword.toLowerCase())) - ); - } - - if(searchCmpn.length > 0){ - tempData = tempData.filter((row) => searchCmpn.includes(row.userCmpn)); - } - - if(searchRole.length > 0){ - tempData = tempData.filter((row) => searchRole.includes(String(row.userRole))); - } - - setViewList(tempData); - }, [searchText, searchCmpn, searchRole, userList]); - const isInternal = mounted && auth.user?.userRole != null && @@ -240,7 +215,6 @@ const UserManagePage = () => { data={viewList} isClient={true} selectMode='single' - onRowSelectionChange={setSelectedUserArray} defaultPageSize={10} pageSizeOptions={[10, 20, 30, 50]} getRowId={(row) => row.userId} // row.id = userId @@ -249,7 +223,7 @@ const UserManagePage = () => { { + const router = useRouter(); + + const mounted = useMounted(); const { users, isLoading } = useItrntUserList(); const { showDialog } = useDialog(); - const { withLoadingAsync } = useLoading(); - const mounted = useMounted(); const { auth } = useAuth(); - const { clearSelectedProject, setSelectedProject } = useSelectedProject(); - - const [statusArray, setStatusArray] = useState([]); - const [deptArray, setDeptArray] = useState([]); - const [fwArray, setFwArray] = useState([]); - - const [searchText, setSearchText] = useState(''); - const [searchStatus, setSearchStatus] = useState([]); - const [searchDept, setSearchDept] = useState([]); - const [searchFw, setSearchFw] = useState([]); + const { setSelectedProject } = useSelectedProject(); const [pagination, setPagination] = useState({ pageIndex: 0, pageSize: 10 }); const [sorting, setSorting] = useState([]); const [query, setQuery] = useState(); - const [viewList, setViewList] = useState([]); - const [pageCount, setPageCount] = useState(0); - const [totalCount, setTotalCount] = useState(0); + + const statusArray: MultiSelectOption[] = useMemo(() => { + return (Object.values(ProjectStatus).filter((v) => typeof v === "number") as number[]) + .sort((a, b) => a - b) + .map((v) => ({ + value: String(v), + label: PROJECT_STATUS_LABEL[v as ProjectStatus], + })); + }, []); + + const enabled = mounted && !isLoading; // intranet user list 준비된 뒤에만 호출 + const ownerQuery = useProjectOwnerListQuery(enabled); + + const deptArray = ownerQuery.data?.ownerDeptList ?? []; + const fwArray = useMemo(() => { + const ownerFwIDList = ownerQuery.data?.ownerFwList ?? []; + + return ownerFwIDList.map((fwID) => ({ + value: fwID, + label: users.find(u => u.userId === fwID)?.userNm ?? "", + })); + + }, [ownerQuery.data?.ownerFwList]); + + const sort = sorting?.[0] ?? { id: "prjctIdx", desc: true as const }; + + const listQuery = useProjectListQuery({ + query, + pageIndex: pagination.pageIndex, + pageSize: pagination.pageSize, + sortBy: sort.id, + sortDir: sort.desc ? "desc" : "asc", + enabled, + }); + + const viewList = listQuery.data?.content ?? []; + const totalCount = listQuery.data?.totalElements ?? 0; + const pageCount = listQuery.data?.totalPages ?? 0; + + const createMutation = useCreateProjectMutation?.(); + + const [searchText, setSearchText] = useState(''); + const [searchStatus, setSearchStatus] = useState([]); + const [searchDept, setSearchDept] = useState([]); + const [searchFw, setSearchFw] = useState([]); const columns = getProjectColumns(users); const userId = auth.user?.userId ?? ""; @@ -76,8 +109,9 @@ const MainPage = () => { showDialog('projectCreateDialog'); } - const handleSubmit = async (data:ProjectCreateRequest): Promise => { - const projectInfo = await nextApi.put("/project", data); + const handleSubmit = async (data: ProjectCreateRequest): Promise => { + const projectInfo = await createMutation.mutateAsync(data); + setSelectedProject({ prjctIdx: projectInfo.prjctIdx, prjctCd: projectInfo.prjctCd, @@ -87,8 +121,8 @@ const MainPage = () => { ownerFw: projectInfo.ownerFw, } as SelectedProject); - window.location.href = `/project/info`; - } + router.push("/project/info"); + }; const handleClick = (projectInfo:ProjectInfo) => { setSelectedProject({ @@ -100,65 +134,9 @@ const MainPage = () => { ownerFw: projectInfo.ownerFw, } as SelectedProject); - window.location.href = `/list/manage`; + router.push(`/list/manage`); } - // 중복 호출 방지(초기 mount에서 pagination/sorting 콜백이 각각 한번씩 날아오는 케이스 방어) - const lastReqKeyRef = useRef(""); - - useEffect(() => { - const reqKey = JSON.stringify({ query, pagination, sorting}); - if (lastReqKeyRef.current === reqKey) return; - lastReqKeyRef.current = reqKey; - - const sort = sorting?.[0] ?? {id: "prjctIdx", desc: true}; - const pageReq: PageRequest = { - pageIndex: pagination.pageIndex, - pageSize: pagination.pageSize, - sortBy: sort.id, - sortDir: sort.desc ? "desc" : "asc" - }; - - const searchBody: ProjectListRequest = { - prjctText: query?.prjctText || "", - prjctStatusList: query?.prjctStatusList || [], - ownerDeptList: query?.ownerDeptList || [], - ownerFwList: query?.ownerFwList || [], - pageRequest: pageReq, - } - - withLoadingAsync(() => - nextApi.post>("/project/list", searchBody) - .then((r) => { - setViewList(r.content); - setTotalCount(r.totalElements); - setPageCount(r.totalPages); - }) - .catch(() => { - setViewList([]); - setTotalCount(0); - setPageCount(0); - }) - ); - - }, [query, pagination, sorting]); - - useEffect(() => { - clearSelectedProject(); - - const options: MultiSelectOption[] = Object.entries(ProjectStatus) - .sort(([a], [b]) => Number(a) - Number(b)) - .map(([key, label]) => ({ value: key, label: String(label) })); - - setStatusArray(options); - - nextApi.get("/project/owner-list") - .then((res) => { - setDeptArray(res.ownerDeptList); - setFwArray(res.ownerFwList); - }); - }, []); - if (!mounted || isLoading) return ; return ( @@ -203,6 +181,8 @@ const MainPage = () => { items={fwArray} value={searchFw} onChange={setSearchFw} + getValue={(item) => item.value} + getLabel={(item) => item.label} placeholder="담당 실사" widthClassName="w-60" heightClassName="h-9" diff --git a/src/app/(pages)/(main)/project/assign/page.tsx b/src/app/(pages)/(main)/project/assign/page.tsx index 02da7bd..d5fd0b2 100644 --- a/src/app/(pages)/(main)/project/assign/page.tsx +++ b/src/app/(pages)/(main)/project/assign/page.tsx @@ -1,130 +1,130 @@ 'use client' -import {useCallback, useEffect, useMemo, useState} from 'react' +import { useCallback, useEffect, useMemo, useState } from 'react' import { Button } from '@/components/ui/button' import { Input } from '@/components/ui/input' import { Checkbox } from '@/components/ui/checkbox' import { ChevronLeft, ChevronRight } from 'lucide-react' import { KriSingleSelect } from '@/components/common/KriAutoComplete' -import {ProjectInfo} from "@/types/project"; -import {nextApi} from "@/lib/http-client"; -import {PROJECT_SEARCH_COUNT} from "@/const/projectConst"; -import {useDebouncedValue} from "@/hooks/useDebouncedValue"; -import {useMounted} from "@/hooks/useMounted"; -import {UserInfo} from "@/types/user"; -import {useSelectedProject} from "@/hooks/useSelectedProject"; -import {KriSelect, KriSelectItem} from "@/components/common/KriSelect"; -import {useAuth} from "@/hooks/useAuth"; -import {RoleInfo} from "@/types/role"; -import {CONTACT_USER_ROLE, FW_USER_ROLE} from "@/const/userConst"; -import {useLoading} from "@/hooks/useLoading"; -import _ from "lodash"; +import { ProjectInfo } from "@/types/project"; +import { PROJECT_SEARCH_COUNT } from "@/const/projectConst"; +import { useDebouncedValue } from "@/hooks/useDebouncedValue"; +import { useMounted } from "@/hooks/useMounted"; +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 { + useFieldworkUsersQuery, + useRoleListQuery, + useUserCompaniesQuery, +} from "@/query/user"; + +import { + useAssignedFieldworkIdsQuery, + useSaveAssignedFieldworkMutation, + useProjectTopQuery, +} from "@/query/project"; const ProjectAssignPage = () => { const mounted = useMounted(); - const { withLoadingAsync } = useLoading(); const { auth } = useAuth(); const { selectedProject } = useSelectedProject(); - const [projectArray, setProjectArray] = useState([]); + const prjctIdx = selectedProject?.prjctIdx ?? 0; + const enabled = mounted && prjctIdx > 0; + + const fwUsersQuery = useFieldworkUsersQuery(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 [sourceProject, setSourceProject] = useState(); + const projectTopQuery = useProjectTopQuery(PROJECT_SEARCH_COUNT, debouncedKeyword, mounted); + const projectArray = projectTopQuery.data ?? []; + const companyArray = companyQuery.data ?? []; + + const roleArray: KriSelectItem[] = useMemo(() => { + const roles = roleQuery.data ?? []; + return roles + .filter(r => r.roleCd >= FW_USER_ROLE) + .map(r => ({ value: String(r.roleCd), label: r.roleNm })); + }, [roleQuery.data]); - const [companyArray, setCompanyArray] = useState([]); const [companyFilter, setCompanyFilter] = useState(''); - const [roleArray, setRoleArray] = useState([]); - const [roleFilter, setRoleFilter] = useState(); - const [fwUserArray, setFwUserArray] = useState([]); + const [roleFilter, setRoleFilter] = useState(undefined); + const fwUserArray = fwUsersQuery.data ?? []; const [originAssign, setOriginAssign] = useState([]); const [assignUserArray, setAssignUserArray] = useState([]); + const [dirty, setDirty] = useState(false); + + // 선택/검색(좌/우) const [selectedAssignUser, setSelectedAssignUser] = useState([]); const [searchAssign, setSearchAssign] = useState(''); const debouncedAssign = useDebouncedValue(searchAssign, 500); - const [assignInfoString, setAssignInfoString] = useState(''); - - const [ableUserArray, setAbleUserArray] = useState([]); const [selectedAbleUser, setSelectedAbleUser] = useState([]); const [searchAble, setSearchAble] = useState(''); const debouncedAble = useDebouncedValue(searchAble, 500); - const searchTopProject = async (keyword: string) => { - const res = await nextApi.get( - `/project/top/${PROJECT_SEARCH_COUNT}`, - { query: { keyword } } - ); - - setProjectArray(res); - }; - - const handleSelectProject = (info:ProjectInfo|null) => { - if(info === null){ - setSourceProject(undefined) - } - else{ - setSourceProject(info); - } - } - - const handleSelectAllLeft = (checked: boolean) => { - if (checked) { - setSelectedAssignUser(assignUserArray.map(u => u.userId)) - } else { - setSelectedAssignUser([]) - } - } - - const handleSelectAllRight = (checked: boolean) => { - if (checked) { - setSelectedAbleUser(ableUserArray.map(u => u.userId)) - } else { - setSelectedAbleUser([]) - } - } - - const handleToggleUnassign = (id: string) => { - setSelectedAssignUser(prev => - prev.includes(id) - ? prev.filter(x => x !== id) - : [...prev, id] - ) - } - - const handleToggleAssign = (id: string) => { - setSelectedAbleUser(prev => - prev.includes(id) - ? prev.filter(x => x !== id) - : [...prev, id] - ) - } - - const appendUserInfo = ( - userIdArray:string[], - sourceArray:UserInfo[] - ) => { - return sourceArray.filter(user => userIdArray.includes(user.userId)); - } - - const resetSelect = () => { + const resetSelect = useCallback(() => { setSelectedAssignUser([]); setSelectedAbleUser([]); - - //검색도 초기화 setSearchAssign(''); setSearchAble(''); - } + }, []); - const resetSelectAndAssign = () => { + const resetSelectAndAssign = useCallback(() => { resetSelect(); - setAssignUserArray(_.cloneDeep(originAssign)); + setAssignUserArray(structuredClone(originAssign)); + setDirty(false); + }, [originAssign, resetSelect]); + + const [sourceProject, setSourceProject] = useState(undefined); + const handleSelectProject = (info: ProjectInfo | null) => { + setSourceProject(info ?? undefined); + resetSelect(); + }; + + const sourcePrjctIdx = sourceProject?.prjctIdx ?? 0; + const sourceAssignedIdsQuery = useAssignedFieldworkIdsQuery( + sourcePrjctIdx, + mounted && sourcePrjctIdx > 0 + ); + + const ableUserArray: UserInfo[] = useMemo(() => { + if (sourcePrjctIdx > 0) { + const ids = sourceAssignedIdsQuery.data ?? []; + return fwUserArray.filter(u => ids.includes(u.userId)); + } + return structuredClone(fwUserArray); + }, [fwUserArray, sourcePrjctIdx, sourceAssignedIdsQuery.data]); + + const handleSelectAllLeft = (checked: boolean) => { + setSelectedAssignUser(checked ? assignView.map(u => u.userId) : []); + }; + + const handleSelectAllRight = (checked: boolean) => { + setSelectedAbleUser(checked ? ableView.map(u => u.userId) : []); + }; + + const handleToggleUnassign = (id: string) => { + setSelectedAssignUser(prev => prev.includes(id) ? prev.filter(x => x !== id) : [...prev, id]); + }; + + const handleToggleAssign = (id: string) => { + setSelectedAbleUser(prev => prev.includes(id) ? prev.filter(x => x !== id) : [...prev, id]); }; const handleCompanyChange = (v: string) => { resetSelectAndAssign(); setCompanyFilter(v); - // 필요하면 데이터도 같이 재조회/재계산 트리거 }; const handleRoleChange = (item: KriSelectItem) => { @@ -132,170 +132,132 @@ const ProjectAssignPage = () => { setRoleFilter(item); }; - const handleAssign = () => { - const toAssign = ableUserArray.filter(u => selectedAbleUser.includes(u.userId)); - setAssignUserArray(prev => [...prev, ...toAssign]); + const { + assignBase, + assignView, + ableBase, + ableView, + } = useMemo(() => { + const roleVal = roleFilter?.value; + const cmpnVal = companyFilter; + const passBase = (u: UserInfo) => + (!roleVal || String(u.userRole) === roleVal) && + (!cmpnVal || u.userCmpn === cmpnVal); + + const kwFilter = (u: UserInfo, k: string) => + u.userId.includes(k) || u.userName.includes(k); + + // LEFT + const _assignBase = assignUserArray.filter(passBase); + const kAssign = debouncedAssign.trim(); + const _assignView = kAssign ? _assignBase.filter((u) => kwFilter(u, kAssign)) : _assignBase; + + // RIGHT (exclude already assigned) + const assignedSet = new Set(assignUserArray.map((u) => u.userId)); + const _ableBase0 = ableUserArray.filter(passBase).filter((u) => !assignedSet.has(u.userId)); + const kAble = debouncedAble.trim(); + const _ableView = kAble ? _ableBase0.filter((u) => kwFilter(u, kAble)) : _ableBase0; + + return { + assignBase: _assignBase, + assignView: _assignView, + ableBase: _ableBase0, + ableView: _ableView, + }; + }, [ + assignUserArray, + ableUserArray, + roleFilter?.value, + companyFilter, + debouncedAssign, + debouncedAble, + ]); + + const assignInfoString = useMemo(() => { + return roleArray.map(role => { + const cnt = originAssign.filter(u => String(u.userRole) === role.value).length; + return `${role.label} : ${cnt}`; + }).join(' / '); + }, [roleArray, originAssign]); + + const handleAssign = () => { + const toAssign = ableView.filter(u => selectedAbleUser.includes(u.userId)); + if (toAssign.length === 0) return; + + setAssignUserArray(prev => [...prev, ...toAssign]); setSelectedAbleUser([]); - } + setDirty(true); + }; const handleRemove = () => { - const toRemove = assignUserArray.filter(u => selectedAssignUser.includes(u.userId)); - setAssignUserArray(prev => prev.filter(u => !selectedAssignUser.includes(u.userId))); + if (selectedAssignUser.length === 0) return; + setAssignUserArray(prev => prev.filter(u => !selectedAssignUser.includes(u.userId))); setSelectedAssignUser([]); - } + setDirty(true); + }; const handleSave = async () => { - if(selectedProject){ - await nextApi.put( - `/assign/prjct-fieldwork/${selectedProject.prjctIdx}`, - assignUserArray.map(u => u.userId) - ) - - setOriginAssign(_.cloneDeep(assignUserArray)); - - alert("저장되었습니다."); - } - else{ + if (!selectedProject) { alert("옳지 않은 요청입니다."); + return; } - } - const baseFiltered = useCallback((users: UserInfo[]) => { - return users.filter( - (u) => - String(u.userRole) === roleFilter?.value && - u.userCmpn === companyFilter - ); - }, [roleFilter, companyFilter]); - - const withKeyword = useCallback((users: UserInfo[], keyword: string) => { - const k = keyword.trim(); - if (!k) return users; - - return users.filter( - (u) => u.userId.includes(k) || u.userName.includes(k) - ); - }, []); - - const assignBase = useMemo( - () => baseFiltered(assignUserArray), - [assignUserArray, baseFiltered] - ); - - const assignView = useMemo( - () => withKeyword(assignBase, debouncedAssign), - [assignBase, debouncedAssign, withKeyword] - ); - - const assignedIdSet = useMemo( - () => new Set(assignUserArray.map(u => u.userId)), - [assignUserArray] - ); - - const ableBase = useMemo( - () => baseFiltered(ableUserArray) - .filter((user) => !assignedIdSet.has(user.userId)), - [ableUserArray, baseFiltered, assignedIdSet] - ); - - const ableView = useMemo( - () => withKeyword(ableBase, debouncedAble) - .filter((user) => !assignedIdSet.has(user.userId)), - [ableBase, debouncedAble, withKeyword, assignedIdSet] - ); + await saveAssignMutation.mutateAsync(assignUserArray.map(u => u.userId)); + setOriginAssign(structuredClone(assignUserArray)); + setDirty(false); + alert("저장되었습니다."); + }; useEffect(() => { - if(selectedProject){ - const keyword = debouncedKeyword.trim(); - searchTopProject(keyword); - } - }, [debouncedKeyword]); + const cmpn = auth.user?.userCmpn ?? ""; + if (cmpn) setCompanyFilter(cmpn); + }, [auth.user?.userCmpn]); useEffect(() => { - withLoadingAsync(async () => { - nextApi.get("/user/fieldwork") - .then(res => setFwUserArray(res)); + if (roleFilter) return; + if (roleArray.length === 0) return; - nextApi.get("/user/cmpn") - .then((res) => setCompanyArray(res)); - - const roleList = await nextApi.get("/role") - const roleOptionArray = roleList - .filter(role => role.roleCd >= FW_USER_ROLE) - .map((role) => ({ - value: String(role.roleCd), - label: role.roleNm, - })) - setRoleArray(roleOptionArray); - const contactRole = roleOptionArray.find((role) => role.value === CONTACT_USER_ROLE.toString()); - if(contactRole){ - setRoleFilter(contactRole); - } - }) - - }, []); + const contactRole = roleArray.find(r => r.value === String(CONTACT_USER_ROLE)); + setRoleFilter(contactRole ?? roleArray[0]); + }, [roleArray, roleFilter]); + // prjctIdx 바뀌면: 편집 상태 초기화(서버 데이터 다시 주입 받을 준비) useEffect(() => { - if(auth.user){ - setCompanyFilter(auth.user.userCmpn || "") - } - }, [auth.user]); + if (!enabled) return; + setDirty(false); + resetSelect(); + setOriginAssign([]); + setAssignUserArray([]); + }, [enabled, prjctIdx, resetSelect]); + // 서버 배정 ids + fwUserArray 준비되면 "초기 1회" 주입 useEffect(() => { - withLoadingAsync(async () => { - if(selectedProject){ - const res = await nextApi.get(`/assign/prjct-fieldwork/${selectedProject.prjctIdx}`); - const assignUserInfoArray = appendUserInfo(res, fwUserArray); + if (!enabled) return; + if (dirty) return; - setAssignUserArray(assignUserInfoArray); - setOriginAssign(assignUserInfoArray); - }else{ - setAssignUserArray([]); - setOriginAssign([]); - } - resetSelect(); - }); - }, [fwUserArray, selectedProject, roleArray]); + const ids = assignedIdsQuery.data; + if (!ids) return; - useEffect(() => { - const assignString = roleArray.map((role) => { - const assignCount = originAssign.filter(user => user.userRole.toString() === role.value).length - return `${role.label} : ${assignCount}`; - }).join(' / '); + // fwUserArray가 아직 비어있을 수 있으니 둘 다 준비된 상태에서만 + if (!fwUserArray || fwUserArray.length === 0) return; - setAssignInfoString(assignString); - }, [originAssign]); + const assignUserInfoArray = fwUserArray.filter(u => ids.includes(u.userId)); + setAssignUserArray(assignUserInfoArray); + setOriginAssign(structuredClone(assignUserInfoArray)); + resetSelect(); + }, [enabled, dirty, assignedIdsQuery.data, fwUserArray, resetSelect]); - useEffect(() => { - withLoadingAsync(async () => { - let ableUserList :UserInfo[] = []; - - if(sourceProject){ - const res = await nextApi.get(`/assign/prjct-fieldwork/${sourceProject.prjctIdx}`); - ableUserList = appendUserInfo(res, fwUserArray); - } - else{ - ableUserList = _.cloneDeep(fwUserArray); - } - - setAbleUserArray(ableUserList); - }); - }, [fwUserArray, sourceProject]); - - if (!mounted || !selectedProject) return null + if (!mounted || !selectedProject) return null; return (
- {/* 공용 필터 바 (회사 / 대상) */}
-
- 회사 -
+
회사
{
-
- 대상 -
+
대상
{
- {/* 메인 배정 영역 */}
- {/* 왼쪽: 배정된 면접원 */}
- - {assignInfoString} - + {assignInfoString}
@@ -354,12 +310,13 @@ const ProjectAssignPage = () => { className="border-white" /> - 배정된 {roleFilter?.label} ( {assignBase.length}명 ) + + 배정된 {roleFilter?.label} ( {assignBase.length}명 ) + - {assignView - .map((userInfo) => ( + {assignView.map((userInfo) => ( {
- {/* 가운데: 배정/제외 버튼 */}
- {/* 오른쪽: 전체 면접원 풀 */}
- + items={projectArray} value={String(sourceProject?.prjctIdx ?? "")} onChange={() => {}} @@ -449,12 +403,13 @@ const ProjectAssignPage = () => { className="border-white" /> - 배정 가능 {roleFilter?.label} ({ableBase.length}명 ) + + 배정 가능 {roleFilter?.label} ({ableBase.length}명 ) + - {ableView - .map((user) => ( + {ableView.map((user) => ( {
- {/* 하단 저장 버튼 */}
diff --git a/src/components/dialog/UserUpsertDialog.tsx b/src/components/dialog/UserUpsertDialog.tsx index 40ddec1..a1f7eb8 100644 --- a/src/components/dialog/UserUpsertDialog.tsx +++ b/src/components/dialog/UserUpsertDialog.tsx @@ -20,7 +20,7 @@ import {KriSelect, KriSelectItem} from "@/components/common/KriSelect"; import {DataVerification} from "@/types/common"; import {apiError} from "@/lib/http-util"; import {KriSingleSelect} from "@/components/common/KriAutoComplete"; -import {USER_NAME_REGEX} from "@/const/userConst"; +import {FW_TEAM, USER_NAME_REGEX} from "@/const/userConst"; import {NONE_HTTP_ERROR, UNKNOWN_HTTP_ERROR} from "@/const/commonConst"; export type UserUpsertDialogProps = { @@ -159,6 +159,8 @@ const UserUpsertDialog = ({ setIsSubmitting(true); + formData.userTeam = FW_TEAM; + try { await onSubmit(formData as UserInfoSaveRequest); handleOpenChange(false); diff --git a/src/components/kri-editor/KriEditorWysiwyg.tsx b/src/components/kri-editor/KriEditorWysiwyg.tsx index 968dd22..29e5124 100644 --- a/src/components/kri-editor/KriEditorWysiwyg.tsx +++ b/src/components/kri-editor/KriEditorWysiwyg.tsx @@ -253,10 +253,6 @@ export function KriEditorWysiwyg(props: KriEditorProps) { }, },[wysiwygKey]); - useEffect(() => { - console.log(wysiwygKey) - }, [wysiwygKey]); - const restoreSelection = useCallback(() => { if (!editor) return; const s = selectionRef.current; diff --git a/src/components/layout/Header.tsx b/src/components/layout/Header.tsx index 120c07b..ea738aa 100644 --- a/src/components/layout/Header.tsx +++ b/src/components/layout/Header.tsx @@ -1,5 +1,6 @@ "use client"; +import { useRouter } from "next/navigation"; import { Button } from "@/components/ui/button"; import { Menu, X, ZoomIn, ZoomOut, LogOut } from "lucide-react"; import Image from "next/image"; @@ -29,6 +30,7 @@ export const Header = ({ decreaseFontSize, increaseFontSize, }: HeaderProps) => { + const router = useRouter(); const { auth } = useAuth(); const [userInfo, setUserInfo] = useState(undefined); @@ -37,7 +39,7 @@ export const Header = ({ setUserInfo(auth.user); } else{ - window.location.replace("/logout"); + router.replace("/logout"); } }, [auth.user]) diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx index e3bb9e0..5a480e6 100644 --- a/src/components/layout/MainLayout.tsx +++ b/src/components/layout/MainLayout.tsx @@ -36,11 +36,7 @@ const MainLayout = ({ children, initialFontSize }: MainLayoutProps) => { sideMenus.forEach((item) => { if ( - item.children && - item.children.some( - (child) => - pathname === child.path || pathname.startsWith(child.path + "/") - ) + item.children?.some((child) => pathname === child.path || pathname.startsWith(child.path + "/")) ) { initial[item.id] = true; } @@ -76,7 +72,7 @@ const MainLayout = ({ children, initialFontSize }: MainLayoutProps) => { useEffect(() => { if(!isMain && isProjectMenu && !selectedProject){ alert("옳지 않은 접근입니다."); - window.location.replace("/"); + router.replace("/"); } }, []); diff --git a/src/components/layout/SidebarProjectSearch .tsx b/src/components/layout/SidebarProjectSearch .tsx index abf1baf..c4d6e75 100644 --- a/src/components/layout/SidebarProjectSearch .tsx +++ b/src/components/layout/SidebarProjectSearch .tsx @@ -1,45 +1,30 @@ -import {nextApi} from "@/lib/http-client"; -import {ProjectInfo} from "@/types/project"; import {useDebouncedValue} from "@/hooks/useDebouncedValue"; -import {useEffect, useState} from "react"; +import {useMemo, useState} from "react"; import {KriSingleSelect} from "@/components/common/KriAutoComplete"; import {useSelectedProject} from "@/hooks/useSelectedProject"; -import {useLoading} from "@/hooks/useLoading"; import {useMounted} from "@/hooks/useMounted"; import {PROJECT_SEARCH_COUNT} from "@/const/projectConst"; import {SelectedProject} from "@/store/jotai/project"; +import {useProjectTopQuery} from "@/query/project"; export const SidebarProjectSearch = () =>{ const mounted = useMounted(); - const { selectedProject, setSelectedProject } = useSelectedProject(); + const [searchKeyword, setSearchKeyword] = useState(selectedProject?.prjctCd || ""); const debouncedKeyword = useDebouncedValue(searchKeyword, 500); - const [projectArray, setProjectArray] = useState([]); - const searchTopProject = async (keyword: string) => { - const res = await nextApi.get( - `/project/top/${PROJECT_SEARCH_COUNT}`, - { query: { keyword } } - ); + const enabled = mounted && !!selectedProject; + const topQuery = useProjectTopQuery(PROJECT_SEARCH_COUNT, debouncedKeyword, enabled); - setProjectArray(res); + const projectArray = useMemo(() => topQuery.data ?? [] ,[topQuery.data]); + + const handleSelectProject = (info: SelectedProject | null) => { + if (!info) return; + setSelectedProject(info); }; - const handleSelectProject = (info:SelectedProject|null) => { - if(info === null) return; - - setSelectedProject(info); - } - - useEffect(() => { - if(selectedProject){ - const keyword = debouncedKeyword.trim(); - searchTopProject(keyword); - } - }, [debouncedKeyword]); - - if (!mounted || !selectedProject) return null + if (!mounted || !selectedProject) return null; return ( { +const MessageTemplate = ({ pageTitle, defaultTemplate }: MessageTemplateProps) => { const { selectedProject } = useSelectedProject(); const editorCmdRef = useRef(null); const sessionTempUrlsRef = useRef>(new Set()); - const [mainTemplateIdx, setMainTemplateIdx] = useState(null); - const [listHderList, setListHderList] = useState([]) - const [templateList, setTemplateList] = useState([]); + const [listHderList, setListHderList] = useState([]); const [selectedTemplate, setSelectedTemplate] = useState