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

refactoring

Browse Source
This commit is contained in:
admin-bot
2026-05-14 08:11:02 +09:00
parent e36a973053
commit f6f8e88342
17 changed files with 217 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -583,8 +583,8 @@ function UserDetailPage() {
name:
typeof metadata.primaryTenantName === "string"
? metadata.primaryTenantName
: user.tenant?.name || user.companyCode || "",
slug: user.companyCode,
: user.tenant?.name || user.tenantSlug || "",
slug: user.tenantSlug,
}
: null;
const fallbackAppointment =
@@ -603,7 +603,7 @@ function UserDetailPage() {
role: user.role,
status: user.status,
tenantSlug:
user.companyCode ||
user.tenantSlug ||
user.joinedTenants?.find(
(t) => t.type === "COMPANY" || t.type === "COMPANY_GROUP",
)?.slug ||
@@ -624,7 +624,6 @@ function UserDetailPage() {
hanmacFamilyTenantId,
);
const isPersonalUser =
user.companyCode === personalTenant.slug ||
user.tenantSlug === personalTenant.slug ||
user.tenant?.id === personalTenant.id ||
user.tenant?.slug === personalTenant.slug ||
@@ -896,7 +895,7 @@ function UserDetailPage() {
>
<Building2 size={12} className="mr-1.5" />
{user.tenant?.name ||
user.companyCode ||
user.tenantSlug ||
user.joinedTenants?.find(
(t) => t.type === "COMPANY" || t.type === "COMPANY_GROUP",
)?.name ||