From f239ac984f9070c0a448a31b91b945c5ed2692e1 Mon Sep 17 00:00:00 2001 From: chan Date: Tue, 17 Mar 2026 09:48:00 +0900 Subject: [PATCH] =?UTF-8?q?=EB=A6=B0=ED=8A=B8=20=EC=A0=81=EC=9A=A93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/OrgChartUploadModal.tsx | 66 ++++++++++++++----- .../src/features/users/UserCreatePage.tsx | 3 +- .../src/features/users/UserDetailPage.tsx | 15 +++-- .../components/UserBulkMoveGroupModal.tsx | 3 +- .../users/components/UserBulkUploadModal.tsx | 8 +-- .../src/features/users/utils/csvParser.ts | 9 +-- 6 files changed, 73 insertions(+), 31 deletions(-) diff --git a/adminfront/src/features/tenants/components/OrgChartUploadModal.tsx b/adminfront/src/features/tenants/components/OrgChartUploadModal.tsx index 3f465340..ad7b27eb 100644 --- a/adminfront/src/features/tenants/components/OrgChartUploadModal.tsx +++ b/adminfront/src/features/tenants/components/OrgChartUploadModal.tsx @@ -1,4 +1,5 @@ import { useMutation } from "@tanstack/react-query"; +import type { AxiosError } from "axios"; import { Download, FileText, Loader2, Upload } from "lucide-react"; import * as React from "react"; import { toast } from "sonner"; @@ -20,7 +21,10 @@ interface OrgChartUploadModalProps { onSuccess?: () => void; } -export function OrgChartUploadModal({ tenantId, onSuccess }: OrgChartUploadModalProps) { +export function OrgChartUploadModal({ + tenantId, + onSuccess, +}: OrgChartUploadModalProps) { const [open, setOpen] = React.useState(false); const [file, setFile] = React.useState(null); const fileInputRef = React.useRef(null); @@ -28,11 +32,16 @@ export function OrgChartUploadModal({ tenantId, onSuccess }: OrgChartUploadModal const mutation = useMutation({ mutationFn: (file: File) => importOrgChart(tenantId, file), onSuccess: () => { - toast.success(t("msg.admin.org.import_success", "조직도가 성공적으로 업로드되었습니다.")); + toast.success( + t( + "msg.admin.org.import_success", + "조직도가 성공적으로 업로드되었습니다.", + ), + ); setOpen(false); onSuccess?.(); }, - onError: (error: any) => { + onError: (error: AxiosError<{ error?: string }>) => { toast.error(t("msg.admin.org.import_error", "조직도 업로드 실패"), { description: error.response?.data?.error || error.message, }); @@ -54,11 +63,16 @@ export function OrgChartUploadModal({ tenantId, onSuccess }: OrgChartUploadModal const downloadTemplate = () => { const headers = "email,name,organization,position,jobtitle,is_owner"; - const example = "ceo@example.com,홍길동,경영진,대표이사,경영총괄,true + const example = `ceo@example.com,홍길동,경영진,대표이사,경영총괄,true cto@example.com,이몽룡,기술부문,이사,기술총괄,true -user1@example.com,성춘향,기술부문/개발팀,팀원,프론트엔드 개발,false"; - const blob = new Blob([`${headers} -${example}`], { type: "text/csv" }); +user1@example.com,성춘향,기술부문/개발팀,팀원,프론트엔드 개발,false`; + const blob = new Blob( + [ + `${headers} +${example}`, + ], + { type: "text/csv" }, + ); const url = URL.createObjectURL(blob); const a = document.createElement("a"); a.href = url; @@ -77,15 +91,25 @@ ${example}`], { type: "text/csv" }); - {t("ui.admin.org.import_title", "조직도 일괄 등록")} + + {t("ui.admin.org.import_title", "조직도 일괄 등록")} + - {t("msg.admin.org.import_description", "CSV 파일을 업로드하여 조직 계층과 멤버를 한 번에 구성합니다.")} + {t( + "msg.admin.org.import_description", + "CSV 파일을 업로드하여 조직 계층과 멤버를 한 번에 구성합니다.", + )}
- @@ -96,8 +120,14 @@ ${example}`], { type: "text/csv" }); ref={fileInputRef} onChange={handleFileChange} /> -
@@ -106,19 +136,23 @@ ${example}`], { type: "text/csv" });
{file.name}
-
{(file.size / 1024).toFixed(1)} KB
+
+ {(file.size / 1024).toFixed(1)} KB +
)} - diff --git a/adminfront/src/features/users/UserCreatePage.tsx b/adminfront/src/features/users/UserCreatePage.tsx index 4329f07e..b657a4cd 100644 --- a/adminfront/src/features/users/UserCreatePage.tsx +++ b/adminfront/src/features/users/UserCreatePage.tsx @@ -477,7 +477,8 @@ function UserCreatePage() { /> {errors.metadata?.[field.key] && (

- {(errors.metadata[field.key] as any).message} + {(errors.metadata[field.key] as { message?: string }) + ?.message}

)} diff --git a/adminfront/src/features/users/UserDetailPage.tsx b/adminfront/src/features/users/UserDetailPage.tsx index fa5a82fe..3b69b6cb 100644 --- a/adminfront/src/features/users/UserDetailPage.tsx +++ b/adminfront/src/features/users/UserDetailPage.tsx @@ -9,7 +9,11 @@ import { Users, } from "lucide-react"; import * as React from "react"; -import { useForm } from "react-hook-form"; +import { + type FieldErrors, + type UseFormRegister, + useForm, +} from "react-hook-form"; import { Link, useNavigate, useParams } from "react-router-dom"; import { Button } from "../../components/ui/button"; import { @@ -22,6 +26,7 @@ import { import { Input } from "../../components/ui/input"; import { Label } from "../../components/ui/label"; import { + type TenantSummary, type UserUpdateRequest, fetchMe, fetchTenant, @@ -40,7 +45,7 @@ type UserSchemaField = { validation?: string; }; -type UserFormValues = UserUpdateRequest & { metadata: Record }; +type UserFormValues = UserUpdateRequest & { metadata: Record> }; // [New] Component for per-tenant profile/schema management function TenantProfileCard({ @@ -49,9 +54,9 @@ function TenantProfileCard({ errors, isAdmin, }: { - tenant: any; - register: any; - errors: any; + tenant: TenantSummary; + register: UseFormRegister; + errors: FieldErrors; isAdmin: boolean; }) { const { data: detail, isLoading } = useQuery({ diff --git a/adminfront/src/features/users/components/UserBulkMoveGroupModal.tsx b/adminfront/src/features/users/components/UserBulkMoveGroupModal.tsx index 13b8f88d..ad1c51a1 100644 --- a/adminfront/src/features/users/components/UserBulkMoveGroupModal.tsx +++ b/adminfront/src/features/users/components/UserBulkMoveGroupModal.tsx @@ -1,4 +1,5 @@ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; +import type { AxiosError } from "axios"; import { FolderTree, Loader2, Search } from "lucide-react"; import * as React from "react"; import { toast } from "sonner"; @@ -70,7 +71,7 @@ export function UserBulkMoveGroupModal({ setOpen(false); onSuccess?.(); }, - onError: (error: any) => { + onError: (error: AxiosError<{ error?: string }>) => { toast.error(t("msg.admin.users.bulk.move_error", "부서 이동 실패"), { description: error.response?.data?.error || error.message, }); diff --git a/adminfront/src/features/users/components/UserBulkUploadModal.tsx b/adminfront/src/features/users/components/UserBulkUploadModal.tsx index 83c1c60f..793c49ee 100644 --- a/adminfront/src/features/users/components/UserBulkUploadModal.tsx +++ b/adminfront/src/features/users/components/UserBulkUploadModal.tsx @@ -195,8 +195,8 @@ ${example}`, - {previewData.slice(0, 10).map((u, i) => ( - + {previewData.slice(0, 10).map((u) => ( + {u.email} {u.name} {u.companyCode || "-"} @@ -241,9 +241,9 @@ ${example}`,
- {results.map((r, i) => ( + {results.map((r) => (
{r.success ? ( diff --git a/adminfront/src/features/users/utils/csvParser.ts b/adminfront/src/features/users/utils/csvParser.ts index 015b2351..7be80adb 100644 --- a/adminfront/src/features/users/utils/csvParser.ts +++ b/adminfront/src/features/users/utils/csvParser.ts @@ -13,11 +13,12 @@ export function parseUserCSV(text: string): BulkUserItem[] { if (!lines[i].trim()) continue; const values = lines[i].split(",").map((v) => v.trim()); - const item: any = { metadata: {} }; + const item: Record = { metadata: {} }; - headers.forEach((header, index) => { + for (let index = 0; index < headers.length; index++) { + const header = headers[index]; const value = values[index]; - if (value === undefined || value === "") return; + if (value === undefined || value === "") continue; if ( [ @@ -34,7 +35,7 @@ export function parseUserCSV(text: string): BulkUserItem[] { } else { item.metadata[header] = value; } - }); + } if (item.email && item.name) { data.push(item as BulkUserItem);