Merge pull request #376 from datacite/all-related

Add All option to related works filters
datacite · Jul 30, 2024 · 403926e · 403926e
2 parents 9093c7e + 83591bf
commit 403926e
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 38 deletions.
diff --git a/src/app/doi.org/[...doi]/RelatedContent.tsx b/src/app/doi.org/[...doi]/RelatedContent.tsx
@@ -45,6 +45,7 @@ export default function RelatedContent(props: Props) {
 
   const relatedWorks = data.work
 
+  const allRelatedCount = relatedWorks.allRelated?.totalCount || 0
   const referenceCount = relatedWorks.references?.totalCount || 0
   const citationCount = relatedWorks.citations?.totalCount || 0
   const partCount = relatedWorks.parts?.totalCount || 0
@@ -56,6 +57,7 @@ export default function RelatedContent(props: Props) {
   const url = '/doi.org/' + relatedWorks.doi + '/?'
 
   const connectionTypeCounts = {
+    allRelated: allRelatedCount,
     references: referenceCount,
     citations: citationCount,
     parts: partCount,
@@ -64,12 +66,21 @@ export default function RelatedContent(props: Props) {
   }
 
   const defaultConnectionType =
+    allRelatedCount > 0 ? 'allRelated' :
     referenceCount > 0 ? 'references' :
-      citationCount > 0 ? 'citations' :
-        partCount > 0 ? 'parts' :
-          partOfCount > 0 ? 'partOf' : 'otherRelated'
+    citationCount > 0 ? 'citations' :
+    partCount > 0 ? 'parts' :
+    partOfCount > 0 ? 'partOf' : 'otherRelated'
 
   const displayedConnectionType = connectionType ? connectionType : defaultConnectionType
+  //convert camel case to title and make first letter uppercase
+  //convert connectionType to title, allRelated becomes All Related Wokrs, references becomes References, citations becomes Citations, parts becomes Parts, partOf becomes Part Of, and otherRelated becomes Other Works
+  const displayedConnectionTitle =
+    displayedConnectionType === 'allRelated' ? 'All Related Works' :
+    displayedConnectionType === 'otherRelated' ? 'Other Works' :
+    displayedConnectionType.replace(/([A-Z])/g, ' $1').replace(/^./, str => str.toUpperCase())
+
+
 
 
   const works: Works = displayedConnectionType in relatedWorks ?
@@ -98,7 +109,7 @@ export default function RelatedContent(props: Props) {
               connectionTypesCounts={connectionTypeCounts}
               showAnalytics={true}
               showSankey={showSankey}
-              sankeyTitle={`Contributions to ${displayedConnectionType}`}
+              sankeyTitle={`Contributions to ${displayedConnectionTitle}`}
               showClaimStatus={true}
               hasPagination={works.totalCount > 25}
               hasNextPage={hasNextPage}

diff --git a/src/components/WorkFacets/WorkFacets.tsx b/src/components/WorkFacets/WorkFacets.tsx
@@ -12,7 +12,7 @@ interface Props {
   model: string
   url: string
   loading: boolean
-  connectionTypesCounts?: { references: number, citations: number, parts: number, partOf: number, otherRelated: number }
+  connectionTypesCounts?: { references: number, citations: number, parts: number, partOf: number, otherRelated: number, allRelated: number }
 }
 
 interface Facets {
@@ -50,6 +50,7 @@ export default function WorkFacets({
   const path = url.substring(0, url.length - 2)
 
   const connectionTypeList: Facet[] = connectionTypesCounts ? [
+    { id: 'allRelated', title: 'All', count: connectionTypesCounts.allRelated },
     { id: 'references', title: 'References', count: connectionTypesCounts.references },
     { id: 'citations', title: 'Citations', count: connectionTypesCounts.citations },
     { id: 'parts', title: 'Parts', count: connectionTypesCounts.parts },

diff --git a/src/components/WorksListing/WorksListing.tsx b/src/components/WorksListing/WorksListing.tsx
@@ -17,7 +17,7 @@ interface Props {
   showSankey?: boolean
   sankeyTitle?: string
   showFacets: boolean
-  connectionTypesCounts?: { references: number, citations: number, parts: number, partOf: number, otherRelated: number }
+  connectionTypesCounts?: { references: number, citations: number, parts: number, partOf: number, otherRelated: number , allRelated: number}
   showClaimStatus: boolean
   loading: boolean
   model: string

diff --git a/src/data/queries/doiQuery.ts b/src/data/queries/doiQuery.ts
@@ -109,7 +109,7 @@ export const workFragment = gql`
       title
     }
     repository {
-      id:uid
+      id: uid
       name
     }
     rights {
@@ -164,9 +164,7 @@ export const DOI_METADATA_QUERY = gql`
 `
 
 export const DOI_QUERY = gql`
-  query getDoiQuery(
-    $id: ID!
-  ) {
+  query getDoiQuery($id: ID!) {
     work(id: $id) {
       ...WorkFragment
       contentUrl
@@ -229,11 +227,28 @@ export const RELATED_CONTENT_QUERY = gql`
     $repositoryId: String
   ) {
     work(id: $id) {
-      doi,
+      doi
       types {
-        resourceTypeGeneral,
+        resourceTypeGeneral
         resourceType
-      },
+      }
+      allRelated(
+        first: 25
+        query: $filterQuery
+        after: $cursor
+        published: $published
+        resourceTypeId: $resourceTypeId
+        fieldOfScience: $fieldOfScience
+        language: $language
+        license: $license
+        registrationAgency: $registrationAgency
+        repositoryId: $repositoryId
+      ) {
+        ...WorkConnectionFragment
+        nodes {
+          ...WorkFragment
+        }
+      }
       citations(
         first: 25
         query: $filterQuery
@@ -333,7 +348,6 @@ export interface MetadataQueryData {
   work: WorkMetadata
 }
 
-
 export interface QueryData {
   work: Work
 }
@@ -348,4 +362,4 @@ export interface QueryVar {
   license?: string
   fieldOfScience?: string
   registrationAgency?: string
-}
+}
diff --git a/src/data/types.ts b/src/data/types.ts
@@ -40,7 +40,7 @@ export type Work = WorkMetadata & {
     id: string
     name: string
   }
-  
+
   registered?: Date
   formattedCitation?: string
   claims?: Claim[]
@@ -57,9 +57,9 @@ export type Work = WorkMetadata & {
   parts?: Works
   partOf?: Works
   otherRelated?: Works
+  allRelated?: Works
 }
 
-
 export type Works = {
   totalCount: number
   pageInfo: PageInfo
@@ -73,8 +73,6 @@ export type Works = {
   personToWorkTypesMultilevel: MultilevelFacet[]
 }
 
-
-
 type Title = {
   title: string
 }
@@ -97,7 +95,6 @@ export type Rights = {
   rightsIdentifier: string
 }
 
-
 type Creator = {
   id: string
   name: string
@@ -153,8 +150,6 @@ type UsageMonth = {
   total: number
 }
 
-
-
 // Organization types
 export type OrganizationMetadata = {
   name: string
@@ -179,7 +174,6 @@ export type Organization = OrganizationMetadata & {
   works: Works
 }
 
-
 export type Organizations = {
   totalCount: number
   pageInfo: PageInfo
@@ -188,8 +182,6 @@ export type Organizations = {
   nodes: Organization[]
 }
 
-
-
 type Geolocation = {
   pointLongitude: number
   pointLatitude: number
@@ -200,8 +192,6 @@ type OrganizationIdentifier = {
   identifierType: string
 }
 
-
-
 // People types
 export type PersonMetadata = {
   id: string
@@ -225,15 +215,13 @@ export interface Person extends PersonMetadata {
   works: PersonWorks
 }
 
-
 export interface People {
   __typename: String
   totalCount: number
   pageInfo: PageInfo
   nodes: Person[]
 }
 
-
 interface Link {
   name: string
   url: string
@@ -253,8 +241,6 @@ interface PersonWorks extends Works {
   openLicenseResourceTypes: Facet[]
 }
 
-
-
 // Repository types
 export type RepositoryMetadata = {
   id: string
@@ -293,8 +279,6 @@ export interface Repositories {
   nodes: Repository[]
 }
 
-
-
 interface RepositoryWorks {
   totalCount: number
   languages: Facet[]
@@ -305,8 +289,6 @@ interface RepositoryWorks {
   published: Facet[]
 }
 
-
-
 interface RepositoryFacet extends Facet {
   name: string
 }
@@ -319,9 +301,6 @@ type DefinedTerm = {
   name: string
 }
 
-
-
-
 // Shared types
 type Identifier = {
   identifier: string