Merge pull request #33 from contentstack/customSchema

bugfix: resolved "contentstack_asset" type node for the file field
contentstack · May 12, 2020 · 8aa2776 · 8aa2776
2 parents aaa28d4 + 714abca
commit 8aa2776
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 4 deletions.
diff --git a/normalize.js b/normalize.js
@@ -287,8 +287,25 @@ var buildCustomSchema = exports.buildCustomSchema = function (schema, types, par
         var type = 'type ' + prefix + '_assets implements Node { url: String }';
         types.push(type);
         fields[field.uid] = {
-          resolve: function resolve(source) {
-            return source[field.uid] || null;
+          resolve: function resolve(source, args, context) {
+            if (field.multiple && source[field.uid + '___NODE']) {
+              var nodesData = [];
+              context.nodeModel.getAllNodes({ type: prefix + '_assets' }).find(function (node) {
+                source[field.uid + '___NODE'].forEach(function (id) {
+                  if (node.id === id) {
+                    nodesData.push(node);
+                  }
+                });
+              });
+              return nodesData;
+            }
+
+            if (source[field.uid + '___NODE']) {
+              return context.nodeModel.getAllNodes({ type: prefix + '_assets' }).find(function (node) {
+                return node.id === source[field.uid + '___NODE'];
+              });
+            }
+            return null;
           }
         };
         if (field.mandatory) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-source-contentstack",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Gatsby source plugin for building websites using Contentstack as a data source",
   "scripts": {
     "prepublish": "npm run build",

diff --git a/src/normalize.js b/src/normalize.js
@@ -263,7 +263,25 @@ const buildCustomSchema = exports.buildCustomSchema = (schema, types, parent, pr
         const type = `type ${prefix}_assets implements Node { url: String }`;
         types.push(type);
         fields[field.uid] = {
-          resolve: (source) => source[field.uid] || null,
+          resolve: (source, args, context) => {
+            if (field.multiple && source[`${field.uid}___NODE`]) {
+              const nodesData = [];
+              context.nodeModel.getAllNodes({ type: `${prefix}_assets` }).find((node) => {
+                source[`${field.uid}___NODE`].forEach((id) => {
+                  if (node.id === id) {
+                    nodesData.push(node);
+                  }
+                });
+              });
+              return nodesData;
+            }
+
+            if (source[`${field.uid}___NODE`]) {
+              return context.nodeModel.getAllNodes({ type: `${prefix}_assets` })
+                .find((node) => node.id === source[`${field.uid}___NODE`]);
+            }
+            return null;
+          },
         };
         if (field.mandatory) {
           if (field.multiple) {