@blaze-cms/react-page-builder 0.127.0 → 0.128.0-admin-updates.3

package/src/components/List/components/Cards/CardsRenderItem.js

@@ -11,7 +11,6 @@ const CardsRenderItem = ({
   listProps,
   bannerProps,
   index,
-  entity,
   currentListLength,
   cardChildren,
   gtmChildren,
@@ -26,7 +25,8 @@ const CardsRenderItem = ({
   autoScrollTimer,
   arrowSize,
   overlayModifier,
-  titleOverlayModifier
+  titleOverlayModifier,
+  graphqlEntityMap
 }) => {
   const {
     initialOffset,
@@ -64,7 +64,7 @@ const CardsRenderItem = ({
         {renderWaypoint && <Waypoint onEnter={triggerInfiniteScroll} />}
         <Card
           id={id}
-          entity={entity}
+          graphqlEntityMap={graphqlEntityMap}
           gridModifier={gridModifier}
           propsToDisplay={propsToDisplay}
           parsedPropsToDisplay={parsedPropsToDisplay}
@@ -102,7 +102,7 @@ CardsRenderItem.propTypes = {
   bannerProps: PropTypes.object,
   gridModifier: PropTypes.string,
   propsToDisplay: PropTypes.array,
-  entity: PropTypes.string.isRequired,
+  graphqlEntityMap: PropTypes.object.isRequired,
   modifier: PropTypes.string,
   cardChildren: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
   gtmChildren: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),

package/src/components/index.js

@@ -51,5 +51,6 @@ export default {
   ),
   contentgroupsection: dynamic(() =>
     import(/* webpackChunkName: "blazePbContentGroupSection" */ './ContentGroupSection')
-  )
+  ),
+  iframe: dynamic(() => import(/* webpackChunkName: "blazePbIframe" */ './Iframe'))
 };

package/src/helpers/build-props-query.js

@@ -6,11 +6,11 @@ const categoryProps = 'id publishedListingPage{id, url}';
 const checkProps = props =>
   !!(props && Object.keys(props).filter(prop => prop === CATEGORY_ID).length);
 
-const buildPropsQuery = (data, extraProps = [], cardOptions = null) => {
+const buildPropsQuery = (entitySchema, extraProps = [], cardOptions = null) => {
+  const parsedSchema = entitySchema.getEntitySchema ? entitySchema.getEntitySchema : entitySchema;
   const extraPropsHaveCategory = !!extraProps.filter(prop => prop.includes('category.')).length;
-
   const { typeBasedProps, shouldAddCategoryProps } = getTypeBaseProps(
-    data,
+    parsedSchema,
     cardOptions,
     extraPropsHaveCategory
   );
@@ -22,11 +22,11 @@ const buildPropsQuery = (data, extraProps = [], cardOptions = null) => {
   const basicProps = uniqueProps
     .filter(prop => prop && !prop.includes('.'))
     .filter((prop, i, arr) => arr.indexOf(prop) === i);
-  const complexProps = buildComplexProps(shouldAddCategoryProps, uniqueProps, data);
+  const complexProps = buildComplexProps(shouldAddCategoryProps, uniqueProps, parsedSchema);
   return [...basicProps, ...complexProps].join(',');
 };
 
-const buildComplexProps = (shouldAddCategoryProps, props, { getEntitySchema: { relations } }) =>
+const buildComplexProps = (shouldAddCategoryProps, props, { relations }) =>
   props
     .filter(prop => prop && prop.includes('.'))
     .map(nested => nested.split('.')[0])
@@ -50,7 +50,7 @@ const buildComplexProps = (shouldAddCategoryProps, props, { getEntitySchema: { r
       return `${base}{${jointNestedProps}}`;
     });
 
-const getTypeBaseProps = (data, cardOptions, extraPropsHaveCategory) => {
+const getTypeBaseProps = (entitySchema, cardOptions, extraPropsHaveCategory) => {
   const isCard = !!cardOptions;
   const { displayCategory = true, displayThumbnail = true } = cardOptions || {};
 
@@ -59,8 +59,7 @@ const getTypeBaseProps = (data, cardOptions, extraPropsHaveCategory) => {
 
   if (!isCard) return { typeBasedProps: [ID], shouldAddCategoryProps };
 
-  const { getEntitySchema } = data;
-  const { interfaces, properties, dynamicProperties, relations } = getEntitySchema;
+  const { interfaces, properties, dynamicProperties, relations } = entitySchema;
 
   const isContent = !!interfaces.includes('content/content');
   const hasCategory = checkProps(properties) || checkProps(dynamicProperties);

package/src/helpers/build-query-fields.js

@@ -1,11 +1,14 @@
-const buildQueryFields = (sanitizedEntityFields, entityType, isFullList) =>
+const buildQueryFields = (sanitizedEntityFields, entityTypes, isFullList) =>
   `results {
+    ${entityTypes.map(
+      entityType => `
     ... on ${entityType} {
       ${sanitizedEntityFields}
       __typename
       id
       ${isFullList ? 'pageBuilderComponents' : ''}
-    }
+    }`
+    )}
   },
   total
   `;

package/src/helpers/build-raw-query-base.js

@@ -36,6 +36,23 @@ const buildItemsToDisplayValues = itemsToDisplay => {
   return [{ ids: { values: itemToDisplayIds } }];
 };
 
+const buildShouldValues = docTypes => {
+  if (Array.isArray(docTypes)) {
+    return docTypes.map(docType => ({
+      match: {
+        docType
+      }
+    }));
+  }
+  return [
+    {
+      match: {
+        docType: docTypes
+      }
+    }
+  ];
+};
+
 const buildRawQueryBase = ({
   docType,
   id,
@@ -53,15 +70,9 @@ const buildRawQueryBase = ({
 
   const queryFilters = [];
   const baseBoolObject = {
-    must: [
-      {
-        term: {
-          docType
-        }
-      },
-      ...itemsToDisplayValues,
-      ...checkboxFiltersValue
-    ]
+    should: buildShouldValues(docType),
+    minimum_should_match: 1,
+    must: [...itemsToDisplayValues, ...checkboxFiltersValue]
   };
 
   if (isOperatorOr) {

package/src/helpers/get-entity-data.js

@@ -9,11 +9,11 @@ const getEntityData = (entity, schema) => {
     const { interfaces, [entity]: { interfaces: nestedInterfaces } = {} } = schema || {};
     const interfacesToCheck = interfaces || nestedInterfaces;
     if (interfacesToCheck && !interfacesToCheck.includes('publish/publishable')) {
-      return { docType: entity, entityType: upperFirst(camelcase(entity)) };
+      return { entity, docType: entity, entityType: upperFirst(camelcase(entity)) };
     }
   }
 
-  return { docType: publishedDocType, entityType: publishedEntityType };
+  return { entity, docType: publishedDocType, entityType: publishedEntityType };
 };
 
 export default getEntityData;

package/src/helpers/split-children.js

@@ -31,7 +31,7 @@ const buildListChildren = (children, filteredChildren, data) => {
     : null;
 };
 
-const splitChildren = (children, parentData, entity, parentComponent = {}) => {
+const splitChildren = (children, parentData, graphqlEntityMap, parentComponent = {}) => {
   if (!children || Array.isArray(children)) return { regularChildren: children };
   const { props: { children: nestedChildren } = {} } = children;
 
@@ -40,7 +40,7 @@ const splitChildren = (children, parentData, entity, parentComponent = {}) => {
   const parentDataWithEntity = parentData.map(item => ({
     ...item,
     itemId: item.id,
-    itemEntity: entity
+    itemEntity: graphqlEntityMap[item.__typename]
   }));
 
   const gtmChildren = buildListChildren(children, withGTMChildren, parentDataWithEntity);