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

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

@@ -44,19 +44,21 @@ const buildPropsQuery = (entitySchema, extraProps = [], cardOptions = null, link
 const buildComplexProps = (
   shouldAddCategoryProps,
   props,
-  { relations = [], dynamicProperties = {} },
+  { relations = [], 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}}`;

package/src/helpers/build-set-filters.js

@@ -31,8 +31,9 @@ const buildSetFilters = ({
   }
 
   const shouldApplyFilterValues = filterBy.length && filterByProperty.length;
-  const listFilterValues = shouldApplyFilterValues ? getFilterValues(filterBy) : {};
+  if (!shouldApplyFilterValues) return { checkboxFilters, listFilterValues: {} };
 
+  const listFilterValues = getFilterValues(filterBy);
   return { checkboxFilters, listFilterValues };
 };
 

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

@@ -2,10 +2,11 @@ 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 } = currentSchema;
+  const { identifier: currentEntityId, properties } = currentSchema;
+  const { identifier: filterEntityId } = filterEntitySchema;
 
   return inheritedFilters.reduce((acc, filter) => {
     const {
@@ -17,12 +18,19 @@ const getQueryProps = (inheritedFilters, currentSchema, filterEntitySchema) => {
       relationForeignKeys,
       shouldIgnoreFilter
     } = getFilterProps(filter, currentSchema, filterEntitySchema);
-
     if (shouldIgnoreFilter) return acc;
     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;

package/tests/unit/src/components/Card/helpers/get-updated-items-to-display.test.js

@@ -0,0 +1,72 @@
+import '@testing-library/jest-dom/extend-expect';
+import getUpdatedItemsToDisplay from '../../../../../../src/components/Card/helpers/get-updated-items-to-display';
+
+const mockedProps = {
+  itemsToDisplay: [
+    {
+      displayItems: ['54321']
+    }
+  ],
+  parentEntityData: {
+    authorIds: ['12345']
+  },
+  parentSchema: {
+    properties: {
+      authorIds: {
+        relation: {
+          entityIdentifier: 'author'
+        }
+      }
+    }
+  },
+  inheritedFilters: ['id/author']
+};
+
+describe('getUpdatedItemsToDisplay helper function', () => {
+  it('should return empty array if no props passed', () => {
+    const emptyArray = getUpdatedItemsToDisplay({});
+    expect(emptyArray).toEqual([]);
+  });
+
+  it('should return old itemsToDisplay itemsToDisplay if no idProp match, no parentSchema or no parentEntityData', () => {
+    const onlyItemsToDisplayPassed = getUpdatedItemsToDisplay({
+      itemsToDisplay: mockedProps.itemsToDisplay
+    });
+    const noIdPropMatch = getUpdatedItemsToDisplay({
+      ...mockedProps,
+      inheritedFilters: ['notid/author']
+    });
+    const noParentSchema = getUpdatedItemsToDisplay({
+      ...mockedProps,
+      parentSchema: null
+    });
+    const noParentEntityData = getUpdatedItemsToDisplay({
+      ...mockedProps,
+      parentEntityData: null
+    });
+    expect(onlyItemsToDisplayPassed).toEqual(mockedProps.itemsToDisplay);
+    expect(noIdPropMatch).toEqual(mockedProps.itemsToDisplay);
+    expect(noParentSchema).toEqual(mockedProps.itemsToDisplay);
+    expect(noParentEntityData).toEqual(mockedProps.itemsToDisplay);
+  });
+
+  it('should return old itemsToDisplay if parentSchema has no propMatch with idProp entity', () => {
+    const sameItemsToDisplay = getUpdatedItemsToDisplay({
+      ...mockedProps,
+      inheritedFilters: ['id/noentitymatch']
+    });
+    expect(sameItemsToDisplay).toEqual(mockedProps.itemsToDisplay);
+  });
+
+  it('should return updated itemsToDisplay otherwise', () => {
+    const sameItemsToDisplay = getUpdatedItemsToDisplay({
+      ...mockedProps
+    });
+    expect(sameItemsToDisplay).toEqual([
+      ...mockedProps.itemsToDisplay,
+      {
+        displayItems: ['12345']
+      }
+    ]);
+  });
+});

package/tests/unit/src/helpers/build-props-query.test.js

@@ -182,6 +182,31 @@ describe('get card render props', () => {
       'id,name,url,sponsored,featured,category{name,listingPageId,listingPageEntity, id publishedListingPage{id, url}},address{country,id}'
     );
   });
+
+  it('should url props where enableLink is set', () => {
+    const _data = {
+      getEntitySchema: {
+        interfaces: [CONTENT_INTERFACE],
+        properties: {
+          id: 'id',
+          nestedProperty: {
+            type: 'object'
+          }
+        },
+        relations: [{ localField: 'address' }],
+        dynamicProperties: {
+          nestedDynamicProperty: {
+            type: 'object'
+          }
+        }
+      }
+    };
+    const linkProps = ['nestedProperty.title', 'nestedDynamicProperty.title', 'address.title'];
+    const query = buildPropsQuery(_data, linkProps, {}, linkProps);
+    expect(query).toEqual(
+      'id,name,url,sponsored,featured,nestedProperty{title,url},nestedDynamicProperty{title,url},address{title,id,url}'
+    );
+  });
 });
 
 function testUrlProperty({ extraProperties = {}, dynamicProperties = {}, cardProps }) {