Merge pull request #520 from thepolicylab-projectportals/fix/dont-re-…

…sort-project-team fix: don't re-sort the project team
thepolicylab-projectportals · Jul 29, 2023 · a0f2efa · a0f2efa
2 parents 69e6c92 + 31b5131
commit a0f2efa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/packages/example-site/content/project/completed-project.json b/packages/example-site/content/project/completed-project.json
@@ -2,8 +2,8 @@
   "question": "Hello world (from json)?",
   "mainContact": "first-contact",
   "projectTeam": [
-    "first-contact",
-    "second-contact"
+    "second-contact",
+    "first-contact"
   ],
   "title": "completed 1",
   "agency": "example agency",

diff --git a/packages/project-portal-content-netlify/gatsby-node.js b/packages/project-portal-content-netlify/gatsby-node.js
@@ -126,12 +126,18 @@ exports.createSchemaCustomization = ({ actions, schema, getNode }) => {
         projectTeam: {
           type: [CONTACT_JSON_TYPE],
           resolve: async (source, args, context) => {
-            const { entries } = await context.nodeModel.findAll({
-              type: CONTACT_JSON_TYPE,
-              query: {
-                filter: { slug: { in: source.projectTeam ?? [] } },
-              },
-            })
+            projectTeam = source.projectTeam || []
+            const entries = []
+            projectTeam.forEach((element) =>
+              entries.push(
+                context.nodeModel.findOne({
+                  type: CONTACT_JSON_TYPE,
+                  query: {
+                    filter: { slug: { eq: element } },
+                  },
+                })
+              )
+            )
             return entries
           },
         },