@blaze-cms/react-page-builder 0.124.0-alpha.2 → 0.124.0-alpha.6

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

@@ -22,23 +22,24 @@ const buildPropsQuery = (data, extraProps = [], cardOptions = null) => {
   const basicProps = uniqueProps
     .filter(prop => prop && !prop.includes('.'))
     .filter((prop, i, arr) => arr.indexOf(prop) === i);
-  const complexProps = buildComplexProps(shouldAddCategoryProps, uniqueProps);
-
+  const complexProps = buildComplexProps(shouldAddCategoryProps, uniqueProps, data);
   return [...basicProps, ...complexProps].join(',');
 };
 
-const buildComplexProps = (shouldAddCategoryProps, props) =>
+const buildComplexProps = (shouldAddCategoryProps, props, { getEntitySchema: { relations } }) =>
   props
     .filter(prop => prop && prop.includes('.'))
     .map(nested => nested.split('.')[0])
     .filter((prop, i, arr) => arr.indexOf(prop) === i)
     .map(base => {
+      const matchingRelation = relations.find(({ localField }) => localField === base);
       const nestedProps = props
         .filter(
           (extraProp, i, arr) =>
             extraProp && extraProp.startsWith(`${base}.`) && arr.indexOf(extraProp) === i
         )
         .map(nested => nested.split('.')[1]);
+      if (matchingRelation && !nestedProps.includes('id')) nestedProps.push('id');
 
       const jointNestedProps = nestedProps.join(',');
       if (base === 'category' && shouldAddCategoryProps)
@@ -70,6 +71,8 @@ const getTypeBaseProps = (data, cardOptions, extraPropsHaveCategory) => {
   typeBasedProps.push(...getCategoyProps(shouldAddCategoryProps, hasCategory, hasPreheader));
   typeBasedProps.push(...getContentProps(isContent));
 
+  if (properties.url || dynamicProperties.url) typeBasedProps.push('url');
+
   if (displayThumbnail && relations.find(({ localField }) => localField === 'image')) {
     typeBasedProps.push('image.id', 'image.url', 'image.data');
   }

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

@@ -33,6 +33,7 @@ describe('get card render props', () => {
       dynamicProperties: {}
     }
   };
+
   const cardProps = {};
 
   it('should be a function', () => {
@@ -159,4 +160,46 @@ describe('get card render props', () => {
       'id,name,url,sponsored,featured,category{name,listingPageId,listingPageEntity, id publishedListingPage{id, url}}'
     );
   });
+
+  it('should include url if property has url', () => {
+    testUrlProperty({ extraProperties: { url: 'url' }, cardProps });
+  });
+
+  it('should include url if dynamic property has url', () => {
+    testUrlProperty({ dynamicProperties: { url: 'url' }, cardProps });
+  });
+
+  it('should add id prop to nested relations', () => {
+    const _data = {
+      getEntitySchema: {
+        interfaces: [CONTENT_INTERFACE],
+        properties: {
+          id: 'id',
+          categoryId: 'catId'
+        },
+        relations: [{ localField: 'address' }],
+        dynamicProperties: {}
+      }
+    };
+    const query = buildPropsQuery(_data, ['address.country'], cardProps);
+    expect(query).toEqual(
+      'id,name,url,sponsored,featured,category{name,listingPageId,listingPageEntity, id publishedListingPage{id, url}},address{country,id}'
+    );
+  });
 });
+
+function testUrlProperty({ extraProperties = {}, dynamicProperties = {}, cardProps }) {
+  const dataWithUrlProperty = {
+    getEntitySchema: {
+      interfaces: [],
+      properties: {
+        id: 'id',
+        ...extraProperties
+      },
+      relations: [],
+      dynamicProperties
+    }
+  };
+  const query = buildPropsQuery(dataWithUrlProperty, [], cardProps);
+  expect(query).toEqual('id,name,url');
+}