Merge pull request #543 from himanshugupta2168/comment/filter-bug

fixed the comment filter issue
code100x · May 12, 2024 · 278e2c2 · 278e2c2
2 parents 46338bf + a1d7761
commit 278e2c2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -94,6 +94,6 @@
     "prisma": "^5.6.0",
     "tailwindcss": "^3.3.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5"
+    "typescript": "^5.3.2"
   }
 }
diff --git a/src/components/CourseView.tsx b/src/components/CourseView.tsx
@@ -60,6 +60,7 @@ export const CourseView = ({
         <Comments
           content={{
             id: courseContent[0]?.id || 0,
+            courseId: courseContent[0]?.parentId || 0,
             commentCount: courseContent[0]?.commentsCount || 0,
             possiblePath,
           }}

diff --git a/src/components/comment/Comments.tsx b/src/components/comment/Comments.tsx
@@ -39,6 +39,7 @@ const Comments = async ({
 }: {
   content: {
     id: number;
+    courseId: number;
     commentCount: number;
     possiblePath: string;
   };
@@ -55,7 +56,6 @@ const Comments = async ({
     content.id,
     session.user.id,
   );
-
   const data = await getComments(q, searchParams.parentId);
 
   if (!content.id) return null;
@@ -136,7 +136,7 @@ const Comments = async ({
                 <Link
                   scroll={false}
                   href={getUpdatedUrl(
-                    `/courses/${content.possiblePath}`,
+                    `/courses/${content.courseId}/${content.possiblePath}`,
                     searchParams,
                     {
                       tabtype: TabType.mu,
@@ -148,7 +148,7 @@ const Comments = async ({
                 <Link
                   scroll={false}
                   href={getUpdatedUrl(
-                    `/courses/${content.possiblePath}`,
+                    `/courses/${content.courseId}/${content.possiblePath}`,
                     searchParams,
                     {
                       tabtype: TabType.mr,
@@ -160,7 +160,7 @@ const Comments = async ({
                 <Link
                   scroll={false}
                   href={getUpdatedUrl(
-                    `/courses/${content.possiblePath}`,
+                    `/courses/${content.courseId}/${content.possiblePath}`,
                     searchParams,
                     {
                       tabtype: TabType.md,
@@ -191,7 +191,7 @@ const Comments = async ({
                 <Link
                   scroll={false}
                   href={getUpdatedUrl(
-                    `/courses/${content.possiblePath}`,
+                    `/courses/${content.courseId}/${content.possiblePath}`,
                     searchParams,
                     {
                       type: CommentType.DEFAULT,
@@ -204,7 +204,7 @@ const Comments = async ({
                 <Link
                   scroll={false}
                   href={getUpdatedUrl(
-                    `/courses/${content.possiblePath}`,
+                    `/courses/${content.courseId}/${content.possiblePath}`,
                     searchParams,
                     {
                       type: CommentType.INTRO,

diff --git a/tsconfig.json b/tsconfig.json
@@ -15,14 +15,14 @@
     "incremental": true,
     "plugins": [
       {
-        "name": "next",
-      },
+        "name": "next"
+      }
     ],
     "paths": {
       "@/*": ["./src/*"],
-      "@public/*": ["./public/*"],
-    },
+      "@public/*": ["./public/*"]
+    }
   },
   "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"],
+  "exclude": ["node_modules"]
 }