show device model for ios and android

This commit is contained in:
miloschwartz
2026-01-20 20:21:11 -08:00
parent 3eac80e666
commit a2b2fb804b
3 changed files with 6 additions and 9 deletions

View File

@@ -95,9 +95,9 @@ function getPlatformPostureData(
} }
// macOS: Hard drive encryption, Biometric configuration, Firewall, System Integrity Protection (SIP), Gatekeeper, Firewall stealth mode // macOS: Hard drive encryption, Biometric configuration, Firewall, System Integrity Protection (SIP), Gatekeeper, Firewall stealth mode
else if (normalizedPlatform === "macos") { else if (normalizedPlatform === "macos") {
if (fingerprint.diskEncrypted !== null && fingerprint.diskEncrypted !== undefined) { // if (fingerprint.diskEncrypted !== null && fingerprint.diskEncrypted !== undefined) {
posture.diskEncrypted = fingerprint.diskEncrypted; // posture.diskEncrypted = fingerprint.diskEncrypted;
} // }
if (fingerprint.biometricsEnabled !== null && fingerprint.biometricsEnabled !== undefined) { if (fingerprint.biometricsEnabled !== null && fingerprint.biometricsEnabled !== undefined) {
posture.biometricsEnabled = fingerprint.biometricsEnabled; posture.biometricsEnabled = fingerprint.biometricsEnabled;
} }

View File

@@ -175,10 +175,7 @@ async function getSiteAssociations(clientIds: number[]) {
.where(inArray(clientSitesAssociationsCache.clientId, clientIds)); .where(inArray(clientSitesAssociationsCache.clientId, clientIds));
} }
type ClientWithSites = Omit< type ClientWithSites = Awaited<ReturnType<typeof queryClients>>[0] & {
Awaited<ReturnType<typeof queryClients>>[0],
"deviceModel"
> & {
sites: Array<{ sites: Array<{
siteId: number; siteId: number;
siteName: string | null; siteName: string | null;
@@ -324,9 +321,8 @@ export async function listClients(
const clientsWithSites = clientsList.map((client) => { const clientsWithSites = clientsList.map((client) => {
const model = client.deviceModel || null; const model = client.deviceModel || null;
const newName = getUserDeviceName(model, client.name); const newName = getUserDeviceName(model, client.name);
const { deviceModel, ...clientWithoutDeviceModel } = client;
return { return {
...clientWithoutDeviceModel, ...client,
name: newName, name: newName,
sites: sitesByClient[client.clientId] || [] sites: sitesByClient[client.clientId] || []
}; };

View File

@@ -26,6 +26,7 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
await authCookieHeader() await authCookieHeader()
); );
client = res.data.data; client = res.data.data;
console.log(client);
} catch (error) { } catch (error) {
redirect(`/${params.orgId}/settings/clients/user`); redirect(`/${params.orgId}/settings/clients/user`);
} }