Merge remote-tracking branch 'origin/dev' into dev

2026-05-20 18:16:03 +09:00
parent 2c3cab78b1 8b61c054e7
commit 49b78b3786
79 changed files with 6977 additions and 1099 deletions
--- a/adminfront/src/features/users/UserCreatePage.tsx
+++ b/adminfront/src/features/users/UserCreatePage.tsx
@@ -67,6 +67,13 @@ type AppointmentDraft = UserAppointment & {
  draftId: string;
 };

+type AdminFrontTestHooks = {
+  selectUserAppointmentTenant?: (
+    selection: OrgChartTenantSelection,
+    index?: number,
+  ) => Promise<void>;
+};
+
 function createDraftId() {
  return globalThis.crypto?.randomUUID?.() ?? `appointment-${Date.now()}`;
 }
@@ -276,6 +283,21 @@ function UserCreatePage() {
    return () => window.removeEventListener("message", onMessage);
  }, [applyTenantSelection, pickerTarget]);

+  if (typeof window !== "undefined") {
+    const testWindow = window as Window &
+      typeof globalThis & {
+        __adminfrontTestHooks?: AdminFrontTestHooks;
+      };
+    const hooks = testWindow.__adminfrontTestHooks ?? {};
+    hooks.selectUserAppointmentTenant = async (selection, index = 0) => {
+      await applyTenantSelection(selection, {
+        kind: "appointment",
+        index,
+      });
+    };
+    testWindow.__adminfrontTestHooks = hooks;
+  }
+
  const addAppointment = () => {
    setAdditionalAppointments((current) => [
      ...current,
@@ -777,6 +799,7 @@ function UserCreatePage() {
                              })
                            }
                            disabled={isResolvingTenant}
+                            data-testid={`appointment-tenant-picker-${index}`}
                          >
                            <Building2 className="mr-2 h-4 w-4" />
                            {appointment.tenantName || "테넌트 선택"}
@@ -988,6 +1011,7 @@ function UserCreatePage() {
            title={t("ui.admin.users.create.form.pick_tenant", "테넌트 선택")}
            src={pickerUrl}
            className="h-[600px] w-full rounded-md border"
+            data-testid="appointment-tenant-picker-frame"
          />
        </DialogContent>
      </Dialog>
--- a/adminfront/src/features/users/UserListPage.tsx
+++ b/adminfront/src/features/users/UserListPage.tsx
@@ -7,14 +7,17 @@ import {
  ChevronDown,
  ChevronLeft,
  ChevronRight,
+  Users,
+  Download,
  FileDown,
-  LayoutDashboard,
+  FileSpreadsheet,
  Plus,
  RefreshCw,
  Search,
  Settings2,
  ShieldCheck,
  Trash2,
+  Upload,
 } from "lucide-react";
 import * as React from "react";
 import { Link, useNavigate } from "react-router-dom";
@@ -90,7 +93,10 @@ import {
 } from "../../lib/adminApi";
 import { t } from "../../lib/i18n";
 import { isSuperAdminRole } from "../../lib/roles";
-import { UserBulkUploadModal } from "./components/UserBulkUploadModal";
+import {
+  UserBulkUploadModal,
+  downloadUserTemplate,
+} from "./components/UserBulkUploadModal";
 import {
  normalizeUserStatusValue,
  type UserStatusValue,
@@ -140,6 +146,7 @@ function UserListPage() {
    React.useState("");
  const [sortConfig, setSortConfig] =
    React.useState<SortConfig<UserSortKey> | null>(null);
+  const [bulkUploadOpen, setBulkUploadOpen] = React.useState(false);

  const limit = 1000;
  const offset = (page - 1) * limit;
@@ -416,6 +423,7 @@ function UserListPage() {
      <PageHeader
        sticky
        titleAs="h2"
+        icon={<Users size={20} />}
        title={
          <span data-testid="page-title">
            {t("ui.admin.users.list.title", "사용자 관리")}
@@ -485,27 +493,65 @@ function UserListPage() {
              <RefreshCw size={16} />
              {t("ui.common.refresh", "새로고침")}
            </Button>
-            <Button
-              variant="outline"
-              onClick={() => handleExport(false)}
-              className="gap-2"
-              disabled={exportMutation.isPending}
-              data-testid="user-export-without-ids-btn"
-            >
-              <FileDown size={16} />
-              {t("ui.common.export_without_ids", "UUID 제외 내보내기")}
-            </Button>
-            <Button
-              variant="outline"
-              onClick={() => handleExport(true)}
-              className="gap-2"
-              disabled={exportMutation.isPending}
-              data-testid="user-export-with-ids-btn"
-            >
-              <FileDown size={16} />
-              {t("ui.common.export_with_ids", "UUID 포함")}
-            </Button>
-            <UserBulkUploadModal onSuccess={() => query.refetch()} />
+            <DropdownMenu>
+              <DropdownMenuTrigger asChild>
+                <Button
+                  variant="outline"
+                  data-testid="user-data-mgmt-btn"
+                  className="gap-2 h-9"
+                >
+                  <LayoutDashboard size={16} />
+                  {t("ui.admin.users.data_mgmt", "데이터 관리")}
+                  <ChevronDown size={14} className="opacity-50" />
+                </Button>
+              </DropdownMenuTrigger>
+              <DropdownMenuContent align="end" className="w-56">
+                <DropdownMenuItem
+                  onClick={downloadUserTemplate}
+                  data-testid="user-template-menu-item"
+                  className="cursor-pointer"
+                >
+                  <FileSpreadsheet size={16} className="mr-2 opacity-50" />
+                  {t("ui.admin.users.csv_template", "템플릿 다운로드")}
+                </DropdownMenuItem>
+                <DropdownMenuSeparator />
+                <DropdownMenuItem
+                  onSelect={(e) => {
+                    e.preventDefault();
+                    setBulkUploadOpen(true);
+                  }}
+                  className="cursor-pointer"
+                >
+                  <Upload size={16} className="mr-2 opacity-50" />
+                  {t("ui.admin.users.list.bulk_import", "일괄 등록 (CSV)")}
+                </DropdownMenuItem>
+                <DropdownMenuSeparator />
+                <DropdownMenuItem
+                  onClick={() => handleExport(false)}
+                  disabled={exportMutation.isPending}
+                  data-testid="user-export-menu-item"
+                  className="cursor-pointer"
+                >
+                  <FileDown size={16} className="mr-2 opacity-50" />
+                  {t("ui.common.export_without_ids", "UUID 제외 내보내기")}
+                </DropdownMenuItem>
+                <DropdownMenuItem
+                  onClick={() => handleExport(true)}
+                  disabled={exportMutation.isPending}
+                  data-testid="user-export-with-ids-menu-item"
+                  className="cursor-pointer"
+                >
+                  <FileDown size={16} className="mr-2 opacity-50" />
+                  {t("ui.common.export_with_ids", "UUID 포함 내보내기")}
+                </DropdownMenuItem>
+              </DropdownMenuContent>
+            </DropdownMenu>
+            <UserBulkUploadModal
+              variant="custom"
+              open={bulkUploadOpen}
+              onOpenChange={setBulkUploadOpen}
+              onSuccess={() => query.refetch()}
+            />
            <Dialog>
              <DialogTrigger asChild>
                <Button variant="outline" size="icon" className="h-9 w-9">
@@ -577,7 +623,7 @@ function UserListPage() {
      <Card className="flex-1 flex flex-col min-h-0 bg-[var(--color-panel)] overflow-hidden">
        <CardHeader className="flex flex-row items-center justify-between flex-shrink-0">
          <div>
-            <CardTitle>
+            <CardTitle className="text-lg font-bold flex items-center gap-2">
              {t("ui.admin.users.list.registry.title", "User Registry")}
            </CardTitle>
            <CardDescription>
--- a/adminfront/src/features/users/components/UserBulkUploadModal.tsx
+++ b/adminfront/src/features/users/components/UserBulkUploadModal.tsx
@@ -18,6 +18,7 @@ import {
  DialogTitle,
  DialogTrigger,
 } from "../../../components/ui/dialog";
+import { DropdownMenuItem } from "../../../components/ui/dropdown-menu";
 import { ScrollArea } from "../../../components/ui/scroll-area";
 import {
  type BulkUserItem,
@@ -42,7 +43,9 @@ import {

 interface UserBulkUploadModalProps {
  onSuccess?: () => void;
-  variant?: "button" | "dropdown";
+  variant?: "button" | "dropdown" | "custom";
+  open?: boolean;
+  onOpenChange?: (open: boolean) => void;
 }

 function buildUserTenantPreviewRows(
@@ -121,11 +124,34 @@ function hanmacEmailStatusClass(preview?: HanmacImportEmailPreview) {
  return "text-muted-foreground";
 }

+export const downloadUserTemplate = () => {
+  const headers =
+    "email,name,phone,role,tenant_slug,department,grade,position,jobTitle,employee_id,tenant_slug1,department1,grade1,position1,jobTitle1,employee_id1";
+  const example =
+    "user1@example.com,홍길동,010-1234-5678,user,tenant-slug,개발팀,수석,팀장,프론트엔드,EMP001,second-tenant,센터,책임,,Architecture,EMP002";
+  const blob = new Blob([`${headers}\n${example}`], {
+    type: "text/csv;charset=utf-8;",
+  });
+  const url = URL.createObjectURL(blob);
+  const a = document.createElement("a");
+  a.href = url;
+  a.download = "user_bulk_template.csv";
+  a.click();
+  URL.revokeObjectURL(url);
+};
+
 export function UserBulkUploadModal({
  onSuccess,
  variant = "button",
+  open: controlledOpen,
+  onOpenChange: controlledOnOpenChange,
 }: UserBulkUploadModalProps) {
-  const [open, setOpen] = React.useState(false);
+  const [localOpen, setLocalOpen] = React.useState(false);
+  const open = controlledOpen !== undefined ? controlledOpen : localOpen;
+  const setOpen = (val: boolean) => {
+    setLocalOpen(val);
+    controlledOnOpenChange?.(val);
+  };
  const [file, setFile] = React.useState<File | null>(null);
  const [parsing, setParsing] = React.useState(false);
  const [previewData, setPreviewData] = React.useState<BulkUserItem[]>([]);
@@ -334,17 +360,15 @@ export function UserBulkUploadModal({

  const triggerNode =
    variant === "dropdown" ? (
-      <div
-        className="relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors hover:bg-accent hover:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50"
-        role="menuitem"
-        tabIndex={-1}
+      <DropdownMenuItem
        onClick={() => setOpen(true)}
+        className="cursor-pointer"
        {...triggerProps}
      >
        <Upload size={16} className="mr-2 opacity-50" />
        {t("ui.admin.users.list.bulk_import", "일괄 등록 (CSV)")}
-      </div>
-    ) : (
+      </DropdownMenuItem>
+    ) : variant === "custom" ? null : (
      <DialogTrigger asChild>
        <Button variant="outline" className="gap-2" {...triggerProps}>
          <Upload size={16} />
@@ -363,7 +387,7 @@ export function UserBulkUploadModal({
          if (!val) reset();
        }}
      >
-        {variant !== "dropdown" && triggerNode}
+        {variant !== "dropdown" && variant !== "custom" && triggerNode}
        <DialogContent className="max-w-2xl">
          <DialogHeader>
            <DialogTitle data-testid="bulk-upload-title">
@@ -392,20 +416,23 @@ export function UserBulkUploadModal({
                    "템플릿 다운로드",
                  )}
                </Button>
-                <input
-                  type="file"
-                  accept=".csv"
-                  className="hidden"
-                  ref={fileInputRef}
-                  onChange={handleFileChange}
-                />
-                <Button
-                  onClick={() => fileInputRef.current?.click()}
-                  variant="secondary"
-                >
-                  {file
-                    ? t("ui.common.change_file", "파일 변경")
-                    : t("ui.common.select_file", "파일 선택")}
+                <Button asChild variant="secondary" className="cursor-pointer">
+                  <label>
+                    {file
+                      ? t("ui.common.change_file", "파일 변경")
+                      : t("ui.common.select_file", "파일 선택")}
+                    <input
+                      type="file"
+                      accept=".csv"
+                      className="hidden"
+                      ref={fileInputRef}
+                      onChange={handleFileChange}
+                      onClick={(e) => {
+                        // Allow picking the same file again if it was cleared
+                        (e.target as HTMLInputElement).value = "";
+                      }}
+                    />
+                  </label>
                </Button>
              </div>

--- a/adminfront/src/features/users/userStatus.test.ts
+++ b/adminfront/src/features/users/userStatus.test.ts
@@ -32,6 +32,11 @@ describe("userStatus", () => {
    expect(normalizeUserStatusValue("baron_only")).toBe("baron_guest");
  });

+  it("falls back to preboarding when status is missing", () => {
+    expect(normalizeUserStatusValue(undefined)).toBe("preboarding");
+    expect(normalizeUserStatusValue(null)).toBe("preboarding");
+  });
+
  it("uses canonical labels for legacy status values", () => {
    expect(userStatusLabel("baron_only")).toBe("baron_guest");
  });
--- a/adminfront/src/features/users/userStatus.ts
+++ b/adminfront/src/features/users/userStatus.ts
@@ -12,8 +12,8 @@ export const userStatusValues = [

 export type UserStatusValue = (typeof userStatusValues)[number];

-export function normalizeUserStatusValue(status: string): UserStatusValue {
-  switch (status.trim().toLowerCase()) {
+export function normalizeUserStatusValue(status?: string | null): UserStatusValue {
+  switch ((status ?? "").trim().toLowerCase()) {
    case "active":
      return "active";
    case "temporary_leave":