From a31eceaf1665c5a32004fb130397d8b44d1824e6 Mon Sep 17 00:00:00 2001
From: chan <b24028@hanmaceng.co.kr>
Date: Wed, 13 May 2026 14:50:11 +0900
Subject: [PATCH 1/3] feat(adminfront): implement user role management and
 cleanup tenant list UI

- Add user role management (view, edit, bulk) in UserListPage, UserDetailPage, and UserCreatePage.
- Restrict role modification to super_admin only.
- Remove redundant action columns from tenant-related lists (TenantListPage, TenantSubTenantsPage, TenantUsersPage, TenantAdminsAndOwnersTab).
- Improve navigation by making table rows clickable where actions were removed.
---
 .../routes/TenantAdminsAndOwnersTab.tsx       | 100 ++----------------
 .../tenants/routes/TenantListPage.tsx         |  23 +---
 .../tenants/routes/TenantSubTenantsPage.tsx   |  21 ++--
 .../tenants/routes/TenantUsersPage.tsx        |  50 ++-------
 .../src/features/users/UserCreatePage.tsx     |  33 ++++++
 .../src/features/users/UserDetailPage.tsx     |  33 +++++-
 .../src/features/users/UserListPage.tsx       |  84 +++++++++++++++
 7 files changed, 170 insertions(+), 174 deletions(-)

