fix(wordpress): fix using blocks in multiple contents

Author: gregberge

packages/smooth-backend-wordpress/src/acf/config/index.js

@@ -1,13 +1,10 @@
-import oneBlock from './oneBlock'
+import isBlock from './isBlock'
 import oneContent from './oneContent'
 
 export function generateConfig(ast, helpers) {
   const state = { ast }
-  const layouts = ast.definitions
-    .map(def => oneBlock(def, helpers, state))
-    .filter(x => x)
 
-  state.blockLayouts = layouts
+  state.blockNodes = ast.definitions.filter(def => isBlock(def, helpers))
 
   const contentFieldGroups = ast.definitions
     .map(def => oneContent(def, helpers, state))

packages/smooth-backend-wordpress/src/acf/config/isBlock.js

@@ -0,0 +1,6 @@
+export default function isBlock(node, helpers) {
+  const { gql: g } = helpers
+  if (!g.isObjectTypeDefinition(node)) return false
+  if (!g.getDirective(node, 'block')) return false
+  return true
+}

packages/smooth-backend-wordpress/src/acf/config/oneBlock.js

@@ -2,11 +2,9 @@ import allFields from './allFields'
 
 export default function oneBlock(node, helpers, state) {
   const { gql: g, acf: a } = helpers
-  if (!g.isObjectTypeDefinition(node)) return null
-  if (!g.getDirective(node, 'block')) return null
 
   const name = g.getName(node)
-  const id = `blocks_${name}`
+  const id = `${state.parentId}_blocks_${name}`
   const description = node.description ? node.description.value : null
   const fields = allFields(node, helpers, { ...state, parentId: id })
 

packages/smooth-backend-wordpress/src/acf/config/oneField.js

@@ -1,5 +1,6 @@
 import { singularize, humanize } from 'smooth/utils'
 import allFields from './allFields'
+import oneBlock from './oneBlock'
 
 function enumValuesToChoices(nodes, helpers) {
   const { gql: g } = helpers
@@ -119,7 +120,7 @@ const handlers = {
     return {
       type: 'flexible_content',
       button_label: 'Add block',
-      layouts: state.blockLayouts,
+      layouts: state.blockNodes.map(node => oneBlock(node, helpers, state)),
     }
   },
   union({ list, name, type }, helpers, state) {