Merge pull request #91 from TylerBarnes/fix/reference-field-dependenc…

…y-tracking fix(schema-customization): reference field dependency tracking for inc builds
contentstack · Apr 23, 2021 · 140777d · 140777d
2 parents b4ee818 + 1ddbb5c
commit 140777d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 28 deletions.
diff --git a/gatsby-node.js b/gatsby-node.js
@@ -393,18 +393,19 @@ exports.createResolvers = function (_ref7) {
       resolve: function resolve(source, args, context, info) {
         if (fileField.field.multiple && source[fileField.field.uid + '___NODE']) {
           var nodesData = [];
+
           source[fileField.field.uid + '___NODE'].forEach(function (id) {
-            context.nodeModel.getAllNodes().find(function (node) {
-              if (node.id === id) {
-                nodesData.push(node);
-              }
-            });
+            var existingNode = context.nodeModel.getNodeById({ id: id });
+
+            if (existingNode) {
+              nodesData.push(existingNode);
+            }
           });
+
           return nodesData;
         } else {
-          return context.nodeModel.getAllNodes().find(function (node) {
-            return node.id === source[fileField.field.uid + '___NODE'];
-          });
+          var id = source[fileField.field.uid + '___NODE'];
+          return context.nodeModel.getNodeById({ id: id });
         }
       }
     }));
@@ -414,13 +415,17 @@ exports.createResolvers = function (_ref7) {
       resolve: function resolve(source, args, context, info) {
         if (source[reference.uid + '___NODE']) {
           var nodesData = [];
+
           source[reference.uid + '___NODE'].forEach(function (id) {
-            context.nodeModel.getAllNodes().find(function (node) {
-              if (node.id === id) {
-                nodesData.push(node);
-              }
+            var existingNode = context.nodeModel.getNodeById({
+              id: id
             });
+
+            if (existingNode) {
+              nodesData.push(existingNode);
+            }
           });
+
           return nodesData;
         }
         return [];
@@ -440,8 +445,8 @@ exports.createResolvers = function (_ref7) {
   createResolvers(resolvers);
 };
 
-exports.pluginOptionsSchema = function (_ref7) {
-  var Joi = _ref7.Joi;
+exports.pluginOptionsSchema = function (_ref8) {
+  var Joi = _ref8.Joi;
 
   return Joi.object({
     api_key: Joi.string().required().description('API Key is a unique key assigned to each stack.'),
@@ -455,7 +460,7 @@ exports.pluginOptionsSchema = function (_ref7) {
 };
 
 var validateContentstackAccess = function () {
-  var _ref8 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(pluginOptions) {
+  var _ref9 = (0, _asyncToGenerator3.default)( /*#__PURE__*/_regenerator2.default.mark(function _callee3(pluginOptions) {
     var host;
     return _regenerator2.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -494,6 +499,6 @@ var validateContentstackAccess = function () {
   }));
 
   return function validateContentstackAccess(_x5) {
-    return _ref8.apply(this, arguments);
+    return _ref9.apply(this, arguments);
   };
 }();
diff --git a/src/gatsby-node.js b/src/gatsby-node.js
@@ -350,17 +350,19 @@ exports.createResolvers = ({ createResolvers }) => {
         resolve(source, args, context, info) {
           if (fileField.field.multiple && source[`${fileField.field.uid}___NODE`]) {
               const nodesData = [];
+
               source[`${fileField.field.uid}___NODE`].forEach(id => {
-                context.nodeModel.getAllNodes().find(node => {
-                  if (node.id === id) {
-                    nodesData.push(node);
-                  }
-                });
+                const existingNode = context.nodeModel.getNodeById({ id })
+
+                if (existingNode) {
+                  nodesData.push(existingNode);
+                }
               });
+
               return nodesData;
             } else { 
-              return context.nodeModel.getAllNodes().find(
-                node => node.id === source[`${fileField.field.uid}___NODE`])
+              const id = source[`${fileField.field.uid}___NODE`]
+              return context.nodeModel.getNodeById({ id })
             }
         },
       },
@@ -374,13 +376,17 @@ exports.createResolvers = ({ createResolvers }) => {
         resolve(source, args, context, info) {
           if (source[`${reference.uid}___NODE`]) {
             const nodesData = [];
+
             source[`${reference.uid}___NODE`].forEach(id => {
-              context.nodeModel.getAllNodes().find(node => {
-                if (node.id === id) {
-                  nodesData.push(node);
-                }
-              });
+              const existingNode = context.nodeModel.getNodeById({
+                id 
+              })
+
+              if (existingNode) {
+                nodesData.push(existingNode);
+              }
             });
+
             return nodesData;
           }
           return [];