replace person related works with REST API

datacite · Jan 17, 2025 · 23c1ed8 · 23c1ed8
1 parent c22c6f3
commit 23c1ed8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 4 deletions.
diff --git a/src/app/orcid.org/[orcid]/RelatedContent.tsx b/src/app/orcid.org/[orcid]/RelatedContent.tsx
@@ -25,7 +25,7 @@ export default function RelatedContent(props: Props) {
   const searchParams = useSearchParams()
   const { variables } = mapSearchparams(Object.fromEntries(searchParams.entries()) as any)
 
-  const vars = { id: 'http://orcid.org/' + orcid, ...variables }
+  const vars = { userId: 'http://orcid.org/' + orcid, ...variables }
 
   const { loading, data, error } = usePersonRelatedContentQuery(vars)
 

diff --git a/src/data/queries/personRelatedContentQuery.ts b/src/data/queries/personRelatedContentQuery.ts
@@ -1,10 +1,36 @@
 import { gql, useQuery } from "@apollo/client";
 import { workConnection, workFragment } from "src/data/queries/queryFragments";
-import { QueryData, QueryVar } from "src/data/queries/personQuery";
+import { QueryData, QueryVar as QueryVarGQL } from "src/data/queries/personQuery";
+import { useSearchDoiQuery, QueryVar } from "./searchDoiQuery";
+import { useSearchDoiFacetsQuery } from "./searchDoiFacetsQuery";
 
 
 export function usePersonRelatedContentQuery(variables: QueryVar) {
-  const { loading, data, error } = useQuery<QueryData, QueryVar>(
+  const results = useSearchDoiQuery(variables)
+  const facets = useSearchDoiFacetsQuery(variables)
+
+  const loading = results.loading || facets.loading;
+  const error = results.error || facets.error;
+
+  if (loading || error) return { loading, data: undefined, error }
+
+
+  const person = {
+    works: {
+      ...results.data?.works || {},
+      ...facets.data?.works
+    }
+  }
+
+  return {
+    ...results,
+    data: { person } as QueryData,
+  }
+}
+
+
+export function usePersonRelatedContentQueryGQL(variables: QueryVarGQL) {
+  const { loading, data, error } = useQuery<QueryData, QueryVarGQL>(
     RELATED_CONTENT_QUERY,
     {
       variables,

diff --git a/src/data/queries/searchDoiFacetsQuery.ts b/src/data/queries/searchDoiFacetsQuery.ts
@@ -51,7 +51,7 @@ function convertToQueryData(json: any): QueryData {
       affiliations: meta.affiliations,
       repositories: [],
       registrationAgencies: meta.registrationAgencies,
-      authors: [].slice(0, 10),
+      authors: meta.authors.slice(0, 10),
       creatorsAndContributors: meta.creatorsAndContributors.slice(0, 10),
       clientTypes: meta.clientTypes.slice(0, 10),
       personToWorkTypesMultilevel: []

diff --git a/src/data/queries/searchDoiQuery.ts b/src/data/queries/searchDoiQuery.ts
@@ -32,6 +32,7 @@ export function appendFacets(variables: QueryVar, searchParams: URLSearchParams)
   if (variables.published) searchParams.append('published', variables.published)
   if (variables.resourceTypeId) searchParams.append('resource-type-id', variables.resourceTypeId)
   if (variables.fieldOfScience) searchParams.append('field-of-science', variables.fieldOfScience)
+  if (variables.userId) searchParams.append('user-id', variables.userId)
   if (variables.clientId) searchParams.append('client-id', variables.clientId)
   if (variables.clientType) searchParams.append('client-type', variables.clientType)
 }
@@ -149,6 +150,7 @@ export interface QueryVar {
   query?: string
   filterQuery?: string
   rorId?: string
+  userId?: string
   clientId?: string
   cursor?: string
   published?: string