support multiple reference fields for a single content type

gatsbyjs · May 20, 2021 · a0d7001 · a0d7001
1 parent 5f18b1d
commit a0d7001
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/e2e-tests/contentful/src/pages/content-reference.js b/e2e-tests/contentful/src/pages/content-reference.js
@@ -115,6 +115,11 @@ export const pageQuery = graphql`
           }
           ... on ContentfulContentReference {
             title
+            ... on ContentfulEntry {
+              sys {
+                id
+              }
+            }
             one {
               ... on ContentfulText {
                 title

diff --git a/packages/gatsby-source-contentful/src/generate-schema.js b/packages/gatsby-source-contentful/src/generate-schema.js
@@ -84,16 +84,27 @@ const getLinkFieldType = (linkType, field, schema, createTypes) => {
     // { validations: [ { linkContentType: [Array] } ] }
     if (linkContentTypeValidation) {
       const { linkContentType } = linkContentTypeValidation
+      const contentTypes = Array.isArray(linkContentType)
+        ? linkContentType
+        : [linkContentType]
 
       // Full type names for union members, shorter variant for the union type name
-      const translatedTypeNames = linkContentType.map(typeName =>
+      const translatedTypeNames = contentTypes.map(typeName =>
         makeTypeName(typeName)
       )
-      const shortTypeNames = linkContentType.map(typeName =>
+      const shortTypeNames = contentTypes.map(typeName =>
         makeTypeName(typeName, ``)
       )
 
-      // @todo Single content type
+      // Single content type
+      if (translatedTypeNames.length === 1) {
+        return {
+          type: translatedTypeNames.shift(),
+          extensions: {
+            link: { by: `id`, from: `${field.id}___NODE` },
+          },
+        }
+      }
 
       // Multiple content types
       const unionName = [`UnionContentful`, ...shortTypeNames].join(``)
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,6 +115,11 @@ export const pageQuery = graphql` @@
               }
               ... on ContentfulContentReference {
                 title
+                ... on ContentfulEntry {
+                  sys {
+                    id
+                  }
+                }
                 one {
                   ... on ContentfulText {
                     title
@@ Expand Down @@