Merge branch 'main' of https://github.com/progenetix/progenetix-web

progenetix · Jan 30, 2025 · 0132de2 · 0132de2
2 parents e9aff3f + 48a1903
commit 0132de2
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 20 deletions.
diff --git a/src/components/searchResults/BiosamplesResults.js b/src/components/searchResults/BiosamplesResults.js
@@ -25,16 +25,30 @@ export function BiosamplesResults({ response, isLoading, error, query }) {
 }
 
 function AlleleResponses({ biosampleResponseSets, responseMeta, query }) {
-  if (biosampleResponseSets?.[0].resultsCount < 1) {
-    return (
+  return biosampleResponseSets.map((r, i) => (
+    <>
+    {r.resultsCount > 0 && (
+     <DatasetResultBox key={i} data={r} responseMeta={responseMeta} query={query} />
+    )
+    }
+    {r.resultsCount < 1 && (
+     <NoResults data={r}  />
+    )
+    }
+    </>
+  ))
+}
+
+function NoResults({ data: responseSet}) {
+  const {id} = responseSet
+  return (
+   <div className="box">
+      <h2 className="subtitle has-text-dark">{id}</h2>
       <div className="notification">
         No results could be found for this query.
       </div>
-    )
-  }
-  return biosampleResponseSets.map((r, i) => (
-    <DatasetResultBox key={i} data={r} responseMeta={responseMeta} query={query} />
-  ))
+    </div>
+  )
 }
 
 function QuerySummary({ query }) {

diff --git a/src/components/searchResults/DatasetResultBox.js b/src/components/searchResults/DatasetResultBox.js
@@ -41,10 +41,10 @@ export function DatasetResultBox({ data: responseSet, responseMeta, query }) {
     resultsHandovers,
     info,
     resultsCount
-    // paginatedResultsCount
   } = responseSet
 
-  const limit = responseMeta.receivedRequestSummary?.pagination?.limit ? responseMeta.receivedRequestSummary?.pagination?.limit : 121
+  // TODO: This is ugly; something like := ?
+  const limit = responseMeta.receivedRequestSummary?.pagination?.limit ? responseMeta.receivedRequestSummary?.pagination?.limit : 200
 
   const handoverById = (givenId) =>
     resultsHandovers.find(({ info: { contentId } }) => contentId === givenId)
@@ -57,12 +57,14 @@ export function DatasetResultBox({ data: responseSet, responseMeta, query }) {
   biosamplesTableHandover.pages = []
   var cntr = 0
   var skpr = 0
-  while (cntr < biocount) {
-    const pagu = "&skip=" + skpr + "&limit=" + limit
-    cntr += limit
-    skpr += 1
-    biosamplesHandover.pages.push({"url": replaceWithProxy(biosamplesHandover.url + pagu), "label": "Part" + skpr})
-    biosamplesTableHandover.pages.push({"url": replaceWithProxy(biosamplesTableHandover.url + pagu), "label": "Part" + skpr})
+  if (biocount > 0) {
+    while (cntr < biocount) {
+      const pagu = "&skip=" + skpr + "&limit=" + limit
+      cntr += limit
+      skpr += 1
+      biosamplesHandover.pages.push({"url": replaceWithProxy(biosamplesHandover.url + pagu), "label": "Part" + skpr})
+      biosamplesTableHandover.pages.push({"url": replaceWithProxy(biosamplesTableHandover.url + pagu), "label": "Part" + skpr})
+    }
   }
 
   const variantsHandover = handoverById(HANDOVER_IDS.variants)
@@ -238,7 +240,7 @@ export function DatasetResultBox({ data: responseSet, responseMeta, query }) {
       <hr/>
       <h2 className="subtitle has-text-dark">{id} Data Downloads</h2>
 
-      {biosamplesTableHandover?.pages && (
+      {biosamplesTableHandover?.pages.length > 0 && (
         <div className="tabs">
           <div>
             <b>Download Sample Data (TSV)</b>
@@ -251,7 +253,7 @@ export function DatasetResultBox({ data: responseSet, responseMeta, query }) {
           </div>
         </div>
       )}
-      {biosamplesHandover?.pages && (
+      {biosamplesHandover?.pages.length > 0 && (
         <div className="tabs">
           <div>
             <b>Download Sample Data (JSON)</b>
@@ -264,7 +266,7 @@ export function DatasetResultBox({ data: responseSet, responseMeta, query }) {
           </div>
         </div>
       )}
-      {variantsHandover?.pages && (
+      {variantsHandover?.pages.length > 0 && (
         <div className="tabs ">
           <div>
             <b>Download Variants (Beacon VRS)</b>
@@ -277,7 +279,7 @@ export function DatasetResultBox({ data: responseSet, responseMeta, query }) {
           </div>
         </div>
       )}
-      {vcfHandover?.pages && (
+      {vcfHandover?.pages.length > 0 && (
         <div className="tabs ">
           <div>
             <b>Download Variants (VCF)</b>
@@ -290,7 +292,7 @@ export function DatasetResultBox({ data: responseSet, responseMeta, query }) {
           </div>
         </div>
       )}
-      {pgxsegHandover?.pages && (
+      {pgxsegHandover?.pages.length > 0 && (
         <div className="tabs ">
           <div>
             <b>Download Variants (.pgxseg)</b>