@blaze-cms/react-page-builder 0.133.0-alpha.2 → 0.133.0-alpha.4

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

@@ -29,38 +29,41 @@ const builFilterObject = ({ queryKey, value, filters, isRange, isInQuery }) => {
     filters.push({ match: { [key]: filterValue } });
   });
 };
+
 const buildFiltersQuery = ({
   shouldAddFilters,
-  query,
+
   filterBy,
   filterByProperty,
   rangeValues,
-  queryKeys
+  queryKeys,
+  query
 }) => {
   if (!shouldAddFilters) return [];
   const mustFilters = [];
-  Object.keys(query).forEach(queryKey => {
-    if (QUERY_KEYS_TO_IGNORE.includes(queryKey)) return;
-    if (!queryKey || !query[queryKey]) return;
-    const queryValue = query[queryKey];
+  if (query) {
+    Object.keys(query).forEach(queryKey => {
+      if (QUERY_KEYS_TO_IGNORE.includes(queryKey)) return;
+      if (!queryKey || !query[queryKey]) return;
+      const queryValue = query[queryKey];
 
-    const isRange = rangeValues.includes(queryKey);
-    const isInQuery = queryKeys.includes(queryKey);
-    builFilterObject({ queryKey, value: queryValue, filters: mustFilters, isRange, isInQuery });
-  });
+      const isRange = rangeValues.includes(queryKey);
+      const isInQuery = queryKeys.includes(queryKey);
+      builFilterObject({ queryKey, value: queryValue, filters: mustFilters, isRange, isInQuery });
+    });
+  }
 
   if (filterByProperty && filterByProperty.length) {
-    filterByProperty &&
-      filterByProperty.forEach(filterByPropOption => {
-        const [filterByPropKey] = filterByPropOption.split('/');
-        filterBy.forEach(filterByOption => {
-          if (filterByOption.indexOf(filterByPropKey) === -1) return;
-          const [, filteryByValue] = filterByOption.split('/');
-          const filterByKeyword = `${filterByPropKey}.keyword`;
-          if (!filteryByValue) return;
-          mustFilters.push({ match: { [filterByKeyword]: filteryByValue } });
-        });
+    filterByProperty.forEach(filterByPropOption => {
+      const [filterByPropKey] = filterByPropOption.split('/');
+      filterBy.forEach(filterByOption => {
+        if (filterByOption.indexOf(filterByPropKey) === -1) return;
+        const [, filteryByValue] = filterByOption.split('/');
+        const filterByKeyword = `${filterByPropKey}.keyword`;
+        if (!filteryByValue) return;
+        mustFilters.push({ match: { [filterByKeyword]: filteryByValue } });
       });
+    });
   }
 
   return mustFilters;

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

@@ -3,8 +3,6 @@ import parseFilterValue from './parse-filter-value';
 import { buildQueryKey } from '../../../helpers';
 
 const buildUrlQuery = (filterValues, filters, listComponentName = '', query = {}) => {
-  if (!filterValues) return '';
-
   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/components/SocialFollow/sf.config.js

@@ -1,12 +1,12 @@
 import {
   FaFacebookF,
-  FaTwitter,
   FaPinterestP,
   FaInstagram,
   FaLinkedinIn,
   FaYoutube,
   FaTiktok
 } from 'react-icons/fa';
+import { FaXTwitter } from 'react-icons/fa6';
 
 export const BASE_CLASS_NAME_FOLLOW = 'social__list-item social__list-item--follow';
 export const PORTRAIT = 'portrait';
@@ -22,7 +22,7 @@ export const SOCIAL_NETWORKS = {
   twitter: {
     name: 'Twitter',
     className: 'twitter',
-    Icon: FaTwitter,
+    Icon: FaXTwitter,
     spanClassName: 'hidden'
   },
   pinterest: {

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

@@ -3,9 +3,10 @@ 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 }, ...sortProperties],
+    [{ sort, propsToDisplay: sortby }, ...[sortProperty]],
     relations,
     stringProps,
     useSortObject

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/components/SocialFollow/__snapshots__/SocialFollow.test.js.snap

@@ -61,7 +61,7 @@ exports[`SocialFollow component should render without throwing an error and matc
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
+                d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"
               />
             </svg>
           </i>