diff --git a/adminfront/src/features/tenants/routes/TenantAdminsAndOwnersTab.tsx b/adminfront/src/features/tenants/routes/TenantAdminsAndOwnersTab.tsx
index d592d6f2..4f031db5 100644
--- a/adminfront/src/features/tenants/routes/TenantAdminsAndOwnersTab.tsx
+++ b/adminfront/src/features/tenants/routes/TenantAdminsAndOwnersTab.tsx
@@ -371,22 +371,19 @@ export function TenantAdminsAndOwnersTab() {
                       <TableHead className="font-bold">
                         {t("ui.admin.tenants.owners.table_email", "이메일")}
                       </TableHead>
-                      <TableHead className="text-right font-bold w-[100px]">
-                        {t("ui.admin.tenants.owners.table_actions", "액션")}
-                      </TableHead>
                     </TableRow>
                   </TableHeader>
                   <TableBody>
                     {ownersQuery.isLoading ? (
                       <TableRow>
-                        <TableCell colSpan={3} className="h-32 text-center">
+                        <TableCell colSpan={2} className="h-32 text-center">
                           <div className="animate-spin rounded-full h-6 w-6 border-b-2 border-primary mx-auto" />
                         </TableCell>
                       </TableRow>
                     ) : currentOwners.length === 0 ? (
                       <TableRow>
                         <TableCell
-                          colSpan={3}
+                          colSpan={2}
                           className="h-32 text-center text-muted-foreground"
                         >
                           <div className="flex flex-col items-center gap-2">
@@ -404,7 +401,8 @@ export function TenantAdminsAndOwnersTab() {
                       currentOwners.map((owner) => (
                         <TableRow
                           key={owner.id}
-                          className="hover:bg-muted/30 transition-colors group"
+                          className="hover:bg-muted/30 transition-colors group cursor-pointer"
+                          onClick={() => navigate(`/users/${owner.id}`)}
                         >
                           <TableCell className="font-medium">
                             <div className="flex items-center gap-3">
@@ -417,46 +415,6 @@ export function TenantAdminsAndOwnersTab() {
                           <TableCell className="text-muted-foreground italic">
                             {owner.email}
                           </TableCell>
-                          <TableCell className="text-right">
-                            <span className="relative inline-block group/tt">
-                              <Button
-                                variant="ghost"
-                                size="icon"
-                                className={`opacity-0 group-hover:opacity-100 transition-all ${
-                                  owner.id === currentUserId ||
-                                  currentOwners.length <= 1
-                                    ? "opacity-50 cursor-not-allowed pointer-events-none"
-                                    : "text-destructive hover:text-destructive hover:bg-destructive/10"
-                                }`}
-                                onClick={() =>
-                                  handleRemoveOwner(owner.id, owner.name)
-                                }
-                                disabled={
-                                  removeOwnerMutation.isPending ||
-                                  owner.id === currentUserId ||
-                                  currentOwners.length <= 1
-                                }
-                              >
-                                <Trash2 className="h-4 w-4" />
-                              </Button>
-                              <span className="pointer-events-none absolute bottom-full right-0 z-[100] mb-2 w-max rounded bg-foreground px-2 py-1 text-xs text-background opacity-0 shadow-lg transition-opacity group-hover/tt:opacity-100">
-                                {owner.id === currentUserId
-                                  ? t(
-                                      "msg.admin.tenants.owners.remove_self",
-                                      "본인의 권한은 회수할 수 없습니다.",
-                                    )
-                                  : currentOwners.length <= 1
-                                    ? t(
-                                        "msg.admin.tenants.owners.remove_last",
-                                        "마지막 소유자는 회수할 수 없습니다.",
-                                      )
-                                    : t(
-                                        "ui.admin.tenants.owners.remove_title",
-                                        "소유자 권한 회수",
-                                      )}
-                              </span>
-                            </span>
-                          </TableCell>
                         </TableRow>
                       ))
                     )}
@@ -502,22 +460,19 @@ export function TenantAdminsAndOwnersTab() {
                       <TableHead className="font-bold">
                         {t("ui.admin.tenants.admins.table_email", "이메일")}
                       </TableHead>
-                      <TableHead className="text-right font-bold w-[100px]">
-                        {t("ui.admin.tenants.admins.table_actions", "액션")}
-                      </TableHead>
                     </TableRow>
                   </TableHeader>
                   <TableBody>
                     {adminsQuery.isLoading ? (
                       <TableRow>
-                        <TableCell colSpan={3} className="h-32 text-center">
+                        <TableCell colSpan={2} className="h-32 text-center">
                           <div className="animate-spin rounded-full h-6 w-6 border-b-2 border-primary mx-auto" />
                         </TableCell>
                       </TableRow>
                     ) : currentAdmins.length === 0 ? (
                       <TableRow>
                         <TableCell
-                          colSpan={3}
+                          colSpan={2}
                           className="h-32 text-center text-muted-foreground"
                         >
                           <div className="flex flex-col items-center gap-2">
@@ -535,7 +490,8 @@ export function TenantAdminsAndOwnersTab() {
                       currentAdmins.map((admin) => (
                         <TableRow
                           key={admin.id}
-                          className="hover:bg-muted/30 transition-colors group"
+                          className="hover:bg-muted/30 transition-colors group cursor-pointer"
+                          onClick={() => navigate(`/users/${admin.id}`)}
                         >
                           <TableCell className="font-medium">
                             <div className="flex items-center gap-3">
@@ -548,46 +504,6 @@ export function TenantAdminsAndOwnersTab() {
                           <TableCell className="text-muted-foreground italic">
                             {admin.email}
                           </TableCell>
-                          <TableCell className="text-right">
-                            <span className="relative inline-block group/tt">
-                              <Button
-                                variant="ghost"
-                                size="icon"
-                                className={`opacity-0 group-hover:opacity-100 transition-all ${
-                                  admin.id === currentUserId ||
-                                  currentAdmins.length <= 1
-                                    ? "opacity-50 cursor-not-allowed pointer-events-none"
-                                    : "text-destructive hover:text-destructive hover:bg-destructive/10"
-                                }`}
-                                onClick={() =>
-                                  handleRemoveAdmin(admin.id, admin.name)
-                                }
-                                disabled={
-                                  removeAdminMutation.isPending ||
-                                  admin.id === currentUserId ||
-                                  currentAdmins.length <= 1
-                                }
-                              >
-                                <Trash2 className="h-4 w-4" />
-                              </Button>
-                              <span className="pointer-events-none absolute bottom-full right-0 z-[100] mb-2 w-max rounded bg-foreground px-2 py-1 text-xs text-background opacity-0 shadow-lg transition-opacity group-hover/tt:opacity-100">
-                                {admin.id === currentUserId
-                                  ? t(
-                                      "msg.admin.tenants.admins.remove_self",
-                                      "본인의 권한은 회수할 수 없습니다.",
-                                    )
-                                  : currentAdmins.length <= 1
-                                    ? t(
-                                        "msg.admin.tenants.admins.remove_last",
-                                        "마지막 관리자는 회수할 수 없습니다.",
-                                      )
-                                    : t(
-                                        "ui.admin.tenants.admins.remove_title",
-                                        "관리자 권한 회수",
-                                      )}
-                              </span>
-                            </span>
-                          </TableCell>
                         </TableRow>
                       ))
                     )}
diff --git a/adminfront/src/features/tenants/routes/TenantListPage.tsx b/adminfront/src/features/tenants/routes/TenantListPage.tsx
index 25b9381d..69f331fc 100644
--- a/adminfront/src/features/tenants/routes/TenantListPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantListPage.tsx
@@ -850,15 +850,12 @@ function TenantListPage() {
                             {getSortIcon("updatedAt")}
                           </div>
                         </TableHead>
-                        <TableHead className="whitespace-nowrap">
-                          {t("ui.common.actions", "액션")}
-                        </TableHead>
                       </TableRow>
                     </TableHeader>
                     <TableBody>
                       {query.isLoading && (
                         <TableRow>
-                          <TableCell colSpan={9}>
+                          <TableCell colSpan={8}>
                             {t("msg.common.loading", "로딩 중...")}
                           </TableCell>
                         </TableRow>
@@ -866,7 +863,7 @@ function TenantListPage() {
                       {!query.isLoading && tenants.length === 0 && (
                         <TableRow>
                           <TableCell
-                            colSpan={9}
+                            colSpan={8}
                             className="text-center py-8 text-muted-foreground"
                           >
                             {t(
@@ -954,22 +951,6 @@ function TenantListPage() {
                                 )
                               : "-"}
                           </TableCell>
-                          <TableCell>
-                            <Button
-                              variant="ghost"
-                              size="sm"
-                              disabled={
-                                isSeedTenant(tenant) || deleteMutation.isPending
-                              }
-                              onClick={() =>
-                                handleDelete(tenant.id, tenant.name)
-                              }
-                              className="text-destructive hover:text-destructive hover:bg-destructive/10"
-                            >
-                              <Trash2 size={14} className="mr-2" />
-                              {t("ui.common.delete", "삭제")}
-                            </Button>
-                          </TableCell>
                         </TableRow>
                       ))}
                     </TableBody>
diff --git a/adminfront/src/features/tenants/routes/TenantSubTenantsPage.tsx b/adminfront/src/features/tenants/routes/TenantSubTenantsPage.tsx
index dbc965a9..de2a2d7b 100644
--- a/adminfront/src/features/tenants/routes/TenantSubTenantsPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantSubTenantsPage.tsx
@@ -72,16 +72,13 @@ function TenantSubTenantsPage() {
                   <TableHead>
                     {t("ui.admin.tenants.sub.table.status", "STATUS")}
                   </TableHead>
-                  <TableHead className="text-right">
-                    {t("ui.admin.tenants.sub.table.action", "ACTION")}
-                  </TableHead>
                 </TableRow>
               </TableHeader>
               <TableBody>
                 {subTenants.length === 0 && (
                   <TableRow>
                     <TableCell
-                      colSpan={4}
+                      colSpan={3}
                       className="text-center py-8 text-muted-foreground"
                     >
                       {t(
@@ -92,7 +89,11 @@ function TenantSubTenantsPage() {
                   </TableRow>
                 )}
                 {subTenants.map((tenant) => (
-                  <TableRow key={tenant.id}>
+                  <TableRow
+                    key={tenant.id}
+                    className="cursor-pointer hover:bg-muted/50 transition-colors"
+                    onClick={() => navigate(`/tenants/${tenant.id}`)}
+                  >
                     <TableCell className="font-semibold">
                       {tenant.name}
                     </TableCell>
@@ -108,16 +109,6 @@ function TenantSubTenantsPage() {
                         {t(`ui.common.status.${tenant.status}`, tenant.status)}
                       </Badge>
                     </TableCell>
-                    <TableCell className="text-right">
-                      <Button
-                        variant="ghost"
-                        size="sm"
-                        onClick={() => navigate(`/tenants/${tenant.id}`)}
-                      >
-                        {t("ui.admin.tenants.sub.manage", "관리")}{" "}
-                        <ArrowRight size={12} className="ml-1" />
-                      </Button>
-                    </TableCell>
                   </TableRow>
                 ))}
               </TableBody>
diff --git a/adminfront/src/features/tenants/routes/TenantUsersPage.tsx b/adminfront/src/features/tenants/routes/TenantUsersPage.tsx
index 2f91f404..7d7e9946 100644
--- a/adminfront/src/features/tenants/routes/TenantUsersPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantUsersPage.tsx
@@ -137,15 +137,12 @@ function TenantUsersPage() {
                   <TableHead>
                     {t("ui.admin.tenants.members.table.status", "STATUS")}
                   </TableHead>
-                  <TableHead className="w-[80px] text-right">
-                    {t("ui.admin.tenants.members.table.actions", "ACTIONS")}
-                  </TableHead>
                 </TableRow>
               </TableHeader>
               <TableBody>
                 {usersQuery.isLoading ? (
                   <TableRow>
-                    <TableCell colSpan={5} className="text-center py-20">
+                    <TableCell colSpan={4} className="text-center py-20">
                       <div className="flex flex-col items-center gap-2">
                         <Loader2
                           className="animate-spin text-muted-foreground"
@@ -160,7 +157,7 @@ function TenantUsersPage() {
                 ) : users.length === 0 ? (
                   <TableRow>
                     <TableCell
-                      colSpan={5}
+                      colSpan={4}
                       className="text-center py-8 text-muted-foreground"
                     >
                       {t(
@@ -171,7 +168,11 @@ function TenantUsersPage() {
                   </TableRow>
                 ) : (
                   users.map((user) => (
-                    <TableRow key={user.id}>
+                    <TableRow
+                      key={user.id}
+                      className="cursor-pointer hover:bg-muted/50 transition-colors"
+                      onClick={() => navigate(`/users/${user.id}`)}
+                    >
                       <TableCell className="font-semibold">
                         {user.name}
                       </TableCell>
@@ -198,43 +199,6 @@ function TenantUsersPage() {
                           {t(`ui.common.status.${user.status}`, user.status)}
                         </Badge>
                       </TableCell>
-                      <TableCell className="text-right">
-                        <DropdownMenu>
-                          <DropdownMenuTrigger asChild>
-                            <Button
-                              variant="ghost"
-                              size="icon"
-                              className="h-8 w-8"
-                            >
-                              <MoreHorizontal size={16} />
-                            </Button>
-                          </DropdownMenuTrigger>
-                          <DropdownMenuContent align="end">
-                            <DropdownMenuItem asChild>
-                              <Link to={`/users/${user.id}`}>
-                                <User size={14} className="mr-2" />
-                                {t(
-                                  "ui.admin.tenants.members.view_profile",
-                                  "상세 정보",
-                                )}
-                              </Link>
-                            </DropdownMenuItem>
-                            <DropdownMenuItem
-                              className="text-destructive focus:text-destructive"
-                              onClick={() =>
-                                handleRemoveMember(user.id, user.name)
-                              }
-                              disabled={removeTenantMutation.isPending}
-                            >
-                              <UserMinus size={14} className="mr-2" />
-                              {t(
-                                "ui.admin.tenants.members.remove",
-                                "조직에서 제외",
-                              )}
-                            </DropdownMenuItem>
-                          </DropdownMenuContent>
-                        </DropdownMenu>
-                      </TableCell>
                     </TableRow>
                   ))
                 )}
diff --git a/adminfront/src/features/users/UserCreatePage.tsx b/adminfront/src/features/users/UserCreatePage.tsx
index 56d4d8e4..a763a280 100644
--- a/adminfront/src/features/users/UserCreatePage.tsx
+++ b/adminfront/src/features/users/UserCreatePage.tsx
@@ -152,6 +152,7 @@ function UserCreatePage() {
       grade: "",
       position: "",
       jobTitle: "",
+      role: "user",
       metadata: {},
     },
   });
@@ -366,6 +367,7 @@ function UserCreatePage() {
       password: data.password,
       name: data.name,
       phone: data.phone,
+      role: data.role,
       metadata,
     };
 
@@ -644,6 +646,37 @@ function UserCreatePage() {
               </div>
             </div>
 
+            <div className="space-y-2">
+              <Label htmlFor="role">
+                {t("ui.admin.users.create.form.role", "역할")}
+              </Label>
+              <select
+                id="role"
+                className="flex h-9 w-full rounded-md border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50"
+                {...register("role")}
+                disabled={profile?.role !== "super_admin"}
+              >
+                <option value="super_admin">
+                  {t("ui.admin.role.super_admin", "시스템 관리자")}
+                </option>
+                <option value="tenant_admin">
+                  {t("ui.admin.role.tenant_admin", "테넌트 관리자")}
+                </option>
+                <option value="rp_admin">
+                  {t("ui.admin.role.rp_admin", "서비스 관리자")}
+                </option>
+                <option value="user">
+                  {t("ui.admin.role.user", "일반 사용자")}
+                </option>
+              </select>
+              <p className="text-xs text-muted-foreground">
+                {t(
+                  "msg.admin.users.create.form.role_help",
+                  "시스템 접근 권한을 결정합니다.",
+                )}
+              </p>
+            </div>
+
             <Tabs value={userType} onValueChange={handleUserTypeChange}>
               <TabsList className="flex h-auto w-full justify-start rounded-none border-b bg-transparent p-0 text-foreground">
                 <TabsTrigger
diff --git a/adminfront/src/features/users/UserDetailPage.tsx b/adminfront/src/features/users/UserDetailPage.tsx
index 23fee20f..915bd884 100644
--- a/adminfront/src/features/users/UserDetailPage.tsx
+++ b/adminfront/src/features/users/UserDetailPage.tsx
@@ -743,10 +743,8 @@ function UserDetailPage() {
       userType,
     };
 
-    const profileData = { ...data };
-    profileData.role = undefined;
     const payload: UserUpdateRequest = {
-      ...profileData,
+      ...data,
       metadata,
     };
 
@@ -1068,6 +1066,35 @@ function UserDetailPage() {
                       </span>
                     </div>
                   </div>
+                  <div className="space-y-2">
+                    <Label
+                      htmlFor="role"
+                      className="text-xs font-bold uppercase text-muted-foreground"
+                    >
+                      {t("ui.admin.users.detail.form.role", "역할")}
+                    </Label>
+                    <div className="flex h-11 items-center gap-3">
+                      <select
+                        id="role"
+                        className="flex h-11 w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary disabled:opacity-50"
+                        {...register("role")}
+                        disabled={profile?.role !== "super_admin" || profile?.id === user.id}
+                      >
+                        <option value="super_admin">
+                          {t("ui.admin.role.super_admin", "시스템 관리자")}
+                        </option>
+                        <option value="tenant_admin">
+                          {t("ui.admin.role.tenant_admin", "테넌트 관리자")}
+                        </option>
+                        <option value="rp_admin">
+                          {t("ui.admin.role.rp_admin", "서비스 관리자")}
+                        </option>
+                        <option value="user">
+                          {t("ui.admin.role.user", "일반 사용자")}
+                        </option>
+                      </select>
+                    </div>
+                  </div>
                 </div>
 
                 <Tabs
diff --git a/adminfront/src/features/users/UserListPage.tsx b/adminfront/src/features/users/UserListPage.tsx
index 590b50be..70a5e945 100644
--- a/adminfront/src/features/users/UserListPage.tsx
+++ b/adminfront/src/features/users/UserListPage.tsx
@@ -318,6 +318,11 @@ function UserListPage() {
     bulkUpdateMutation.mutate({ userIds: selectedUserIds, status });
   };
 
+  const handleBulkRoleChange = (role: string) => {
+    if (selectedUserIds.length === 0) return;
+    bulkUpdateMutation.mutate({ userIds: selectedUserIds, role });
+  };
+
   const handleBulkDelete = () => {
     if (selectedUserIds.length === 0) return;
     if (
@@ -567,6 +572,15 @@ function UserListPage() {
                         {getSortIcon("status")}
                       </div>
                     </TableHead>
+                    <TableHead
+                      className="whitespace-nowrap cursor-pointer hover:bg-muted/50 transition-colors"
+                      onClick={() => requestSort("role")}
+                    >
+                      <div className="flex items-center">
+                        {t("ui.admin.users.list.table.role", "ROLE")}
+                        {getSortIcon("role")}
+                      </div>
+                    </TableHead>
                     <TableHead
                       className="whitespace-nowrap cursor-pointer hover:bg-muted/50 transition-colors"
                       onClick={() => requestSort("tenant_dept")}
@@ -711,6 +725,48 @@ function UserListPage() {
                           </span>
                         </div>
                       </TableCell>
+                      <TableCell>
+                        <Select
+                          defaultValue={user.role}
+                          onValueChange={(value) =>
+                            bulkUpdateMutation.mutate({
+                              userIds: [user.id],
+                              role: value,
+                            })
+                          }
+                          disabled={
+                            bulkUpdateMutation.isPending ||
+                            profile?.role !== "super_admin" ||
+                            user.id === profile?.id
+                          }
+                        >
+                          <SelectTrigger className="h-8 w-[140px] border-none bg-transparent hover:bg-muted/50 transition-colors px-0 font-medium">
+                            <SelectValue />
+                          </SelectTrigger>
+                          <SelectContent>
+                            {profile?.role === "super_admin" && (
+                              <SelectItem value="super_admin">
+                                {t(
+                                  "ui.admin.role.super_admin",
+                                  "시스템 관리자",
+                                )}
+                              </SelectItem>
+                            )}
+                            <SelectItem value="tenant_admin">
+                              {t(
+                                "ui.admin.role.tenant_admin",
+                                "테넌트 관리자",
+                              )}
+                            </SelectItem>
+                            <SelectItem value="rp_admin">
+                              {t("ui.admin.role.rp_admin", "서비스 관리자")}
+                            </SelectItem>
+                            <SelectItem value="user">
+                              {t("ui.admin.role.user", "일반 사용자")}
+                            </SelectItem>
+                          </SelectContent>
+                        </Select>
+                      </TableCell>
                       <TableCell>
                         <div className="flex flex-col gap-1">
                           <span className="text-sm font-medium">
@@ -775,6 +831,34 @@ function UserListPage() {
                   {t("ui.common.status.inactive", "비활성화")}
                 </Button>
                 <div className="w-px h-4 bg-background/20 mx-1" />
+                {profile?.role === "super_admin" && (
+                  <>
+                    <Select onValueChange={handleBulkRoleChange}>
+                      <SelectTrigger className="h-8 w-[140px] bg-transparent border-background/20 text-background text-xs">
+                        <SelectValue
+                          placeholder={
+                            t("ui.admin.users.list.table.role", "ROLE")
+                          }
+                        />
+                      </SelectTrigger>
+                      <SelectContent>
+                        <SelectItem value="super_admin">
+                          {t("ui.admin.role.super_admin", "시스템 관리자")}
+                        </SelectItem>
+                        <SelectItem value="tenant_admin">
+                          {t("ui.admin.role.tenant_admin", "테넌트 관리자")}
+                        </SelectItem>
+                        <SelectItem value="rp_admin">
+                          {t("ui.admin.role.rp_admin", "서비스 관리자")}
+                        </SelectItem>
+                        <SelectItem value="user">
+                          {t("ui.admin.role.user", "일반 사용자")}
+                        </SelectItem>
+                      </SelectContent>
+                    </Select>
+                    <div className="w-px h-4 bg-background/20 mx-1" />
+                  </>
+                )}
                 <Button
                   variant="ghost"
                   size="sm"

From 9681945f5acb0d1af7458d54a9e43ea92cac209c Mon Sep 17 00:00:00 2001
From: chan <b24028@hanmaceng.co.kr>
Date: Wed, 13 May 2026 15:00:17 +0900
Subject: [PATCH 2/3] test(adminfront): update tests to match recent UI changes

- Remove checks for deleted 'Action' column buttons in tenant list.
- Update user list test to expect 'ROLE' column.
- Update user creation test to expect role field and payload.
---
 adminfront/tests/tenant_seed_protection.spec.ts | 2 --
 adminfront/tests/users.spec.ts                  | 8 +++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/adminfront/tests/tenant_seed_protection.spec.ts b/adminfront/tests/tenant_seed_protection.spec.ts
index a78deab6..94b04f2f 100644
--- a/adminfront/tests/tenant_seed_protection.spec.ts
+++ b/adminfront/tests/tenant_seed_protection.spec.ts
@@ -99,11 +99,9 @@ test.describe("Seed tenant protection", () => {
     const seedRow = page.getByRole("row", { name: /한맥가족/ });
     await expect(seedRow.getByRole("checkbox")).toHaveCount(0);
     await expect(seedRow.getByText("초기 설정")).toBeVisible();
-    await expect(seedRow.getByRole("button", { name: /삭제/ })).toBeDisabled();
 
     const normalRow = page.getByRole("row", { name: /일반 테넌트/ });
     await expect(normalRow.getByRole("checkbox")).toBeEnabled();
-    await expect(normalRow.getByRole("button", { name: /삭제/ })).toBeEnabled();
   });
 
   test("disables delete action on seed tenant profile", async ({ page }) => {
diff --git a/adminfront/tests/users.spec.ts b/adminfront/tests/users.spec.ts
index 994b855b..98420c65 100644
--- a/adminfront/tests/users.spec.ts
+++ b/adminfront/tests/users.spec.ts
@@ -457,7 +457,7 @@ test.describe("User Management", () => {
     const table = page.locator("table");
     await expect(
       table.getByRole("columnheader", { name: /ROLE|역할/i }),
-    ).toHaveCount(0);
+    ).toBeVisible();
     await expect(page.getByTestId("user-contact-u-1")).toContainText(
       "John Doe john@test.com 010-1111-2222",
     );
@@ -528,7 +528,7 @@ test.describe("User Management", () => {
       page.getByRole("tab", { name: /한맥가족 구성원/i }),
     ).toHaveAttribute("data-state", "active");
     await expect(page.getByLabel(/한맥 가족 구성원으로 등록/i)).toHaveCount(0);
-    await expect(page.locator("select#role")).toHaveCount(0);
+    await expect(page.locator("select#role")).toBeVisible();
     await expect(page.locator("input#department")).toHaveCount(0);
 
     await expect(page.getByText(/대표 소속/i)).toHaveCount(0);
@@ -593,7 +593,9 @@ test.describe("User Management", () => {
           ],
         },
       });
-    expect(createPayload).not.toHaveProperty("role");
+    expect(createPayload).toMatchObject({
+      role: "user",
+    });
     expect(createPayload).not.toHaveProperty("department");
     expect(createPayload).not.toHaveProperty("tenantSlug");
     expect(createPayload).not.toHaveProperty("companyCode");

From f047c24a3880b0c9f102282f01717ac4b254efc0 Mon Sep 17 00:00:00 2001
From: chan <b24028@hanmaceng.co.kr>
Date: Wed, 13 May 2026 15:08:36 +0900
Subject: [PATCH 3/3] fix(adminfront): fix ReferenceErrors and null checks in
 UI components

- Import and initialize 'navigate' in TenantUsersPage and TenantAdminsAndOwnersTab.
- Use optional chaining for 'user.id' in UserDetailPage to prevent runtime errors during initial load.
---
 .../src/features/tenants/routes/TenantAdminsAndOwnersTab.tsx   | 3 ++-
 adminfront/src/features/tenants/routes/TenantUsersPage.tsx     | 3 ++-
 adminfront/src/features/users/UserDetailPage.tsx               | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/adminfront/src/features/tenants/routes/TenantAdminsAndOwnersTab.tsx b/adminfront/src/features/tenants/routes/TenantAdminsAndOwnersTab.tsx
index 78b08c99..f150d322 100644
--- a/adminfront/src/features/tenants/routes/TenantAdminsAndOwnersTab.tsx
+++ b/adminfront/src/features/tenants/routes/TenantAdminsAndOwnersTab.tsx
@@ -11,7 +11,7 @@ import {
 } from "lucide-react";
 import { useState } from "react";
 import { useAuth } from "react-oidc-context";
-import { useParams } from "react-router-dom";
+import { useNavigate, useParams } from "react-router-dom";
 import { Badge } from "../../../components/ui/badge";
 import { Button } from "../../../components/ui/button";
 import {
@@ -66,6 +66,7 @@ function mergePendingMembers(
 
 export function TenantAdminsAndOwnersTab() {
   const auth = useAuth();
+  const navigate = useNavigate();
   const currentUserId = auth.user?.profile.sub;
   const { tenantId } = useParams<{ tenantId: string }>();
   const queryClient = useQueryClient();
diff --git a/adminfront/src/features/tenants/routes/TenantUsersPage.tsx b/adminfront/src/features/tenants/routes/TenantUsersPage.tsx
index 7d7e9946..fb288807 100644
--- a/adminfront/src/features/tenants/routes/TenantUsersPage.tsx
+++ b/adminfront/src/features/tenants/routes/TenantUsersPage.tsx
@@ -9,7 +9,7 @@ import {
   UserMinus,
   UserPlus,
 } from "lucide-react";
-import { Link, useParams } from "react-router-dom";
+import { Link, useNavigate, useParams } from "react-router-dom";
 import { Badge } from "../../../components/ui/badge";
 import { Button } from "../../../components/ui/button";
 import {
@@ -38,6 +38,7 @@ import { t } from "../../../lib/i18n";
 
 function TenantUsersPage() {
   const params = useParams<{ tenantId: string }>();
+  const navigate = useNavigate();
   const tenantId = params.tenantId ?? "";
   const queryClient = useQueryClient();
 
diff --git a/adminfront/src/features/users/UserDetailPage.tsx b/adminfront/src/features/users/UserDetailPage.tsx
index 915bd884..cb924519 100644
--- a/adminfront/src/features/users/UserDetailPage.tsx
+++ b/adminfront/src/features/users/UserDetailPage.tsx
@@ -1078,7 +1078,7 @@ function UserDetailPage() {
                         id="role"
                         className="flex h-11 w-full rounded-md border border-input bg-background px-3 py-2 text-sm shadow-sm transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-primary disabled:opacity-50"
                         {...register("role")}
-                        disabled={profile?.role !== "super_admin" || profile?.id === user.id}
+                        disabled={profile?.role !== "super_admin" || profile?.id === user?.id}
                       >
                         <option value="super_admin">
                           {t("ui.admin.role.super_admin", "시스템 관리자")}