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

4
orgfront/src/features/orgchart/pickerTree.ts
View File

@@ -6,9 +6,7 @@ import { filterTenantsByVisibility } from "./tenantVisibility";
import { getOrgChartUserDisplayName } from "./userDisplay";
function getUserTenantSlug(user: UserSummary) {
return (
user.companyCode?.toLowerCase() || user.tenantSlug?.toLowerCase() || ""
);
return user.tenantSlug?.toLowerCase() || "";
}
function isOrgFrontTenantType(tenant: TenantSummary) {

7
orgfront/src/features/orgchart/routes/OrgChartPage.tsx
View File

@@ -990,8 +990,8 @@ function isSystemGlobalUser(user: UserSummary) {
normalizedRole === "system-admin" ||
isSystemGlobalTenant(user.tenant) ||
isSystemGlobalTenant({
id: user.companyCode || user.tenantSlug || "",
slug: user.companyCode || user.tenantSlug || "",
id: user.tenantSlug || "",
slug: user.tenantSlug || "",
type: user.role,
name: user.role,
})
@@ -1145,8 +1145,7 @@ function buildUsersMap(
if (!isVisibleOrgChartUser(user)) continue;
const slugs = new Set<string>();
const primarySlug =
user.companyCode?.toLowerCase() || user.tenantSlug?.toLowerCase() || "";
const primarySlug = user.tenantSlug?.toLowerCase() || "";
if (
primarySlug &&
!isSystemGlobalTenant({

7
orgfront/src/features/profile/ProfilePage.tsx
View File

@@ -58,8 +58,7 @@ function ProfilePage() {
profile.tenantId ||
auth.user?.profile?.tenant_id?.toString() ||
"-";
const displayCompanyCode =
profile.companyCode || auth.user?.profile?.companyCode?.toString() || "-";
const displayTenantSlug = profile.tenant?.slug || profile.tenantId || "-";
return (
<div className="space-y-6 max-w-4xl mx-auto">
@@ -160,9 +159,9 @@ function ProfilePage() {
</div>
<div className="space-y-1">
<p className="text-sm font-medium text-muted-foreground">
{t("ui.dev.profile.org.company_code", "회사 코드")}
{t("ui.dev.profile.org.tenant_slug", "테넌트 Slug")}
</p>
<p className="text-sm">{displayCompanyCode}</p>
<p className="text-sm">{displayTenantSlug}</p>
</div>
</CardContent>
</Card>