@blaze-cms/react-page-builder 0.114.0-alpha.0 → 0.114.0-alpha.4

package/src/helpers/get-generic-render-variables.js

@@ -1,31 +1,41 @@
-import checkSortby from './check-sort-by';
 import getSortbyFieldName from './get-sort-by-field-name';
 import { DEFAULT_LIMIT, DEFAULT_OFFSET } from '../constants';
 
+const buildSortValues = (sortFilters, relations, stringProps) => {
+  if (!sortFilters || !sortFilters.length) return { sort: [] };
+  const sortValues = sortFilters
+    .map(
+      ({ sort, propsToDisplay }) =>
+        !!sort &&
+        !!propsToDisplay[0] &&
+        `${getSortbyFieldName(relations, propsToDisplay[0], stringProps)}:${sort.toLowerCase()}`
+    )
+    .filter(Boolean)
+    .join(',');
+
+  return { sort: sortValues };
+};
 const getCorrectSort = (relations, filterProps, stringProps, isTextSearchApplied) => {
   if (isTextSearchApplied) {
     return {};
   }
-  const { sort, sortby } = filterProps;
-
-  const isSortbyArray = Array.isArray(sortby);
-
-  const hasSortFields = sort && checkSortby(sortby, isSortbyArray);
-
-  const sortValue = hasSortFields
-    ? `${getSortbyFieldName(relations, sortby, stringProps, isSortbyArray)}:${sort.toLowerCase()}`
-    : '';
+  const { sort, sortby, sortProperties = [] } = filterProps;
 
-  return sortValue ? { sort: sortValue } : {};
+  return buildSortValues(
+    [{ sort, propsToDisplay: [sortby] }, ...sortProperties],
+    relations,
+    stringProps
+  );
 };
 
 const getGenericRenderVariables = (
   relations,
-  { limit = DEFAULT_LIMIT, offset, ...filterProps } = {},
+  filterProps = {},
   stringProps = [],
   rawQueryStringified = '',
   isTextSearchFilterApplied = false
 ) => {
+  const { limit = DEFAULT_LIMIT, offset } = filterProps;
   const sort = getCorrectSort(relations, filterProps, stringProps, isTextSearchFilterApplied);
   const raw = rawQueryStringified ? { rawQueryStringified } : {};
 

package/tests/unit/src/components/DataSummary/helpers/build-loop-props-content.test.js

@@ -57,4 +57,28 @@ describe('buildLoopPropsContent helper function', () => {
   it('should return looped data based on limit if is reachable', () => {
     expect(withLimit).toEqual(mockedResults[3]);
   });
+
+  it('should have empty label if label is not set', () => {
+    const withNoLabel = buildLoopPropsContent(
+      mockedLoopProps,
+      [
+        {
+          bold: false,
+          enableLink: true,
+          label: '',
+          modifier: '',
+          prefix: '',
+          propertiesToDisplay: ['nestedLoopProp.nestedValue'],
+          shouldStrip: true
+        }
+      ],
+      0,
+      mockedData[0]
+    );
+
+    withNoLabel.forEach(([label]) => {
+      expect(label).toEqual('');
+    });
+    expect.hasAssertions();
+  });
 });

package/tests/unit/src/components/List/helpers/get-sort-props.test.js

@@ -0,0 +1,58 @@
+import getSortProps from '../../../../../../src/components/List/helpers/get-sort-props';
+
+const property = 'updated';
+const defaultProperty = 'name';
+const asc = 'asc';
+const desc = 'desc';
+const sortProperties = [
+  {
+    propsToDisplay: [property],
+    sort: asc
+  }
+];
+const querySortBy = 'date';
+const props = {
+  querySort: '',
+  sortProperties,
+  defaultSort: desc,
+  querySortBy: '',
+  defaultSortBy: [defaultProperty]
+};
+
+describe('getSortProps helper function', () => {
+  it('should ignore old sortby/sort and use sortProperties', () => {
+    const { sortbyFilters, updatedSortProperties } = getSortProps(props);
+    expect(sortbyFilters).toEqual([property]);
+    expect(updatedSortProperties).toEqual(sortProperties);
+  });
+
+  it('should add query sort', () => {
+    const { sortbyFilters, updatedSortProperties } = getSortProps({
+      ...props,
+      querySortBy,
+      querySort: desc
+    });
+    expect(sortbyFilters).toEqual([querySortBy, property]);
+    expect(updatedSortProperties).toEqual([
+      {
+        propsToDisplay: [querySortBy],
+        sort: desc
+      },
+      ...sortProperties
+    ]);
+  });
+
+  it('should use old style sort', () => {
+    const { sortbyFilters, updatedSortProperties } = getSortProps({
+      ...props,
+      sortProperties: []
+    });
+    expect(sortbyFilters).toEqual([defaultProperty]);
+    expect(updatedSortProperties).toEqual([
+      {
+        propsToDisplay: [defaultProperty],
+        sort: desc
+      }
+    ]);
+  });
+});

package/tests/unit/src/components/SearchFilter/components/__snapshots__/Range.test.js.snap

@@ -18,7 +18,7 @@ Array [
         0
       </span>
       <span>
-        6600
+        6,600
       </span>
     </div>
     <div
@@ -118,7 +118,7 @@ Array [
         0
       </span>
       <span>
-        6600
+        6,600
       </span>
     </div>
     <div

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

@@ -304,6 +304,7 @@ describe('build raw query', () => {
       id,
       itemsToDisplay
     );
+
     expect(rawQueryOneCheckboxFilterMoreItemsToDisplayValues).toEqual(
       RAW_QUERY_OR_OPERATOR_ITEMS_TO_DISPLAY
     );
@@ -347,7 +348,7 @@ describe('build raw query', () => {
       filterData,
       id,
       [],
-      false,
+      true,
       { shouldReturnAggs: true, isAZ: true }
     );
     expect(queryWithAggs).toEqual(RAW_QUERY_WITH_AGGS);

package/tests/unit/src/helpers/get-generic-render-variables.test.js

@@ -17,11 +17,7 @@ const mockedProps = overrides => ({
 });
 
 describe('get card/list render variables', () => {
-  it('should be a function', () => {
-    expect(typeof getGenericRenderVariables).toEqual('function');
-  });
-
-  it('should return always an object', () => {
+  it('should always return an object', () => {
     const variables = getGenericRenderVariables();
     const variablesWithProps = getGenericRenderVariables([], mockedProps(), STRING_PROPS_EMPTY);
 
@@ -78,20 +74,18 @@ describe('get card/list render variables', () => {
       mockedProps({ sortby: ['length'] }),
       STRING_PROPS_EMPTY
     );
-
     expect(sort).toEqual('length:desc');
   });
 
   it('should return correct sort data when when there is a prop that is of type string', () => {
-    const { sort } = getGenericRenderVariables([], mockedProps({ sortby: ['name'] }), STRING_PROPS);
-
+    const { sort } = getGenericRenderVariables([], mockedProps({ sortby: 'name' }), STRING_PROPS);
     expect(sort).toEqual('name.keyword:desc');
   });
 
   it("should return correct sort data when when there is a prop that is of type string and it's also a relation prop", () => {
     const { sort } = getGenericRenderVariables(
       [{ localField: 'entity', entityIdentifier: 'entity' }],
-      mockedProps({ sortby: ['entity.name'], sort: 'ASC' }),
+      mockedProps({ sortby: 'entity.name', sort: 'ASC' }),
       ['entity.name']
     );
 
@@ -103,7 +97,7 @@ describe('get card/list render variables', () => {
     const sortby = `${localField}.length`;
     const { sort } = getGenericRenderVariables(
       [{ localField, entityIdentifier: 'entity' }],
-      mockedProps({ sortby: [sortby], sort: 'ASC' }),
+      mockedProps({ sortby, sort: 'ASC' }),
       []
     );
 
@@ -113,7 +107,7 @@ describe('get card/list render variables', () => {
   it('should return correct sort data when when there is a relation prop that is of type string but with updated value', () => {
     const { sort } = getGenericRenderVariables(
       [{ localField: 'tag', entityIdentifier: 'tags' }],
-      mockedProps({ sortby: ['tag.name'], sort: 'ASC' }),
+      mockedProps({ sortby: 'tag.name', sort: 'ASC' }),
       ['tags.name']
     );
 

package/lib/helpers/check-sort-by.js

@@ -1,16 +0,0 @@
-"use strict";
-
-require("core-js/modules/es.object.define-property.js");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports["default"] = void 0;
-
-var checkSortby = function checkSortby(sortby, isSortbyArray) {
-  return isSortbyArray && sortby.length || !isSortbyArray && sortby;
-};
-
-var _default = checkSortby;
-exports["default"] = _default;
-//# sourceMappingURL=check-sort-by.js.map

package/lib/helpers/check-sort-by.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/helpers/check-sort-by.js"],"names":["checkSortby","sortby","isSortbyArray","length"],"mappings":";;;;;;;;;AAAA,IAAMA,WAAW,GAAG,SAAdA,WAAc,CAACC,MAAD,EAASC,aAAT;AAAA,SACjBA,aAAa,IAAID,MAAM,CAACE,MAAzB,IAAqC,CAACD,aAAD,IAAkBD,MADrC;AAAA,CAApB;;eAGeD,W","sourcesContent":["const checkSortby = (sortby, isSortbyArray) =>\n  (isSortbyArray && sortby.length) || (!isSortbyArray && sortby);\n\nexport default checkSortby;\n"],"file":"check-sort-by.js"}

package/lib-es/helpers/check-sort-by.js

@@ -1,4 +0,0 @@
-const checkSortby = (sortby, isSortbyArray) => isSortbyArray && sortby.length || !isSortbyArray && sortby;
-
-export default checkSortby;
-//# sourceMappingURL=check-sort-by.js.map

package/lib-es/helpers/check-sort-by.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/helpers/check-sort-by.js"],"names":["checkSortby","sortby","isSortbyArray","length"],"mappings":"AAAA,MAAMA,WAAW,GAAG,CAACC,MAAD,EAASC,aAAT,KACjBA,aAAa,IAAID,MAAM,CAACE,MAAzB,IAAqC,CAACD,aAAD,IAAkBD,MADzD;;AAGA,eAAeD,WAAf","sourcesContent":["const checkSortby = (sortby, isSortbyArray) =>\n  (isSortbyArray && sortby.length) || (!isSortbyArray && sortby);\n\nexport default checkSortby;\n"],"file":"check-sort-by.js"}

package/src/helpers/check-sort-by.js

@@ -1,4 +0,0 @@
-const checkSortby = (sortby, isSortbyArray) =>
-  (isSortbyArray && sortby.length) || (!isSortbyArray && sortby);
-
-export default checkSortby;