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

package/src/components/Card/{CardFactory.js → CardsFactory.js}

@@ -2,13 +2,21 @@ import React from 'react';
 import { useQuery } from '@apollo/client';
 import PropTypes from 'prop-types';
 import { getSingleEntitySchema } from '../../application/query';
-import CardRender from './CardRender';
+import CardsRender from './CardsRender';
 import { buildPropsQuery, getGenericProps, checkPropsToUse } from '../../helpers';
 import { WITH_BANNER } from '../../constants';
 
-const CardFactory = ({ entity, propsToDisplay, itemsToDisplay, itemListName, ...cardProps }) => {
+const CardsFactory = ({
+  entity,
+  entities,
+  propsToDisplay,
+  itemsToDisplay,
+  itemListName,
+  ...cardProps
+}) => {
+  const entityTouse = entities && entities.length ? entities[0] : entity;
   const { data, error, loading } = useQuery(getSingleEntitySchema, {
-    variables: { id: entity }
+    variables: { id: entityTouse }
   });
 
   if (loading) return '';
@@ -21,29 +29,33 @@ const CardFactory = ({ entity, propsToDisplay, itemsToDisplay, itemListName, ...
   const extraModifierForBanner = cardRenderProps.banner ? WITH_BANNER : '';
 
   return (
-    <CardRender
+    <CardsRender
       gridModifier={`${gridModifier}${extraModifierForBanner}`}
       bannerModifier={extraModifierForBanner}
-      entity={entity}
       itemsToDisplay={itemsToDisplay}
       propsToDisplay={propsToDisplay}
       entityFields={extraProps}
       {...cardRenderProps}
+      entity={entityTouse}
+      entities={entities}
     />
   );
 };
 
-CardFactory.propTypes = {
-  entity: PropTypes.string.isRequired,
+CardsFactory.propTypes = {
+  entity: PropTypes.string,
   propsToDisplay: PropTypes.array,
   itemsToDisplay: PropTypes.array,
-  itemListName: PropTypes.string
+  itemListName: PropTypes.string,
+  entities: PropTypes.array
 };
 
-CardFactory.defaultProps = {
+CardsFactory.defaultProps = {
   propsToDisplay: [],
   itemsToDisplay: [],
-  itemListName: ''
+  itemListName: '',
+  entity: null,
+  entities: null
 };
 
-export default CardFactory;
+export default CardsFactory;

package/src/components/Card/{CardRender.js → CardsRender.js}

@@ -17,14 +17,27 @@ import {
   removeExtraItems,
   appendImages
 } from '../../helpers';
-import { filtersSetup, filterQuerySetup, shouldSkipSingleQuery, shouldReturn } from './helpers';
-
-const CardContainer = dynamic(() => import('./CardContainer'));
-
-const CardRender = ({ entity, entityFields, itemsToDisplay, children, ...otherProps }) => {
+import {
+  filtersSetup,
+  filterQuerySetup,
+  shouldSkipSingleQuery,
+  shouldReturn,
+  getUpdatedSortProperties
+} from './helpers';
+
+const CardsContainer = dynamic(() => import('./CardsContainer'));
+
+const CardsRender = ({
+  entity: legacyEntity,
+  entities,
+  entityFields,
+  itemsToDisplay,
+  children,
+  ...otherProps
+}) => {
   const { isPreview } = useContext(MainContext);
   const {
-    parent: { itemId, itemEntity },
+    parent: { itemId: parentId, itemEntity: parentEntity },
     filterBy = [],
     filterByProperty = [],
     sortby,
@@ -33,16 +46,11 @@ const CardRender = ({ entity, entityFields, itemsToDisplay, children, ...otherPr
     operator: filterOperator = AND,
     useRandomSort
   } = otherProps;
-
-  const updatedSortProperties = [...sortProperties];
-  if (!updatedSortProperties.length && sort) {
-    updatedSortProperties.unshift({ sort, propsToDisplay: sortby });
-  }
-
-  const sortbyFilters = updatedSortProperties
-    .map(({ propsToDisplay }) => propsToDisplay)
-    .filter(Boolean)
-    .flat();
+  const [updatedSortProperties, sortbyFilters] = getUpdatedSortProperties(
+    sort,
+    sortby,
+    sortProperties
+  );
 
   const variableProps = {
     ...otherProps,
@@ -51,16 +59,23 @@ const CardRender = ({ entity, entityFields, itemsToDisplay, children, ...otherPr
     sortby: null
   };
 
-  const itemEntityUpdated = getUnpublishedEntityName(itemEntity);
-  const { data: mainSchemas = {}, loading: _loading, error: _error } = useGetEntitySchemasAsObj([
-    itemEntityUpdated,
-    entity
-  ]);
-
-  const schemas = Object.values(mainSchemas);
-  const currentSchema = schemas.find(({ identifier }) => identifier === itemEntityUpdated) || {};
-  const filterEntitySchema = schemas.find(({ id }) => entity === id) || {};
-  const { entityType, docType } = getEntityData(entity, filterEntitySchema);
+  const entitiesToUse = entities || [legacyEntity];
+  const primaryEntityToUse = entitiesToUse[0];
+  const unpublishedParentEntityName = getUnpublishedEntityName(parentEntity);
+  const allEntityNames = [...entitiesToUse, unpublishedParentEntityName];
+  const uniqueEntityNames = [...new Set(allEntityNames)];
+  const { data: mainSchemas = {}, loading: _loading, error: _error } = useGetEntitySchemasAsObj(
+    uniqueEntityNames
+  );
+  const parentSchema = mainSchemas[unpublishedParentEntityName] || {};
+  const filterEntitySchema = mainSchemas[primaryEntityToUse] || {};
+  const entitiesTypes = entitiesToUse.map(ent => getEntityData(ent, mainSchemas[ent]));
+  const graphqlEntityMap = entitiesTypes.reduce(
+    (acc, entityType) => ({ ...acc, [entityType.entityType]: entityType.entity }),
+    {}
+  );
+  const docTypes = entitiesTypes.map(({ docType: type }) => type);
+  const entityTypes = entitiesTypes.map(({ entityType: eType }) => eType);
 
   const {
     getAction,
@@ -71,19 +86,19 @@ const CardRender = ({ entity, entityFields, itemsToDisplay, children, ...otherPr
     filterEntityRelations
   } = filtersSetup({
     entityFields,
-    entityType,
+    entityTypes,
     filterBy,
     filterByProperty,
-    entity,
-    currentSchema,
+    entities: entitiesToUse,
+    currentSchema: parentSchema,
     filterEntitySchema,
     isPreview,
-    itemEntityUpdated
+    itemEntityUpdated: unpublishedParentEntityName
   });
-  const { data: { entityData = {} } = {}, error: _err, loading: _load } = useQuery(
+  const { data: { parentEntityData = {} } = {}, error: _err, loading: _load } = useQuery(
     generateSingleItemQuery(getAction, queryProps),
     {
-      variables: { id: itemId },
+      variables: { id: parentId },
       skip: shouldSkipSingleQuery(_loading, getAction, queryProps)
     }
   );
@@ -99,77 +114,88 @@ const CardRender = ({ entity, entityFields, itemsToDisplay, children, ...otherPr
 
   const updatedFilterBy = getUpdatedFilterBy(
     inheritedFilters,
-    entityData,
-    currentSchema,
+    parentEntityData,
+    parentSchema,
     filterEntitySchema,
-    itemId,
+    parentId,
     variableProps
   );
 
   const { limit, variables } = filterQuerySetup({
     getEntitySchemas: Object.values(requiredSchema),
-    entity,
+    entity: primaryEntityToUse,
     updatedFilterBy,
     variableProps,
-    docType,
+    docType: docTypes,
     filterOperator,
     filterEntityRelations,
     itemsToDisplay,
     entitySameAsCurrentItemEntity,
     useRandomSort
   });
-  const { data, error: cardsError, loading: cardsLoading } = useQuery(action, {
+  const { data: cardData, error: cardsError, loading: cardsLoading } = useQuery(action, {
     variables,
     fetchPolicy: useRandomSort ? 'cache-and-network' : 'cache-first',
     skip: shouldReturn(!updatedFilterBy, _loading, _load, schemaLoading, _error, _err, schemaError)
   });
-
   const imageIds = itemsToDisplay.map(({ imageId }) => imageId).filter(Boolean);
   const { data: imagesData, loading: imagesLoading } = useGetImages(imageIds, true);
   const isLoading = shouldReturn(_loading, _load, schemaLoading, cardsLoading, imagesLoading);
   const hasError = shouldReturn(_error, _err, schemaError);
 
   if (!updatedFilterBy) return null;
-  if (isLoading) return '';
+  if (isLoading) return null;
   if (hasError) return null;
   if (cardsError) return cardsError.message;
-  let { results: cardData } = data[SEARCH_PUBLISHED_CONTENT];
-
-  if (!cardData || !cardData.length) return null;
-
-  cardData = entitySameAsCurrentItemEntity ? removeExtraItems(cardData, limit, itemId) : cardData;
-  if (!cardData.length) return null;
-
-  const orderedData = useRandomSort ? cardData : sortResponseData(cardData, itemsToDisplay);
-  const { regularChildren, gtmChildren } = splitChildren(children, cardData, entity, {
-    name: variableProps.name
-  });
+  let { results: cardDataResults } = cardData[SEARCH_PUBLISHED_CONTENT];
+
+  if (!cardDataResults || !cardDataResults.length) return null;
+
+  cardDataResults = entitySameAsCurrentItemEntity
+    ? removeExtraItems(cardDataResults, limit, parentId)
+    : cardDataResults;
+  if (!cardDataResults.length) return null;
+
+  const orderedData = useRandomSort
+    ? cardDataResults
+    : sortResponseData(cardDataResults, itemsToDisplay);
+  const { regularChildren, gtmChildren } = splitChildren(
+    children,
+    cardDataResults,
+    graphqlEntityMap,
+    {
+      name: variableProps.name
+    }
+  );
   const updatedCards = appendImages(imagesData, orderedData, itemsToDisplay);
 
   return (
     <>
       {gtmChildren && renderChildren(gtmChildren)}
-      <CardContainer
+      <CardsContainer
         cardData={updatedCards}
-        entity={entity}
+        entity={primaryEntityToUse}
         gtmChildren={gtmChildren}
         cardChildren={regularChildren}
+        graphqlEntityMap={graphqlEntityMap}
         {...variableProps}
       />
     </>
   );
 };
 
-CardRender.propTypes = {
+CardsRender.propTypes = {
   children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
   entity: PropTypes.string.isRequired,
   entityFields: PropTypes.string.isRequired,
-  itemsToDisplay: PropTypes.array
+  itemsToDisplay: PropTypes.array,
+  entities: PropTypes.array
 };
 
-CardRender.defaultProps = {
+CardsRender.defaultProps = {
   children: [],
-  itemsToDisplay: []
+  itemsToDisplay: [],
+  entities: []
 };
 
-export default CardRender;
+export default CardsRender;

package/src/components/Card/helpers/filters-setup.js

@@ -3,19 +3,19 @@ import { getSearchPublishedContent } from '../../../application/query';
 
 const filtersSetup = ({
   entityFields,
-  entityType,
+  entityTypes,
   filterBy,
   filterByProperty,
-  entity,
+  entities,
   currentSchema,
   filterEntitySchema,
   isPreview,
   itemEntityUpdated
 }) => {
-  const fields = buildQueryFields(entityFields, entityType);
+  const fields = buildQueryFields(entityFields, entityTypes);
   const action = getSearchPublishedContent(fields);
   const inheritedFilters = getInheritedFilters(filterBy, filterByProperty);
-  const entitySameAsCurrentItemEntity = itemEntityUpdated === entity;
+  const entitySameAsCurrentItemEntity = entities.includes(itemEntityUpdated);
   const { relations: filterEntityRelations = [] } = filterEntitySchema;
   const queryProps = getQueryProps(inheritedFilters, currentSchema, filterEntitySchema);
   const { actions = {} } = currentSchema || {};

package/src/components/Card/helpers/get-updated-sort-properties.js

@@ -0,0 +1,14 @@
+const getUpdatedSortProperties = (sort, sortby, sortProperties = []) => {
+  const updatedSortProperties = [...sortProperties];
+  if (!updatedSortProperties.length && sort) {
+    updatedSortProperties.unshift({ sort, propsToDisplay: sortby });
+  }
+
+  const sortbyFilters = updatedSortProperties
+    .map(({ propsToDisplay }) => propsToDisplay)
+    .filter(Boolean)
+    .flat();
+  return [updatedSortProperties, sortbyFilters];
+};
+
+export default getUpdatedSortProperties;

package/src/components/Card/helpers/index.js

@@ -5,3 +5,4 @@ export { default as filtersSetup } from './filters-setup';
 export { default as filterQuerySetup } from './filter-query-setup';
 export { default as shouldReturn } from './should-return';
 export { default as shouldSkipSingleQuery } from './should-skip-single-query';
+export { default as getUpdatedSortProperties } from './get-updated-sort-properties';

package/src/components/Card/index.js

@@ -1,3 +1,3 @@
-import CardFactory from './CardFactory';
+import CardsFactory from './CardsFactory';
 
-export default CardFactory;
+export default CardsFactory;

package/src/components/ContentGroup/helpers/get-active-tab.js

@@ -1,8 +1,7 @@
 import { TAB } from '../constants';
 
 const getActiveTab = (sections, url) => {
-  const decodedUrl = decodeURI(url);
-  const activeTabName = decodedUrl.split('#')[1];
+  const activeTabName = url.split('#')[1];
   const isUrlTabValid = !!sections.find(section => section[0] === activeTabName);
   const tabToUse = (isUrlTabValid && activeTabName) || sections[0][0];
   return `${TAB}-${tabToUse}`;

package/src/components/ContentGroup/helpers/get-sections-data.js

@@ -1,7 +1,7 @@
 const getSectionsData = sections =>
   sections.map(section => {
     const { props: { component: { settings: { label, name } = {} } = {} } = {} } = section;
-    return [name, label];
+    return [encodeURI(name), label];
   });
 
 export default getSectionsData;

package/src/components/ContentGroupSection/ContentGroupSection.js

@@ -13,9 +13,10 @@ const ContentGroupSection = ({ children, name, ...props }) => {
 };
 
 ContentGroupSection.propTypes = {
-  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node])
+  children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),
+  name: PropTypes.string
 };
 
-ContentGroupSection.defaultProps = { children: null };
+ContentGroupSection.defaultProps = { children: null, name: '' };
 
 export default ContentGroupSection;

package/src/components/Iframe/Iframe.js

@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import IframeResizer from 'iframe-resizer-react';
+import { IFRAME_CLASS, DEFAULT_WIDTH } from './constants';
+
+const Iframe = ({ src, modifier, width, height, enableScrolling }) => {
+  if (!src) return null;
+  const modifierString = modifier ? ` ${modifier}` : '';
+  const iframeClassName = `${IFRAME_CLASS}${modifierString}`;
+  const defaultWidth = !width ? DEFAULT_WIDTH : {};
+  return (
+    <div className={iframeClassName}>
+      <IframeResizer
+        scrolling={enableScrolling}
+        autoResize
+        src={src}
+        sizeHeight={!height}
+        height={height}
+        width={width}
+        style={defaultWidth}
+      />
+    </div>
+  );
+};
+
+Iframe.propTypes = {
+  src: PropTypes.string.isRequired,
+  enableScrolling: PropTypes.bool,
+  modifier: PropTypes.string,
+  width: PropTypes.string,
+  height: PropTypes.string
+};
+
+Iframe.defaultProps = { enableScrolling: false, modifier: '', width: '', height: '' };
+
+export default Iframe;

package/src/components/Iframe/constants.js

@@ -0,0 +1,4 @@
+const IFRAME_CLASS = 'iframe-container';
+const DEFAULT_WIDTH = { width: '1px', minWidth: '100%' };
+
+export { IFRAME_CLASS, DEFAULT_WIDTH };

package/src/components/Iframe/index.js

@@ -0,0 +1,3 @@
+import Iframe from './Iframe';
+
+export default Iframe;

package/src/components/List/ListBuilder.js

@@ -27,12 +27,12 @@ import { RAW_RESULTS } from './constants';
 
 const ListBuilder = props => {
   const {
-    entitySchema,
+    mainSchemas,
     isCard,
     isAZ,
     inheritedFilters,
     paginationType,
-    entity,
+    entities,
     isTextSearchFilterApplied,
     parent: { itemId },
     itemsPerPage,
@@ -55,17 +55,25 @@ const ListBuilder = props => {
     sortProperties,
     itemListIds
   } = props;
+
+  const [entity] = entities;
   const isInfinite = paginationType === INFINITE;
   const listComponent = getListComponent(isCard, paginationType);
   const propsToDisplayValues = checkPropsToUse(propsToDisplay);
-  const entityFields = buildPropsQuery(entitySchema, propsToDisplayValues, props) || '';
+  const entitiesTypes = entities.map(ent => getEntityData(ent, mainSchemas[ent]));
+  const graphqlEntityMap = entitiesTypes.reduce(
+    (acc, entityType) => ({ ...acc, [entityType.entityType]: entityType.entity }),
+    {}
+  );
+  const docTypes = entitiesTypes.map(({ docType: type }) => type);
+  const entityTypes = entitiesTypes.map(({ entityType: eType }) => eType);
+  const entityFields = buildPropsQuery(filterEntitySchema, propsToDisplayValues, props) || '';
   const itemsToDisplayToUse = itemListIds || itemsToDisplay;
   const limitToUse = limit || itemsToDisplayToUse.length;
   const shouldApplyDefaultSort = !sortProperties || !sortProperties.length;
   const itemsPerPageToUse = getItemsPerPageToUse(itemsPerPage, limitToUse);
   const initialOffset = getCurrentOffset(offset, itemsPerPageToUse, paginationIndex, limitToUse);
-  const { entityType, docType } = getEntityData(entity, requiredSchema);
-  const fields = buildQueryFields(entityFields, entityType, !isCard);
+  const fields = buildQueryFields(entityFields, entityTypes, !isCard);
   const action = getSearchPublishedContent(fields);
   const actionKey = SEARCH_PUBLISHED_CONTENT;
   const updatedFilterBy = getUpdatedFilterBy(
@@ -86,7 +94,7 @@ const ListBuilder = props => {
   const stringProps = getStringTypeProps(entity, relations, Object.values(requiredSchema));
 
   const azRawQuery = buildRawQuery(
-    docType,
+    docTypes,
     operator,
     searchValues,
     {
@@ -128,7 +136,7 @@ const ListBuilder = props => {
   const updatedAggregations = buildAzAggregations(listAggregations);
 
   const rawQuery = buildRawQuery(
-    docType,
+    docTypes,
     operator,
     searchValues,
     {
@@ -173,6 +181,7 @@ const ListBuilder = props => {
       listAggregations={updatedAggregations}
       isAZ={isAZ}
       azFilter={azFilter}
+      graphqlEntityMap={graphqlEntityMap}
       {...props}
       itemsToDisplay={itemsToDisplayToUse}
     />
@@ -180,8 +189,8 @@ const ListBuilder = props => {
 };
 
 ListBuilder.propTypes = {
-  entity: PropTypes.string.isRequired,
-  entitySchema: PropTypes.object.isRequired,
+  entities: PropTypes.array.isRequired,
+  mainSchemas: PropTypes.object.isRequired,
   isCard: PropTypes.bool.isRequired,
   isAZ: PropTypes.bool.isRequired,
   isTextSearchFilterApplied: PropTypes.bool.isRequired,
@@ -199,8 +208,8 @@ ListBuilder.propTypes = {
   limit: PropTypes.number,
   omitWrappers: PropTypes.bool,
   offset: PropTypes.number,
-  sortby: PropTypes.array.isRequired,
-  sort: PropTypes.string.isRequired,
+  sortby: PropTypes.array,
+  sort: PropTypes.string,
   operator: PropTypes.string.isRequired,
   filterOperator: PropTypes.string.isRequired,
   paginationType: PropTypes.string,
@@ -210,6 +219,8 @@ ListBuilder.propTypes = {
 };
 
 ListBuilder.defaultProps = {
+  sort: '',
+  sortby: [],
   entityData: {},
   itemsToDisplay: [],
   itemListIds: null,

package/src/components/List/ListFactory.js

@@ -4,11 +4,7 @@ import { parseUrl } from 'query-string';
 import PropTypes from 'prop-types';
 import { useRouter } from 'next/router';
 import { MainContext } from '@blaze-cms/nextjs-components';
-import {
-  getSingleEntitySchema,
-  generateSingleItemQuery,
-  getItemList
-} from '../../application/query';
+import { generateSingleItemQuery, getItemList } from '../../application/query';
 import ListBuilder from './ListBuilder';
 import { AZ_LIST_TYPE } from './constants';
 import { getAzQueryFilter, getSortProps, hasRequiredItemListDetails } from './helpers';
@@ -31,7 +27,8 @@ import { AND_OPERATOR, TEXT_SEARCH, ID, AND, FULL } from '../../constants';
 
 const ListFactory = props => {
   const {
-    entity,
+    entity: legacyEntity,
+    entities,
     parent,
     name,
     filterByProperty,
@@ -63,26 +60,22 @@ const ListFactory = props => {
   });
 
   const itemListId = getItemListId(itemListName, queryItemListId);
-  const { itemEntity, itemId } = parent;
-  const itemEntityUpdated = getUnpublishedEntityName(itemEntity);
+  const { itemEntity: parentEntity, itemId: parentId } = parent;
+  const updatedParentEntity = getUnpublishedEntityName(parentEntity);
   const paginationIndex = getPaginationIndex(query, name);
   const azFilter = getAzQueryFilter(query, name);
 
-  const { data: entitySchema, error: schemaError, loading: schemaLoading } = useQuery(
-    getSingleEntitySchema,
-    {
-      variables: { id: entity }
-    }
-  );
+  const entitiesToUse = entities && entities.length ? entities : [legacyEntity];
+  const [filterEntity] = entitiesToUse;
   const {
     data: mainSchemas = {},
     loading: schemasLoading,
     error: schemasError
-  } = useGetEntitySchemasAsObj([itemEntityUpdated, entity]);
+  } = useGetEntitySchemasAsObj([updatedParentEntity, ...entitiesToUse]);
 
   const {
-    [itemEntityUpdated]: currentSchema = {},
-    [entity]: filterEntitySchema = {}
+    [updatedParentEntity]: currentSchema = {},
+    [filterEntity]: filterEntitySchema = {}
   } = mainSchemas;
 
   const {
@@ -103,7 +96,7 @@ const ListFactory = props => {
     error: itemQueryError,
     loading: itemQueryLoading
   } = useQuery(generateSingleItemQuery(getAction, queryProps), {
-    variables: { id: itemId },
+    variables: { id: parentId },
     skip: schemasLoading || (!inheritedFilters.length && queryProps === ID)
   });
 
@@ -117,25 +110,11 @@ const ListFactory = props => {
 
   if (!hasRequiredItemListDetails({ itemListName, router, itemListId, queryItemListId })) return '';
 
-  const errorsToCheck = [
-    schemaError,
-    schemasError,
-    requiredSchemaError,
-    itemQueryError,
-    itemListError
-  ];
+  const errorsToCheck = [schemasError, requiredSchemaError, itemQueryError, itemListError];
   const { hasErr, errMsg } = checkForError(errorsToCheck);
 
-  if (
-    requiredSchemaLoading ||
-    schemasLoading ||
-    schemaLoading ||
-    itemQueryLoading ||
-    itemListLoading
-  )
-    return '';
+  if (requiredSchemaLoading || schemasLoading || itemQueryLoading || itemListLoading) return '';
   if (hasErr) return errMsg;
-  if (!entitySchema) return null;
 
   const itemListIds = getItemListIds(itemListData);
   const isCard = type !== FULL;
@@ -165,7 +144,6 @@ const ListFactory = props => {
     isCard,
     isAZ,
     router,
-    entitySchema,
     sort: null,
     sortby: null,
     sortProperties: updatedSortProperties,
@@ -181,7 +159,9 @@ const ListFactory = props => {
     entityData,
     inheritedFilters,
     filterOperator,
-    itemListIds
+    itemListIds,
+    entities: entitiesToUse,
+    mainSchemas
   };
 
   return <ListBuilder {...listProps} />;
@@ -189,8 +169,9 @@ const ListFactory = props => {
 
 ListFactory.propTypes = {
   parent: PropTypes.object.isRequired,
-  entity: PropTypes.string.isRequired,
   type: PropTypes.string.isRequired,
+  entity: PropTypes.string,
+  entities: PropTypes.array,
   filterBy: PropTypes.array,
   filterByProperty: PropTypes.array,
   omitWrappers: PropTypes.bool,
@@ -204,6 +185,8 @@ ListFactory.propTypes = {
 };
 
 ListFactory.defaultProps = {
+  entity: '',
+  entities: [],
   filterBy: [],
   filterByProperty: [],
   omitWrappers: false,