Add proper parsing of nmr methods

Author: craquet

package-lock.json

@@ -40,7 +40,6 @@
         "@radix-ui/react-slot": "^1.1.0",
         "@storybook/addon-docs": "^8.5.0",
         "@types/luxon": "^3.4.2",
-        "@types/sparql-http-client": "^3.0.5",
         "@xyflow/react": "^12.3.6",
         "class-variance-authority": "^0.7.1",
         "clsx": "^2.1.1",
@@ -52,7 +51,6 @@
         "prettier": "^3.4.2",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
-        "sparql-http-client": "^3.0.1",
         "swr": "^2.3.0",
         "tailwind-merge": "^2.5.5",
         "tailwindcss-animate": "^1.0.7",

package.json

@@ -1,6 +1,7 @@
 import { PidResolver, pidResolver } from "@/lib/pidResolver"
 import { memo, useCallback } from "react"
 import useSWR from "swr"
+import { ontobeeResolver } from "@/lib/OntobeeResolver"
 
 /**
  * Resolves a PID and displays the name of the received record
@@ -9,11 +10,13 @@ import useSWR from "swr"
  */
 export const PidDisplay = memo(function PidDisplay({ pid }: { pid: string }) {
     const resolveContent = useCallback(async (pid: string) => {
-        if (!PidResolver.isPID(pid)) {
-            return pid
-        } else {
+        if (PidResolver.isPID(pid)) {
             const content = await pidResolver.resolve(pid)
             return content.name
+        } else if (pid.startsWith("http://purl.obolibrary.org")) {
+            return ontobeeResolver.parse(pid)
+        } else {
+            return pid
         }
     }, [])
 

src/components/result/PidDisplay.tsx

@@ -3,9 +3,8 @@ import { Label } from "@/components/ui/label"
 import { PidDisplay } from "@/components/result/PidDisplay"
 import { FacetValue } from "@elastic/search-ui"
 import { FairDOFacetConfig } from "@/config/FairDOConfig"
-import { useEffect, useMemo } from "react"
+import { useMemo } from "react"
 import { tryURLPrettyPrint } from "@/lib/utils"
-import { ontobeeResolver } from "@/lib/OntobeeResolver"
 
 export function DefaultFacetOption({
     option,
@@ -28,16 +27,10 @@ export function DefaultFacetOption({
         } else return value
     }, [facetConfig.prettyPrintURLs, value])
 
-    useEffect(() => {
-        if (value.startsWith("http://purl.obolibrary.org")) {
-            ontobeeResolver.parse(value)
-        }
-    }, [value])
-
     return (
         <div key={value} className="flex max-w-full items-center gap-2 break-words p-1 pb-2">
             <Checkbox id={value} checked={option.selected} onCheckedChange={(v) => (v ? onSelect(value) : onRemove(value))} />
-            <Label htmlFor={value} className="min-w-0 grow break-words [&:not(:hover)]:truncate">
+            <Label htmlFor={value} className="min-w-0 grow break-words">
                 {value ? (
                     facetConfig.usePidResolver ? (
                         <PidDisplay pid={value} />

src/components/search/DefaultFacetOption.tsx

@@ -102,7 +102,8 @@ export class FairDOConfigBuilder {
         return {
             index_names,
             search_fields: allSearchFields,
-            result_fields: allResultFields
+            result_fields: allResultFields,
+            disjunctiveFacets: this.getConfig().disjunctiveFacets
         }
     }
 

src/config/FairDOConfigBuilder.ts

@@ -1,23 +1,26 @@
-import { ParsingClient } from "sparql-http-client"
+import { z } from "zod"
 
-export class OntobeeResolver {
-    private client: ParsingClient
-
-    constructor() {
-        this.client = new ParsingClient({ endpointUrl: "https://sparql.hegroup.org/sparql" })
-    }
+const TS4TIBResponse = z.object({
+    response: z.object({
+        docs: z.object({ label: z.string(), iri: z.string() }).array()
+    })
+})
 
+export class OntobeeResolver {
     async parse(url: string) {
         try {
-            const result = await this.client.query.select(`
-            DEFINE sql:describe-mode "CBD"
-            DESCRIBE <${url}>
-            FROM <http://purl.obolibrary.org/obo/merged/CHMO>
-        `)
-
-            console.log(result)
+            const result = await fetch(`https://service.tib.eu/ts4tib/api/select?q=${url}`)
+            const data = await result.json()
+            const parsed = TS4TIBResponse.parse(data)
+            const entry = parsed.response.docs.find((entry) => entry.iri === url)
+            if (entry) return entry.label
+            else {
+                console.log("Found no matching entry", parsed.response.docs)
+                return url
+            }
         } catch (e) {
             console.error(e)
+            return url
         }
     }
 }

src/lib/OntobeeResolver.ts

@@ -44,7 +44,7 @@ const demoConfig: FairDOConfig = {
                 {
                     key: "NMR_Method.keyword",
                     label: "NMR Method",
-                    prettyPrintURLs: true
+                    usePidResolver: true
                 }
             ],
             resultFields: [], // Leave empty to get all fields
@@ -85,13 +85,14 @@ const demoConfig2: FairDOConfig = {
                 {
                     key: "NMR_Method.keyword",
                     label: "NMR Method",
-                    prettyPrintURLs: true
+                    usePidResolver: true
                 }
             ],
             resultFields: [], // Leave empty to get all fields
             searchFields: ["name", "pid", "hasMetadata", "isMetadataFor", "NMR_Method"]
         }
-    ]
+    ],
+    disjunctiveFacets: ["NMR_Method.keyword"]
 }
 
 export const DemoElastic: Story = {