From a2b2fb804bec006ec9b76e829625e21e16cd4a4a Mon Sep 17 00:00:00 2001 From: miloschwartz Date: Tue, 20 Jan 2026 20:21:11 -0800 Subject: [PATCH] show device model for ios and android --- server/routers/client/getClient.ts | 6 +++--- server/routers/client/listClients.ts | 8 ++------ src/app/[orgId]/settings/clients/user/[niceId]/layout.tsx | 1 + 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/server/routers/client/getClient.ts b/server/routers/client/getClient.ts index d981cbd3..d3fe44d9 100644 --- a/server/routers/client/getClient.ts +++ b/server/routers/client/getClient.ts @@ -95,9 +95,9 @@ function getPlatformPostureData( } // macOS: Hard drive encryption, Biometric configuration, Firewall, System Integrity Protection (SIP), Gatekeeper, Firewall stealth mode else if (normalizedPlatform === "macos") { - if (fingerprint.diskEncrypted !== null && fingerprint.diskEncrypted !== undefined) { - posture.diskEncrypted = fingerprint.diskEncrypted; - } + // if (fingerprint.diskEncrypted !== null && fingerprint.diskEncrypted !== undefined) { + // posture.diskEncrypted = fingerprint.diskEncrypted; + // } if (fingerprint.biometricsEnabled !== null && fingerprint.biometricsEnabled !== undefined) { posture.biometricsEnabled = fingerprint.biometricsEnabled; } diff --git a/server/routers/client/listClients.ts b/server/routers/client/listClients.ts index b04a0166..b4e2eb56 100644 --- a/server/routers/client/listClients.ts +++ b/server/routers/client/listClients.ts @@ -175,10 +175,7 @@ async function getSiteAssociations(clientIds: number[]) { .where(inArray(clientSitesAssociationsCache.clientId, clientIds)); } -type ClientWithSites = Omit< - Awaited>[0], - "deviceModel" -> & { +type ClientWithSites = Awaited>[0] & { sites: Array<{ siteId: number; siteName: string | null; @@ -324,9 +321,8 @@ export async function listClients( const clientsWithSites = clientsList.map((client) => { const model = client.deviceModel || null; const newName = getUserDeviceName(model, client.name); - const { deviceModel, ...clientWithoutDeviceModel } = client; return { - ...clientWithoutDeviceModel, + ...client, name: newName, sites: sitesByClient[client.clientId] || [] }; diff --git a/src/app/[orgId]/settings/clients/user/[niceId]/layout.tsx b/src/app/[orgId]/settings/clients/user/[niceId]/layout.tsx index 7d8059aa..db9264ce 100644 --- a/src/app/[orgId]/settings/clients/user/[niceId]/layout.tsx +++ b/src/app/[orgId]/settings/clients/user/[niceId]/layout.tsx @@ -26,6 +26,7 @@ export default async function SettingsLayout(props: SettingsLayoutProps) { await authCookieHeader() ); client = res.data.data; + console.log(client); } catch (error) { redirect(`/${params.orgId}/settings/clients/user`); }