Fix regression when parent list of a Content field had a where clau…

…se as its access control. (#1673)
keystonejs · Sep 18, 2019 · 04aa6a0 · 04aa6a0
1 parent b1d73ab
commit 04aa6a0
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 5 deletions.
diff --git a/.changeset/dry-clouds-sit/changes.json b/.changeset/dry-clouds-sit/changes.json
@@ -0,0 +1,7 @@
+{
+  "releases": [
+    { "name": "@keystone-alpha/field-content", "type": "patch" },
+    { "name": "@keystone-alpha/fields", "type": "patch" }
+  ],
+  "dependents": []
+}
diff --git a/.changeset/dry-clouds-sit/changes.md b/.changeset/dry-clouds-sit/changes.md
@@ -0,0 +1 @@
+Fix regression when parent list of a Content field had a `where` clause as its access control.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -134,7 +134,9 @@ We also build commonjs builds to run in node (for testing with jest or etc.) and
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
 
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+
 <!-- prettier-ignore -->
+
 <table>
   <tr>
     <td align="center"><a href="http://www.thinkmill.com.au"><img src="https://avatars3.githubusercontent.com/u/872310?v=4" width="100px;" alt="Jed Watson"/><br /><sub><b>Jed Watson</b></sub></a><br /><a href="https://github.com/keystonejs/keystone-5/commits?author=JedWatson" title="Code">💻</a></td>

diff --git a/demo-projects/todo/package.json b/demo-projects/todo/package.json
@@ -22,4 +22,4 @@
     "@keystone-alpha/app-static": "^1.1.1",
     "cross-env": "^5.2.0"
   }
-}
+}
diff --git a/packages/field-content/src/Implementation.js b/packages/field-content/src/Implementation.js
@@ -167,7 +167,16 @@ export class Content extends Relationship.implementation {
             };
           },
         },
-        access: listConfig.listAccess,
+        access: Object.entries(listConfig.listAccess).reduce(
+          (acc, [schemaName, access]) => ({
+            ...acc,
+            [schemaName]: Object.entries(access).reduce(
+              (acc, [op, rule]) => ({ ...acc, [op]: !!rule }), // Reduce the entries to truthy values
+              {}
+            ),
+          }),
+          {}
+        ),
       });
     }
 

diff --git a/packages/fields/src/types/CloudinaryImage/ImageBlock.js b/packages/fields/src/types/CloudinaryImage/ImageBlock.js
@@ -57,7 +57,16 @@ export class ImageBlock extends Block {
               'A reference back to the Slate.js Serialised Document this image is embedded within',
           },
         },
-        access: listConfig.listAccess,
+        access: Object.entries(listConfig.listAccess).reduce(
+          (acc, [schemaName, access]) => ({
+            ...acc,
+            [schemaName]: Object.entries(access).reduce(
+              (acc, [op, rule]) => ({ ...acc, [op]: !!rule }), // Reduce the entries to truthy values
+              {}
+            ),
+          }),
+          {}
+        ),
       });
     }
 

diff --git a/packages/fields/src/types/OEmbed/OEmbedBlock.js b/packages/fields/src/types/OEmbed/OEmbedBlock.js
@@ -51,7 +51,16 @@ export class OEmbedBlock extends Block {
               'A reference back to the Slate.js Serialised Document this embed is contained within',
           },
         },
-        access: listConfig.listAccess,
+        access: Object.entries(listConfig.listAccess).reduce(
+          (acc, [schemaName, access]) => ({
+            ...acc,
+            [schemaName]: Object.entries(access).reduce(
+              (acc, [op, rule]) => ({ ...acc, [op]: !!rule }), // Reduce the entries to truthy values
+              {}
+            ),
+          }),
+          {}
+        ),
       });
     }
 

diff --git a/packages/fields/src/types/Unsplash/UnsplashBlock.js b/packages/fields/src/types/Unsplash/UnsplashBlock.js
@@ -63,7 +63,16 @@ export class UnsplashBlock extends Block {
               'A reference back to the Slate.js Serialised Document this unsplash image is contained within',
           },
         },
-        access: listConfig.listAccess,
+        access: Object.entries(listConfig.listAccess).reduce(
+          (acc, [schemaName, access]) => ({
+            ...acc,
+            [schemaName]: Object.entries(access).reduce(
+              (acc, [op, rule]) => ({ ...acc, [op]: !!rule }), // Reduce the entries to truthy values
+              {}
+            ),
+          }),
+          {}
+        ),
       });
     }