kevin/baron-sso
1
0
Fork 0
forked from baron/baron-sso
Code Pull Requests Activity

린트 적용3

Browse Source
This commit is contained in:
조찬영
2026-03-17 09:48:00 +09:00
parent 45ae1bb1c0
commit f239ac984f
6 changed files with 73 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
adminfront/src/features/tenants/components/OrgChartUploadModal.tsx
View File

@@ -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<File | null>(null);
const fileInputRef = React.useRef<HTMLInputElement>(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" });
</DialogTrigger>
<DialogContent>
<DialogHeader>
<DialogTitle>{t("ui.admin.org.import_title", "조직도 일괄 등록")}</DialogTitle>
<DialogTitle>
{t("ui.admin.org.import_title", "조직도 일괄 등록")}
</DialogTitle>
<DialogDescription>
{t("msg.admin.org.import_description", "CSV 파일을 업로드하여 조직 계층과 멤버를 한 번에 구성합니다.")}
{t(
"msg.admin.org.import_description",
"CSV 파일을 업로드하여 조직 계층과 멤버를 한 번에 구성합니다.",
)}
</DialogDescription>
</DialogHeader>
<div className="space-y-4 py-4">
<div className="flex justify-between items-center">
<Button variant="ghost" size="sm" onClick={downloadTemplate} className="gap-2">
<Button
variant="ghost"
size="sm"
onClick={downloadTemplate}
className="gap-2"
>
<Download size={14} />
{t("ui.admin.org.download_template", "템플릿 다운로드")}
</Button>
@@ -96,8 +120,14 @@ ${example}`], { type: "text/csv" });
ref={fileInputRef}
onChange={handleFileChange}
/>
<Button onClick={() => fileInputRef.current?.click()} variant="secondary" size="sm">
{file ? t("ui.common.change_file", "파일 변경") : t("ui.common.select_file", "파일 선택")}
<Button
onClick={() => fileInputRef.current?.click()}
variant="secondary"
size="sm"
>
{file
? t("ui.common.change_file", "파일 변경")
: t("ui.common.select_file", "파일 선택")}
</Button>
</div>
@@ -106,19 +136,23 @@ ${example}`], { type: "text/csv" });
<FileText className="text-primary" />
<div className="flex-1 min-w-0">
<div className="font-medium truncate">{file.name}</div>
<div className="text-xs text-muted-foreground">{(file.size / 1024).toFixed(1)} KB</div>
<div className="text-xs text-muted-foreground">
{(file.size / 1024).toFixed(1)} KB
</div>
</div>
</div>
)}
</div>
<DialogFooter>
<Button
onClick={handleUpload}
<Button
onClick={handleUpload}
disabled={!file || mutation.isPending}
className="w-full sm:w-auto"
>
{mutation.isPending && <Loader2 size={16} className="mr-2 animate-spin" />}
{mutation.isPending && (
<Loader2 size={16} className="mr-2 animate-spin" />
)}
{t("ui.admin.org.start_import", "임포트 시작")}
</Button>
</DialogFooter>

3
adminfront/src/features/users/UserCreatePage.tsx
View File

@@ -477,7 +477,8 @@ function UserCreatePage() {
/>
{errors.metadata?.[field.key] && (
<p className="text-xs text-destructive">
{(errors.metadata[field.key] as any).message}
{(errors.metadata[field.key] as { message?: string })
?.message}
</p>
)}
</div>

15
adminfront/src/features/users/UserDetailPage.tsx
View File

@@ -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<string, unknown> };
type UserFormValues = UserUpdateRequest & { metadata: Record<string, Record<string, unknown>> };
// [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<UserFormValues>;
errors: FieldErrors<UserFormValues>;
isAdmin: boolean;
}) {
const { data: detail, isLoading } = useQuery({

3
adminfront/src/features/users/components/UserBulkMoveGroupModal.tsx
View File

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

8
adminfront/src/features/users/components/UserBulkUploadModal.tsx
View File

@@ -195,8 +195,8 @@ ${example}`,
</tr>
</thead>
<tbody>
{previewData.slice(0, 10).map((u, i) => (
<tr key={i} className="border-t">
{previewData.slice(0, 10).map((u) => (
<tr key={u.email} className="border-t">
<td className="p-2">{u.email}</td>
<td className="p-2">{u.name}</td>
<td className="p-2">{u.companyCode || "-"}</td>
@@ -241,9 +241,9 @@ ${example}`,
<ScrollArea className="h-[250px] rounded-md border">
<div className="p-2 space-y-2">
{results.map((r, i) => (
{results.map((r) => (
<div
key={i}
key={r.email}
className="flex items-start gap-3 p-2 rounded border bg-card text-sm"
>
{r.success ? (

9
adminfront/src/features/users/utils/csvParser.ts
View File

@@ -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<string, any> = { 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);