@openneuro/server 4.24.0-alpha.0 → 4.24.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openneuro/server",
-  "version": "4.24.0-alpha.0",
+  "version": "4.24.0-alpha.2",
   "description": "Core service for the OpenNeuro platform.",
   "license": "MIT",
   "main": "src/server.js",
@@ -21,7 +21,7 @@
     "@elastic/elasticsearch": "8.13.1",
     "@graphql-tools/schema": "^10.0.0",
     "@keyv/redis": "^2.7.0",
-    "@openneuro/search": "^4.24.0-alpha.0",
+    "@openneuro/search": "^4.24.0-alpha.2",
     "@passport-next/passport-google-oauth2": "^1.0.0",
     "@sentry/node": "^4.5.3",
     "base64url": "^3.0.0",
@@ -86,5 +86,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4e271231c20d21e4c8b5ba8851d67cb94b7f739a"
+  "gitHead": "aa9717595d41e5e0eb55328c62fa59c80847b95e"
 }

package/src/graphql/resolvers/dataset-search.ts

@@ -4,6 +4,7 @@ import Star from "../../models/stars"
 import Subscription from "../../models/subscription"
 import Permission from "../../models/permission"
 import { hashObject } from "../../libs/authentication/crypto"
+import util from "util"
 
 const elasticIndex = "datasets"
 
@@ -215,6 +216,7 @@ export const advancedDatasetSearchConnection = async (
   },
   { user, userInfo },
 ) => {
+  // Create an identity for this search (used to cache connections)
   const searchId = hashObject({
     query,
     datasetType,
@@ -223,28 +225,32 @@ export const advancedDatasetSearchConnection = async (
     user,
   })
   const sort = [{ _score: "desc" }, { id: "desc" }]
-  if (sortBy) sort.unshift(sortBy)
-  const requestBody = {
-    sort,
-    query: allDatasets
-      ? query
-      : await parseQuery(query, datasetType, datasetStatus, user),
-    search_after: undefined,
+  if (sortBy) {
+    sort.unshift(sortBy)
   }
+  // Parse out the decode token and add it to our query if successful
+  let search_after
   if (after) {
     try {
-      requestBody.search_after = decodeCursor(after)
-    } catch (err) {
+      search_after = decodeCursor(after)
+    } catch (_err) {
       // Don't include search_after if parsing fails
     }
   }
-  await elasticClient.search({
+  const requestBody = {
     index: elasticIndex,
     size: first,
-    ...requestBody,
-  })
+    sort,
+    query: allDatasets
+      ? query
+      : await parseQuery(query, datasetType, datasetStatus, user),
+    search_after,
+  }
+  // Run the query
+  const result = await elasticClient.search(requestBody)
+  // Extend with relay connection pagination
   return elasticRelayConnection(
-    requestBody,
+    result,
     searchId,
     first,
     undefined,