forked from baron/baron-sso
refactoring
This commit is contained in:
@@ -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 ||
|
||||
|
||||
@@ -778,7 +778,7 @@ function UserListPage() {
|
||||
<div className="flex flex-col gap-1">
|
||||
<span className="text-sm font-medium">
|
||||
{user.tenant?.name ||
|
||||
user.companyCode ||
|
||||
user.tenantSlug ||
|
||||
t("ui.common.unassigned", "미배정")}
|
||||
</span>
|
||||
{user.department && (
|
||||
|
||||
@@ -160,7 +160,6 @@ export function isHanmacFamilyUser<T extends TenantFilterTarget>(
|
||||
...metadataAppointments.map((appointment) =>
|
||||
tenantById.get(appointment.id ?? ""),
|
||||
),
|
||||
tenantBySlug.get(user.companyCode?.toLowerCase() ?? ""),
|
||||
tenantBySlug.get(user.tenantSlug?.toLowerCase() ?? ""),
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user