diff --git a/orgfront/src/features/orgchart/userDisplay.ts b/orgfront/src/features/orgchart/userDisplay.ts index 1f52f255..044ccf33 100644 --- a/orgfront/src/features/orgchart/userDisplay.ts +++ b/orgfront/src/features/orgchart/userDisplay.ts @@ -1,63 +1,63 @@ import type { TenantSummary, UserSummary } from "../../lib/adminApi"; type UserAppointment = { - tenantId?: string; - tenantSlug?: string; - jobTitle?: string; - position?: string; + tenantId?: string; + tenantSlug?: string; + jobTitle?: string; + position?: string; }; type TenantIdentity = Pick; function normalizeText(value: unknown) { - return typeof value === "string" ? value.trim() : ""; + return typeof value === "string" ? value.trim() : ""; } function getUserAppointments(user: UserSummary): UserAppointment[] { - const rawAppointments = user.metadata?.additionalAppointments; - if (!Array.isArray(rawAppointments)) return []; + const rawAppointments = user.metadata?.additionalAppointments; + if (!Array.isArray(rawAppointments)) return []; - return rawAppointments - .filter( - (item): item is Record => - typeof item === "object" && item !== null, - ) - .map((item) => ({ - tenantId: normalizeText(item.tenantId), - tenantSlug: normalizeText(item.tenantSlug), - jobTitle: normalizeText(item.jobTitle), - position: normalizeText(item.position), - })); + return rawAppointments + .filter( + (item): item is Record => + typeof item === "object" && item !== null, + ) + .map((item) => ({ + tenantId: normalizeText(item.tenantId), + tenantSlug: normalizeText(item.tenantSlug), + jobTitle: normalizeText(item.jobTitle), + position: normalizeText(item.position), + })); } export function getUserOrgProfile(user: UserSummary, tenant?: TenantIdentity) { - const appointment = getUserAppointments(user).find((item) => { - if (tenant?.id && item.tenantId === tenant.id) return true; - if ( - tenant?.slug && - item.tenantSlug && - item.tenantSlug.toLowerCase() === tenant.slug.toLowerCase() - ) { - return true; - } - return false; - }); + const appointment = getUserAppointments(user).find((item) => { + if (tenant?.id && item.tenantId === tenant.id) return true; + if ( + tenant?.slug && + item.tenantSlug && + item.tenantSlug.toLowerCase() === tenant.slug.toLowerCase() + ) { + return true; + } + return false; + }); - return { - jobTitle: appointment?.jobTitle || normalizeText(user.jobTitle), - position: appointment?.position || normalizeText(user.position), - }; + return { + jobTitle: appointment?.jobTitle || normalizeText(user.jobTitle), + position: appointment?.position || normalizeText(user.position), + }; } export function getOrgChartUserDisplayName( - user: UserSummary, - tenant?: TenantIdentity, + user: UserSummary, + tenant?: TenantIdentity, ) { - const { jobTitle, position } = getUserOrgProfile(user, tenant); - const baseName = user.name.trim(); + const { jobTitle, position } = getUserOrgProfile(user, tenant); + const baseName = user.name.trim(); - if (jobTitle && position) return `${baseName} ${position}[${jobTitle}]`; - if (jobTitle) return `${baseName}[${jobTitle}]`; - if (position) return `${baseName} ${position}`; - return baseName; + if (jobTitle && position) return `${baseName} ${position}[${jobTitle}]`; + if (jobTitle) return `${baseName}[${jobTitle}]`; + if (position) return `${baseName} ${position}`; + return baseName; } diff --git a/orgfront/tests/orgfront-auto-login.spec.ts b/orgfront/tests/orgfront-auto-login.spec.ts index 816fcec6..3b0b3464 100644 --- a/orgfront/tests/orgfront-auto-login.spec.ts +++ b/orgfront/tests/orgfront-auto-login.spec.ts @@ -21,13 +21,16 @@ test("orgfront login auto parameter starts OIDC authorization", async ({ }, ); - await page.route("http://localhost:5000/oidc/oauth2/auth**", async (route) => { - authorizationURL = route.request().url(); - await route.fulfill({ - contentType: "text/html", - body: "Authorization captured", - }); - }); + await page.route( + "http://localhost:5000/oidc/oauth2/auth**", + async (route) => { + authorizationURL = route.request().url(); + await route.fulfill({ + contentType: "text/html", + body: "Authorization captured", + }); + }, + ); await page.goto("/login?auto=1&returnTo=%2Fpicker");