Update web/src/App.tsx

web/src/App.tsx

@@ -25,7 +25,6 @@ import {
   energyPct,
 } from "./lib/reviewStar";
 
-
 export type MessageAttachmentKind = "pdf" | "ppt" | "doc" | "image" | "other";
 
 export interface MessageAttachment {
@@ -36,16 +35,21 @@ export interface MessageAttachment {
   fileType?: FileType; // syllabus / lecture-slides / ...
 }
 
+type RefObj = { source_file: string; section?: string };
+
 export interface Message {
   id: string;
   role: "user" | "assistant";
   content: string;
   timestamp: Date;
+  // ✅ NEW: structured refs returned by backend
+  refs?: RefObj[];
+  // legacy string list (keep)
   references?: string[];
   sender?: GroupMember;
   showNextButton?: boolean;
 
-  // ✅ NEW: show files “with” the user message (metadata only)
+  // ✅ show files “with” the user message (metadata only)
   attachments?: MessageAttachment[];
 
   questionData?: {
@@ -58,8 +62,6 @@ export interface Message {
   };
 }
 
-
-
 export interface User {
   // required identity
   name: string;
@@ -155,6 +157,56 @@ function mapLanguagePref(lang: Language): string {
   return "Auto";
 }
 
+// ✅ map UI course ids to backend course_id
+const BACKEND_COURSE_ID_MAP: Record<string, string> = {
+  course1: "course_ist345",
+  course2: "course_ist345",
+  course3: "course_ist345",
+  course4: "course_ist345",
+};
+
+function getBackendCourseId(uiCourseId: string): string {
+  return BACKEND_COURSE_ID_MAP[uiCourseId] || "course_ist345";
+}
+
+function normalizeApiRefs(raw: any): RefObj[] {
+  const arr = Array.isArray(raw) ? raw : [];
+  return arr
+    .map((x) => {
+      // object form
+      if (x && typeof x === "object") {
+        const source = x.source_file ? String(x.source_file).trim() : "";
+        const section = x.section ? String(x.section).trim() : "";
+        if (!source && !section) return null;
+        return { source_file: source || "Unknown file", section: section || undefined };
+      }
+
+      // legacy string
+      if (typeof x === "string") {
+        const s = x.trim();
+        if (!s) return null;
+        const parts = s.split("—").map((p) => p.trim()).filter(Boolean);
+        if (parts.length >= 2) {
+          return { source_file: parts[0] || "Unknown file", section: parts.slice(1).join(" — ") || undefined };
+        }
+        return { source_file: s, section: undefined };
+      }
+
+      return null;
+    })
+    .filter(Boolean) as RefObj[];
+}
+
+function refsToLegacyStrings(refs: RefObj[]): string[] {
+  return (refs || [])
+    .map((r) => {
+      const a = (r.source_file || "").trim();
+      const b = (r.section || "").trim();
+      return b ? `${a} — ${b}` : a;
+    })
+    .filter(Boolean);
+}
+
 // ✅ localStorage helpers for saved chats
 function savedChatsStorageKey(email: string) {
   return `saved_chats::${email}`;
@@ -654,6 +706,8 @@ function App() {
 
     if (!hasText && !hasFiles) return;
 
+    const backendCourseId = getBackendCourseId(currentCourseId);
+
     const fileNames = hasFiles ? uploadedFiles.map((f) => f.file.name) : [];
     const fileLine = fileNames.length ? `Uploaded files: ${fileNames.join(", ")}` : "";
 
@@ -672,29 +726,28 @@ function App() {
       ? content
       : `📎 Sent ${fileNames.length} file(s)\n${fileNames.map((n) => `- ${n}`).join("\n")}`;
 
-    // ✅ snapshot attachments at send-time 
-    const attachmentsSnapshot: MessageAttachment[] =
-      uploadedFiles.map((uf) => {
-        const lower = uf.file.name.toLowerCase();
-        const kind: MessageAttachmentKind =
-          lower.endsWith(".pdf")
-            ? "pdf"
-            : lower.endsWith(".ppt") || lower.endsWith(".pptx")
-            ? "ppt"
-            : lower.endsWith(".doc") || lower.endsWith(".docx")
-            ? "doc"
-            : [".jpg", ".jpeg", ".png", ".gif", ".webp"].some((e) => lower.endsWith(e))
-            ? "image"
-            : "other";
-    
-        return {
-          name: uf.file.name,
-          size: uf.file.size,
-          kind,
-          fileType: uf.type,
-        };
-      });
-    
+    // ✅ snapshot attachments at send-time
+    const attachmentsSnapshot: MessageAttachment[] = uploadedFiles.map((uf) => {
+      const lower = uf.file.name.toLowerCase();
+      const kind: MessageAttachmentKind =
+        lower.endsWith(".pdf")
+          ? "pdf"
+          : lower.endsWith(".ppt") || lower.endsWith(".pptx")
+          ? "ppt"
+          : lower.endsWith(".doc") || lower.endsWith(".docx")
+          ? "doc"
+          : [".jpg", ".jpeg", ".png", ".gif", ".webp"].some((e) => lower.endsWith(e))
+          ? "image"
+          : "other";
+
+      return {
+        name: uf.file.name,
+        size: uf.file.size,
+        kind,
+        fileType: uf.type,
+      };
+    });
+
     const userMessage: Message = {
       id: Date.now().toString(),
       role: "user",
@@ -720,32 +773,19 @@ function App() {
           learning_mode: "quiz",
           language_preference: mapLanguagePref(language),
           doc_type: docType,
-        });
-
-        const normalizeRefs = (raw: any): string[] => {
-          const arr = Array.isArray(raw) ? raw : [];
-          return arr
-            .map((x) => {
-              if (typeof x === "string") {
-                const s = x.trim();
-                return s ? s : null;
-              }
-              const a = x?.source_file ? String(x.source_file) : "";
-              const b = x?.section ? String(x.section) : "";
-              const s = `${a}${a && b ? " — " : ""}${b}`.trim();
-              return s || null;
-            })
-            .filter(Boolean) as string[];
-        };
+          course_id: backendCourseId,
+        } as any);
 
-        const refs = normalizeRefs((r as any).refs ?? (r as any).references);
+        const refsObj = normalizeApiRefs((r as any).refs ?? (r as any).references);
+        const refsLegacy = refsToLegacyStrings(refsObj);
 
         const assistantMessage: Message = {
           id: (Date.now() + 1).toString(),
           role: "assistant",
-          content: r.reply || "",
+          content: (r as any).reply || "",
           timestamp: new Date(),
-          references: refs.length ? refs : undefined,
+          refs: refsObj.length ? refsObj : undefined,
+          references: refsLegacy.length ? refsLegacy : undefined,
           sender: spaceType === "group" ? groupMembers.find((m) => m.isAI) : undefined,
           showNextButton: false,
         };
@@ -786,23 +826,19 @@ function App() {
         learning_mode: learningMode,
         language_preference: mapLanguagePref(language),
         doc_type: docType,
-      });
+        course_id: backendCourseId,
+      } as any);
 
-      const refs = (r.refs || [])
-        .map((x: any) => {
-          const a = x?.source_file ? String(x.source_file) : "";
-          const b = x?.section ? String(x.section) : "";
-          const s = `${a}${a && b ? " — " : ""}${b}`.trim();
-          return s || null;
-        })
-        .filter(Boolean) as string[];
+      const refsObj = normalizeApiRefs((r as any).refs ?? (r as any).references);
+      const refsLegacy = refsToLegacyStrings(refsObj);
 
       const assistantMessage: Message = {
         id: (Date.now() + 1).toString(),
         role: "assistant",
-        content: r.reply || "",
+        content: (r as any).reply || "",
         timestamp: new Date(),
-        references: refs.length ? refs : undefined,
+        refs: refsObj.length ? refsObj : undefined,
+        references: refsLegacy.length ? refsLegacy : undefined,
         sender: spaceType === "group" ? groupMembers.find((m) => m.isAI) : undefined,
       };
 
@@ -841,6 +877,8 @@ function App() {
   const handleNextQuestion = async () => {
     if (!user) return;
 
+    const backendCourseId = getBackendCourseId(currentCourseId);
+
     const prompt = "Please give me another question of the same quiz style.";
     const sender: GroupMember = {
       id: user.email,
@@ -868,23 +906,19 @@ function App() {
         learning_mode: "quiz",
         language_preference: mapLanguagePref(language),
         doc_type: docType,
-      });
+        course_id: backendCourseId,
+      } as any);
 
-      const refs = (r.refs || [])
-        .map((x: any) => {
-          const a = x?.source_file ? String(x.source_file) : "";
-          const b = x?.section ? String(x.section) : "";
-          const s = `${a}${a && b ? " — " : ""}${b}`.trim();
-          return s || null;
-        })
-        .filter(Boolean) as string[];
+      const refsObj = normalizeApiRefs((r as any).refs ?? (r as any).references);
+      const refsLegacy = refsToLegacyStrings(refsObj);
 
       const assistantMessage: Message = {
         id: (Date.now() + 1).toString(),
         role: "assistant",
-        content: r.reply || "",
+        content: (r as any).reply || "",
         timestamp: new Date(),
-        references: refs.length ? refs : undefined,
+        refs: refsObj.length ? refsObj : undefined,
+        references: refsLegacy.length ? refsLegacy : undefined,
         sender: spaceType === "group" ? groupMembers.find((m) => m.isAI) : undefined,
         showNextButton: false,
       };
@@ -919,6 +953,8 @@ function App() {
   const handleStartQuiz = async () => {
     if (!user) return;
 
+    const backendCourseId = getBackendCourseId(currentCourseId);
+
     setIsTyping(true);
     try {
       const docType = getCurrentDocTypeForChat();
@@ -928,23 +964,19 @@ function App() {
         language_preference: mapLanguagePref(language),
         doc_type: docType,
         learning_mode: "quiz",
-      });
+        course_id: backendCourseId,
+      } as any);
 
-      const refs = (r.refs || [])
-        .map((x: any) => {
-          const a = x?.source_file ? String(x.source_file) : "";
-          const b = x?.section ? String(x.section) : "";
-          const s = `${a}${a && b ? " — " : ""}${b}`.trim();
-          return s || null;
-        })
-        .filter(Boolean) as string[];
+      const refsObj = normalizeApiRefs((r as any).refs ?? (r as any).references);
+      const refsLegacy = refsToLegacyStrings(refsObj);
 
       const assistantMessage: Message = {
         id: Date.now().toString(),
         role: "assistant",
-        content: r.reply || "",
+        content: (r as any).reply || "",
         timestamp: new Date(),
-        references: refs.length ? refs : undefined,
+        refs: refsObj.length ? refsObj : undefined,
+        references: refsLegacy.length ? refsLegacy : undefined,
         sender: spaceType === "group" ? groupMembers.find((m) => m.isAI) : undefined,
         showNextButton: false,
       };
@@ -974,7 +1006,6 @@ function App() {
   // =========================
   //  File Upload (FIXED)
   // =========================
-
   const handleFileUpload = async (input: File[] | FileList | null | undefined) => {
     const files = Array.isArray(input) ? input : input ? Array.from(input) : [];
     if (!files.length) return;
@@ -985,6 +1016,8 @@ function App() {
 
     if (!user) return;
 
+    const backendCourseId = getBackendCourseId(currentCourseId);
+
     for (const f of files) {
       const fp = `${f.name}::${f.size}::${f.lastModified}`;
       if (uploadedFingerprintsRef.current.has(fp)) continue;
@@ -994,8 +1027,9 @@ function App() {
         await apiUpload({
           user_id: user.email,
           doc_type: DOC_TYPE_MAP["other"] || "Other Course Document",
+          course_id: backendCourseId,
           file: f,
-        });
+        } as any);
         toast.success(`File uploaded: ${f.name}`);
       } catch (e: any) {
         toast.error(e?.message || `Upload failed: ${f.name}`);
@@ -1054,12 +1088,15 @@ function App() {
     if (uploadedFingerprintsRef.current.has(fp)) return;
     uploadedFingerprintsRef.current.add(fp);
 
+    const backendCourseId = getBackendCourseId(currentCourseId);
+
     try {
       await apiUpload({
         user_id: user.email,
         doc_type: DOC_TYPE_MAP[type] || "Other Course Document",
+        course_id: backendCourseId,
         file: target,
-      });
+      } as any);
       toast.success("File uploaded to backend");
     } catch (e: any) {
       toast.error(e?.message || "Upload failed");
@@ -1523,7 +1560,6 @@ function App() {
                 onReviewActivity={handleReviewActivity}
                 currentUserId={user?.email}
                 docType={"Syllabus"}
-                // ✅ bio is still allowed to be updated by chat/Clare
                 onProfileBioUpdate={(bio) => updateUser({ bio })}
               />
             </div>