Merge pull request #2602 from trycompai/lewis/comp-framework-controls-fix

[dev] [carhartlewis] lewis/comp-framework-controls-fix

Author: carhartlewis

apps/api/src/frameworks/frameworks-scores.helper.ts

@@ -227,6 +227,20 @@ interface EvidenceSubmissionForScoring {
   submittedAt: Date | string;
 }
 
+function hasAnyArtifact(
+  control: ControlForScoring,
+  tasks: TaskWithControls[],
+): boolean {
+  const policies = control.policies ?? [];
+  const documentTypes = control.controlDocumentTypes ?? [];
+  const controlTasks = tasks.filter((t) =>
+    t.controls.some((c) => c.id === control.id),
+  );
+  return (
+    policies.length > 0 || controlTasks.length > 0 || documentTypes.length > 0
+  );
+}
+
 function isControlCompleted(
   control: ControlForScoring,
   tasks: TaskWithControls[],
@@ -267,20 +281,17 @@ function isControlCompleted(
     }
   }
 
-  const hasAnyArtifact =
-    policies.length > 0 || controlTasks.length > 0 || documentTypes.length > 0;
-
-  return (
-    hasAnyArtifact && policiesComplete && tasksComplete && documentsComplete
-  );
+  return policiesComplete && tasksComplete && documentsComplete;
 }
 
 export function computeFrameworkComplianceScore(
   framework: FrameworkWithControlsForScoring,
   tasks: TaskWithControls[],
   evidenceSubmissions: EvidenceSubmissionForScoring[] = [],
 ): number {
-  const controls = framework.controls ?? [];
+  const controls = (framework.controls ?? []).filter((c) =>
+    hasAnyArtifact(c, tasks),
+  );
   if (controls.length === 0) return 0;
   const completed = controls.filter((c) =>
     isControlCompleted(c, tasks, evidenceSubmissions),

apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/components/AddCustomRequirementSheet.tsx

@@ -23,7 +23,7 @@ import { Input } from '@trycompai/ui/input';
 import { Textarea } from '@trycompai/ui/textarea';
 import { zodResolver } from '@hookform/resolvers/zod';
 import { useRouter } from 'next/navigation';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { toast } from 'sonner';
 import { z } from 'zod';
@@ -52,6 +52,12 @@ export function AddCustomRequirementSheet({
     mode: 'onChange',
   });
 
+  useEffect(() => {
+    if (!isOpen) {
+      form.reset({ identifier: '', name: '', description: '' });
+    }
+  }, [isOpen, form]);
+
   if (!hasPermission('framework', 'update')) return null;
 
   const handleSubmit = async (values: FormValues) => {

apps/app/src/app/(app)/[orgId]/frameworks/[frameworkInstanceId]/controls/[controlId]/components/useControlOptions.ts

@@ -1,7 +1,6 @@
 'use client';
 
-import { apiClient } from '@/lib/api-client';
-import useSWR from 'swr';
+import { useApiSWR } from '@/hooks/use-api-swr';
 
 interface PolicyOption {
   id: string;
@@ -31,26 +30,17 @@ interface ControlOptionsResponse {
 }
 
 export function useControlOptions(enabled: boolean) {
-  const { data, isLoading, mutate } = useSWR<ControlOptionsResponse>(
-    enabled ? '/v1/controls/options' : null,
-    async (url: string) => {
-      const res = await apiClient.get<ControlOptionsResponse>(url);
-      if (res.error) throw new Error(res.error);
-      return (
-        res.data ?? {
-          policies: [],
-          tasks: [],
-          requirements: [],
-        }
-      );
-    },
-    { revalidateOnFocus: false },
+  const { data, isLoading, mutate } = useApiSWR<ControlOptionsResponse>(
+    '/v1/controls/options',
+    { enabled },
   );
 
+  const options = data?.data;
+
   return {
-    policies: data?.policies ?? [],
-    tasks: data?.tasks ?? [],
-    requirements: data?.requirements ?? [],
+    policies: options?.policies ?? [],
+    tasks: options?.tasks ?? [],
+    requirements: options?.requirements ?? [],
     isLoading,
     mutate,
   };