Преглед изворни кода

Merge pull request #2111 from visuddhinanda/agile

wbw 设置时才显示学生discussion
visuddhinanda пре 1 година
родитељ
комит
6f67532d1c
1 измењених фајлова са 11 додато и 7 уклоњено
  1. 11 7
      dashboard/src/components/discussion/DiscussionButton.tsx

+ 11 - 7
dashboard/src/components/discussion/DiscussionButton.tsx

@@ -7,7 +7,7 @@ import { TResType } from "./DiscussionListCard";
 import { useAppSelector } from "../../hooks";
 import { currentUser } from "../../reducers/current-user";
 import { discussionList } from "../../reducers/discussion-count";
-import { IDiscussionCountWbw } from "../api/Comment";
+import { IDiscussionCountData, IDiscussionCountWbw } from "../api/Comment";
 
 interface IWidget {
   initCount?: number;
@@ -32,12 +32,16 @@ const DiscussionButton = ({
 
   const all = discussions?.filter((value) => value.res_id === resId);
   const my = all?.filter((value) => value.editor_uid === user?.id);
-  const withStudent = discussions?.filter(
-    (value) =>
-      value.wbw?.book_id === wbw?.book_id &&
-      value.wbw?.paragraph === wbw?.paragraph &&
-      value.wbw?.wid.toString() === wbw?.wid.toString()
-  );
+
+  let withStudent: IDiscussionCountData[] | undefined;
+  if (wbw) {
+    withStudent = discussions?.filter(
+      (value) =>
+        value.wbw?.book_id === wbw?.book_id &&
+        value.wbw?.paragraph === wbw?.paragraph &&
+        value.wbw?.wid.toString() === wbw?.wid.toString()
+    );
+  }
 
   console.debug("DiscussionButton", discussions, wbw, withStudent);