refactor(security-questionnaire): normalize results and update button states

Author: tofikwest

apps/app/src/app/(app)/[orgId]/security-questionnaire/components/QuestionnaireParser.tsx

@@ -40,11 +40,23 @@ export function QuestionnaireParser() {
     handleToggleSource,
   } = useQuestionnaireParser();
 
+  const normalizedResults =
+    results?.map((result) => ({
+      ...result,
+      sources: result.sources ?? [],
+    })) ?? null;
+
+  const normalizedFilteredResults =
+    filteredResults?.map((result) => ({
+      ...result,
+      sources: result.sources ?? [],
+    })) ?? null;
+
   return (
     <QuestionnaireView
       orgId={orgId}
-      results={results}
-      filteredResults={filteredResults}
+      results={normalizedResults}
+      filteredResults={normalizedFilteredResults}
       searchQuery={searchQuery}
       setSearchQuery={setSearchQuery}
       editingIndex={editingIndex}

apps/app/src/app/(app)/[orgId]/security-questionnaire/components/QuestionnaireResultsHeader.tsx

@@ -154,7 +154,7 @@ export function QuestionnaireResultsHeader({
             </Button>
             <DropdownMenu>
               <DropdownMenuTrigger asChild>
-                <Button variant="outline" size="default" disabled={isExporting || isLoading} suppressHydrationWarning>
+                <Button variant="outline" size="default" disabled={isExporting} suppressHydrationWarning>
                   <Download className="size-4" />
                   Export
                   <ChevronDown className="size-4" />
@@ -163,21 +163,21 @@ export function QuestionnaireResultsHeader({
               <DropdownMenuContent align="end" suppressHydrationWarning>
                 <DropdownMenuItem
                   onClick={() => onExport('xlsx')}
-                  disabled={isExporting || isLoading}
+                  disabled={isExporting}
                 >
                   <FileSpreadsheet className="mr-2 h-4 w-4" />
                   Excel
                 </DropdownMenuItem>
                 <DropdownMenuItem
                   onClick={() => onExport('csv')}
-                  disabled={isExporting || isLoading}
+                  disabled={isExporting}
                 >
                   <FileTextIcon className="mr-2 h-4 w-4" />
                   CSV
                 </DropdownMenuItem>
                 <DropdownMenuItem
                   onClick={() => onExport('pdf')}
-                  disabled={isExporting || isLoading}
+                  disabled={isExporting}
                 >
                   <File className="mr-2 h-4 w-4" />
                   PDF

apps/app/src/app/(app)/[orgId]/security-questionnaire/components/QuestionnaireUpload.tsx

@@ -19,6 +19,7 @@ interface QuestionnaireUploadProps {
   isLoading: boolean;
   parseStatus: 'uploading' | 'starting' | 'queued' | 'analyzing' | 'processing' | null;
   orgId: string;
+  hasResults?: boolean;
 }
 
 export function QuestionnaireUpload({
@@ -28,6 +29,7 @@ export function QuestionnaireUpload({
   onParse,
   isLoading,
   parseStatus,
+  hasResults = false,
 }: QuestionnaireUploadProps) {
   return (
     <div className="flex flex-col gap-6">
@@ -99,7 +101,7 @@ export function QuestionnaireUpload({
         <div className="flex items-center justify-end">
           <Button
             onClick={onParse}
-            disabled={isLoading || !selectedFile}
+            disabled={isLoading || !selectedFile || hasResults}
             className="h-11 lg:h-12 px-6 lg:px-8 w-full sm:w-auto"
             size="lg"
           >

apps/app/src/app/(app)/[orgId]/security-questionnaire/hooks/useQuestionnaireAutoAnswer.ts

@@ -299,17 +299,30 @@ export function useQuestionnaireAutoAnswer({
 
           answers.forEach((answer) => {
             if (answer.sources && answer.sources.length > 0) {
-              const targetIndex = updatedResults.findIndex(
-                (r) => r.originalIndex === answer.questionIndex
-              );
-
-              if (targetIndex >= 0 && targetIndex < updatedResults.length) {
-                const currentSources = updatedResults[targetIndex]?.sources || [];
-                const sourcesChanged = JSON.stringify(currentSources) !== JSON.stringify(answer.sources);
+              const directIndex =
+                answer.questionIndex >= 0 && answer.questionIndex < updatedResults.length
+                  ? answer.questionIndex
+                  : -1;
+
+              const fallbackIndex =
+                directIndex === -1
+                  ? updatedResults.findIndex((r, idx) => {
+                      const candidate =
+                        (r as { originalIndex?: number; _originalIndex?: number }).originalIndex ??
+                        (r as { originalIndex?: number; _originalIndex?: number })._originalIndex ??
+                        idx;
+                      return candidate === answer.questionIndex;
+                    })
+                  : directIndex;
+
+              if (fallbackIndex >= 0 && fallbackIndex < updatedResults.length) {
+                const currentSources = updatedResults[fallbackIndex]?.sources || [];
+                const sourcesChanged =
+                  JSON.stringify(currentSources) !== JSON.stringify(answer.sources);
 
                 if (sourcesChanged) {
-                  updatedResults[targetIndex] = {
-                    ...updatedResults[targetIndex],
+                  updatedResults[fallbackIndex] = {
+                    ...updatedResults[fallbackIndex],
                     sources: answer.sources,
                   };
                   hasChanges = true;

apps/app/src/app/(app)/[orgId]/security-questionnaire/hooks/useQuestionnaireDetail/useQuestionnaireDetailHandlers.ts

@@ -32,7 +32,9 @@ interface UseQuestionnaireDetailHandlersProps {
     }) => void;
   };
   deleteAnswerAction: {
-    execute: (payload: { questionnaireId: string; questionAnswerId: string }) => Promise<any>;
+    execute: (
+      payload: { questionnaireId: string; questionAnswerId: string }
+    ) => Promise<any> | void;
   };
   router: { refresh: () => void };
   triggerAutoAnswer: (payload: {
@@ -242,10 +244,12 @@ export function useQuestionnaireDetailHandlers({
 
   const handleDeleteAnswer = async (questionAnswerId: string, questionIndex: number) => {
     try {
-      await deleteAnswerAction.execute({
-        questionnaireId,
-        questionAnswerId,
-      });
+      await Promise.resolve(
+        deleteAnswerAction.execute({
+          questionnaireId,
+          questionAnswerId,
+        })
+      );
 
       setResults((prev) =>
         prev.map((r) =>

apps/app/src/lib/vector/core/upsert-embedding.ts

@@ -17,6 +17,7 @@ export interface EmbeddingMetadata {
   vendorName?: string;
   questionnaireQuestion?: string;
   documentName?: string;
+  manualAnswerQuestion?: string;
   updatedAt?: string; // ISO timestamp for incremental sync comparison
 }
 
@@ -62,6 +63,7 @@ export async function upsertEmbedding(
       ...(metadata.vendorId && { vendorId: metadata.vendorId }),
       ...(metadata.vendorName && { vendorName: metadata.vendorName }),
       ...(metadata.questionnaireQuestion && { questionnaireQuestion: metadata.questionnaireQuestion }),
+      ...(metadata.manualAnswerQuestion && { manualAnswerQuestion: metadata.manualAnswerQuestion }),
       ...(metadata.documentName && { documentName: metadata.documentName }),
       ...(metadata.updatedAt && { updatedAt: metadata.updatedAt }),
     };
@@ -171,6 +173,9 @@ export async function batchUpsertEmbeddings(
             ...(item.metadata.questionnaireQuestion && {
               questionnaireQuestion: item.metadata.questionnaireQuestion,
             }),
+            ...(item.metadata.manualAnswerQuestion && {
+              manualAnswerQuestion: item.metadata.manualAnswerQuestion,
+            }),
             ...(item.metadata.documentName && { documentName: item.metadata.documentName }),
             ...(item.metadata.updatedAt && { updatedAt: item.metadata.updatedAt }),
           },