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

fix(adminfront): ensure tenant admin can always access their tenant even if manageable list is empty

Browse Source
This commit is contained in:
조찬영
2026-03-04 13:58:08 +09:00
parent 2b4b40c0d9
commit 20a8a19e12
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
adminfront/src/components/layout/AppLayout.tsx
View File

@@ -60,8 +60,8 @@ function AppLayout() {
icon: Building2, icon: Building2,
}); });
} else if (isTenantAdmin) { } else if (isTenantAdmin) {
if (manageableCount === 1 && profile?.tenantId) { if (manageableCount <= 1 && profile?.tenantId) {
// Direct link if only one tenant // Direct link if only one (or zero in array but has tenantId) tenant
items.splice(1, 0, { items.splice(1, 0, {
label: "ui.admin.nav.my_tenant", label: "ui.admin.nav.my_tenant",
to: `/tenants/${profile.tenantId}`, to: `/tenants/${profile.tenantId}`,

5
adminfront/src/features/tenants/routes/TenantListPage.tsx
View File

@@ -36,11 +36,12 @@ function TenantListPage() {
queryFn: fetchMe, queryFn: fetchMe,
}); });
// Redirect tenant_admin ONLY if they have exactly one manageable tenant // Redirect tenant_admin ONLY if they have one or fewer manageable tenants in the list
React.useEffect(() => { React.useEffect(() => {
if (profile?.role === "tenant_admin") { if (profile?.role === "tenant_admin") {
const manageableCount = profile.manageableTenants?.length ?? 0; const manageableCount = profile.manageableTenants?.length ?? 0;
if (manageableCount === 1 && profile.tenantId) { // If only 1 in array, OR array is empty but we have a primary tenantId
if ((manageableCount === 1 || manageableCount === 0) && profile.tenantId) {
navigate(`/tenants/${profile.tenantId}`, { replace: true }); navigate(`/tenants/${profile.tenantId}`, { replace: true });
} }
} }