npm - @blaze-cms/react-page-builder - Versions diffs - 0.130.0-admin-updates.6 → 0.130.0-admin-updates.9 - Mend

@blaze-cms/react-page-builder 0.130.0-admin-updates.6 → 0.130.0-admin-updates.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (43) hide show

package/lib-es/components/Card/CardsRender.js CHANGED Viewed

@@ -13,7 +13,7 @@ import { generateSingleItemQuery } from '../../application/query';
 import { SEARCH_PUBLISHED_CONTENT, AND } from '../../constants';
 import { useGetEntitySchemasAsObj, useGetImages } from '../../hooks';
 import { getUpdatedFilterBy, getEntityData, getRequiredSchemas, sortResponseData, getUnpublishedEntityName, renderChildren, splitChildren, removeExtraItems, appendImages } from '../../helpers';
-import { filtersSetup, filterQuerySetup, shouldSkipSingleQuery, shouldReturn, getUpdatedSortProperties } from './helpers';
+import { filtersSetup, filterQuerySetup, shouldSkipSingleQuery, shouldReturn, getUpdatedSortProperties, getUpdatedItemsToDisplay } from './helpers';
 const CardsContainer = dynamic(() => import('./CardsContainer'));
 const CardsRender = _ref => {
   let {
@@ -104,6 +104,12 @@ const CardsRender = _ref => {
     error: schemaError
   } = useGetEntitySchemasAsObj(getRequiredSchemas([...filterByProperty, ...sortbyFilters], filterEntitySchema), _loading);
   const updatedFilterBy = getUpdatedFilterBy(inheritedFilters, parentEntityData, parentSchema, filterEntitySchema, parentId, variableProps);
+  const updatedItemsToDisplay = getUpdatedItemsToDisplay({
+    itemsToDisplay,
+    inheritedFilters,
+    parentSchema,
+    parentEntityData
+  });
   const {
     limit,
     variables
@@ -115,10 +121,11 @@ const CardsRender = _ref => {
     docType: docTypes,
     filterOperator,
     filterEntityRelations,
-    itemsToDisplay,
+    itemsToDisplay: updatedItemsToDisplay,
     entitySameAsCurrentItemEntity,
     useRandomSort
   });
+  const hasNoFiltersOrItemsToDisplay = !updatedItemsToDisplay.length && !updatedFilterBy;
   const {
     data: cardData,
     error: cardsError,
@@ -126,9 +133,9 @@ const CardsRender = _ref => {
   } = useQuery(action, {
     variables,
     fetchPolicy: useRandomSort ? 'cache-and-network' : 'cache-first',
-    skip: shouldReturn(!updatedFilterBy, _loading, _load, schemaLoading, _error, _err, schemaError)
+    skip: shouldReturn(hasNoFiltersOrItemsToDisplay, _loading, _load, schemaLoading, _error, _err, schemaError)
   });
-  const imageIds = itemsToDisplay.map(({
+  const imageIds = updatedItemsToDisplay.map(({
     imageId
   }) => imageId).filter(Boolean);
   const {
@@ -137,7 +144,7 @@ const CardsRender = _ref => {
   } = useGetImages(imageIds, true);
   const isLoading = shouldReturn(_loading, _load, schemaLoading, cardsLoading, imagesLoading);
   const hasError = shouldReturn(_error, _err, schemaError);
-  if (!updatedFilterBy) return null;
+  if (hasNoFiltersOrItemsToDisplay) return null;
   if (isLoading) return null;
   if (hasError) return null;
   if (cardsError) return cardsError.message;
@@ -147,14 +154,14 @@ const CardsRender = _ref => {
   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 orderedData = useRandomSort ? cardDataResults : sortResponseData(cardDataResults, updatedItemsToDisplay);
   const {
     regularChildren,
     gtmChildren
   } = splitChildren(children, cardDataResults, graphqlEntityMap, {
     name: variableProps.name
   });
-  const updatedCards = appendImages(imagesData, orderedData, itemsToDisplay);
+  const updatedCards = appendImages(imagesData, orderedData, updatedItemsToDisplay);
   return /*#__PURE__*/React.createElement(React.Fragment, null, gtmChildren && renderChildren(gtmChildren), /*#__PURE__*/React.createElement(CardsContainer, _extends({
     cardData: updatedCards,
     entity: primaryEntityToUse,

package/lib-es/components/Card/CardsRender.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CardsRender.js","names":["React","useContext","useQuery","dynamic","PropTypes","MainContext","generateSingleItemQuery","SEARCH_PUBLISHED_CONTENT","AND","useGetEntitySchemasAsObj","useGetImages","getUpdatedFilterBy","getEntityData","getRequiredSchemas","sortResponseData","getUnpublishedEntityName","renderChildren","splitChildren","removeExtraItems","appendImages","filtersSetup","filterQuerySetup","shouldSkipSingleQuery","shouldReturn","getUpdatedSortProperties","CardsContainer","CardsRender","_ref","entity","legacyEntity","entities","entityFields","itemsToDisplay","children","otherProps","_objectWithoutProperties","_excluded","isPreview","parent","itemId","parentId","itemEntity","parentEntity","filterBy","filterByProperty","sortby","sort","sortProperties","operator","filterOperator","useRandomSort","updatedSortProperties","sortbyFilters","variableProps","_objectSpread","entitiesToUse","primaryEntityToUse","unpublishedParentEntityName","allEntityNames","uniqueEntityNames","Set","data","mainSchemas","loading","_loading","error","_error","parentSchema","filterEntitySchema","entitiesTypes","map","ent","graphqlEntityMap","reduce","acc","entityType","docTypes","docType","type","entityTypes","eType","getAction","queryProps","inheritedFilters","entitySameAsCurrentItemEntity","action","filterEntityRelations","currentSchema","itemEntityUpdated","entityData","parentEntityData","_err","_load","variables","id","skip","requiredSchema","schemaLoading","schemaError","updatedFilterBy","limit","getEntitySchemas","Object","values","cardData","cardsError","cardsLoading","fetchPolicy","imageIds","imageId","filter","Boolean","imagesData","imagesLoading","isLoading","hasError","message","results","cardDataResults","length","orderedData","regularChildren","gtmChildren","name","updatedCards","createElement","Fragment","_extends","cardChildren","propTypes","oneOfType","arrayOf","node","string","isRequired","array","defaultProps"],"sources":["../../../src/components/Card/CardsRender.js"],"sourcesContent":["import React, { useContext } from 'react';\nimport { useQuery } from '@apollo/client';\nimport dynamic from 'next/dynamic';\nimport PropTypes from 'prop-types';\nimport { MainContext } from '@blaze-cms/nextjs-components';\nimport { generateSingleItemQuery } from '../../application/query';\nimport { SEARCH_PUBLISHED_CONTENT, AND } from '../../constants';\nimport { useGetEntitySchemasAsObj, useGetImages } from '../../hooks';\nimport {\n getUpdatedFilterBy,\n getEntityData,\n getRequiredSchemas,\n sortResponseData,\n getUnpublishedEntityName,\n renderChildren,\n splitChildren,\n removeExtraItems,\n appendImages\n} from '../../helpers';\nimport {\n filtersSetup,\n filterQuerySetup,\n shouldSkipSingleQuery,\n shouldReturn,\n getUpdatedSortProperties\n} from './helpers';\n\nconst CardsContainer = dynamic(() => import('./CardsContainer'));\n\nconst CardsRender = ({\n entity: legacyEntity,\n entities,\n entityFields,\n itemsToDisplay,\n children,\n ...otherProps\n}) => {\n const { isPreview } = useContext(MainContext);\n const {\n parent: { itemId: parentId, itemEntity: parentEntity },\n filterBy = [],\n filterByProperty = [],\n sortby,\n sort,\n sortProperties = [],\n operator: filterOperator = AND,\n useRandomSort\n } = otherProps;\n const [updatedSortProperties, sortbyFilters] = getUpdatedSortProperties(\n sort,\n sortby,\n sortProperties\n );\n\n const variableProps = {\n ...otherProps,\n sortProperties: updatedSortProperties,\n sort: null,\n sortby: null\n };\n\n const entitiesToUse = entities \|\| [legacyEntity];\n const primaryEntityToUse = entitiesToUse[0];\n const unpublishedParentEntityName = getUnpublishedEntityName(parentEntity);\n const allEntityNames = [...entitiesToUse, unpublishedParentEntityName];\n const uniqueEntityNames = [...new Set(allEntityNames)];\n const { data: mainSchemas = {}, loading: _loading, error: _error } = useGetEntitySchemasAsObj(\n uniqueEntityNames\n );\n const parentSchema = mainSchemas[unpublishedParentEntityName] \|\| {};\n const filterEntitySchema = mainSchemas[primaryEntityToUse] \|\| {};\n const entitiesTypes = entitiesToUse.map(ent => getEntityData(ent, mainSchemas[ent]));\n const graphqlEntityMap = entitiesTypes.reduce(\n (acc, entityType) => ({ ...acc, [entityType.entityType]: entityType.entity }),\n {}\n );\n const docTypes = entitiesTypes.map(({ docType: type }) => type);\n const entityTypes = entitiesTypes.map(({ entityType: eType }) => eType);\n\n const {\n getAction,\n queryProps,\n inheritedFilters,\n entitySameAsCurrentItemEntity,\n action,\n filterEntityRelations\n } = filtersSetup({\n entityFields,\n entityTypes,\n filterBy,\n filterByProperty,\n entities: entitiesToUse,\n currentSchema: parentSchema,\n filterEntitySchema,\n isPreview,\n itemEntityUpdated: unpublishedParentEntityName\n });\n const {\n data: { entityData: parentEntityData = {} } = {},\n error: _err,\n loading: _load\n } = useQuery(generateSingleItemQuery(getAction, queryProps), {\n variables: { id: parentId },\n skip: shouldSkipSingleQuery(_loading, getAction, queryProps)\n });\n\n const {\n data: requiredSchema = {},\n loading: schemaLoading,\n error: schemaError\n } = useGetEntitySchemasAsObj(\n getRequiredSchemas([...filterByProperty, ...sortbyFilters], filterEntitySchema),\n _loading\n );\n\n const updatedFilterBy = getUpdatedFilterBy(\n inheritedFilters,\n parentEntityData,\n parentSchema,\n filterEntitySchema,\n parentId,\n variableProps\n );\n\n const { limit, variables } = filterQuerySetup({\n getEntitySchemas: Object.values(requiredSchema),\n entity: primaryEntityToUse,\n updatedFilterBy,\n variableProps,\n docType: docTypes,\n filterOperator,\n filterEntityRelations,\n itemsToDisplay,\n entitySameAsCurrentItemEntity,\n useRandomSort\n });\n const { data: cardData, error: cardsError, loading: cardsLoading } = useQuery(action, {\n variables,\n fetchPolicy: useRandomSort ? 'cache-and-network' : 'cache-first',\n skip: shouldReturn(!updatedFilterBy, _loading, _load, schemaLoading, _error, _err, schemaError)\n });\n\n const imageIds = itemsToDisplay.map(({ imageId }) => imageId).filter(Boolean);\n const { data: imagesData, loading: imagesLoading } = useGetImages(imageIds, true);\n const isLoading = shouldReturn(_loading, _load, schemaLoading, cardsLoading, imagesLoading);\n const hasError = shouldReturn(_error, _err, schemaError);\n\n if (!updatedFilterBy) return null;\n if (isLoading) return null;\n if (hasError) return null;\n if (cardsError) return cardsError.message;\n let { results: cardDataResults } = cardData[SEARCH_PUBLISHED_CONTENT];\n\n if (!cardDataResults \|\| !cardDataResults.length) return null;\n\n cardDataResults = entitySameAsCurrentItemEntity\n ? removeExtraItems(cardDataResults, limit, parentId)\n : cardDataResults;\n if (!cardDataResults.length) return null;\n\n const orderedData = useRandomSort\n ? cardDataResults\n : sortResponseData(cardDataResults, itemsToDisplay);\n const { regularChildren, gtmChildren } = splitChildren(\n children,\n cardDataResults,\n graphqlEntityMap,\n {\n name: variableProps.name\n }\n );\n const updatedCards = appendImages(imagesData, orderedData, itemsToDisplay);\n\n return (\n <>\n {gtmChildren && renderChildren(gtmChildren)}\n <CardsContainer\n cardData={updatedCards}\n entity={primaryEntityToUse}\n gtmChildren={gtmChildren}\n cardChildren={regularChildren}\n graphqlEntityMap={graphqlEntityMap}\n {...variableProps}\n />\n </>\n );\n};\n\nCardsRender.propTypes = {\n children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),\n entity: PropTypes.string.isRequired,\n entityFields: PropTypes.string.isRequired,\n itemsToDisplay: PropTypes.array,\n entities: PropTypes.array\n};\n\nCardsRender.defaultProps = {\n children: [],\n itemsToDisplay: [],\n entities: []\n};\n\nexport default CardsRender;\n"],"mappings":"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"}
1	+ {"version":3,"file":"CardsRender.js","names":["React","useContext","useQuery","dynamic","PropTypes","MainContext","generateSingleItemQuery","SEARCH_PUBLISHED_CONTENT","AND","useGetEntitySchemasAsObj","useGetImages","getUpdatedFilterBy","getEntityData","getRequiredSchemas","sortResponseData","getUnpublishedEntityName","renderChildren","splitChildren","removeExtraItems","appendImages","filtersSetup","filterQuerySetup","shouldSkipSingleQuery","shouldReturn","getUpdatedSortProperties","getUpdatedItemsToDisplay","CardsContainer","CardsRender","_ref","entity","legacyEntity","entities","entityFields","itemsToDisplay","children","otherProps","_objectWithoutProperties","_excluded","isPreview","parent","itemId","parentId","itemEntity","parentEntity","filterBy","filterByProperty","sortby","sort","sortProperties","operator","filterOperator","useRandomSort","updatedSortProperties","sortbyFilters","variableProps","_objectSpread","entitiesToUse","primaryEntityToUse","unpublishedParentEntityName","allEntityNames","uniqueEntityNames","Set","data","mainSchemas","loading","_loading","error","_error","parentSchema","filterEntitySchema","entitiesTypes","map","ent","graphqlEntityMap","reduce","acc","entityType","docTypes","docType","type","entityTypes","eType","getAction","queryProps","inheritedFilters","entitySameAsCurrentItemEntity","action","filterEntityRelations","currentSchema","itemEntityUpdated","entityData","parentEntityData","_err","_load","variables","id","skip","requiredSchema","schemaLoading","schemaError","updatedFilterBy","updatedItemsToDisplay","limit","getEntitySchemas","Object","values","hasNoFiltersOrItemsToDisplay","length","cardData","cardsError","cardsLoading","fetchPolicy","imageIds","imageId","filter","Boolean","imagesData","imagesLoading","isLoading","hasError","message","results","cardDataResults","orderedData","regularChildren","gtmChildren","name","updatedCards","createElement","Fragment","_extends","cardChildren","propTypes","oneOfType","arrayOf","node","string","isRequired","array","defaultProps"],"sources":["../../../src/components/Card/CardsRender.js"],"sourcesContent":["import React, { useContext } from 'react';\nimport { useQuery } from '@apollo/client';\nimport dynamic from 'next/dynamic';\nimport PropTypes from 'prop-types';\nimport { MainContext } from '@blaze-cms/nextjs-components';\nimport { generateSingleItemQuery } from '../../application/query';\nimport { SEARCH_PUBLISHED_CONTENT, AND } from '../../constants';\nimport { useGetEntitySchemasAsObj, useGetImages } from '../../hooks';\nimport {\n getUpdatedFilterBy,\n getEntityData,\n getRequiredSchemas,\n sortResponseData,\n getUnpublishedEntityName,\n renderChildren,\n splitChildren,\n removeExtraItems,\n appendImages\n} from '../../helpers';\nimport {\n filtersSetup,\n filterQuerySetup,\n shouldSkipSingleQuery,\n shouldReturn,\n getUpdatedSortProperties,\n getUpdatedItemsToDisplay\n} from './helpers';\n\nconst CardsContainer = dynamic(() => import('./CardsContainer'));\n\nconst CardsRender = ({\n entity: legacyEntity,\n entities,\n entityFields,\n itemsToDisplay,\n children,\n ...otherProps\n}) => {\n const { isPreview } = useContext(MainContext);\n const {\n parent: { itemId: parentId, itemEntity: parentEntity },\n filterBy = [],\n filterByProperty = [],\n sortby,\n sort,\n sortProperties = [],\n operator: filterOperator = AND,\n useRandomSort\n } = otherProps;\n const [updatedSortProperties, sortbyFilters] = getUpdatedSortProperties(\n sort,\n sortby,\n sortProperties\n );\n\n const variableProps = {\n ...otherProps,\n sortProperties: updatedSortProperties,\n sort: null,\n sortby: null\n };\n\n const entitiesToUse = entities \|\| [legacyEntity];\n const primaryEntityToUse = entitiesToUse[0];\n const unpublishedParentEntityName = getUnpublishedEntityName(parentEntity);\n const allEntityNames = [...entitiesToUse, unpublishedParentEntityName];\n const uniqueEntityNames = [...new Set(allEntityNames)];\n const { data: mainSchemas = {}, loading: _loading, error: _error } = useGetEntitySchemasAsObj(\n uniqueEntityNames\n );\n const parentSchema = mainSchemas[unpublishedParentEntityName] \|\| {};\n const filterEntitySchema = mainSchemas[primaryEntityToUse] \|\| {};\n const entitiesTypes = entitiesToUse.map(ent => getEntityData(ent, mainSchemas[ent]));\n const graphqlEntityMap = entitiesTypes.reduce(\n (acc, entityType) => ({ ...acc, [entityType.entityType]: entityType.entity }),\n {}\n );\n const docTypes = entitiesTypes.map(({ docType: type }) => type);\n const entityTypes = entitiesTypes.map(({ entityType: eType }) => eType);\n\n const {\n getAction,\n queryProps,\n inheritedFilters,\n entitySameAsCurrentItemEntity,\n action,\n filterEntityRelations\n } = filtersSetup({\n entityFields,\n entityTypes,\n filterBy,\n filterByProperty,\n entities: entitiesToUse,\n currentSchema: parentSchema,\n filterEntitySchema,\n isPreview,\n itemEntityUpdated: unpublishedParentEntityName\n });\n\n const {\n data: { entityData: parentEntityData = {} } = {},\n error: _err,\n loading: _load\n } = useQuery(generateSingleItemQuery(getAction, queryProps), {\n variables: { id: parentId },\n skip: shouldSkipSingleQuery(_loading, getAction, queryProps)\n });\n\n const {\n data: requiredSchema = {},\n loading: schemaLoading,\n error: schemaError\n } = useGetEntitySchemasAsObj(\n getRequiredSchemas([...filterByProperty, ...sortbyFilters], filterEntitySchema),\n _loading\n );\n\n const updatedFilterBy = getUpdatedFilterBy(\n inheritedFilters,\n parentEntityData,\n parentSchema,\n filterEntitySchema,\n parentId,\n variableProps\n );\n\n const updatedItemsToDisplay = getUpdatedItemsToDisplay({\n itemsToDisplay,\n inheritedFilters,\n parentSchema,\n parentEntityData\n });\n\n const { limit, variables } = filterQuerySetup({\n getEntitySchemas: Object.values(requiredSchema),\n entity: primaryEntityToUse,\n updatedFilterBy,\n variableProps,\n docType: docTypes,\n filterOperator,\n filterEntityRelations,\n itemsToDisplay: updatedItemsToDisplay,\n entitySameAsCurrentItemEntity,\n useRandomSort\n });\n\n const hasNoFiltersOrItemsToDisplay = !updatedItemsToDisplay.length && !updatedFilterBy;\n\n const { data: cardData, error: cardsError, loading: cardsLoading } = useQuery(action, {\n variables,\n fetchPolicy: useRandomSort ? 'cache-and-network' : 'cache-first',\n skip: shouldReturn(\n hasNoFiltersOrItemsToDisplay,\n _loading,\n _load,\n schemaLoading,\n _error,\n _err,\n schemaError\n )\n });\n\n const imageIds = updatedItemsToDisplay.map(({ imageId }) => imageId).filter(Boolean);\n const { data: imagesData, loading: imagesLoading } = useGetImages(imageIds, true);\n const isLoading = shouldReturn(_loading, _load, schemaLoading, cardsLoading, imagesLoading);\n const hasError = shouldReturn(_error, _err, schemaError);\n\n if (hasNoFiltersOrItemsToDisplay) return null;\n if (isLoading) return null;\n if (hasError) return null;\n if (cardsError) return cardsError.message;\n let { results: cardDataResults } = cardData[SEARCH_PUBLISHED_CONTENT];\n\n if (!cardDataResults \|\| !cardDataResults.length) return null;\n\n cardDataResults = entitySameAsCurrentItemEntity\n ? removeExtraItems(cardDataResults, limit, parentId)\n : cardDataResults;\n if (!cardDataResults.length) return null;\n\n const orderedData = useRandomSort\n ? cardDataResults\n : sortResponseData(cardDataResults, updatedItemsToDisplay);\n const { regularChildren, gtmChildren } = splitChildren(\n children,\n cardDataResults,\n graphqlEntityMap,\n {\n name: variableProps.name\n }\n );\n const updatedCards = appendImages(imagesData, orderedData, updatedItemsToDisplay);\n\n return (\n <>\n {gtmChildren && renderChildren(gtmChildren)}\n <CardsContainer\n cardData={updatedCards}\n entity={primaryEntityToUse}\n gtmChildren={gtmChildren}\n cardChildren={regularChildren}\n graphqlEntityMap={graphqlEntityMap}\n {...variableProps}\n />\n </>\n );\n};\n\nCardsRender.propTypes = {\n children: PropTypes.oneOfType([PropTypes.arrayOf(PropTypes.node), PropTypes.node]),\n entity: PropTypes.string.isRequired,\n entityFields: PropTypes.string.isRequired,\n itemsToDisplay: PropTypes.array,\n entities: PropTypes.array\n};\n\nCardsRender.defaultProps = {\n children: [],\n itemsToDisplay: [],\n entities: []\n};\n\nexport default CardsRender;\n"],"mappings":"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"}

package/lib-es/components/Card/helpers/get-updated-items-to-display.js ADDED Viewed

@@ -0,0 +1,32 @@
+const getUpdatedItemsToDisplay = ({
+  parentSchema,
+  parentEntityData,
+  itemsToDisplay = [],
+  inheritedFilters = []
+}) => {
+  const idProp = inheritedFilters.find(filter => filter.indexOf('id/') === 0);
+  if (!idProp || !parentSchema || !parentEntityData) return itemsToDisplay;
+  const {
+    properties
+  } = parentSchema;
+  const [, entityKey] = idProp.split('/');
+  if (!properties || !entityKey) return itemsToDisplay;
+  const queryValue = Object.keys(properties).find(propKey => properties[propKey] && properties[propKey].relation && properties[propKey].relation.entityIdentifier === entityKey);
+  const parentValues = parentEntityData[queryValue];
+  if (!parentValues) return itemsToDisplay;
+  const updatedItemsToDisplay = [...itemsToDisplay];
+  if (Array.isArray(parentValues)) {
+    parentValues.forEach(value => {
+      updatedItemsToDisplay.push({
+        displayItems: [value]
+      });
+    });
+  } else {
+    updatedItemsToDisplay.push({
+      displayItems: [parentValues]
+    });
+  }
+  return updatedItemsToDisplay;
+};
+export default getUpdatedItemsToDisplay;
+//# sourceMappingURL=get-updated-items-to-display.js.map

package/lib-es/components/Card/helpers/get-updated-items-to-display.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"get-updated-items-to-display.js","names":["getUpdatedItemsToDisplay","parentSchema","parentEntityData","itemsToDisplay","inheritedFilters","idProp","find","filter","indexOf","properties","entityKey","split","queryValue","Object","keys","propKey","relation","entityIdentifier","parentValues","updatedItemsToDisplay","Array","isArray","forEach","value","push","displayItems"],"sources":["../../../../src/components/Card/helpers/get-updated-items-to-display.js"],"sourcesContent":["const getUpdatedItemsToDisplay = ({\n parentSchema,\n parentEntityData,\n itemsToDisplay = [],\n inheritedFilters = []\n}) => {\n const idProp = inheritedFilters.find(filter => filter.indexOf('id/') === 0);\n\n if (!idProp || !parentSchema || !parentEntityData) return itemsToDisplay;\n const { properties } = parentSchema;\n const [, entityKey] = idProp.split('/');\n if (!properties || !entityKey) return itemsToDisplay;\n const queryValue = Object.keys(properties).find(\n propKey =>\n properties[propKey] &&\n properties[propKey].relation &&\n properties[propKey].relation.entityIdentifier === entityKey\n );\n const parentValues = parentEntityData[queryValue];\n if (!parentValues) return itemsToDisplay;\n const updatedItemsToDisplay = [...itemsToDisplay];\n if (Array.isArray(parentValues)) {\n parentValues.forEach(value => {\n updatedItemsToDisplay.push({ displayItems: [value] });\n });\n } else {\n updatedItemsToDisplay.push({ displayItems: [parentValues] });\n }\n return updatedItemsToDisplay;\n};\n\nexport default getUpdatedItemsToDisplay;\n"],"mappings":"AAAA,MAAMA,wBAAwB,GAAGA,CAAC;EAChCC,YAAY;EACZC,gBAAgB;EAChBC,cAAc,GAAG,EAAE;EACnBC,gBAAgB,GAAG;AACrB,CAAC,KAAK;EACJ,MAAMC,MAAM,GAAGD,gBAAgB,CAACE,IAAI,CAACC,MAAM,IAAIA,MAAM,CAACC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;EAE3E,IAAI,CAACH,MAAM,IAAI,CAACJ,YAAY,IAAI,CAACC,gBAAgB,EAAE,OAAOC,cAAc;EACxE,MAAM;IAAEM;EAAW,CAAC,GAAGR,YAAY;EACnC,MAAM,GAAGS,SAAS,CAAC,GAAGL,MAAM,CAACM,KAAK,CAAC,GAAG,CAAC;EACvC,IAAI,CAACF,UAAU,IAAI,CAACC,SAAS,EAAE,OAAOP,cAAc;EACpD,MAAMS,UAAU,GAAGC,MAAM,CAACC,IAAI,CAACL,UAAU,CAAC,CAACH,IAAI,CAC7CS,OAAO,IACLN,UAAU,CAACM,OAAO,CAAC,IACnBN,UAAU,CAACM,OAAO,CAAC,CAACC,QAAQ,IAC5BP,UAAU,CAACM,OAAO,CAAC,CAACC,QAAQ,CAACC,gBAAgB,KAAKP,SACtD,CAAC;EACD,MAAMQ,YAAY,GAAGhB,gBAAgB,CAACU,UAAU,CAAC;EACjD,IAAI,CAACM,YAAY,EAAE,OAAOf,cAAc;EACxC,MAAMgB,qBAAqB,GAAG,CAAC,GAAGhB,cAAc,CAAC;EACjD,IAAIiB,KAAK,CAACC,OAAO,CAACH,YAAY,CAAC,EAAE;IAC/BA,YAAY,CAACI,OAAO,CAACC,KAAK,IAAI;MAC5BJ,qBAAqB,CAACK,IAAI,CAAC;QAAEC,YAAY,EAAE,CAACF,KAAK;MAAE,CAAC,CAAC;IACvD,CAAC,CAAC;EACJ,CAAC,MAAM;IACLJ,qBAAqB,CAACK,IAAI,CAAC;MAAEC,YAAY,EAAE,CAACP,YAAY;IAAE,CAAC,CAAC;EAC9D;EACA,OAAOC,qBAAqB;AAC9B,CAAC;AAED,eAAenB,wBAAwB"}

package/lib-es/components/Card/helpers/index.js CHANGED Viewed

@@ -6,4 +6,5 @@ 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';
+export { default as getUpdatedItemsToDisplay } from './get-updated-items-to-display';
 //# sourceMappingURL=index.js.map

package/lib-es/components/Card/helpers/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","names":["default","getPublishedListingUrl","useDynamicSizeKey","getDynamicGridClasses","filtersSetup","filterQuerySetup","shouldReturn","shouldSkipSingleQuery","getUpdatedSortProperties"],"sources":["../../../../src/components/Card/helpers/index.js"],"sourcesContent":["export { default as getPublishedListingUrl } from './get-published-listing-url';\nexport { default as useDynamicSizeKey } from './use-dynamic-size-key';\nexport { default as getDynamicGridClasses } from './get-dynamic-grid-classes';\nexport { default as filtersSetup } from './filters-setup';\nexport { default as filterQuerySetup } from './filter-query-setup';\nexport { default as shouldReturn } from './should-return';\nexport { default as shouldSkipSingleQuery } from './should-skip-single-query';\nexport { default as getUpdatedSortProperties } from './get-updated-sort-properties';\n"],"mappings":"AAAA,SAASA,OAAO,IAAIC,sBAAsB,QAAQ,6BAA6B;AAC/E,SAASD,OAAO,IAAIE,iBAAiB,QAAQ,wBAAwB;AACrE,SAASF,OAAO,IAAIG,qBAAqB,QAAQ,4BAA4B;AAC7E,SAASH,OAAO,IAAII,YAAY,QAAQ,iBAAiB;AACzD,SAASJ,OAAO,IAAIK,gBAAgB,QAAQ,sBAAsB;AAClE,SAASL,OAAO,IAAIM,YAAY,QAAQ,iBAAiB;AACzD,SAASN,OAAO,IAAIO,qBAAqB,QAAQ,4BAA4B;AAC7E,SAASP,OAAO,IAAIQ,wBAAwB,QAAQ,+BAA+B"}
1	+ {"version":3,"file":"index.js","names":["default","getPublishedListingUrl","useDynamicSizeKey","getDynamicGridClasses","filtersSetup","filterQuerySetup","shouldReturn","shouldSkipSingleQuery","getUpdatedSortProperties","getUpdatedItemsToDisplay"],"sources":["../../../../src/components/Card/helpers/index.js"],"sourcesContent":["export { default as getPublishedListingUrl } from './get-published-listing-url';\nexport { default as useDynamicSizeKey } from './use-dynamic-size-key';\nexport { default as getDynamicGridClasses } from './get-dynamic-grid-classes';\nexport { default as filtersSetup } from './filters-setup';\nexport { default as filterQuerySetup } from './filter-query-setup';\nexport { default as shouldReturn } from './should-return';\nexport { default as shouldSkipSingleQuery } from './should-skip-single-query';\nexport { default as getUpdatedSortProperties } from './get-updated-sort-properties';\nexport { default as getUpdatedItemsToDisplay } from './get-updated-items-to-display';\n"],"mappings":"AAAA,SAASA,OAAO,IAAIC,sBAAsB,QAAQ,6BAA6B;AAC/E,SAASD,OAAO,IAAIE,iBAAiB,QAAQ,wBAAwB;AACrE,SAASF,OAAO,IAAIG,qBAAqB,QAAQ,4BAA4B;AAC7E,SAASH,OAAO,IAAII,YAAY,QAAQ,iBAAiB;AACzD,SAASJ,OAAO,IAAIK,gBAAgB,QAAQ,sBAAsB;AAClE,SAASL,OAAO,IAAIM,YAAY,QAAQ,iBAAiB;AACzD,SAASN,OAAO,IAAIO,qBAAqB,QAAQ,4BAA4B;AAC7E,SAASP,OAAO,IAAIQ,wBAAwB,QAAQ,+BAA+B;AACnF,SAASR,OAAO,IAAIS,wBAAwB,QAAQ,gCAAgC"}

package/lib-es/components/SearchContent/SearchContentItems.js CHANGED Viewed

@@ -18,7 +18,7 @@ const SearchContentItems = ({
     key: id
   }, /*#__PURE__*/React.createElement("div", {
     className: "search-content--results__wrapper"
-  }, (image === null || image === void 0 ? void 0 : image.url) ? /*#__PURE__*/React.createElement(LazyImage, {
+  }, image !== null && image !== void 0 && image.url ? /*#__PURE__*/React.createElement(LazyImage, {
     src: image.url,
     alt: name,
     className: "search-content--results__image",

package/lib-es/components/SearchContent/SearchContentItems.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SearchContentItems.js","names":["React","BlazeLink","LazyImage","SearchContentItems","results","onClick","map","item","url","id","name","image","createElement","href","key","className","src","alt","sizeKey"],"sources":["../../../src/components/SearchContent/SearchContentItems.js"],"sourcesContent":["import React from 'react';\nimport BlazeLink from '../BlazeLink';\nimport LazyImage from '../LazyImage';\n\nconst SearchContentItems = ({ results = [], onClick }) =>\n results.map(item => {\n if (!item.url) return null;\n\n const { id, name, image, url } = item;\n\n return (\n <BlazeLink href={url} onClick={onClick} key={id}>\n <div className=\"search-content--results__wrapper\">\n {image?.url ? (\n <LazyImage\n src={image.url}\n alt={name}\n className=\"search-content--results__image\"\n sizeKey=\"search-result\"\n />\n ) : null}\n <span className=\"search-content--results__title\">{name}</span>\n </div>\n </BlazeLink>\n );\n });\n\nexport default SearchContentItems;\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,SAAS,MAAM,cAAc;AACpC,OAAOC,SAAS,MAAM,cAAc;AAEpC,MAAMC,kBAAkB,GAAGA,CAAC;EAAEC,OAAO,GAAG,EAAE;EAAEC;AAAQ,CAAC,KACnDD,OAAO,CAACE,GAAG,CAACC,IAAI,IAAI;EAClB,IAAI,CAACA,IAAI,CAACC,GAAG,EAAE,OAAO,IAAI;EAE1B,MAAM;IAAEC,EAAE;IAAEC,IAAI;IAAEC,KAAK;IAAEH;EAAI,CAAC,GAAGD,IAAI;EAErC,oBACEP,KAAA,CAAAY,aAAA,CAACX,SAAS;IAACY,IAAI,EAAEL,GAAI;IAACH,OAAO,EAAEA,OAAQ;IAACS,GAAG,EAAEL;EAAG,gBAC9CT,KAAA,CAAAY,aAAA;IAAKG,SAAS,EAAC;EAAkC,~~GAC9C~~,~~CAAAJ,~~KAAK,aAALA,KAAK,~~uBAALA~~,KAAK,CAAEH,GAAG,~~iBACTR~~,KAAA,CAAAY,aAAA,CAACV,SAAS;IACRc,GAAG,EAAEL,KAAK,CAACH,GAAI;IACfS,GAAG,EAAEP,IAAK;IACVK,SAAS,EAAC,gCAAgC;IAC1CG,OAAO,EAAC;EAAe,CACxB,CAAC,GACA,IAAI,eACRlB,KAAA,CAAAY,aAAA;IAAMG,SAAS,EAAC;EAAgC,GAAEL,IAAW,CAC1D,CACI,CAAC;AAEhB,CAAC,CAAC;AAEJ,eAAeP,kBAAkB"}
1	+ {"version":3,"file":"SearchContentItems.js","names":["React","BlazeLink","LazyImage","SearchContentItems","results","onClick","map","item","url","id","name","image","createElement","href","key","className","src","alt","sizeKey"],"sources":["../../../src/components/SearchContent/SearchContentItems.js"],"sourcesContent":["import React from 'react';\nimport BlazeLink from '../BlazeLink';\nimport LazyImage from '../LazyImage';\n\nconst SearchContentItems = ({ results = [], onClick }) =>\n results.map(item => {\n if (!item.url) return null;\n\n const { id, name, image, url } = item;\n\n return (\n <BlazeLink href={url} onClick={onClick} key={id}>\n <div className=\"search-content--results__wrapper\">\n {image?.url ? (\n <LazyImage\n src={image.url}\n alt={name}\n className=\"search-content--results__image\"\n sizeKey=\"search-result\"\n />\n ) : null}\n <span className=\"search-content--results__title\">{name}</span>\n </div>\n </BlazeLink>\n );\n });\n\nexport default SearchContentItems;\n"],"mappings":"AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,OAAOC,SAAS,MAAM,cAAc;AACpC,OAAOC,SAAS,MAAM,cAAc;AAEpC,MAAMC,kBAAkB,GAAGA,CAAC;EAAEC,OAAO,GAAG,EAAE;EAAEC;AAAQ,CAAC,KACnDD,OAAO,CAACE,GAAG,CAACC,IAAI,IAAI;EAClB,IAAI,CAACA,IAAI,CAACC,GAAG,EAAE,OAAO,IAAI;EAE1B,MAAM;IAAEC,EAAE;IAAEC,IAAI;IAAEC,KAAK;IAAEH;EAAI,CAAC,GAAGD,IAAI;EAErC,oBACEP,KAAA,CAAAY,aAAA,CAACX,SAAS;IAACY,IAAI,EAAEL,GAAI;IAACH,OAAO,EAAEA,OAAQ;IAACS,GAAG,EAAEL;EAAG,gBAC9CT,KAAA,CAAAY,aAAA;IAAKG,SAAS,EAAC;EAAkC,GAC9CJ,KAAK,aAALA,KAAK,eAALA,KAAK,CAAEH,GAAG,gBACTR,KAAA,CAAAY,aAAA,CAACV,SAAS;IACRc,GAAG,EAAEL,KAAK,CAACH,GAAI;IACfS,GAAG,EAAEP,IAAK;IACVK,SAAS,EAAC,gCAAgC;IAC1CG,OAAO,EAAC;EAAe,CACxB,CAAC,GACA,IAAI,eACRlB,KAAA,CAAAY,aAAA;IAAMG,SAAS,EAAC;EAAgC,GAAEL,IAAW,CAC1D,CACI,CAAC;AAEhB,CAAC,CAAC;AAEJ,eAAeP,kBAAkB"}

package/lib-es/helpers/build-inherited-filters.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import flatten from 'lodash.flatten';
 import isFilterEntitysId from './is-filter-entitys-id';
 import getFilterProps from './get-filter-props';
+import { ID } from '../constants';
 const getRelationData = (entityData, relationName, currentRelationNames) => {
   if (!entityData) return null;
   if (currentRelationNames && currentRelationNames.length) {
@@ -38,6 +39,7 @@ const buildInheritedFilters = (entityData, inheritedFilters, currentSchema, filt
       relationForeignKeys,
       shouldIgnoreFilter
     } = getFilterProps(filter, currentSchema, filterEntitySchema);
+    if (filterName === ID) return;
     const relationData = getRelationData(entityData, relationName, relationForeignKeys);
     if (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId) || shouldIgnoreFilter) {
       relationFilters.push(`${filterName}/${itemId}`);

package/lib-es/helpers/build-inherited-filters.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-inherited-filters.js","names":["flatten","isFilterEntitysId","getFilterProps","getRelationData","entityData","relationName","currentRelationNames","length","arrayOfRelations","map","name","filter","Boolean","checkIfArrayHasData","isDataArray","relationData","setFiltersNoRelation","arrayHasData","filters","filterValues","reduce","acc","relationValue","push","buildInheritedFilters","inheritedFilters","currentSchema","filterEntitySchema","itemId","relationFilters","identifier","currentEntityId","forEach","filterName","entityName","relationProp","relationEntityName","relationForeignKeys","shouldIgnoreFilter","Array","isArray","filtersNoRelation"],"sources":["../../src/helpers/build-inherited-filters.js"],"sourcesContent":["import flatten from 'lodash.flatten';\nimport isFilterEntitysId from './is-filter-entitys-id';\nimport getFilterProps from './get-filter-props';\n\nconst getRelationData = (entityData, relationName, currentRelationNames) => {\n if (!entityData) return null;\n if (currentRelationNames && currentRelationNames.length) {\n const arrayOfRelations = currentRelationNames.map(name => entityData[name]).filter(Boolean);\n return arrayOfRelations.length ? flatten(arrayOfRelations) : null;\n }\n return entityData[relationName];\n};\n\nconst checkIfArrayHasData = (isDataArray, relationData) => isDataArray && !!relationData.length;\n\nconst setFiltersNoRelation = (isDataArray, arrayHasData, relationData, relationName) => {\n const filters = [];\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue && typeof relationValue !== 'object')\n acc.push(`${relationName}/${relationValue}`);\n return acc;\n }, []);\n filters.push(...filterValues);\n } else if (!isDataArray && typeof relationData !== 'object') {\n filters.push(`${relationName}/${relationData}`);\n }\n\n return filters;\n};\nconst buildInheritedFilters = (\n entityData,\n inheritedFilters,\n currentSchema,\n filterEntitySchema,\n itemId\n) => {\n const relationFilters = [];\n const { identifier: currentEntityId } = currentSchema;\n\n inheritedFilters.forEach(filter => {\n const {\n filterName,\n entityName,\n relationName,\n relationProp,\n relationEntityName,\n relationForeignKeys,\n shouldIgnoreFilter\n } = getFilterProps(filter, currentSchema, filterEntitySchema);\n\n const relationData = getRelationData(entityData, relationName, relationForeignKeys);\n\n if (\n (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId)) \|\|\n shouldIgnoreFilter\n ) {\n relationFilters.push(`${filterName}/${itemId}`);\n }\n\n if (!relationData) return;\n\n const isDataArray = Array.isArray(relationData);\n const arrayHasData = checkIfArrayHasData(isDataArray, relationData);\n\n if (!relationEntityName) {\n const filtersNoRelation = setFiltersNoRelation(\n isDataArray,\n arrayHasData,\n relationData,\n relationName\n );\n relationFilters.push(...filtersNoRelation);\n }\n\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue[relationProp]) acc.push(`${filterName}/${relationValue[relationProp]}`);\n return acc;\n }, []);\n relationFilters.push(...filterValues);\n } else if (!isDataArray && relationData[relationProp]) {\n relationFilters.push(`${filterName}/${relationData[relationProp]}`);\n }\n });\n\n return relationFilters;\n};\n\nexport default buildInheritedFilters;\n"],"mappings":"AAAA,OAAOA,OAAO,MAAM,gBAAgB;AACpC,OAAOC,iBAAiB,MAAM,wBAAwB;AACtD,OAAOC,cAAc,MAAM,oBAAoB;~~AAE~~/C,MAAMC,eAAe,GAAGA,CAACC,UAAU,EAAEC,YAAY,EAAEC,oBAAoB,KAAK;EAC1E,IAAI,CAACF,UAAU,EAAE,OAAO,IAAI;EAC5B,IAAIE,oBAAoB,IAAIA,oBAAoB,CAACC,MAAM,EAAE;IACvD,MAAMC,gBAAgB,GAAGF,oBAAoB,CAACG,GAAG,CAACC,IAAI,IAAIN,UAAU,CAACM,IAAI,CAAC,CAAC,CAACC,MAAM,CAACC,OAAO,CAAC;IAC3F,OAAOJ,gBAAgB,CAACD,MAAM,~~GAAGP~~,OAAO,~~CAACQ~~,gBAAgB,CAAC,GAAG,IAAI;EACnE;EACA,OAAOJ,UAAU,CAACC,YAAY,CAAC;AACjC,CAAC;AAED,MAAMQ,mBAAmB,GAAGA,CAACC,WAAW,EAAEC,YAAY,KAAKD,WAAW,IAAI,CAAC,CAACC,YAAY,CAACR,MAAM;AAE/F,MAAMS,oBAAoB,GAAGA,CAACF,WAAW,EAAEG,YAAY,EAAEF,YAAY,EAAEV,YAAY,KAAK;EACtF,MAAMa,OAAO,GAAG,EAAE;EAClB,IAAID,YAAY,EAAE;IAChB,MAAME,YAAY,GAAGJ,YAAY,CAACK,MAAM,CAAC,CAACC,GAAG,EAAEC,aAAa,KAAK;MAC/D,IAAIA,aAAa,IAAI,OAAOA,aAAa,KAAK,QAAQ,EACpDD,GAAG,CAACE,IAAI,CAAE,GAAElB,YAAa,IAAGiB,aAAc,EAAC,CAAC;MAC9C,OAAOD,GAAG;IACZ,CAAC,EAAE,EAAE,CAAC;IACNH,OAAO,CAACK,IAAI,CAAC,GAAGJ,YAAY,CAAC;EAC/B,CAAC,MAAM,IAAI,CAACL,WAAW,IAAI,OAAOC,YAAY,KAAK,QAAQ,EAAE;IAC3DG,OAAO,CAACK,IAAI,CAAE,GAAElB,YAAa,IAAGU,YAAa,EAAC,CAAC;EACjD;EAEA,OAAOG,OAAO;AAChB,CAAC;AACD,MAAMM,qBAAqB,GAAGA,CAC5BpB,UAAU,EACVqB,gBAAgB,EAChBC,aAAa,EACbC,kBAAkB,EAClBC,MAAM,KACH;EACH,MAAMC,eAAe,GAAG,EAAE;EAC1B,MAAM;IAAEC,UAAU,EAAEC;EAAgB,CAAC,GAAGL,aAAa;EAErDD,gBAAgB,CAACO,OAAO,CAACrB,MAAM,IAAI;IACjC,MAAM;MACJsB,UAAU;MACVC,UAAU;MACV7B,YAAY;MACZ8B,YAAY;MACZC,kBAAkB;MAClBC,mBAAmB;MACnBC;IACF,CAAC,~~GAAGpC~~,cAAc,~~CAACS~~,MAAM,EAAEe,aAAa,EAAEC,kBAAkB,CAAC;IAE7D,~~MAAMZ~~,YAAY,GAAGZ,eAAe,CAACC,UAAU,EAAEC,YAAY,EAAEgC,mBAAmB,CAAC;~~IAEnF~~,IACGN,eAAe,KAAKG,UAAU,~~IAAIjC~~,iBAAiB,~~CAACgC~~,UAAU,EAAEF,eAAe,CAAC,IACjFO,kBAAkB,EAClB;MACAT,eAAe,CAACN,IAAI,CAAE,GAAEU,UAAW,IAAGL,MAAO,EAAC,CAAC;IACjD;IAEA,IAAI,CAACb,YAAY,EAAE;IAEnB,MAAMD,WAAW,GAAGyB,KAAK,CAACC,OAAO,CAACzB,YAAY,CAAC;IAC/C,MAAME,YAAY,GAAGJ,mBAAmB,CAACC,WAAW,EAAEC,YAAY,CAAC;IAEnE,IAAI,CAACqB,kBAAkB,EAAE;MACvB,MAAMK,iBAAiB,GAAGzB,oBAAoB,CAC5CF,WAAW,EACXG,YAAY,EACZF,YAAY,EACZV,YACF,CAAC;MACDwB,eAAe,CAACN,IAAI,CAAC,GAAGkB,iBAAiB,CAAC;IAC5C;IAEA,IAAIxB,YAAY,EAAE;MAChB,MAAME,YAAY,GAAGJ,YAAY,CAACK,MAAM,CAAC,CAACC,GAAG,EAAEC,aAAa,KAAK;QAC/D,IAAIA,aAAa,CAACa,YAAY,CAAC,EAAEd,GAAG,CAACE,IAAI,CAAE,GAAEU,UAAW,IAAGX,aAAa,CAACa,YAAY,CAAE,EAAC,CAAC;QACzF,OAAOd,GAAG;MACZ,CAAC,EAAE,EAAE,CAAC;MACNQ,eAAe,CAACN,IAAI,CAAC,GAAGJ,YAAY,CAAC;IACvC,CAAC,MAAM,IAAI,CAACL,WAAW,IAAIC,YAAY,CAACoB,YAAY,CAAC,EAAE;MACrDN,eAAe,CAACN,IAAI,CAAE,GAAEU,UAAW,IAAGlB,YAAY,CAACoB,YAAY,CAAE,EAAC,CAAC;IACrE;EACF,CAAC,CAAC;EAEF,OAAON,eAAe;AACxB,CAAC;AAED,eAAeL,qBAAqB"}
1	+ {"version":3,"file":"build-inherited-filters.js","names":["flatten","isFilterEntitysId","getFilterProps","ID","getRelationData","entityData","relationName","currentRelationNames","length","arrayOfRelations","map","name","filter","Boolean","checkIfArrayHasData","isDataArray","relationData","setFiltersNoRelation","arrayHasData","filters","filterValues","reduce","acc","relationValue","push","buildInheritedFilters","inheritedFilters","currentSchema","filterEntitySchema","itemId","relationFilters","identifier","currentEntityId","forEach","filterName","entityName","relationProp","relationEntityName","relationForeignKeys","shouldIgnoreFilter","Array","isArray","filtersNoRelation"],"sources":["../../src/helpers/build-inherited-filters.js"],"sourcesContent":["import flatten from 'lodash.flatten';\nimport isFilterEntitysId from './is-filter-entitys-id';\nimport getFilterProps from './get-filter-props';\nimport { ID } from '../constants';\n\nconst getRelationData = (entityData, relationName, currentRelationNames) => {\n if (!entityData) return null;\n if (currentRelationNames && currentRelationNames.length) {\n const arrayOfRelations = currentRelationNames.map(name => entityData[name]).filter(Boolean);\n return arrayOfRelations.length ? flatten(arrayOfRelations) : null;\n }\n return entityData[relationName];\n};\n\nconst checkIfArrayHasData = (isDataArray, relationData) => isDataArray && !!relationData.length;\n\nconst setFiltersNoRelation = (isDataArray, arrayHasData, relationData, relationName) => {\n const filters = [];\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue && typeof relationValue !== 'object')\n acc.push(`${relationName}/${relationValue}`);\n return acc;\n }, []);\n filters.push(...filterValues);\n } else if (!isDataArray && typeof relationData !== 'object') {\n filters.push(`${relationName}/${relationData}`);\n }\n\n return filters;\n};\nconst buildInheritedFilters = (\n entityData,\n inheritedFilters,\n currentSchema,\n filterEntitySchema,\n itemId\n) => {\n const relationFilters = [];\n const { identifier: currentEntityId } = currentSchema;\n\n inheritedFilters.forEach(filter => {\n const {\n filterName,\n entityName,\n relationName,\n relationProp,\n relationEntityName,\n relationForeignKeys,\n shouldIgnoreFilter\n } = getFilterProps(filter, currentSchema, filterEntitySchema);\n\n if (filterName === ID) return;\n\n const relationData = getRelationData(entityData, relationName, relationForeignKeys);\n if (\n (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId)) \|\|\n shouldIgnoreFilter\n ) {\n relationFilters.push(`${filterName}/${itemId}`);\n }\n\n if (!relationData) return;\n\n const isDataArray = Array.isArray(relationData);\n const arrayHasData = checkIfArrayHasData(isDataArray, relationData);\n\n if (!relationEntityName) {\n const filtersNoRelation = setFiltersNoRelation(\n isDataArray,\n arrayHasData,\n relationData,\n relationName\n );\n relationFilters.push(...filtersNoRelation);\n }\n\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue[relationProp]) acc.push(`${filterName}/${relationValue[relationProp]}`);\n return acc;\n }, []);\n relationFilters.push(...filterValues);\n } else if (!isDataArray && relationData[relationProp]) {\n relationFilters.push(`${filterName}/${relationData[relationProp]}`);\n }\n });\n\n return relationFilters;\n};\n\nexport default buildInheritedFilters;\n"],"mappings":"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"}

package/lib-es/helpers/build-props-query.js CHANGED Viewed

@@ -28,16 +28,18 @@ const buildPropsQuery = (entitySchema, extraProps = [], cardOptions = null, link
 };
 const buildComplexProps = (shouldAddCategoryProps, props, {
   relations = [],
-  dynamicProperties = {}
+  dynamicProperties = {},
+  properties = {}
 }, linkProps) => Object.keys(props).map(base => {
   const nestedProps = props[base];
   const hasLink = !!linkProps.find(linkProp => linkProp.includes(base));
+  const matchingProperty = !!properties[base];
   const matchingRelation = relations.find(({
     localField
   }) => localField === base);
   const matchingDynamicProp = Object.keys(dynamicProperties).find(dynamicKey => dynamicKey === base);
   if (matchingRelation && !nestedProps.includes('id')) nestedProps.push('id');
-  if (hasLink && (!!matchingRelation || !!matchingDynamicProp)) nestedProps.push('url');
+  if (hasLink && (!!matchingProperty || !!matchingRelation || !!matchingDynamicProp)) nestedProps.push('url');
   const jointNestedProps = nestedProps.join(',');
   if (base === 'category' && shouldAddCategoryProps) return `${base}{${jointNestedProps}, ${categoryProps}}`;
   if (base.includes('published')) {

package/lib-es/helpers/build-props-query.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-props-query.js","names":["CATEGORY_ID","ID","PREHEADER_PROP","HEADLINE_PROP","defaultProps","categoryProps","checkProps","props","Object","keys","filter","prop","length","buildPropsQuery","entitySchema","extraProps","cardOptions","linkProps","parsedSchema","getEntitySchema","extraPropsHaveCategory","includes","typeBasedProps","shouldAddCategoryProps","getTypeBaseProps","allProps","uniqueProps","Set","basicProps","nestedProps","forEach","push","base","nested","split","complexProps","buildComplexProps","join","relations","dynamicProperties","map","hasLink","find","linkProp","matchingRelation","localField","matchingDynamicProp","dynamicKey","jointNestedProps","isCard","displayCategory","displayThumbnail","interfaces","~~properties","~~isContent","hasCategory","hasPreheader","getCategoyProps","getContentProps","url"],"sources":["../../src/helpers/build-props-query.js"],"sourcesContent":["import { CATEGORY_ID, ID, PREHEADER_PROP, HEADLINE_PROP } from '../constants';\n\nconst defaultProps = [ID, 'name'];\nconst categoryProps = 'id publishedListingPage{id, url}';\n\nconst checkProps = props =>\n !!(props && Object.keys(props).filter(prop => prop === CATEGORY_ID).length);\n\nconst buildPropsQuery = (entitySchema, extraProps = [], cardOptions = null, linkProps = []) => {\n const parsedSchema = entitySchema.getEntitySchema ? entitySchema.getEntitySchema : entitySchema;\n const extraPropsHaveCategory = !!extraProps.filter(prop => prop.includes('category.')).length;\n const { typeBasedProps, shouldAddCategoryProps } = getTypeBaseProps(\n parsedSchema,\n cardOptions,\n extraPropsHaveCategory\n );\n\n const allProps = [...typeBasedProps, ...extraProps];\n const uniqueProps = [...new Set([...allProps])];\n const basicProps = [];\n const nestedProps = {};\n uniqueProps.forEach(prop => {\n if (prop) {\n if (!prop.includes('.')) {\n basicProps.push(prop);\n return;\n }\n const [base, nested] = prop.split('.');\n if (!nestedProps[base]) nestedProps[base] = [nested];\n else nestedProps[base].push(nested);\n }\n });\n\n const complexProps = buildComplexProps(\n shouldAddCategoryProps,\n nestedProps,\n parsedSchema,\n linkProps\n );\n\n return [...basicProps, ...complexProps].join(',');\n};\n\nconst buildComplexProps = (\n shouldAddCategoryProps,\n props,\n { relations = [], dynamicProperties = {} },\n linkProps\n) =>\n Object.keys(props).map(base => {\n const nestedProps = props[base];\n const hasLink = !!linkProps.find(linkProp => linkProp.includes(base));\n const matchingRelation = relations.find(({ localField }) => localField === base);\n const matchingDynamicProp = Object.keys(dynamicProperties).find(\n dynamicKey => dynamicKey === base\n );\n\n if (matchingRelation && !nestedProps.includes('id')) nestedProps.push('id');\n if (hasLink && (!!matchingRelation \|\| !!matchingDynamicProp)) nestedProps.push('url');\n const jointNestedProps = nestedProps.join(',');\n if (base === 'category' && shouldAddCategoryProps)\n return `${base}{${jointNestedProps}, ${categoryProps}}`;\n if (base.includes('published')) {\n return `${base}{${jointNestedProps},url}`;\n }\n return `${base}{${jointNestedProps}}`;\n });\n\nconst getTypeBaseProps = (entitySchema, cardOptions, extraPropsHaveCategory) => {\n const isCard = !!cardOptions;\n const { displayCategory = true, displayThumbnail = true } = cardOptions \|\| {};\n\n const shouldAddCategoryProps =\n (isCard && displayCategory) \|\| (!isCard && !extraPropsHaveCategory);\n\n if (!isCard) return { typeBasedProps: [ID], shouldAddCategoryProps };\n\n const { interfaces, properties, dynamicProperties, relations } = entitySchema;\n\n const isContent = !!interfaces.includes('content/content');\n const hasCategory = checkProps(properties) \|\| checkProps(dynamicProperties);\n const hasPreheader = properties[PREHEADER_PROP];\n\n const typeBasedProps = [...defaultProps];\n\n typeBasedProps.push(...getCategoyProps(shouldAddCategoryProps, hasCategory, hasPreheader));\n typeBasedProps.push(...getContentProps(isContent));\n\n if (properties.url \|\| dynamicProperties.url) typeBasedProps.push('url');\n\n if (displayThumbnail && relations.find(({ localField }) => localField === 'image')) {\n typeBasedProps.push('image.id', 'image.url', 'image.data');\n }\n\n return { typeBasedProps, shouldAddCategoryProps };\n};\n\nconst getContentProps = isContent => (isContent ? ['url', 'sponsored', 'featured'] : []);\n\nconst getCategoyProps = (shouldAddCategoryProps, hasCategory, hasPreheader) => {\n if (!shouldAddCategoryProps) return [];\n const props = [];\n if (hasCategory)\n props.push('category.name', 'category.listingPageId', 'category.listingPageEntity');\n\n if (hasPreheader) {\n props.push(`${PREHEADER_PROP}{name}`);\n props.push(HEADLINE_PROP);\n }\n\n return props;\n};\n\nexport default buildPropsQuery;\n"],"mappings":"AAAA,SAASA,WAAW,EAAEC,EAAE,EAAEC,cAAc,EAAEC,aAAa,QAAQ,cAAc;AAE7E,MAAMC,YAAY,GAAG,CAACH,EAAE,EAAE,MAAM,CAAC;AACjC,MAAMI,aAAa,GAAG,kCAAkC;AAExD,MAAMC,UAAU,GAAGC,KAAK,IACtB,CAAC,EAAEA,KAAK,IAAIC,MAAM,CAACC,IAAI,CAACF,KAAK,CAAC,CAACG,MAAM,CAACC,IAAI,IAAIA,IAAI,KAAKX,WAAW,CAAC,CAACY,MAAM,CAAC;AAE7E,MAAMC,eAAe,GAAGA,CAACC,YAAY,EAAEC,UAAU,GAAG,EAAE,EAAEC,WAAW,GAAG,IAAI,EAAEC,SAAS,GAAG,EAAE,KAAK;EAC7F,MAAMC,YAAY,GAAGJ,YAAY,CAACK,eAAe,GAAGL,YAAY,CAACK,eAAe,GAAGL,YAAY;EAC/F,MAAMM,sBAAsB,GAAG,CAAC,CAACL,UAAU,CAACL,MAAM,CAACC,IAAI,IAAIA,IAAI,CAACU,QAAQ,CAAC,WAAW,CAAC,CAAC,CAACT,MAAM;EAC7F,MAAM;IAAEU,cAAc;IAAEC;EAAuB,CAAC,GAAGC,gBAAgB,CACjEN,YAAY,EACZF,WAAW,EACXI,sBACF,CAAC;EAED,MAAMK,QAAQ,GAAG,CAAC,GAAGH,cAAc,EAAE,GAAGP,UAAU,CAAC;EACnD,MAAMW,WAAW,GAAG,CAAC,GAAG,IAAIC,GAAG,CAAC,CAAC,GAAGF,QAAQ,CAAC,CAAC,CAAC;EAC/C,MAAMG,UAAU,GAAG,EAAE;EACrB,MAAMC,WAAW,GAAG,CAAC,CAAC;EACtBH,WAAW,CAACI,OAAO,CAACnB,IAAI,IAAI;IAC1B,IAAIA,IAAI,EAAE;MACR,IAAI,CAACA,IAAI,CAACU,QAAQ,CAAC,GAAG,CAAC,EAAE;QACvBO,UAAU,CAACG,IAAI,CAACpB,IAAI,CAAC;QACrB;MACF;MACA,MAAM,CAACqB,IAAI,EAAEC,MAAM,CAAC,GAAGtB,IAAI,CAACuB,KAAK,CAAC,GAAG,CAAC;MACtC,IAAI,CAACL,WAAW,CAACG,IAAI,CAAC,EAAEH,WAAW,CAACG,IAAI,CAAC,GAAG,CAACC,MAAM,CAAC,CAAC,KAChDJ,WAAW,CAACG,IAAI,CAAC,CAACD,IAAI,CAACE,MAAM,CAAC;IACrC;EACF,CAAC,CAAC;EAEF,MAAME,YAAY,GAAGC,iBAAiB,CACpCb,sBAAsB,EACtBM,WAAW,EACXX,YAAY,EACZD,SACF,CAAC;EAED,OAAO,CAAC,GAAGW,UAAU,EAAE,GAAGO,YAAY,CAAC,CAACE,IAAI,CAAC,GAAG,CAAC;AACnD,CAAC;AAED,MAAMD,iBAAiB,GAAGA,CACxBb,sBAAsB,EACtBhB,KAAK,EACL;EAAE+B,SAAS,GAAG,EAAE;EAAEC,iBAAiB,GAAG,CAAC;AAAE,CAAC,~~EAC1CtB~~,SAAS,KAETT,MAAM,CAACC,IAAI,CAACF,KAAK,CAAC,~~CAACiC~~,GAAG,~~CAACR~~,IAAI,IAAI;EAC7B,MAAMH,WAAW,GAAGtB,KAAK,CAACyB,IAAI,CAAC;EAC/B,~~MAAMS~~,OAAO,GAAG,CAAC,~~CAACxB~~,SAAS,~~CAACyB~~,IAAI,CAACC,QAAQ,IAAIA,QAAQ,~~CAACtB~~,QAAQ,CAACW,IAAI,CAAC,CAAC;EACrE,~~MAAMY~~,gBAAgB,~~GAAGN~~,SAAS,~~CAACI~~,IAAI,CAAC,CAAC;~~IAAEG~~;EAAW,CAAC,KAAKA,UAAU,~~KAAKb~~,IAAI,CAAC;EAChF,~~MAAMc~~,mBAAmB,~~GAAGtC~~,MAAM,CAACC,IAAI,CAAC8B,iBAAiB,CAAC,~~CAACG~~,IAAI,~~CAC7DK~~,UAAU,IAAIA,UAAU,~~KAAKf~~,IAC/B,CAAC;EAED,~~IAAIY~~,gBAAgB,IAAI,~~CAACf~~,WAAW,CAACR,QAAQ,CAAC,IAAI,CAAC,EAAEQ,WAAW,CAACE,IAAI,CAAC,IAAI,CAAC;EAC3E,~~IAAIU~~,OAAO,KAAK,CAAC,CAACG,gBAAgB,IAAI,CAAC,CAACE,mBAAmB,CAAC,~~EAAEjB~~,WAAW,CAACE,IAAI,CAAC,KAAK,CAAC;~~EACrF~~,~~MAAMiB~~,gBAAgB,~~GAAGnB~~,WAAW,CAACQ,IAAI,CAAC,GAAG,CAAC;EAC9C,IAAIL,IAAI,KAAK,UAAU,IAAIT,sBAAsB,EAC/C,OAAQ,GAAES,IAAK,~~IAAGgB~~,gBAAiB,~~KAAI3C~~,aAAc,GAAE;EACzD,IAAI2B,IAAI,CAACX,QAAQ,CAAC,WAAW,CAAC,EAAE;IAC9B,OAAQ,GAAEW,IAAK,~~IAAGgB~~,gBAAiB,OAAM;EAC3C;EACA,OAAQ,~~GAAEhB~~,IAAK,~~IAAGgB~~,gBAAiB,GAAE;AACvC,CAAC,CAAC;AAEJ,~~MAAMxB~~,gBAAgB,GAAGA,CAACV,YAAY,EAAEE,WAAW,EAAEI,sBAAsB,KAAK;EAC9E,~~MAAM6B~~,MAAM,GAAG,CAAC,~~CAACjC~~,WAAW;EAC5B,MAAM;~~IAAEkC~~,eAAe,GAAG,IAAI;IAAEC,gBAAgB,GAAG;EAAK,CAAC,~~GAAGnC~~,WAAW,IAAI,CAAC,CAAC;EAE7E,MAAMO,sBAAsB,~~GACzB0B~~,MAAM,IAAIC,eAAe,IAAM,CAACD,MAAM,IAAI,~~CAAC7B~~,sBAAuB;EAErE,IAAI,~~CAAC6B~~,MAAM,EAAE,OAAO;~~IAAE3B~~,cAAc,EAAE,CAACrB,EAAE,CAAC;IAAEsB;EAAuB,CAAC;EAEpE,MAAM;~~IAAE6B~~,UAAU;~~IAAEC~~,UAAU;~~IAAEd~~,iBAAiB;IAAED;EAAU,CAAC,GAAGxB,YAAY;EAE7E,~~MAAMwC~~,SAAS,GAAG,CAAC,~~CAACF~~,UAAU,~~CAAC/B~~,QAAQ,CAAC,iBAAiB,CAAC;EAC1D,~~MAAMkC~~,WAAW,~~GAAGjD~~,UAAU,~~CAAC+C~~,UAAU,CAAC,~~IAAI/C~~,UAAU,CAACiC,iBAAiB,CAAC;EAC3E,~~MAAMiB~~,YAAY,~~GAAGH~~,UAAU,~~CAACnD~~,cAAc,CAAC;EAE/C,MAAMoB,cAAc,GAAG,CAAC,GAAGlB,YAAY,CAAC;EAExCkB,cAAc,CAACS,IAAI,CAAC,~~GAAG0B~~,eAAe,~~CAAClC~~,sBAAsB,~~EAAEgC~~,WAAW,EAAEC,YAAY,CAAC,CAAC;~~EAC1FlC~~,cAAc,CAACS,IAAI,CAAC,~~GAAG2B~~,eAAe,CAACJ,SAAS,CAAC,CAAC;EAElD,~~IAAID~~,UAAU,~~CAACM~~,GAAG,~~IAAIpB~~,iBAAiB,~~CAACoB~~,GAAG,~~EAAErC~~,cAAc,CAACS,IAAI,CAAC,KAAK,CAAC;EAEvE,~~IAAIoB~~,gBAAgB,~~IAAIb~~,SAAS,~~CAACI~~,IAAI,CAAC,CAAC;~~IAAEG~~;EAAW,CAAC,KAAKA,UAAU,KAAK,OAAO,CAAC,EAAE;~~IAClFvB~~,cAAc,CAACS,IAAI,CAAC,UAAU,EAAE,WAAW,EAAE,YAAY,CAAC;EAC5D;EAEA,OAAO;IAAET,cAAc;IAAEC;EAAuB,CAAC;AACnD,CAAC;AAED,~~MAAMmC~~,eAAe,GAAGJ,SAAS,IAAKA,SAAS,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,UAAU,CAAC,GAAG,EAAG;AAExF,MAAMG,eAAe,GAAGA,~~CAAClC~~,sBAAsB,~~EAAEgC~~,WAAW,EAAEC,YAAY,KAAK;EAC7E,IAAI,~~CAACjC~~,sBAAsB,EAAE,OAAO,EAAE;EACtC,MAAMhB,KAAK,GAAG,EAAE;EAChB,~~IAAIgD~~,WAAW,~~EACbhD~~,KAAK,CAACwB,IAAI,CAAC,eAAe,EAAE,wBAAwB,EAAE,4BAA4B,CAAC;EAErF,~~IAAIyB~~,YAAY,EAAE;~~IAChBjD~~,KAAK,CAACwB,IAAI,CAAE,GAAE7B,cAAe,QAAO,CAAC;IACrCK,KAAK,CAACwB,IAAI,CAAC5B,aAAa,CAAC;EAC3B;EAEA,OAAOI,KAAK;AACd,CAAC;AAED,eAAeM,eAAe"}
1	+ {"version":3,"file":"build-props-query.js","names":["CATEGORY_ID","ID","PREHEADER_PROP","HEADLINE_PROP","defaultProps","categoryProps","checkProps","props","Object","keys","filter","prop","length","buildPropsQuery","entitySchema","extraProps","cardOptions","linkProps","parsedSchema","getEntitySchema","extraPropsHaveCategory","includes","typeBasedProps","shouldAddCategoryProps","getTypeBaseProps","allProps","uniqueProps","Set","basicProps","nestedProps","forEach","push","base","nested","split","complexProps","buildComplexProps","join","relations","dynamicProperties","properties","map","hasLink","find","linkProp","matchingProperty","matchingRelation","localField","matchingDynamicProp","dynamicKey","jointNestedProps","isCard","displayCategory","displayThumbnail","interfaces","isContent","hasCategory","hasPreheader","getCategoyProps","getContentProps","url"],"sources":["../../src/helpers/build-props-query.js"],"sourcesContent":["import { CATEGORY_ID, ID, PREHEADER_PROP, HEADLINE_PROP } from '../constants';\n\nconst defaultProps = [ID, 'name'];\nconst categoryProps = 'id publishedListingPage{id, url}';\n\nconst checkProps = props =>\n !!(props && Object.keys(props).filter(prop => prop === CATEGORY_ID).length);\n\nconst buildPropsQuery = (entitySchema, extraProps = [], cardOptions = null, linkProps = []) => {\n const parsedSchema = entitySchema.getEntitySchema ? entitySchema.getEntitySchema : entitySchema;\n const extraPropsHaveCategory = !!extraProps.filter(prop => prop.includes('category.')).length;\n const { typeBasedProps, shouldAddCategoryProps } = getTypeBaseProps(\n parsedSchema,\n cardOptions,\n extraPropsHaveCategory\n );\n\n const allProps = [...typeBasedProps, ...extraProps];\n const uniqueProps = [...new Set([...allProps])];\n const basicProps = [];\n const nestedProps = {};\n uniqueProps.forEach(prop => {\n if (prop) {\n if (!prop.includes('.')) {\n basicProps.push(prop);\n return;\n }\n const [base, nested] = prop.split('.');\n if (!nestedProps[base]) nestedProps[base] = [nested];\n else nestedProps[base].push(nested);\n }\n });\n\n const complexProps = buildComplexProps(\n shouldAddCategoryProps,\n nestedProps,\n parsedSchema,\n linkProps\n );\n\n return [...basicProps, ...complexProps].join(',');\n};\n\nconst buildComplexProps = (\n shouldAddCategoryProps,\n props,\n { relations = [], dynamicProperties = {}, properties = {} },\n linkProps\n) =>\n Object.keys(props).map(base => {\n const nestedProps = props[base];\n const hasLink = !!linkProps.find(linkProp => linkProp.includes(base));\n const matchingProperty = !!properties[base];\n const matchingRelation = relations.find(({ localField }) => localField === base);\n const matchingDynamicProp = Object.keys(dynamicProperties).find(\n dynamicKey => dynamicKey === base\n );\n\n if (matchingRelation && !nestedProps.includes('id')) nestedProps.push('id');\n if (hasLink && (!!matchingProperty \|\| !!matchingRelation \|\| !!matchingDynamicProp))\n nestedProps.push('url');\n const jointNestedProps = nestedProps.join(',');\n if (base === 'category' && shouldAddCategoryProps)\n return `${base}{${jointNestedProps}, ${categoryProps}}`;\n if (base.includes('published')) {\n return `${base}{${jointNestedProps},url}`;\n }\n return `${base}{${jointNestedProps}}`;\n });\n\nconst getTypeBaseProps = (entitySchema, cardOptions, extraPropsHaveCategory) => {\n const isCard = !!cardOptions;\n const { displayCategory = true, displayThumbnail = true } = cardOptions \|\| {};\n\n const shouldAddCategoryProps =\n (isCard && displayCategory) \|\| (!isCard && !extraPropsHaveCategory);\n\n if (!isCard) return { typeBasedProps: [ID], shouldAddCategoryProps };\n\n const { interfaces, properties, dynamicProperties, relations } = entitySchema;\n\n const isContent = !!interfaces.includes('content/content');\n const hasCategory = checkProps(properties) \|\| checkProps(dynamicProperties);\n const hasPreheader = properties[PREHEADER_PROP];\n\n const typeBasedProps = [...defaultProps];\n\n typeBasedProps.push(...getCategoyProps(shouldAddCategoryProps, hasCategory, hasPreheader));\n typeBasedProps.push(...getContentProps(isContent));\n\n if (properties.url \|\| dynamicProperties.url) typeBasedProps.push('url');\n\n if (displayThumbnail && relations.find(({ localField }) => localField === 'image')) {\n typeBasedProps.push('image.id', 'image.url', 'image.data');\n }\n\n return { typeBasedProps, shouldAddCategoryProps };\n};\n\nconst getContentProps = isContent => (isContent ? ['url', 'sponsored', 'featured'] : []);\n\nconst getCategoyProps = (shouldAddCategoryProps, hasCategory, hasPreheader) => {\n if (!shouldAddCategoryProps) return [];\n const props = [];\n if (hasCategory)\n props.push('category.name', 'category.listingPageId', 'category.listingPageEntity');\n\n if (hasPreheader) {\n props.push(`${PREHEADER_PROP}{name}`);\n props.push(HEADLINE_PROP);\n }\n\n return props;\n};\n\nexport default buildPropsQuery;\n"],"mappings":"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"}

package/lib-es/helpers/build-set-filters.js CHANGED Viewed

@@ -24,7 +24,11 @@ const buildSetFilters = ({
     getCheckboxFilters(checkboxFilters, SPONSORED);
   }
   const shouldApplyFilterValues = filterBy.length && filterByProperty.length;
-  const listFilterValues = shouldApplyFilterValues ? getFilterValues(filterBy) : {};
+  if (!shouldApplyFilterValues) return {
+    checkboxFilters,
+    listFilterValues: {}
+  };
+  const listFilterValues = getFilterValues(filterBy);
   return {
     checkboxFilters,
     listFilterValues

package/lib-es/helpers/build-set-filters.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-set-filters.js","names":["FEATURED","SPONSORED","getCheckboxFilters","checkboxFilters","name","push","getFilterValues","filterBy","reduce","acc","filter","fieldName","values","split","value","join","previousValue","finalValue","buildSetFilters","filterByProperty","filterByFeatured","filterBySponsored","shouldApplyFilterValues","length","listFilterValues"],"sources":["../../src/helpers/build-set-filters.js"],"sourcesContent":["import { FEATURED, SPONSORED } from '../constants';\n\nconst getCheckboxFilters = (checkboxFilters, name) => {\n checkboxFilters.push(name);\n};\n\nconst getFilterValues = filterBy =>\n filterBy.reduce((acc, filter) => {\n const [fieldName, ...values] = filter.split('/');\n const value = values.join('/');\n const previousValue = acc[fieldName];\n const finalValue = previousValue ? [...previousValue, value] : [value];\n\n acc[fieldName] = finalValue;\n return acc;\n }, {});\n\nconst buildSetFilters = ({\n filterBy = [],\n filterByProperty = [],\n filterByFeatured,\n filterBySponsored\n}) => {\n const checkboxFilters = [];\n\n if (filterByFeatured) {\n getCheckboxFilters(checkboxFilters, FEATURED);\n }\n if (filterBySponsored) {\n getCheckboxFilters(checkboxFilters, SPONSORED);\n }\n\n const shouldApplyFilterValues = filterBy.length && filterByProperty.length;\n ~~const~~ ~~listFilterValues~~ = ~~shouldApplyFilterValues~~ ? ~~getFilterValues(filterBy)~~ : {};\n\n return { checkboxFilters, listFilterValues };\n};\n\nexport default buildSetFilters;\n"],"mappings":"AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,cAAc;AAElD,MAAMC,kBAAkB,GAAGA,CAACC,eAAe,EAAEC,IAAI,KAAK;EACpDD,eAAe,CAACE,IAAI,CAACD,IAAI,CAAC;AAC5B,CAAC;AAED,MAAME,eAAe,GAAGC,QAAQ,IAC9BA,QAAQ,CAACC,MAAM,CAAC,CAACC,GAAG,EAAEC,MAAM,KAAK;EAC/B,MAAM,CAACC,SAAS,EAAE,GAAGC,MAAM,CAAC,GAAGF,MAAM,CAACG,KAAK,CAAC,GAAG,CAAC;EAChD,MAAMC,KAAK,GAAGF,MAAM,CAACG,IAAI,CAAC,GAAG,CAAC;EAC9B,MAAMC,aAAa,GAAGP,GAAG,CAACE,SAAS,CAAC;EACpC,MAAMM,UAAU,GAAGD,aAAa,GAAG,CAAC,GAAGA,aAAa,EAAEF,KAAK,CAAC,GAAG,CAACA,KAAK,CAAC;EAEtEL,GAAG,CAACE,SAAS,CAAC,GAAGM,UAAU;EAC3B,OAAOR,GAAG;AACZ,CAAC,EAAE,CAAC,CAAC,CAAC;AAER,MAAMS,eAAe,GAAGA,CAAC;EACvBX,QAAQ,GAAG,EAAE;EACbY,gBAAgB,GAAG,EAAE;EACrBC,gBAAgB;EAChBC;AACF,CAAC,KAAK;EACJ,MAAMlB,eAAe,GAAG,EAAE;EAE1B,IAAIiB,gBAAgB,EAAE;IACpBlB,kBAAkB,CAACC,eAAe,EAAEH,QAAQ,CAAC;EAC/C;EACA,IAAIqB,iBAAiB,EAAE;IACrBnB,kBAAkB,CAACC,eAAe,EAAEF,SAAS,CAAC;EAChD;EAEA,MAAMqB,uBAAuB,GAAGf,QAAQ,CAACgB,MAAM,IAAIJ,gBAAgB,CAACI,MAAM;EAC1E,~~MAAMC~~,~~gBAAgB~~,~~GAAGF,~~uBAAuB,~~GAAGhB~~,eAAe,~~CAACC~~,~~QAAQ~~,CAAC,~~GAAG,~~CAAC,CAAC;~~EAEjF~~,OAAO;IAAEJ,eAAe;IAAEqB;EAAiB,CAAC;AAC9C,CAAC;AAED,eAAeN,eAAe"}
1	+ {"version":3,"file":"build-set-filters.js","names":["FEATURED","SPONSORED","getCheckboxFilters","checkboxFilters","name","push","getFilterValues","filterBy","reduce","acc","filter","fieldName","values","split","value","join","previousValue","finalValue","buildSetFilters","filterByProperty","filterByFeatured","filterBySponsored","shouldApplyFilterValues","length","listFilterValues"],"sources":["../../src/helpers/build-set-filters.js"],"sourcesContent":["import { FEATURED, SPONSORED } from '../constants';\n\nconst getCheckboxFilters = (checkboxFilters, name) => {\n checkboxFilters.push(name);\n};\n\nconst getFilterValues = filterBy =>\n filterBy.reduce((acc, filter) => {\n const [fieldName, ...values] = filter.split('/');\n const value = values.join('/');\n const previousValue = acc[fieldName];\n const finalValue = previousValue ? [...previousValue, value] : [value];\n\n acc[fieldName] = finalValue;\n return acc;\n }, {});\n\nconst buildSetFilters = ({\n filterBy = [],\n filterByProperty = [],\n filterByFeatured,\n filterBySponsored\n}) => {\n const checkboxFilters = [];\n\n if (filterByFeatured) {\n getCheckboxFilters(checkboxFilters, FEATURED);\n }\n if (filterBySponsored) {\n getCheckboxFilters(checkboxFilters, SPONSORED);\n }\n\n const shouldApplyFilterValues = filterBy.length && filterByProperty.length;\n if (!shouldApplyFilterValues) return { checkboxFilters, listFilterValues: {} };\n\n const listFilterValues = getFilterValues(filterBy);\n return { checkboxFilters, listFilterValues };\n};\n\nexport default buildSetFilters;\n"],"mappings":"AAAA,SAASA,QAAQ,EAAEC,SAAS,QAAQ,cAAc;AAElD,MAAMC,kBAAkB,GAAGA,CAACC,eAAe,EAAEC,IAAI,KAAK;EACpDD,eAAe,CAACE,IAAI,CAACD,IAAI,CAAC;AAC5B,CAAC;AAED,MAAME,eAAe,GAAGC,QAAQ,IAC9BA,QAAQ,CAACC,MAAM,CAAC,CAACC,GAAG,EAAEC,MAAM,KAAK;EAC/B,MAAM,CAACC,SAAS,EAAE,GAAGC,MAAM,CAAC,GAAGF,MAAM,CAACG,KAAK,CAAC,GAAG,CAAC;EAChD,MAAMC,KAAK,GAAGF,MAAM,CAACG,IAAI,CAAC,GAAG,CAAC;EAC9B,MAAMC,aAAa,GAAGP,GAAG,CAACE,SAAS,CAAC;EACpC,MAAMM,UAAU,GAAGD,aAAa,GAAG,CAAC,GAAGA,aAAa,EAAEF,KAAK,CAAC,GAAG,CAACA,KAAK,CAAC;EAEtEL,GAAG,CAACE,SAAS,CAAC,GAAGM,UAAU;EAC3B,OAAOR,GAAG;AACZ,CAAC,EAAE,CAAC,CAAC,CAAC;AAER,MAAMS,eAAe,GAAGA,CAAC;EACvBX,QAAQ,GAAG,EAAE;EACbY,gBAAgB,GAAG,EAAE;EACrBC,gBAAgB;EAChBC;AACF,CAAC,KAAK;EACJ,MAAMlB,eAAe,GAAG,EAAE;EAE1B,IAAIiB,gBAAgB,EAAE;IACpBlB,kBAAkB,CAACC,eAAe,EAAEH,QAAQ,CAAC;EAC/C;EACA,IAAIqB,iBAAiB,EAAE;IACrBnB,kBAAkB,CAACC,eAAe,EAAEF,SAAS,CAAC;EAChD;EAEA,MAAMqB,uBAAuB,GAAGf,QAAQ,CAACgB,MAAM,IAAIJ,gBAAgB,CAACI,MAAM;EAC1E,IAAI,CAACD,uBAAuB,EAAE,OAAO;IAAEnB,eAAe;IAAEqB,gBAAgB,EAAE,CAAC;EAAE,CAAC;EAE9E,MAAMA,gBAAgB,GAAGlB,eAAe,CAACC,QAAQ,CAAC;EAClD,OAAO;IAAEJ,eAAe;IAAEqB;EAAiB,CAAC;AAC9C,CAAC;AAED,eAAeN,eAAe"}

package/lib-es/helpers/get-query-props.js CHANGED Viewed

@@ -1,11 +1,15 @@
 import isFilterEntitysId from './is-filter-entitys-id';
 import getFilterProps from './get-filter-props';
 import { ID } from '../constants';
-const getQueryProps = (inheritedFilters, currentSchema, filterEntitySchema) => {
+const getQueryProps = (inheritedFilters, currentSchema, filterEntitySchema = {}) => {
   if (!currentSchema || !inheritedFilters.length) return ID;
   const {
-    identifier: currentEntityId
+    identifier: currentEntityId,
+    properties
   } = currentSchema;
+  const {
+    identifier: filterEntityId
+  } = filterEntitySchema;
   return inheritedFilters.reduce((acc, filter) => {
     const {
       filterName,
@@ -20,6 +24,10 @@ const getQueryProps = (inheritedFilters, currentSchema, filterEntitySchema) => {
     if (relationForeignKeys && relationForeignKeys.length) {
       return `${acc} ${relationForeignKeys.join(' ')}`;
     }
+    if (filterName === ID) {
+      const queryValue = Object.keys(properties).find(propKey => properties[propKey] && properties[propKey].relation && properties[propKey].relation.entityIdentifier === filterEntityId);
+      if (queryValue) return `${acc} ${queryValue} `;
+    }
     const queryProp = relationEntityName ? `${relationName} { ${relationProp} }` : filterName;
     const queryPropFinalValue = isEntityItself && isFilterEntitysId(filterName, currentEntityId) ? ID : queryProp;
     return `${acc} ${queryPropFinalValue} `;

package/lib-es/helpers/get-query-props.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"get-query-props.js","names":["isFilterEntitysId","getFilterProps","ID","getQueryProps","inheritedFilters","currentSchema","filterEntitySchema","length","identifier","currentEntityId","reduce","acc","filter","filterName","relationName","relationProp","relationEntityName","isEntityItself","relationForeignKeys","shouldIgnoreFilter","join","queryProp","queryPropFinalValue"],"sources":["../../src/helpers/get-query-props.js"],"sourcesContent":["import isFilterEntitysId from './is-filter-entitys-id';\nimport getFilterProps from './get-filter-props';\nimport { ID } from '../constants';\n\nconst getQueryProps = (inheritedFilters, currentSchema, filterEntitySchema) => {\n if (!currentSchema \|\| !inheritedFilters.length) return ID;\n\n const { identifier: currentEntityId } = currentSchema;\n\n return inheritedFilters.reduce((acc, filter) => {\n const {\n filterName,\n relationName,\n relationProp,\n relationEntityName,\n isEntityItself,\n relationForeignKeys,\n shouldIgnoreFilter\n } = getFilterProps(filter, currentSchema, filterEntitySchema);\n\n if (shouldIgnoreFilter) return acc;\n if (relationForeignKeys && relationForeignKeys.length) {\n return `${acc} ${relationForeignKeys.join(' ')}`;\n }\n\n const queryProp = relationEntityName ? `${relationName} { ${relationProp} }` : filterName;\n const queryPropFinalValue =\n isEntityItself && isFilterEntitysId(filterName, currentEntityId) ? ID : queryProp;\n\n return `${acc} ${queryPropFinalValue} `;\n }, ID);\n};\n\nexport default getQueryProps;\n"],"mappings":"AAAA,OAAOA,iBAAiB,MAAM,wBAAwB;AACtD,OAAOC,cAAc,MAAM,oBAAoB;AAC/C,SAASC,EAAE,QAAQ,cAAc;AAEjC,MAAMC,aAAa,GAAGA,CAACC,gBAAgB,EAAEC,aAAa,EAAEC,kBAAkB,KAAK;~~EAC7E~~,IAAI,CAACD,aAAa,IAAI,CAACD,gBAAgB,CAACG,MAAM,EAAE,OAAOL,EAAE;EAEzD,MAAM;IAAEM,UAAU,EAAEC;~~EAAgB~~,CAAC,~~GAAGJ~~,aAAa;~~EAErD~~,~~OAAOD~~,gBAAgB,~~CAACM~~,MAAM,CAAC,CAACC,GAAG,EAAEC,MAAM,KAAK;IAC9C,MAAM;MACJC,UAAU;MACVC,YAAY;MACZC,YAAY;MACZC,kBAAkB;MAClBC,cAAc;MACdC,mBAAmB;MACnBC;IACF,CAAC,~~GAAGlB~~,cAAc,~~CAACW~~,MAAM,~~EAAEP~~,aAAa,EAAEC,kBAAkB,CAAC;~~IAE7D~~,~~IAAIa~~,kBAAkB,EAAE,OAAOR,GAAG;IAClC,IAAIO,mBAAmB,IAAIA,mBAAmB,~~CAACX~~,MAAM,EAAE;MACrD,OAAQ,~~GAAEI~~,GAAI,IAAGO,mBAAmB,CAACE,IAAI,CAAC,GAAG,CAAE,EAAC;IAClD;~~IAEA~~,~~MAAMC~~,SAAS,~~GAAGL~~,kBAAkB,GAAI,GAAEF,YAAa,MAAKC,YAAa,IAAG,GAAGF,UAAU;IACzF,~~MAAMS~~,mBAAmB,~~GACvBL~~,cAAc,~~IAAIjB~~,iBAAiB,~~CAACa~~,UAAU,~~EAAEJ~~,eAAe,CAAC,GAAGP,EAAE,~~GAAGmB~~,SAAS;IAEnF,OAAQ,~~GAAEV~~,GAAI,~~IAAGW~~,mBAAoB,GAAE;EACzC,CAAC,~~EAAEpB~~,EAAE,CAAC;AACR,CAAC;AAED,eAAeC,aAAa"}
1	+ {"version":3,"file":"get-query-props.js","names":["isFilterEntitysId","getFilterProps","ID","getQueryProps","inheritedFilters","currentSchema","filterEntitySchema","length","identifier","currentEntityId","properties","filterEntityId","reduce","acc","filter","filterName","relationName","relationProp","relationEntityName","isEntityItself","relationForeignKeys","shouldIgnoreFilter","join","queryValue","Object","keys","find","propKey","relation","entityIdentifier","queryProp","queryPropFinalValue"],"sources":["../../src/helpers/get-query-props.js"],"sourcesContent":["import isFilterEntitysId from './is-filter-entitys-id';\nimport getFilterProps from './get-filter-props';\nimport { ID } from '../constants';\n\nconst getQueryProps = (inheritedFilters, currentSchema, filterEntitySchema = {}) => {\n if (!currentSchema \|\| !inheritedFilters.length) return ID;\n\n const { identifier: currentEntityId, properties } = currentSchema;\n const { identifier: filterEntityId } = filterEntitySchema;\n\n return inheritedFilters.reduce((acc, filter) => {\n const {\n filterName,\n relationName,\n relationProp,\n relationEntityName,\n isEntityItself,\n relationForeignKeys,\n shouldIgnoreFilter\n } = getFilterProps(filter, currentSchema, filterEntitySchema);\n if (shouldIgnoreFilter) return acc;\n if (relationForeignKeys && relationForeignKeys.length) {\n return `${acc} ${relationForeignKeys.join(' ')}`;\n }\n if (filterName === ID) {\n const queryValue = Object.keys(properties).find(\n propKey =>\n properties[propKey] &&\n properties[propKey].relation &&\n properties[propKey].relation.entityIdentifier === filterEntityId\n );\n if (queryValue) return `${acc} ${queryValue} `;\n }\n const queryProp = relationEntityName ? `${relationName} { ${relationProp} }` : filterName;\n const queryPropFinalValue =\n isEntityItself && isFilterEntitysId(filterName, currentEntityId) ? ID : queryProp;\n\n return `${acc} ${queryPropFinalValue} `;\n }, ID);\n};\n\nexport default getQueryProps;\n"],"mappings":"AAAA,OAAOA,iBAAiB,MAAM,wBAAwB;AACtD,OAAOC,cAAc,MAAM,oBAAoB;AAC/C,SAASC,EAAE,QAAQ,cAAc;AAEjC,MAAMC,aAAa,GAAGA,CAACC,gBAAgB,EAAEC,aAAa,EAAEC,kBAAkB,GAAG,CAAC,CAAC,KAAK;EAClF,IAAI,CAACD,aAAa,IAAI,CAACD,gBAAgB,CAACG,MAAM,EAAE,OAAOL,EAAE;EAEzD,MAAM;IAAEM,UAAU,EAAEC,eAAe;IAAEC;EAAW,CAAC,GAAGL,aAAa;EACjE,MAAM;IAAEG,UAAU,EAAEG;EAAe,CAAC,GAAGL,kBAAkB;EAEzD,OAAOF,gBAAgB,CAACQ,MAAM,CAAC,CAACC,GAAG,EAAEC,MAAM,KAAK;IAC9C,MAAM;MACJC,UAAU;MACVC,YAAY;MACZC,YAAY;MACZC,kBAAkB;MAClBC,cAAc;MACdC,mBAAmB;MACnBC;IACF,CAAC,GAAGpB,cAAc,CAACa,MAAM,EAAET,aAAa,EAAEC,kBAAkB,CAAC;IAC7D,IAAIe,kBAAkB,EAAE,OAAOR,GAAG;IAClC,IAAIO,mBAAmB,IAAIA,mBAAmB,CAACb,MAAM,EAAE;MACrD,OAAQ,GAAEM,GAAI,IAAGO,mBAAmB,CAACE,IAAI,CAAC,GAAG,CAAE,EAAC;IAClD;IACA,IAAIP,UAAU,KAAKb,EAAE,EAAE;MACrB,MAAMqB,UAAU,GAAGC,MAAM,CAACC,IAAI,CAACf,UAAU,CAAC,CAACgB,IAAI,CAC7CC,OAAO,IACLjB,UAAU,CAACiB,OAAO,CAAC,IACnBjB,UAAU,CAACiB,OAAO,CAAC,CAACC,QAAQ,IAC5BlB,UAAU,CAACiB,OAAO,CAAC,CAACC,QAAQ,CAACC,gBAAgB,KAAKlB,cACtD,CAAC;MACD,IAAIY,UAAU,EAAE,OAAQ,GAAEV,GAAI,IAAGU,UAAW,GAAE;IAChD;IACA,MAAMO,SAAS,GAAGZ,kBAAkB,GAAI,GAAEF,YAAa,MAAKC,YAAa,IAAG,GAAGF,UAAU;IACzF,MAAMgB,mBAAmB,GACvBZ,cAAc,IAAInB,iBAAiB,CAACe,UAAU,EAAEN,eAAe,CAAC,GAAGP,EAAE,GAAG4B,SAAS;IAEnF,OAAQ,GAAEjB,GAAI,IAAGkB,mBAAoB,GAAE;EACzC,CAAC,EAAE7B,EAAE,CAAC;AACR,CAAC;AAED,eAAeC,aAAa"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.130.0-admin-updates.6",
+  "version": "0.130.0-admin-updates.9",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -32,7 +32,7 @@
     "@blaze-cms/core-errors-ui": "0.130.0-admin-updates.0",
     "@blaze-cms/image-cdn-react": "0.3.0-alpha.5",
     "@blaze-cms/nextjs-components": "0.130.0-admin-updates.0",
-    "@blaze-cms/plugin-search-ui": "0.130.0-admin-updates.4",
+    "@blaze-cms/plugin-search-ui": "0.130.0-admin-updates.9",
     "@blaze-cms/setup-ui": "0.130.0-admin-updates.0",
     "@blaze-cms/utils": "0.130.0-admin-updates.0",
     "@blaze-cms/utils-handlebars": "0.130.0-admin-updates.0",
@@ -89,5 +89,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "b9d0211de22635574875beede5105697dbb24377"
+  "gitHead": "462e28db91657c82f0e901a77dd82d9901d2a160"
 }

package/src/components/Card/CardsRender.js CHANGED Viewed

@@ -22,7 +22,8 @@ import {
   filterQuerySetup,
   shouldSkipSingleQuery,
   shouldReturn,
-  getUpdatedSortProperties
+  getUpdatedSortProperties,
+  getUpdatedItemsToDisplay
 } from './helpers';
 const CardsContainer = dynamic(() => import('./CardsContainer'));
@@ -95,6 +96,7 @@ const CardsRender = ({
     isPreview,
     itemEntityUpdated: unpublishedParentEntityName
   });
   const {
     data: { entityData: parentEntityData = {} } = {},
     error: _err,
@@ -122,6 +124,13 @@ const CardsRender = ({
     variableProps
   );
+  const updatedItemsToDisplay = getUpdatedItemsToDisplay({
+    itemsToDisplay,
+    inheritedFilters,
+    parentSchema,
+    parentEntityData
+  });
   const { limit, variables } = filterQuerySetup({
     getEntitySchemas: Object.values(requiredSchema),
     entity: primaryEntityToUse,
@@ -130,22 +139,33 @@ const CardsRender = ({
     docType: docTypes,
     filterOperator,
     filterEntityRelations,
-    itemsToDisplay,
+    itemsToDisplay: updatedItemsToDisplay,
     entitySameAsCurrentItemEntity,
     useRandomSort
   });
+  const hasNoFiltersOrItemsToDisplay = !updatedItemsToDisplay.length && !updatedFilterBy;
   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)
+    skip: shouldReturn(
+      hasNoFiltersOrItemsToDisplay,
+      _loading,
+      _load,
+      schemaLoading,
+      _error,
+      _err,
+      schemaError
+    )
   });
-  const imageIds = itemsToDisplay.map(({ imageId }) => imageId).filter(Boolean);
+  const imageIds = updatedItemsToDisplay.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 (hasNoFiltersOrItemsToDisplay) return null;
   if (isLoading) return null;
   if (hasError) return null;
   if (cardsError) return cardsError.message;
@@ -160,7 +180,7 @@ const CardsRender = ({
   const orderedData = useRandomSort
     ? cardDataResults
-    : sortResponseData(cardDataResults, itemsToDisplay);
+    : sortResponseData(cardDataResults, updatedItemsToDisplay);
   const { regularChildren, gtmChildren } = splitChildren(
     children,
     cardDataResults,
@@ -169,7 +189,7 @@ const CardsRender = ({
       name: variableProps.name
     }
   );
-  const updatedCards = appendImages(imagesData, orderedData, itemsToDisplay);
+  const updatedCards = appendImages(imagesData, orderedData, updatedItemsToDisplay);
   return (
     <>

package/src/components/Card/helpers/get-updated-items-to-display.js ADDED Viewed

@@ -0,0 +1,32 @@
+const getUpdatedItemsToDisplay = ({
+  parentSchema,
+  parentEntityData,
+  itemsToDisplay = [],
+  inheritedFilters = []
+}) => {
+  const idProp = inheritedFilters.find(filter => filter.indexOf('id/') === 0);
+  if (!idProp || !parentSchema || !parentEntityData) return itemsToDisplay;
+  const { properties } = parentSchema;
+  const [, entityKey] = idProp.split('/');
+  if (!properties || !entityKey) return itemsToDisplay;
+  const queryValue = Object.keys(properties).find(
+    propKey =>
+      properties[propKey] &&
+      properties[propKey].relation &&
+      properties[propKey].relation.entityIdentifier === entityKey
+  );
+  const parentValues = parentEntityData[queryValue];
+  if (!parentValues) return itemsToDisplay;
+  const updatedItemsToDisplay = [...itemsToDisplay];
+  if (Array.isArray(parentValues)) {
+    parentValues.forEach(value => {
+      updatedItemsToDisplay.push({ displayItems: [value] });
+    });
+  } else {
+    updatedItemsToDisplay.push({ displayItems: [parentValues] });
+  }
+  return updatedItemsToDisplay;
+};
+export default getUpdatedItemsToDisplay;

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

@@ -6,3 +6,4 @@ 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';
+export { default as getUpdatedItemsToDisplay } from './get-updated-items-to-display';

package/src/helpers/build-inherited-filters.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import flatten from 'lodash.flatten';
 import isFilterEntitysId from './is-filter-entitys-id';
 import getFilterProps from './get-filter-props';
+import { ID } from '../constants';
 const getRelationData = (entityData, relationName, currentRelationNames) => {
   if (!entityData) return null;
@@ -49,8 +50,9 @@ const buildInheritedFilters = (
       shouldIgnoreFilter
     } = getFilterProps(filter, currentSchema, filterEntitySchema);
-    const relationData = getRelationData(entityData, relationName, relationForeignKeys);
+    if (filterName === ID) return;
+    const relationData = getRelationData(entityData, relationName, relationForeignKeys);
     if (
       (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId)) ||
       shouldIgnoreFilter