@blaze-cms/react-page-builder 0.133.0-admin-updates.6 → 0.133.0-admin-updates.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.133.0-admin-updates.6",
+  "version": "0.133.0-admin-updates.10",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -32,7 +32,7 @@
     "@blaze-cms/core-errors-ui": "0.133.0-admin-updates.0",
     "@blaze-cms/image-cdn-react": "0.3.0-alpha.5",
     "@blaze-cms/nextjs-components": "0.133.0-admin-updates.0",
-    "@blaze-cms/plugin-search-ui": "0.133.0-admin-updates.0",
+    "@blaze-cms/plugin-search-ui": "0.133.0-admin-updates.8",
     "@blaze-cms/setup-ui": "0.133.0-admin-updates.0",
     "@blaze-cms/utils": "0.133.0-admin-updates.0",
     "@blaze-cms/utils-handlebars": "0.133.0-admin-updates.0",
@@ -75,7 +75,7 @@
     "next": "12.x",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
-    "react-icons": ">= 4.3.1"
+    "react-icons": "^4.11.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.11.3",
@@ -89,5 +89,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "686c556bde89083f3cb2f23c101c8d87951c5221"
+  "gitHead": "7122ffb5f6f5c452d176e15d12b8ea024fc348f0"
 }

package/src/components/SearchFilter/SearchFilter/SearchFilter.js

@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import debounce from 'lodash.debounce';
 import FiltersList from './FiltersList';
-import { isDeviceDesktop, buildUrlQuery, getResponsiveFilterClassnames } from '../helpers';
+import { isDeviceDesktop, getResponsiveFilterClassnames, buildUrlQuery } from '../helpers';
+
 import CloseMobileForm from './CloseMobileForm';
 import ResetDesktopForm from './ResetDesktopForm';
 import MobileFormToolbar from './MobileFormToolbar';
