Update web/src/components/LeftSidebar.tsx

web/src/components/LeftSidebar.tsx

@@ -1,3 +1,4 @@
+// web/src/components/LeftSidebar.tsx
 import React, { useMemo, useState } from "react";
 import { Button } from "./ui/button";
 import { Input } from "./ui/input";
@@ -5,7 +6,15 @@ import { Separator } from "./ui/separator";
 import { Bookmark, Trash2, Edit2, Check, X as XIcon } from "lucide-react";
 
 import type { SavedChat, Workspace } from "../App";
-import type { CourseDirectoryItem } from "../lib/courseDirectory";
+
+// 你项目里可能有 courseDirectory，也可能直接从 App 传 availableCourses（CourseInfo[]）。
+// 所以这里不强依赖 CourseDirectoryItem 结构，做宽松兼容。
+type AnyCourse = {
+  id: string;
+  name: string;
+  instructor?: { name: string; email: string };
+  teachingAssistant?: { name: string; email: string };
+};
 
 type Props = {
   savedChats: SavedChat[];
@@ -19,8 +28,8 @@ type Props = {
   // ✅ 当前选中的课程（My Space 用它）
   selectedCourse: string;
 
-  // ✅ use courseDirectory items
-  availableCourses: CourseDirectoryItem[];
+  // ✅ 允许两种来源：CourseInfo[] 或 CourseDirectoryItem[]
+  availableCourses: AnyCourse[];
 };
 
 function formatSub(ts: any) {
@@ -53,36 +62,34 @@ export function LeftSidebar({
   const [editingId, setEditingId] = useState<string | null>(null);
   const [draftTitle, setDraftTitle] = useState("");
 
-  /** ===== 当前 workspace 对应的 course info ===== */
-  const currentWorkspace = workspaces.find((w) => w.id === currentWorkspaceId);
-
-  // ✅ group(course) workspace: 用 workspace.courseInfo
-  // ✅ individual(My Space): 用 selectedCourse 去 availableCourses 找
-  const courseInfo: CourseDirectoryItem | null = useMemo(() => {
-    const wsCourse = (currentWorkspace as any)?.courseInfo as
-      | { id?: string; name?: string; instructor?: any; teachingAssistant?: any }
-      | undefined;
-
-    // 1) workspace 自带 courseInfo（group 课 workspace）
-    const wsId = wsCourse?.id?.trim();
-    if (wsId) {
-      const hit = availableCourses.find((c) => c.id === wsId);
-      return hit ?? (wsCourse as any);
-    }
-
-    const wsName = wsCourse?.name?.trim();
-    if (wsName) {
-      const hit = availableCourses.find((c) => c.name === wsName);
-      return hit ?? (wsCourse as any);
-    }
+  const currentWorkspace = useMemo(
+    () => workspaces.find((w) => w.id === currentWorkspaceId),
+    [workspaces, currentWorkspaceId]
+  );
 
-    // 2) My Space：按 selectedCourse 找
+  /**
+   * ✅ 最关键：courseInfo 一定要能在 My Space 下拿到
+   * 优先使用 selectedCourse（你 App 里 currentCourseId），这才是 My Space 的 source of truth
+   * group workspace 再用 workspace.courseInfo 兜底
+   */
+  const courseInfo: AnyCourse | null = useMemo(() => {
     const selId = (selectedCourse || "").trim();
     if (selId) {
-      const hit = availableCourses.find((c) => c.id === selId);
+      const hit = availableCourses.find((c) => String(c.id) === selId);
       if (hit) return hit;
     }
 
+    const wsCourse = (currentWorkspace as any)?.courseInfo as AnyCourse | undefined;
+    if (wsCourse?.id) {
+      const hit = availableCourses.find((c) => String(c.id) === String(wsCourse.id));
+      return hit ?? wsCourse;
+    }
+
+    if (wsCourse?.name) {
+      const hit = availableCourses.find((c) => c.name === wsCourse.name);
+      return hit ?? wsCourse;
+    }
+
     return null;
   }, [availableCourses, currentWorkspace, selectedCourse]);
 
@@ -118,7 +125,7 @@ export function LeftSidebar({
   return (
     <div className="h-full w-full flex flex-col min-h-0">
       {/* ================= Course Info（不滚动） ================= */}
-      {courseInfo && (
+      {courseInfo ? (
         <div className="px-4 pt-4 pb-3 flex-shrink-0 space-y-2">
           <div className="font-semibold text-base">{courseInfo.name}</div>
 
@@ -162,7 +169,7 @@ export function LeftSidebar({
             )}
           </div>
         </div>
-      )}
+      ) : null}
 
       {/* ✅ Info / Saved Chat 分割线：固定 #ECECF1 */}
       <Separator className="flex-shrink-0 bg-[#ECECF1]" />