Expect array on some more fields

Author: craquet

src/components/result/GenericResultView.tsx

@@ -123,13 +123,16 @@ export function GenericResultView({
     const getField = useCallback(
         (field: string) => {
             try {
-                return autoUnwrap(
+                const value = autoUnwrap(
                     z
                         .string()
-                        .or(z.object({ raw: z.string() }))
+                        .or(z.number())
+                        .or(z.object({ raw: z.string().or(z.number()) }))
                         .optional()
                         .parse(result[field])
                 )
+
+                return value ? value + "" : undefined
             } catch (e) {
                 console.warn(`Parsing field ${field} failed`, e)
                 return undefined
@@ -141,14 +144,17 @@ export function GenericResultView({
     const getArrayField = useCallback(
         (field: string) => {
             try {
-                return autoUnwrapArray(
+                const value = autoUnwrapArray<string | number>(
                     z
                         .string()
                         .array()
+                        .or(z.number().array())
                         .or(z.object({ raw: z.string().array() }))
+                        .or(z.object({ raw: z.number().array() }))
                         .optional()
                         .parse(result[field])
                 )
+                return value ? value.map((v) => v + "") : []
             } catch (e) {
                 console.warn(`Parsing array field ${field} failed`, e)
                 return []
@@ -179,12 +185,14 @@ export function GenericResultView({
     }, [getField, pidField])
 
     const title = useMemo(() => {
-        return getField(titleField ?? "name")
-    }, [getField, titleField])
+        const maybeArray = getArrayOrSingleField(titleField ?? "name")
+        return Array.isArray(maybeArray) ? maybeArray.join(", ") : maybeArray
+    }, [getArrayOrSingleField, titleField])
 
     const description = useMemo(() => {
-        return getField(descriptionField ?? "description")
-    }, [descriptionField, getField])
+        const maybeArray = getArrayOrSingleField(descriptionField ?? "description")
+        return Array.isArray(maybeArray) ? maybeArray.join("\n\r") : maybeArray
+    }, [descriptionField, getArrayOrSingleField])
 
     const doLocation = useMemo(() => {
         const value = getField(digitalObjectLocationField ?? "digitalObjectLocation")
@@ -203,8 +211,9 @@ export function GenericResultView({
     }, [getArrayOrSingleField, imageField])
 
     const identifier = useMemo(() => {
-        return getField(additionalIdentifierField ?? "identifier")
-    }, [getField, additionalIdentifierField])
+        const maybeArray = getArrayOrSingleField(additionalIdentifierField ?? "identifier")
+        return Array.isArray(maybeArray) ? maybeArray.join(" - ") : maybeArray
+    }, [getArrayOrSingleField, additionalIdentifierField])
 
     const isMetadataFor = useMemo(() => {
         const val = getArrayOrSingleField(relatedItemPidsField ?? "isMetadataFor")

src/components/result/utils.ts

@@ -1,4 +1,4 @@
-export function autoUnwrap(item?: string | { raw?: string }) {
+export function autoUnwrap<E>(item?: E | { raw?: E }) {
     if (!item) {
         return undefined
     } else if (typeof item === "string") {
@@ -10,7 +10,7 @@ export function autoUnwrap(item?: string | { raw?: string }) {
     }
 }
 
-export function autoUnwrapArray(item?: string[] | { raw?: string[] }) {
+export function autoUnwrapArray<E>(item?: E[] | { raw?: E[] }) {
     if (!item) {
         return []
     }

src/stories/FairDOElasticSearch.stories.tsx

@@ -34,14 +34,27 @@ const demoConfig: FairDOConfig = {
                     label: "Source",
                     prettyPrintURLs: true
                 },
+                {
+                    key: "NMR_Method.keyword",
+                    label: "NMR Method",
+                    usePidResolver: true
+                },
+                {
+                    key: "Pulse_Sequence_Name.keyword",
+                    label: "Pulse Sequence Name"
+                },
+                {
+                    key: "Acquisition_Nucleus.keyword",
+                    label: "Acquisition Nucleus"
+                },
                 {
                     key: "licenseURL.keyword",
                     label: "License",
                     prettyPrintURLs: true
                 },
                 {
-                    key: "NMR_Method.keyword",
-                    label: "NMR Method",
+                    key: "digitalObjectType.keyword",
+                    label: "File Type",
                     usePidResolver: true
                 }
             ],
@@ -153,7 +166,7 @@ export const GenericResultRenderer: Story = {
                 parentItemPidField="hasMetadata"
                 relatedItemPidsField="isMetadataFor"
                 pidField="pid"
-                relatedItemsPrefetch={{ prefetchAmount: 20, searchFields: { pid: {}, isMetadataFor: {}, hasMetadata: {} } }}
+                relatedItemsPrefetch={{ searchFields: { pid: {}, isMetadataFor: {}, hasMetadata: {} } }}
                 showOpenInFairDoScope
             />
         )
@@ -199,7 +212,7 @@ export const CompoundSlider: Story = {
                 parentItemPidField="hasMetadata"
                 relatedItemPidsField="isMetadataFor"
                 pidField="pid"
-                relatedItemsPrefetch={{ prefetchAmount: 20, searchFields: { pid: {}, isMetadataFor: {}, hasMetadata: {} } }}
+                relatedItemsPrefetch={{ searchFields: { pid: {}, isMetadataFor: {}, hasMetadata: {} } }}
                 showOpenInFairDoScope
             />
         )