Fix search order accuracy

Author: craquet

src/components/result/OrcidDisplay.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useMemo } from "react"
 import useSWRImmutable from "swr/immutable"
+import { Skeleton } from "@/components/ui/skeleton"
 
 async function orcidFetch(orcid: string) {
     const req = await fetch(`https://pub.orcid.org/v3.0/${orcid}`, {
@@ -29,9 +30,10 @@ export function OrcidDisplay({ orcid }: { orcid: string }) {
     }, [data])
 
     useEffect(() => {
-        if (error) console.log(error)
-    }, [error])
+        if (error) console.warn(`OrcidDisplay failed to resolve ${orcid}`, error)
+    }, [error, orcid])
 
     if (familyName && givenName) return givenName + " " + familyName
-    return null
+    if (error) return orcid
+    return <Skeleton className="rfs-h-4 rfs-w-14 rfs-bg-muted-foreground/10" />
 }

src/components/ui/skeleton.tsx

@@ -0,0 +1,15 @@
+import { cn } from "@/lib/utils"
+
+function Skeleton({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) {
+  return (
+    <div
+      className={cn("rfs-animate-pulse rfs-rounded-md rfs-bg-muted", className)}
+      {...props}
+    />
+  )
+}
+
+export { Skeleton }

src/config/FairDOConfig.ts

@@ -1,4 +1,4 @@
-import { RequestState } from "@elastic/search-ui"
+import { RequestState, SearchFieldConfiguration } from "@elastic/search-ui"
 
 export interface FairDOCoreFacetConfig {
     key: string
@@ -47,7 +47,7 @@ export interface FairDOIndexConfig {
     /**
      * Fields that support searching
      */
-    searchFields: string[]
+    searchFields: (string | ({ field: string } & SearchFieldConfiguration))[]
     /**
      * Fields that should be included in the results for a search query
      */

src/config/FairDOConfigBuilder.ts

@@ -63,7 +63,11 @@ export class FairDOConfigBuilder {
             index_names.push(index.name)
 
             allSearchFields = (index.searchFields || []).reduce((acc, n) => {
-                acc[n] = {}
+                if (typeof n === "string") {
+                    acc[n] = {}
+                } else {
+                    acc[n.field] = n
+                }
 
                 return acc
             }, allSearchFields)

src/stories/FairDOElasticSearch.stories.tsx

@@ -71,7 +71,18 @@ const demoConfig: FairDOConfig = {
                 }
             ],
             resultFields: [], // Leave empty to get all fields
-            searchFields: ["name", "pid", "hasMetadata", "isMetadataFor", "NMR_Method"]
+            searchFields: [
+                { field: "name", weight: 2 },
+                { field: "pid", weight: 2 },
+                "hasMetadata",
+                "isMetadataFor",
+                "NMR_Method",
+                "digitalObjectType",
+                "Acquisition_Nucleus",
+                "Pulse_Sequence_Name",
+                "hadPrimarySource",
+                "resourceType"
+            ]
         }
     ],
     initialState: {