Merge pull request #26 from Health-Informatics-UoN/update/next_version

Remove concept sorting & router refresh

Author: vpnu

components/ConceptList.tsx

@@ -5,14 +5,20 @@ import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Button } from "@/components/ui/button";
 import { ScrollArea, ScrollBar } from "@/components/ui/scroll-area";
 import { buildSearchParams } from "@/lib/helpers";
+import { useEffect, useState } from "react";
 
 export default function ConceptList({ concepts }: { concepts: Concept[] }) {
   const router = useRouter();
   const pathname = usePathname();
   const searchParams = useSearchParams();
-  const selectedConcepts = searchParams.getAll("conceptId").sort();
+  const selectedConcepts = searchParams.getAll("conceptId")
+  const [loading, setLoading] = useState(false);
 
   const onSelect = (conceptId: string) => {
+    if (loading) return;
+
+    setLoading(true);
+
     const current = searchParams.getAll("conceptId");
 
     const nextConceptIds = current.includes(conceptId)
@@ -25,9 +31,14 @@ export default function ConceptList({ concepts }: { concepts: Concept[] }) {
       page: 1,
     });
 
-    router.replace(`${pathname}?${query}`, { scroll: false });
-    router.refresh();
+    router.replace(`${pathname}?${query}`, {
+      scroll: false,
+    });
+
   };
+  useEffect(() => {
+  setLoading(false);
+}, [searchParams]);
   const clearSelection = () => {
     const query = buildSearchParams({
       conceptIds: [],
@@ -36,7 +47,6 @@ export default function ConceptList({ concepts }: { concepts: Concept[] }) {
     });
 
     router.replace(`${pathname}?${query}`, { scroll: false });
-    
   };
 
   return (

components/DomainSelect.tsx

@@ -22,13 +22,13 @@ export default function DomainSelect({ domain }: { domain: string }) {
     }
 
     // Keep selected concepts
-    const conceptIds = searchParams.getAll("conceptId").sort();
+    const conceptIds = searchParams.getAll("conceptId")
     conceptIds.forEach((id) => params.append("conceptId", id));
 
     // Reset page number
     params.set("page", "1");
 
-    router.replace(`${pathname}?${params.toString()}`);
+    router.replace(`${pathname}?${params.toString()}`, { scroll: false });
   }
   return (
     <Select value={domain} onValueChange={handleChange}>

components/NoteCard.tsx

@@ -67,7 +67,6 @@ export default function NoteCard({
       router.replace(`${pathname}?${query}`, {
         scroll: false,
       });
-      router.refresh();
     });
   };
 

components/NotesList.tsx

@@ -32,7 +32,7 @@ export default async function NotesList({
         .map((note) => note.note_source_value?.match(/PMC(\d+)/)?.[1])
         .filter((id): id is string => Boolean(id)),
     ),
-  ).sort();
+  );
   if (pmcids.length === 0) return;
   const articles =
     pmcids.length > 0 ? await getMultiplePmcArticles(pmcids) : {};

components/NotesPagination.tsx

@@ -30,7 +30,7 @@ export default function NotesPagination({
       params.set("domain", domain);
     }
     // Get conceptIds and add to URL
-    const conceptIds = searchParams.getAll("conceptId").sort();
+    const conceptIds = searchParams.getAll("conceptId")
     conceptIds.forEach((id) => params.append("conceptId", id));
 
     // Add the page number

lib/helpers.ts

@@ -17,7 +17,6 @@ export function buildSearchParams({
   // Sort and add unique conceptIds
   [...new Set(conceptIds)]
     .map(String)
-    .sort()
     .forEach((id) => params.append("conceptId", id));
 
   // Set page

lib/services/conceptsService.ts

@@ -196,7 +196,7 @@ export async function getNotesForConcept(
   const es = getElasticClient();
 
   // Sort concept IDs
-  const sortedConceptIds = [...conceptIds].sort();
+  const sortedConceptIds = [...conceptIds]
   // Set pagination
   const size = 10;