Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21,676 changes: 10,813 additions & 10,863 deletions package-lock.json

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -66,31 +66,31 @@
},
"devDependencies": {
"@elastic/elasticsearch": "9.5.0",
"@eslint-react/eslint-plugin": "5.18.3",
"@eslint-react/eslint-plugin": "5.18.6",
"@eslint/eslintrc": "3.3.6",
"@eslint/js": "9.39.5",
"@storybook/addon-docs": "10.5.7",
"@storybook/addon-themes": "10.5.7",
"@storybook/react-vite": "10.5.7",
"@eslint/js": "10.0.1",
"@storybook/addon-docs": "10.5.10",
"@storybook/addon-themes": "10.5.10",
"@storybook/react-vite": "10.5.10",
"@tailwindcss/cli": "4.3.3",
"@types/luxon": "3.7.3",
"@types/luxon": "3.7.5",
"@types/react": "19.2.18",
"@types/react-dom": "19.2.4",
"@vitejs/plugin-react": "6.0.5",
"eslint": "10.8.0",
"eslint-plugin-storybook": "10.5.7",
"globals": "17.9.0",
"@types/react-dom": "19.2.5",
"@vitejs/plugin-react": "6.1.1",
"eslint": "10.9.1",
"eslint-plugin-storybook": "10.5.10",
"globals": "17.11.0",
"postcss": "8.5.26",
"postcss-cli": "11.0.1",
"postcss-prefixwrap": "1.58.0",
"prettier": "3.9.6",
"storybook": "10.5.7",
"storybook": "10.5.10",
"tailwindcss": "4.3.3",
"tailwindcss-animate": "1.0.7",
"tsc-alias": "1.9.1",
"typescript": "5.9.3",
"typescript-eslint": "8.66.0",
"vite": "8.2.1"
"tsc-alias": "1.9.2",
"typescript": "^6",
"typescript-eslint": "8.68.0",
"vite": "8.2.2"
},
"peerDependencies": {
"react": "^18 || ^19",
Expand Down
2 changes: 1 addition & 1 deletion src/components/result/GenericResultView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@
showOpenInFairDoScope = true,
showInspectFDO = true
}: GenericResultViewProps) {
const { openOrAddToRelationsGraph } = useContext(RelationsGraphContext)

Check warning on line 136 in src/components/result/GenericResultView.tsx

View workflow job for this annotation

GitHub Actions / build (24.x)

In React 19, 'use' is preferred over 'useContext' because it is more flexible

Check warning on line 136 in src/components/result/GenericResultView.tsx

View workflow job for this annotation

GitHub Actions / build (22.x)

In React 19, 'use' is preferred over 'useContext' because it is more flexible
const { searchTerm, searchFor, config } = useContext(ReactSearchComponentContext)

Check warning on line 137 in src/components/result/GenericResultView.tsx

View workflow job for this annotation

GitHub Actions / build (24.x)

In React 19, 'use' is preferred over 'useContext' because it is more flexible

Check warning on line 137 in src/components/result/GenericResultView.tsx

View workflow job for this annotation

GitHub Actions / build (22.x)

In React 19, 'use' is preferred over 'useContext' because it is more flexible
const addToResultCache = useStore(resultCache, (s) => s.set)
const [loadingRelatedItems, setLoadingRelatedItems] = useState(false)
const [showInspectDialog, setShowInspectDialog] = useState(false)
Expand Down Expand Up @@ -282,7 +282,7 @@
const pid = autoUnwrap(fields[pidField ?? "pid"])
if (!pid) continue
injectMeta(fields, entry._index)
addToResultCache(pid, fields)
addToResultCache(String(pid), fields)
} else {
console.error("Got empty hit from elastic", entry)
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/result/GenericResultViewTag.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export function GenericResultViewTag(props: GenericResultViewTagProps) {

const fieldValue = useMemo(() => {
if (valueOverride !== undefined) return valueOverride
return autoUnwrap(result[field]) as FieldValue
return autoUnwrap(result[field])
}, [field, result, valueOverride])

const value = useMemo(() => {
Expand Down Expand Up @@ -124,12 +124,12 @@ export function GenericResultViewTag(props: GenericResultViewTagProps) {
if (Array.isArray(value) && Array.isArray(fieldValue)) {
return value.map((entry, i) => <GenericResultViewTag key={field + i} {...props} valueOverride={fieldValue[value.indexOf(entry)]} />)
} else if (!label) {
return base(fieldValue, value)
return base(fieldValue ?? "no value", value)
}

return (
<Tooltip delayDuration={500}>
<TooltipTrigger>{base(fieldValue, value)}</TooltipTrigger>
<TooltipTrigger>{base(fieldValue ?? "no value", value)}</TooltipTrigger>
<TooltipContent>
<div>{label}</div>
<div className="rfs:text-xs rfs:text-muted-foreground">{clickBehaviourText}</div>
Expand Down
14 changes: 12 additions & 2 deletions src/components/result/OrcidDisplay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,22 @@ export function OrcidDisplay({ orcid }: { orcid: string }) {

const familyName = useMemo(() => {
if (!data) return null
return data["person"]["name"]["family-name"]["value"]
try {
return data["person"]["name"]["family-name"]["value"]
} catch (error) {
console.error("OrcidDisplay.familyName", error)
return "Unknown"
}
}, [data])

const givenName = useMemo(() => {
if (!data) return null
return data["person"]["name"]["given-names"]["value"]
try {
return data["person"]["name"]["given-names"]["value"]
} catch (error) {
console.error("OrcidDisplay.givenName", error)
return "Unknown"
}
}, [data])

useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui/tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const TooltipContent = React.forwardRef<
ref={ref}
sideOffset={sideOffset}
className={cn(
"rfs-root rfs:z-50 rfs:overflow-hidden rfs:rounded-md rfs:border rfs:bg-popover rfs:px-3 rfs:py-1.5 rfs:text-sm rfs:text-popover-foreground rfs:shadow-md rfs:animate-in rfs:fade-in-0 rfs:zoom-in-95 rfs:data-[state=closed]:animate-out rfs:data-[state=closed]:fade-out-0 rfs:data-[state=closed]:zoom-out-95 rfs:data-[side=bottom]:slide-in-from-top-2 rfs:data-[side=left]:slide-in-from-right-2 rfs:data-[side=right]:slide-in-from-left-2 rfs:data-[side=top]:slide-in-from-bottom-2",
"rfs-root rfs:z-50 rfs:overflow-hidden rfs:rounded-md rfs:border rfs:border-border rfs:bg-popover rfs:px-3 rfs:py-1.5 rfs:text-sm rfs:text-popover-foreground rfs:shadow-md rfs:animate-in rfs:fade-in-0 rfs:zoom-in-95 rfs:data-[state=closed]:animate-out rfs:data-[state=closed]:fade-out-0 rfs:data-[state=closed]:zoom-out-95 rfs:data-[side=bottom]:slide-in-from-top-2 rfs:data-[side=left]:slide-in-from-right-2 rfs:data-[side=right]:slide-in-from-left-2 rfs:data-[side=top]:slide-in-from-bottom-2",
className
)}
{...props}
Expand Down
12 changes: 8 additions & 4 deletions src/lib/utils.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { type ClassValue, clsx } from "clsx"
import { twMerge } from "tailwind-merge"
import { FilterValue } from "@elastic/search-ui"
import { FieldValue, FilterValue } from "@elastic/search-ui"

export function cn(...inputs: ClassValue[]) {
return twMerge(clsx(inputs))
Expand Down Expand Up @@ -38,14 +38,18 @@ export function prettyPrintURL(url: string) {
} else return url
}

export function autoUnwrap<E>(item?: E | { raw?: E | undefined }) {
export function autoUnwrap(item: unknown): FieldValue | undefined {
if (item === undefined || item === null) {
return undefined
} else if (Array.isArray(item)) {
return item.map((i) => (typeof i === "string" || typeof i === "number" || typeof i === "boolean" ? i : JSON.stringify(i)))
} else if (typeof item === "object") {
if ("raw" in item) {
return item.raw
return autoUnwrap(item.raw)
} else return JSON.stringify(item)
} else return item
} else if (typeof item === "string" || typeof item === "number" || typeof item === "boolean") {
return item
} else return JSON.stringify(item)
}

export function autoUnwrapArray<E>(item?: E[] | { raw?: E[] }) {
Expand Down
35 changes: 17 additions & 18 deletions tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
{
"compilerOptions": {
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
"target": "ES2020",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "Preserve",
"skipLibCheck": true,
"jsx": "react-jsx",
"declaration": true,
"sourceMap": true,

"outDir": "dist",
"esModuleInterop": true,
"paths": {
"@/*": ["./*"]
"compilerOptions": {
"tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
"target": "ES2020",
"lib": ["ES2020", "DOM", "DOM.Iterable"],
"module": "Preserve",
"skipLibCheck": true,
"jsx": "react-jsx",
"declaration": true,
"sourceMap": true,
"rootDir": "src",
"outDir": "dist",
"esModuleInterop": true,
"paths": {
"@/*": ["./src/*"]
}
},
"baseUrl": "./src"
},
"include": ["src"],
"exclude": ["src/stories"],
"include": ["src"],
"exclude": ["src/stories"]
}
Loading