@blaze-cms/react-page-builder 0.133.0-core-styles.3 → 0.133.0-core-styles.7

package/src/components/SearchFilter/helpers/build-url-query.js

@@ -2,9 +2,7 @@ import { SEARCH_TERM, TEXT_SEARCH } from '../constants';
 import parseFilterValue from './parse-filter-value';
 import { buildQueryKey } from '../../../helpers';
 
-const buildUrlQuery = (filterValues, filters, listComponentName = '', query = {}) => {
-  if (!filterValues) return '';
-
+const buildUrlQuery = (filterValues = {}, filters = [], listComponentName = '', query = {}) => {
   const newQuery = [];
   const queryKeys = [];
   const searchValue = filterValues[SEARCH_TERM];

package/src/components/SearchFilter/helpers/get-initial-filter-values.js

@@ -0,0 +1,24 @@
+import { SEARCH_TERM, TEXT_SEARCH } from '../constants';
+import getFilterValueFromQuery from './get-filter-value-from-query';
+import { buildQueryKey } from '../../../helpers';
+
+const getInitialFilterValues = (filterData, filters, query, listComponentName) => {
+  const filterValues = {};
+  const searchQueryKey = buildQueryKey(SEARCH_TERM, listComponentName);
+  filterValues[SEARCH_TERM] = query[searchQueryKey] || '';
+
+  filters.forEach(filterProps => {
+    const {
+      propsToDisplay: [key],
+      type
+    } = filterProps;
+    if (type === TEXT_SEARCH) return;
+    const data = filterData && filterData[key] ? filterData[key] : {};
+    const queryKey = buildQueryKey(key, listComponentName);
+    filterValues[key] = getFilterValueFromQuery(queryKey, filterProps, data, query);
+  });
+
+  return filterValues;
+};
+
+export default getInitialFilterValues;

package/src/components/SearchFilter/helpers/get-updated-filter-by.js

@@ -0,0 +1,18 @@
+const getUpdatedFilterBy = (filterBy, filterByProperty, parentData) => {
+  if (!parentData || (filterBy && filterBy.length))
+    return { updatedFilterBy: filterBy, updatedFilterByProperty: filterByProperty };
+
+  const updatedFilterBy = [];
+  filterByProperty.forEach(property => {
+    const [key] = property.split('/');
+    const filterData = parentData[key];
+
+    if (!filterData) return;
+    if (Array.isArray(filterData)) filterData.forEach(dat => updatedFilterBy.push(`${key}/${dat}`));
+    else updatedFilterBy.push(`${key}/${filterData}`);
+  });
+
+  return { updatedFilterBy, updatedFilterByProperty: filterByProperty };
+};
+
+export default getUpdatedFilterBy;

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

@@ -12,12 +12,12 @@ import getSelectOptions from './get-select-options';
 import isDeviceDesktop from './is-device-desktop';
 import getFilterValues from './get-filter-values';
 import getFilterValueFromQuery from './get-filter-value-from-query';
-import buildUrlQuery from './build-url-query';
 import buildFiltersQuery from './build-filters-query';
 import getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';
+import getUpdatedFilterBy from './get-updated-filter-by';
+import buildUrlQuery from './build-url-query';
 
 export {
-  buildUrlQuery,
   buildNewUrl,
   buildRawQueryStringified,
   decodeValue,
@@ -34,5 +34,7 @@ export {
   getFilterValues,
   getFilterValueFromQuery,
   buildFiltersQuery,
-  getFilterRangesAndCheckboxesValues
+  getFilterRangesAndCheckboxesValues,
+  getUpdatedFilterBy,
+  buildUrlQuery
 };

package/src/helpers/build-sort-values.js

@@ -23,7 +23,7 @@ const buildSortValues = (sortFilters, relations, stringProps, useSortObject) =>
       const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
       return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;
     })
-    .filter(Boolean)
+    .filter((item, index, arr) => (!item ? false : arr.indexOf(item) === index))
     .join(',');
 
   return { sort: sortValues };

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

@@ -3,10 +3,9 @@ import buildSortValues from './build-sort-values';
 
 const getCorrectSort = (relations, filterProps, stringProps, useSortObject) => {
   const { sort, sortby, sortProperties = [] } = filterProps;
-  const [sortProperty = []] = sortProperties || [];
 
   return buildSortValues(
-    [{ sort, propsToDisplay: sortby }, ...[sortProperty]],
+    [{ sort, propsToDisplay: sortby }, ...sortProperties],
     relations,
     stringProps,
     useSortObject

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

@@ -11,6 +11,7 @@ const mockedProps = [
 ];
 
 describe('buildUrlQuery helper function', () => {
+  const noProps = buildUrlQuery();
   const simpleExample = buildUrlQuery(...mockedProps[0]);
   const withTextSearch = buildUrlQuery(...mockedProps[1]);
   const withSearchAndRange = buildUrlQuery(...mockedProps[2]);
@@ -20,6 +21,11 @@ describe('buildUrlQuery helper function', () => {
     anotherQuery: '123'
   });
 
+  it('should not break if no params are passed', () => {
+    expect(typeof noProps).toBe('string');
+    expect(noProps).toEqual('');
+  });
+
   it('should always return a string', () => {
     expect(typeof simpleExample).toBe('string');
   });

package/tests/unit/src/components/SearchFilter/helpers/get-updated-filter-by.test.js

@@ -0,0 +1,28 @@
+import getUpdatedFilterBy from '../../../../../../src/components/SearchFilter/helpers/get-updated-filter-by';
+
+const mockedFilterByProperty = ['categoryId/product', 'subjectIds/product'];
+
+const mockedParentData = {
+  id: 'abc123d',
+  categoryId: null,
+  subjectIds: ['subjectid123s']
+};
+
+describe('getUpdatedFilterBy helper', () => {
+  const mockedFilterBy = [1, 2, 3];
+  const noParentData = getUpdatedFilterBy(mockedFilterBy, [], {});
+  const withFilterBy = getUpdatedFilterBy(mockedFilterBy, [], { id: '123' });
+  const withUpdatedFilterBy = getUpdatedFilterBy([], mockedFilterByProperty, mockedParentData);
+
+  it('should return current filterBy and filterByProperty if no parentData or if filterBy values exist', () => {
+    expect(noParentData).toEqual({ updatedFilterBy: mockedFilterBy, updatedFilterByProperty: [] });
+    expect(withFilterBy).toEqual({ updatedFilterBy: mockedFilterBy, updatedFilterByProperty: [] });
+  });
+
+  it('should return updated filterBy based on parent data matchess', () => {
+    expect(withUpdatedFilterBy).toEqual({
+      updatedFilterBy: ['subjectIds/subjectid123s'],
+      updatedFilterByProperty: mockedFilterByProperty
+    });
+  });
+});

package/tests/unit/src/helpers/build-sort-values.test.js

@@ -31,4 +31,24 @@ describe('buildSortValues helper function', () => {
     );
     expect(withUseSortObject).toEqual({ 'slug.keyword': 'asc' });
   });
+
+  it('should filter out duplicate sort values', () => {
+    const sort = buildSortValues(
+      [
+        {
+          propsToDisplay: ['slug'],
+          sort: 'ASC',
+          label: ''
+        },
+        {
+          propsToDisplay: ['slug'],
+          sort: 'ASC',
+          label: ''
+        }
+      ],
+      [],
+      ['name', 'slug', 'metaTitle']
+    );
+    expect(sort).toEqual({ sort: 'slug.keyword:asc' });
+  });
 });

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

@@ -122,4 +122,29 @@ describe('get card/list render variables', () => {
 
     expect(sort).toEqual('tag.name.keyword:asc');
   });
+
+  it('should handle multiple sort properties', () => {
+    const sortProperties = [
+      {
+        propsToDisplay: ['featured'],
+        sort: 'DESC',
+        label: '',
+        status: 'show'
+      },
+      {
+        propsToDisplay: ['date'],
+        sort: 'DESC',
+        label: '',
+        items: null,
+        status: 'show'
+      }
+    ];
+    const { sort } = getGenericRenderVariables({
+      relations: [{ localField: 'tag', entityIdentifier: 'tags' }],
+      filterProps: mockedProps({ sort: '', sortby: '', sortProperties }),
+      stringProps: ['tags.name']
+    });
+
+    expect(sort).toEqual('featured:desc,date:desc');
+  });
 });