Merge pull request #982 from trycompai/main

[comp] Production Deploy

Author: Marfuen

README.md

@@ -20,7 +20,7 @@
     ·
     <a href="https://github.com/trycompai/comp/issues">Issues</a>
     ·
-    <a href="https://github.com/orgs/trycompai/projects/1">Roadmap</a>
+    <a href="https://roadmap.trycomp.ai/roadmap">Roadmap</a>
   </p>
 </p>
 

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

@@ -1,9 +1,19 @@
 import { DeviceComplianceChart } from './components/DeviceComplianceChart';
 import { EmployeeDevicesList } from './components/EmployeeDevicesList';
 import { getEmployeeDevices } from './data';
+import type { Host } from './types';
 
 export default async function EmployeeDevicesPage() {
-  const devices = (await getEmployeeDevices()) || [];
+  let devices: Host[] = [];
+
+  try {
+    const fetchedDevices = await getEmployeeDevices();
+    devices = fetchedDevices || [];
+  } catch (error) {
+    console.error('Error fetching employee devices:', error);
+    // Return empty array on error to render empty state
+    devices = [];
+  }
 
   return (
     <div>

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

@@ -17,7 +17,7 @@ interface EmployeeTasksListProps {
   trainingVideos: EmployeeTrainingVideoCompletion[];
   member: Member;
   fleetPolicies: FleetPolicy[];
-  host: Host;
+  host: Host | null;
   isFleetEnabled: boolean;
 }
 
@@ -65,7 +65,7 @@ export const EmployeeTasksList = ({
     }
   };
 
-  const hasPolicies = fleetPolicies.length;
+  const hasPolicies = fleetPolicies.length > 0;
 
   return (
     <Tabs defaultValue="policies">
@@ -81,7 +81,7 @@ export const EmployeeTasksList = ({
         <VideoCarousel videos={trainingVideos} member={member} />
       </TabsContent>
       <TabsContent value="device" className="py-2">
-        {isFleetEnabled && hasPolicies ? (
+        {isFleetEnabled && hasPolicies && host ? (
           <Card>
             <CardHeader>
               <CardTitle>{host.computer_name}'s Policies</CardTitle>

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

@@ -14,7 +14,7 @@ interface OrganizationDashboardProps {
   organizationId: string;
   member: MemberWithUserOrg; // Pass the full member object for user info etc.
   fleetPolicies: FleetPolicy[];
-  host: Host;
+  host: Host | null;
   isFleetEnabled: boolean;
 }
 

apps/portal/src/app/(app)/(home)/[orgId]/page.tsx

@@ -6,60 +6,88 @@ import type { Member } from '@comp/db/types';
 import { headers } from 'next/headers';
 import { redirect } from 'next/navigation';
 import { OrganizationDashboard } from './components/OrganizationDashboard';
+import type { FleetPolicy, Host } from './types';
 
 export default async function OrganizationPage({ params }: { params: Promise<{ orgId: string }> }) {
-  const { orgId } = await params;
+  try {
+    const { orgId } = await params;
 
-  const session = await auth.api.getSession({
-    headers: await headers(),
-  });
+    const session = await auth.api.getSession({
+      headers: await headers(),
+    });
 
-  if (!session?.user) {
-    redirect('/login'); // Or appropriate login/auth route
-  }
+    if (!session?.user) {
+      redirect('/login'); // Or appropriate login/auth route
+    }
 
-  const member = await db.member.findFirst({
-    where: {
-      userId: session.user.id,
-      organizationId: orgId,
-    },
-    include: {
-      user: true,
-      organization: true, // Include organization details
-    },
-  });
+    let member = null;
 
-  if (!member) {
-    redirect('/'); // Or appropriate login/auth route
-  }
+    try {
+      member = await db.member.findFirst({
+        where: {
+          userId: session.user.id,
+          organizationId: orgId,
+        },
+        include: {
+          user: true,
+          organization: true, // Include organization details
+        },
+      });
+    } catch (error) {
+      console.error('Error fetching member:', error);
+      // Return a fallback UI or redirect to error page
+      redirect('/');
+    }
+
+    if (!member) {
+      redirect('/'); // Or appropriate login/auth route
+    }
+
+    const { fleetPolicies, device } = await getFleetPolicies(member);
 
-  const { fleetPolicies, device } = await getFleetPolicies(member);
-  const isFleetEnabled = await getPostHogClient()?.isFeatureEnabled(
-    'is-fleet-enabled',
-    session?.user.id,
-  );
+    let isFleetEnabled = false;
+    try {
+      const postHogClient = await getPostHogClient();
+      isFleetEnabled =
+        (await postHogClient?.isFeatureEnabled('is-fleet-enabled', session?.user.id)) ?? false;
+    } catch (error) {
+      console.error('Error checking fleet feature flag:', error);
+      // Default to false if there's an error
+    }
 
-  return (
-    <OrganizationDashboard
-      key={orgId} // Use organizationId as key
-      organizationId={orgId}
-      member={member}
-      fleetPolicies={fleetPolicies}
-      host={device}
-      isFleetEnabled={isFleetEnabled ?? false}
-    />
-  );
+    return (
+      <OrganizationDashboard
+        key={orgId} // Use organizationId as key
+        organizationId={orgId}
+        member={member}
+        fleetPolicies={fleetPolicies}
+        host={device}
+        isFleetEnabled={isFleetEnabled}
+      />
+    );
+  } catch (error) {
+    console.error('Error in OrganizationPage:', error);
+    // Redirect to a safe page if there's an unexpected error
+    redirect('/');
+  }
 }
 
-const getFleetPolicies = async (member: Member) => {
+const getFleetPolicies = async (
+  member: Member,
+): Promise<{ fleetPolicies: FleetPolicy[]; device: Host | null }> => {
   const deviceLabelId = member.fleetDmLabelId;
   const fleet = await getFleetInstance();
 
   try {
     const deviceResponse = await fleet.get(`/labels/${deviceLabelId}/hosts`);
-    const device = deviceResponse.data.hosts[0]; // There should only be one device per label.
+    const device: Host | undefined = deviceResponse.data.hosts[0]; // There should only be one device per label.
+
+    if (!device) {
+      return { fleetPolicies: [], device: null };
+    }
+
     const deviceWithPolicies = await fleet.get(`/hosts/${device.id}`);
-    const fleetPolicies = deviceWithPolicies.data.host.policies;
+    const fleetPolicies: FleetPolicy[] = deviceWithPolicies.data.host.policies;
     return { fleetPolicies, device };
   } catch (error) {
     console.error(error);