forked from baron/baron-sso
린트 적용
This commit is contained in:
@@ -144,7 +144,7 @@ const MemberListDialog: React.FC<{
|
||||
{node.name}{" "}
|
||||
{t("ui.admin.tenants.members.list_title", "구성원 관리")}
|
||||
<span className="text-sm font-normal text-muted-foreground ml-1">
|
||||
({isDirectLoading ? "..." : directData?.total ?? 0})
|
||||
({isDirectLoading ? "..." : (directData?.total ?? 0)})
|
||||
</span>
|
||||
</DialogTitle>
|
||||
<DialogDescription>
|
||||
@@ -167,7 +167,7 @@ const MemberListDialog: React.FC<{
|
||||
className="rounded-none border-b-2 border-transparent data-[state=active]:border-primary data-[state=active]:bg-transparent px-0 py-2"
|
||||
>
|
||||
{t("ui.admin.tenants.members.direct", "소속 멤버")} (
|
||||
{isDirectLoading ? "..." : directData?.total ?? 0})
|
||||
{isDirectLoading ? "..." : (directData?.total ?? 0)})
|
||||
</TabsTrigger>
|
||||
<TabsTrigger
|
||||
value="descendants"
|
||||
@@ -715,7 +715,10 @@ const TenantTreeRow: React.FC<{
|
||||
type="button"
|
||||
className="flex items-center gap-2 cursor-pointer hover:bg-muted p-1.5 rounded-md transition-all group/members w-full text-left"
|
||||
onClick={() => setIsMemberListOpen(true)}
|
||||
title={t("msg.admin.org.hover_member_info", "클릭하여 멤버 상세 조회")}
|
||||
title={t(
|
||||
"msg.admin.org.hover_member_info",
|
||||
"클릭하여 멤버 상세 조회",
|
||||
)}
|
||||
>
|
||||
<div className="bg-primary/10 p-1.5 rounded text-primary">
|
||||
<Users size={16} />
|
||||
@@ -872,10 +875,7 @@ function TenantUserGroupsTab() {
|
||||
const tree = buildTenantFullTree(allTenants, tenantId);
|
||||
if (tree.currentBase) {
|
||||
// Merge backend-provided UserGroups into the tree as virtual children
|
||||
tree.currentBase.children = [
|
||||
...tree.currentBase.children,
|
||||
...groupNodes,
|
||||
];
|
||||
tree.currentBase.children = [...tree.currentBase.children, ...groupNodes];
|
||||
}
|
||||
return tree;
|
||||
}, [allTenants, tenantId, groupNodes]);
|
||||
@@ -1092,9 +1092,9 @@ function TenantUserGroupsTab() {
|
||||
/>
|
||||
</div>
|
||||
{treeSearchTerm && (
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="sm"
|
||||
onClick={() => setTreeSearchTerm("")}
|
||||
className="text-xs"
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user