Show MDM Policy on app and Fix MDM policy status issue on portal (#1740)

* fix(app): show MDM policy for mac User

* fix(app): fix status issue of mdm policy

* fix(portal): fix status issue of mdm policy

---------

Co-authored-by: chasprowebdev <chasgarciaprowebdev@gmail.com>

Author: github-actions[bot]

apps/app/src/app/(app)/[orgId]/people/devices/components/HostDetails.tsx

@@ -2,9 +2,22 @@ import { Button } from '@comp/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@comp/ui/card';
 import { cn } from '@comp/ui/cn';
 import { ArrowLeft, CheckCircle2, XCircle } from 'lucide-react';
+import { useMemo } from 'react';
 import type { Host } from '../types';
 
 export const HostDetails = ({ host, onClose }: { host: Host; onClose: () => void }) => {
+  const isMacOS = useMemo(() => {
+    return host.cpu_type && (host.cpu_type.includes('arm64') || host.cpu_type.includes('intel'));
+  }, [host]);
+
+  const mdmEnabledStatus = useMemo(() => {
+    return {
+      id: 'mdm',
+      response: host?.mdm.connected_to_fleet ? 'pass' : 'fail',
+      name: 'MDM Enabled',
+    };
+  }, [host]);
+
   return (
     <div className="space-y-4">
       <Button variant="outline" className="w-min" onClick={onClose}>
@@ -17,28 +30,52 @@ export const HostDetails = ({ host, onClose }: { host: Host; onClose: () => void
         </CardHeader>
         <CardContent className="space-y-3">
           {host.policies.length > 0 ? (
-            host.policies.map((policy) => (
-              <div
-                key={policy.id}
-                className={cn(
-                  'hover:bg-muted/50 flex items-center justify-between rounded-md border border-l-4 p-3 shadow-sm transition-colors',
-                  policy.response === 'pass' ? 'border-l-primary' : 'border-l-red-500',
-                )}
-              >
-                <p className="font-medium">{policy.name}</p>
-                {policy.response === 'pass' ? (
-                  <div className="flex items-center gap-1 text-primary">
-                    <CheckCircle2 size={16} />
-                    <span>Pass</span>
-                  </div>
-                ) : (
-                  <div className="flex items-center gap-1 text-red-600">
-                    <XCircle size={16} />
-                    <span>Fail</span>
-                  </div>
-                )}
-              </div>
-            ))
+            <>
+              {host.policies.map((policy) => (
+                <div
+                  key={policy.id}
+                  className={cn(
+                    'hover:bg-muted/50 flex items-center justify-between rounded-md border border-l-4 p-3 shadow-sm transition-colors',
+                    policy.response === 'pass' ? 'border-l-primary' : 'border-l-red-500',
+                  )}
+                >
+                  <p className="font-medium">{policy.name}</p>
+                  {policy.response === 'pass' ? (
+                    <div className="flex items-center gap-1 text-primary">
+                      <CheckCircle2 size={16} />
+                      <span>Pass</span>
+                    </div>
+                  ) : (
+                    <div className="flex items-center gap-1 text-red-600">
+                      <XCircle size={16} />
+                      <span>Fail</span>
+                    </div>
+                  )}
+                </div>
+              ))}
+              {isMacOS && (
+                <div
+                  key={mdmEnabledStatus.id}
+                  className={cn(
+                    'hover:bg-muted/50 flex items-center justify-between rounded-md border border-l-4 p-3 shadow-sm transition-colors',
+                    mdmEnabledStatus.response === 'pass' ? 'border-l-primary' : 'border-l-red-500',
+                  )}
+                >
+                  <p className="font-medium">{mdmEnabledStatus.name}</p>
+                  {mdmEnabledStatus.response === 'pass' ? (
+                    <div className="flex items-center gap-1 text-primary">
+                      <CheckCircle2 size={16} />
+                      <span>Pass</span>
+                    </div>
+                  ) : (
+                    <div className="flex items-center gap-1 text-red-600">
+                      <XCircle size={16} />
+                      <span>Fail</span>
+                    </div>
+                  )}
+                </div>
+              )}
+            </>
           ) : (
             <p className="text-muted-foreground">No policies found for this device.</p>
           )}

apps/app/src/app/(app)/[orgId]/people/devices/types/index.ts

@@ -66,7 +66,7 @@ export interface Host {
   gigs_total_disk_space: number;
   disk_encryption_enabled: boolean;
   issues: object;
-  mdm: object;
+  mdm: MDM;
   refetch_critical_queries_until: string | null;
   last_restarted_at: string;
   policies: FleetPolicy[];
@@ -80,3 +80,12 @@ export interface Host {
   display_text: string;
   display_name: string;
 }
+
+export type MDM = {
+  connected_to_fleet: boolean;
+  dep_profile_error: boolean;
+  encryption_key_available: boolean;
+  enrollment_status: string;
+  name?: string;
+  server_url?: string;
+};

apps/portal/src/app/(app)/(home)/[orgId]/components/tasks/DeviceAgentAccordionItem.tsx

@@ -36,7 +36,7 @@ export function DeviceAgentAccordionItem({
   const mdmEnabledStatus = useMemo(() => {
     return {
       id: 'mdm',
-      response: host?.mdm.enrollment_status === 'On' ? 'pass' : 'fail',
+      response: host?.mdm.connected_to_fleet ? 'pass' : 'fail',
       name: 'MDM Enabled',
     };
   }, [host]);

apps/portal/src/app/(app)/(home)/[orgId]/types/index.ts

@@ -85,7 +85,7 @@ export type MDM = {
   connected_to_fleet: boolean;
   dep_profile_error: boolean;
   encryption_key_available: boolean;
-  enrollment_status: "Off" | "On";
+  enrollment_status: string;
   name?: string;
   server_url?: string;
 };