fix(gatsby): Fix ordering for node links when search field isn't id (g…

…atsbyjs#14176)
ajordanow · May 20, 2019 · eeb1f8c · eeb1f8c
1 parent ec038e9
commit eeb1f8c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 16 deletions.
diff --git a/packages/gatsby/src/schema/infer/__tests__/infer.js b/packages/gatsby/src/schema/infer/__tests__/infer.js
@@ -783,7 +783,7 @@ describe(`GraphQL type inference`, () => {
       const nodes = [
         {
           id: `1`,
-          linkedOnCustomField: [`test1`, `test3`],
+          linkedOnCustomField: [`test3`, `test1`],
           internal: { type: `Test` },
         },
       ].concat(getMappingNodes())
@@ -802,20 +802,28 @@ describe(`GraphQL type inference`, () => {
         }
       )
 
-      expect(result.errors).not.toBeDefined()
-      expect(result.data.allTest.edges.length).toEqual(1)
-      expect(
-        result.data.allTest.edges[0].node.linkedOnCustomField
-      ).toBeDefined()
-      expect(
-        result.data.allTest.edges[0].node.linkedOnCustomField.length
-      ).toEqual(2)
-      expect(
-        result.data.allTest.edges[0].node.linkedOnCustomField[0].label
-      ).toEqual(`First node`)
-      expect(
-        result.data.allTest.edges[0].node.linkedOnCustomField[1].label
-      ).toEqual(`Third node`)
+      expect(result).toMatchInlineSnapshot(`
+Object {
+  "data": Object {
+    "allTest": Object {
+      "edges": Array [
+        Object {
+          "node": Object {
+            "linkedOnCustomField": Array [
+              Object {
+                "label": "Third node",
+              },
+              Object {
+                "label": "First node",
+              },
+            ],
+          },
+        },
+      ],
+    },
+  },
+}
+`)
     })
   })
 

diff --git a/packages/gatsby/src/schema/resolvers.js b/packages/gatsby/src/schema/resolvers.js
@@ -146,10 +146,21 @@ const link = ({ by = `id`, from }) => async (source, args, context, info) => {
     }
   }, fieldValue)
 
-  return context.nodeModel.runQuery(
+  const result = await context.nodeModel.runQuery(
     { query: args, firstOnly: !(returnType instanceof GraphQLList), type },
     { path: context.path }
   )
+  if (
+    returnType instanceof GraphQLList &&
+    Array.isArray(fieldValue) &&
+    Array.isArray(result)
+  ) {
+    return fieldValue.map(value =>
+      result.find(obj => getValueAt(obj, by) === value)
+    )
+  } else {
+    return result
+  }
 }
 
 const fileByPath = ({ from }) => (source, args, context, info) => {