@@ -31,7 +32,9 @@ const SearchFilter = ({
   const [moreFiltersDesktopCollapsed, setMoreFiltersDesktopCollapsed] = useState(true);
 
   const doSubmit = newValues => {
-    const newQuery = buildUrlQuery(newValues, filters, listComponentName, query);
+    const newQuery = filterValues
+      ? buildUrlQuery(newValues, filters, listComponentName, query)
+      : '';
     handleSearch(newQuery);
     setMoreFiltersDesktopCollapsed(true);
     setMoreFiltersMobileCollapsed(true);

package/src/components/SearchFilter/SearchFilterContainer.js

@@ -1,22 +1,25 @@
-import React, { useState, useRef, useReducer, useEffect } from 'react';
+import React, { useState, useEffect, useRef, useReducer, useContext } from 'react';
+import { MainContext } from '@blaze-cms/nextjs-components';
 import { useRouter } from 'next/router';
 import { useQuery } from '@apollo/client';
 import PropTypes from 'prop-types';
 import { parseUrl } from 'query-string';
 import SearchFilter from './SearchFilter';
 import { withTitle } from '../../HOC';
-import { getSearchPublishedContent } from '../../application/query';
+import { getSearchPublishedContent, generateSingleItemQuery } from '../../application/query';
 import {
   buildNewUrl,
   buildRawQueryStringified,
   getFilterValues,
   buildFiltersQuery,
-  getFilterRangesAndCheckboxesValues
+  getFilterRangesAndCheckboxesValues,
+  getUpdatedFilterBy
 } from './helpers';
-import { getEntityData } from '../../helpers';
+import { getEntityData, getInheritedFilters, getQueryProps } from '../../helpers';
 import { RAW_RESULTS } from './constants';
 import { SCROLL_OFFSET } from '../../constants';
 import searchFilterReducer from './searchFilterReducer';
+import { useGetEntitySchemasAsObj } from '../../hooks';
 
 const getFiltersUrlQuery = (query, listName) => {
   if (!listName) return query;
@@ -46,18 +49,20 @@ const SearchFilterContainer = ({
   filterBy,
   filterByProperty,
   shouldAddFilters,
-  listComponentName
+  listComponentName,
+  parent
 }) => {
+  const { isPreview } = useContext(MainContext);
   const router = useRouter();
   const { asPath } = router;
   const searchFilterRef = useRef(null);
   const [key, setKey] = useState(`filter-${name}`);
   const [displaySearchFilter, setDisplaySearchFilter] = useState(false);
   const [urlPath, setUrlPath] = useState(asPath); // used as asPath can take too long to update
+  const [filterValues, dispatch] = useReducer(searchFilterReducer, null);
   const { url: currentUrl, query } = parseUrl(urlPath);
   const updatedQuery = getFiltersUrlQuery(query, listComponentName);
-
-  const [filterValues, dispatch] = useReducer(searchFilterReducer, null);
+  const { itemId: parentId, itemEntity: parentEntity } = parent;
 
   useEffect(
     () => {
@@ -65,6 +70,27 @@ const SearchFilterContainer = ({
     },
     [asPath]
   );
+  const { data: mainSchemas = {}, loading: schemasLoading } = useGetEntitySchemasAsObj([
+    parentEntity,
+    entity
+  ]);
+  const { [parentEntity]: parentSchema = {}, [entity]: filterEntitySchema = {} } = mainSchemas;
+  const { actions = {} } = parentSchema || {};
+  const getAction = isPreview ? actions.get : actions.getPublished;
+  const inheritedFilters = getInheritedFilters(filterBy, filterByProperty);
+  const queryProps = getQueryProps(inheritedFilters, parentSchema, filterEntitySchema);
+  const { data: { entityData: parentData } = {}, loading: parentQueryLoading } = useQuery(
+    generateSingleItemQuery(getAction, queryProps),
+    {
+      variables: { id: parentId },
+      skip: schemasLoading || !inheritedFilters.length
+    }
+  );
+  const { updatedFilterBy, updatedFilterByProperty } = getUpdatedFilterBy(
+    filterBy,
+    filterByProperty,
+    parentData
+  );
 
   const action = getSearchPublishedContent(RAW_RESULTS);
   const [checkboxSelectValues, rangeValues] = getFilterRangesAndCheckboxesValues(filters);
@@ -73,9 +99,9 @@ const SearchFilterContainer = ({
 
   const filtersQuery = buildFiltersQuery({
     shouldAddFilters,
-    query: filterValues || {},
-    filterBy,
-    filterByProperty,
+    query: filterValues,
+    filterBy: updatedFilterBy,
+    filterByProperty: updatedFilterByProperty,
     rangeValues,
     queryKeys: Object.keys(updatedQuery)
   });
@@ -89,7 +115,7 @@ const SearchFilterContainer = ({
 
   const { data, error, loading } = useQuery(action, {
     variables: { rawQueryStringified, limit: 0 }, // we only want aggs so limit=0 for no search results
-    skip: !rawQueryStringified
+    skip: !rawQueryStringified || parentQueryLoading
   });
 
   if (error) return error.message;
@@ -98,7 +124,7 @@ const SearchFilterContainer = ({
   const { searchPublishedContent: { rawResults: { aggregations: filterData } = {} } = {} } =
     data || {};
 
-  if (!filterValues && !loading && (filterData || !rawQueryStringified)) {
+  if (!filterValues && !loading && !parentQueryLoading && (filterData || !rawQueryStringified)) {
     const newValues = getFilterValues(filterData, filters, updatedQuery);
     dispatch({ newValues, shouldSearch: false, type: 'update' });
     return null;
@@ -171,7 +197,8 @@ SearchFilterContainer.propTypes = {
   filterBy: PropTypes.array,
   filterByProperty: PropTypes.array,
   shouldAddFilters: PropTypes.bool,
-  listComponentName: PropTypes.string
+  listComponentName: PropTypes.string,
+  parent: PropTypes.object
 };
 
 SearchFilterContainer.defaultProps = {
@@ -184,7 +211,8 @@ SearchFilterContainer.defaultProps = {
   filterBy: [],
   filterByProperty: [],
   shouldAddFilters: false,
-  listComponentName: ''
+  listComponentName: '',
+  parent: {}
 };
 
 export default withTitle(SearchFilterContainer);

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/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>