@blaze-cms/react-page-builder 0.131.0 → 0.132.0-admin-updates.0

package/src/components/List/ListFactory.js

@@ -7,7 +7,13 @@ import { MainContext } from '@blaze-cms/nextjs-components';
 import { generateSingleItemQuery, getItemList } from '../../application/query';
 import ListBuilder from './ListBuilder';
 import { AZ_LIST_TYPE } from './constants';
-import { getAzQueryFilter, getSortProps, hasRequiredItemListDetails } from './helpers';
+import {
+  getAzQueryFilter,
+  getSortProps,
+  hasRequiredItemListDetails,
+  getListSpecificSearchFilter,
+  getListQuery
+} from './helpers';
 import {
   getGenericProps,
   getRequiredSchemas,
@@ -37,7 +43,7 @@ const ListFactory = props => {
     type,
     sortby: defaultSortBy,
     sort: defaultSort,
-    searchFilter,
+    allSearchFilters,
     operator: filterOperator,
     sortProperties,
     itemListName
@@ -46,11 +52,13 @@ const ListFactory = props => {
   const router = useRouter();
   const { asPath } = router;
   const parsedQuery = asPath.replace(/%5D/g, ']').replace(/%5B/g, '[');
-  const {
-    query,
-    url,
-    query: { sort: querySort, sortby: querySortBy, itemListId: queryItemListId } = {}
-  } = parseUrl(parsedQuery);
+  const [searchFilter, hasListSpecificFilters] = getListSpecificSearchFilter(
+    allSearchFilters,
+    name
+  );
+  const { query, url, query: { itemListId: queryItemListId } = {} } = parseUrl(parsedQuery);
+  const updatedQuery = getListQuery(query, hasListSpecificFilters, name);
+  const { sort: querySort, sortby: querySortBy } = updatedQuery;
   const { sortbyFilters, updatedSortProperties } = getSortProps({
     querySort,
     sortProperties,
@@ -62,8 +70,8 @@ const ListFactory = props => {
   const itemListId = getItemListId(itemListName, queryItemListId);
   const { itemEntity: parentEntity, itemId: parentId } = parent;
   const updatedParentEntity = getUnpublishedEntityName(parentEntity);
-  const paginationIndex = getPaginationIndex(query, name);
-  const azFilter = getAzQueryFilter(query, name);
+  const paginationIndex = getPaginationIndex(updatedQuery, name);
+  const azFilter = getAzQueryFilter(updatedQuery, name);
 
   const entitiesToUse = entities && entities.length ? entities : [legacyEntity];
   const [filterEntity] = entitiesToUse;
@@ -123,10 +131,12 @@ const ListFactory = props => {
   const [textFilter] = getSearchFilterType(searchFilter, TEXT_SEARCH);
   const shouldApplyTextFilter = textFilter && textFilter.propsToDisplay.length;
   const operator = shouldApplyTextFilter ? getElasticsearchOperator(textFilter) : AND_OPERATOR;
-  const valuesText = shouldApplyTextFilter ? buildSearchValuesText(textFilter, query) : [];
-  const { valuesAnd, valuesOr } = getQueryFilters(searchFilter, query);
+  const valuesText = shouldApplyTextFilter
+    ? buildSearchValuesText(textFilter, updatedQuery, name)
+    : [];
+  const { valuesAnd, valuesOr } = getQueryFilters(searchFilter, updatedQuery, name);
   const isTextSearchFilterApplied = !!(
-    query.search_term &&
+    updatedQuery.search_term &&
     searchFilter &&
     getSearchFilterType(searchFilter, TEXT_SEARCH).length
   );
@@ -139,7 +149,7 @@ const ListFactory = props => {
   const listProps = {
     ...props,
     ...genericProps,
-    query,
+    query: updatedQuery,
     url,
     isCard,
     isAZ,
@@ -179,7 +189,7 @@ ListFactory.propTypes = {
   name: PropTypes.string,
   sortby: PropTypes.array,
   sort: PropTypes.string,
-  searchFilter: PropTypes.object,
+  allSearchFilters: PropTypes.array,
   sortProperties: PropTypes.array,
   itemListName: PropTypes.string
 };
@@ -195,7 +205,7 @@ ListFactory.defaultProps = {
   sortProperties: [],
   sort: '',
   operator: AND,
-  searchFilter: {},
+  allSearchFilters: [],
   itemListName: ''
 };
 

package/src/components/List/helpers/get-list-query.js

@@ -0,0 +1,28 @@
+import stripQueryKey from './strip-query-key';
+
+const getListQuery = (query, hasListSpecificFilters, name) => {
+  const updatedQuery = {};
+  const listKey = `pb[${name}]`;
+  const paginationKey = `${listKey}[page]`;
+  const sortKey = `${listKey}[sort]`;
+  const sortByKey = `${listKey}[sortby]`;
+
+  Object.keys(query).forEach(queryKey => {
+    const isListKey = queryKey.indexOf(`${listKey}`) !== -1;
+    const decodedQueryValue = Array.isArray(query[queryKey])
+      ? query[queryKey].map(value => decodeURIComponent(value))
+      : decodeURIComponent(query[queryKey]);
+    if (hasListSpecificFilters) {
+      const strippedKey = stripQueryKey(queryKey, listKey, paginationKey);
+      if (isListKey) updatedQuery[strippedKey] = decodedQueryValue;
+    } else {
+      if (queryKey.indexOf('pb[') === -1) updatedQuery[queryKey] = decodedQueryValue;
+      if (queryKey.indexOf(paginationKey) !== -1) updatedQuery[queryKey] = decodedQueryValue;
+    }
+  });
+  updatedQuery.sort = query[sortKey] || query.sort;
+  updatedQuery.sortby = query[sortByKey] || query.sortby;
+  return updatedQuery;
+};
+
+export default getListQuery;

package/src/components/List/helpers/get-list-specific-search-filter.js

@@ -0,0 +1,10 @@
+const getListSpecificSearchFilter = (searchFilters, listName) => {
+  const searchFilterMatch = searchFilters.find(
+    ({ settings: { listComponentName } }) => listComponentName === listName
+  );
+  const hasListSpecificFilters = !!searchFilterMatch;
+  const searchFilterToUse = searchFilterMatch || searchFilters[0] || {};
+  return [searchFilterToUse, hasListSpecificFilters];
+};
+
+export default getListSpecificSearchFilter;

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

@@ -7,3 +7,5 @@ export { default as getItemsPerPageToUse } from './get-items-per-page-to-use';
 export { default as getSortProps } from './get-sort-props';
 export { default as hasRequiredItemListDetails } from './has-required-item-list-details';
 export { default as getListComponent } from './get-list-component';
+export { default as getListQuery } from './get-list-query';
+export { default as getListSpecificSearchFilter } from './get-list-specific-search-filter';

package/src/components/List/helpers/strip-query-key.js

@@ -0,0 +1,6 @@
+const stripQueryKey = (fullKey, listNameKey, paginationKey) => {
+  if (paginationKey === fullKey) return fullKey;
+  return fullKey.substring(listNameKey.length + 1, fullKey.length - 1);
+};
+
+export default stripQueryKey;

package/src/components/SearchContent/SearchContent.js

@@ -10,12 +10,12 @@ const SearchContent = ({
   searchInputAlignment,
   searchInputWrapperMobile,
   searchInputWrapperDesktop,
-  collapsible,
   isMobile,
   placeholder,
-  modifier
+  modifier,
+  collapsedSearch
 }) => {
-  const [collapsed, setCollapsed] = useState(collapsible);
+  const [collapsed, setCollapsed] = useState(collapsedSearch);
   const router = useRouter();
 
   const { results, searchTerm, setSearchTerm, debouncedSearchTerm } = useDebounceSearch({
@@ -50,7 +50,7 @@ const SearchContent = ({
   };
 
   const handleOnBlur = () => {
-    if (!collapsible) return;
+    if (!collapsedSearch) return;
     if (!debouncedSearchTerm || debouncedSearchTerm === '') setCollapsed(true);
   };
 
@@ -118,9 +118,9 @@ SearchContent.propTypes = {
   searchInputWrapperDesktop: PropTypes.string,
   placeholder: PropTypes.string,
   isMobile: PropTypes.bool,
-  collapsible: PropTypes.bool,
   entities: PropTypes.array.isRequired,
-  modifier: PropTypes.string
+  modifier: PropTypes.string,
+  collapsedSearch: PropTypes.bool
 };
 
 SearchContent.defaultProps = {
@@ -129,8 +129,8 @@ SearchContent.defaultProps = {
   searchInputWrapperDesktop: '',
   placeholder: '',
   isMobile: false,
-  collapsible: false,
-  modifier: ''
+  modifier: '',
+  collapsedSearch: false
 };
 
 export default SearchContent;

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

@@ -3,12 +3,7 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import debounce from 'lodash.debounce';
 import FiltersList from './FiltersList';
-import {
-  isDeviceDesktop,
-  buildQuery,
-  getInitialFilterValues,
-  getResponsiveFilterClassnames
-} from '../helpers';
+import { isDeviceDesktop, buildUrlQuery, getResponsiveFilterClassnames } from '../helpers';
 import CloseMobileForm from './CloseMobileForm';
 import ResetDesktopForm from './ResetDesktopForm';
 import MobileFormToolbar from './MobileFormToolbar';
@@ -16,6 +11,7 @@ import { SEARCH, REFINE, MORE_FILTERS_CLASSES } from '../constants';
 
 const SearchFilter = ({
   searchFilterRef,
+  listComponentName,
   data,
   filters,
   hasUrl,
@@ -28,13 +24,14 @@ const SearchFilter = ({
   groupAfterDesktop,
   groupAfterMobile,
   filterValues,
-  setAppliedFilters
+  setAppliedFilters,
+  query
 }) => {
   const [moreFiltersMobileCollapsed, setMoreFiltersMobileCollapsed] = useState(true);
   const [moreFiltersDesktopCollapsed, setMoreFiltersDesktopCollapsed] = useState(true);
 
-  const doSubmit = (newValues = filterValues) => {
-    const newQuery = buildQuery(newValues, filters);
+  const doSubmit = newValues => {
+    const newQuery = buildUrlQuery(newValues, filters, listComponentName, query);
     handleSearch(newQuery);
     setMoreFiltersDesktopCollapsed(true);
     setMoreFiltersMobileCollapsed(true);
@@ -69,9 +66,8 @@ const SearchFilter = ({
   const formId = `filter-${name}-form`;
 
   const handleReset = () => {
-    const newValues = getInitialFilterValues(null, filters, {});
-    setAppliedFilters({ newValues, type: 'reset' });
-    doSubmit(newValues);
+    setAppliedFilters({ type: 'reset' });
+    doSubmit();
   };
 
   const updateFilterValues = (newValues, shouldSubmit) => {
@@ -79,7 +75,7 @@ const SearchFilter = ({
   };
 
   const shouldGroup = !!(groupAfterDesktop || groupAfterMobile);
-  const shouldSearch = !hasUrl;
+
   return (
     <>
       <form
@@ -89,7 +85,7 @@ const SearchFilter = ({
         id={formId}
         onSubmit={e => {
           e.preventDefault();
-          doSubmit();
+          doSubmit(filterValues);
         }}>
         {displaySearchFilter && (
           <CloseMobileForm handleClose={() => setDisplaySearchFilter(false)} />
@@ -101,7 +97,7 @@ const SearchFilter = ({
           <div className="filter__wrapper filter__wrapper--search-refine">
             {!shouldGroup && (
               <FiltersList
-                shouldSearch={shouldSearch}
+                shouldSearch={!hasUrl}
                 data={data}
                 filters={filters}
                 hasUrl={hasUrl}
@@ -114,7 +110,7 @@ const SearchFilter = ({
             {shouldGroup && (
               <>
                 <FiltersList
-                  shouldSearch={shouldSearch}
+                  shouldSearch={!hasUrl}
                   data={data}
                   filters={filters.slice(0, groupAfterMobile)}
                   hasUrl={hasUrl}
@@ -136,7 +132,7 @@ const SearchFilter = ({
                 <div className={moreFiltersMobileWrapperClass}>
                   <div className={MORE_FILTERS_CLASSES.MOBILE_CONTENT}>
                     <FiltersList
-                      shouldSearch={shouldSearch && isDeviceDesktop()}
+                      shouldSearch={!hasUrl && isDeviceDesktop()}
                       data={data}
                       filters={filters.slice(
                         groupAfterMobile,
@@ -233,7 +229,14 @@ SearchFilter.propTypes = {
   groupAfterDesktop: PropTypes.number.isRequired,
   groupAfterMobile: PropTypes.number.isRequired,
   filterValues: PropTypes.object.isRequired,
-  setAppliedFilters: PropTypes.func.isRequired
+  setAppliedFilters: PropTypes.func.isRequired,
+  listComponentName: PropTypes.string,
+  query: PropTypes.object
+};
+
+SearchFilter.defaultProps = {
+  listComponentName: '',
+  query: {}
 };
 
 export default SearchFilter;

package/src/components/SearchFilter/SearchFilterContainer.js

@@ -2,33 +2,37 @@ import React, { useState, useRef, useReducer, useEffect } from 'react';
 import { useRouter } from 'next/router';
 import { useQuery } from '@apollo/client';
 import PropTypes from 'prop-types';
-import { parseUrl, stringify } from 'query-string';
+import { parseUrl } from 'query-string';
 import SearchFilter from './SearchFilter';
 import { withTitle } from '../../HOC';
 import { getSearchPublishedContent } from '../../application/query';
 import {
-  buildNewQuery,
+  buildNewUrl,
   buildRawQueryStringified,
-  getInitialFilterValues,
-  buildFiltersQuery
+  getFilterValues,
+  buildFiltersQuery,
+  getFilterRangesAndCheckboxesValues
 } from './helpers';
 import { getEntityData } from '../../helpers';
-import { RAW_RESULTS, RANGE, CHECKBOX_SELECT } from './constants';
+import { RAW_RESULTS } from './constants';
 import { SCROLL_OFFSET } from '../../constants';
+import searchFilterReducer from './searchFilterReducer';
+
+const getFiltersUrlQuery = (query, listName) => {
+  if (!listName) return query;
+  const updatedQuery = {};
+  const listKey = `pb[${listName}]`;
+  Object.keys(query).forEach(queryKey => {
+    const isListKey = queryKey.indexOf(`${listName}`) !== -1;
+    if (!isListKey) return;
+    const decodedQueryValue = Array.isArray(query[queryKey])
+      ? query[queryKey].map(value => decodeURIComponent(value))
+      : decodeURIComponent(query[queryKey]);
+    const strippedKey = queryKey.substring(listKey.length + 1, queryKey.length - 1);
+    if (isListKey) updatedQuery[strippedKey] = decodedQueryValue;
+  });
 
-const reducer = (state, action) => {
-  const { newValues, type, shouldSearch = true } = action;
-
-  switch (type) {
-    case 'update':
-      return { ...state, ...newValues, shouldSearch };
-    case 'resetSearch':
-      return { ...state, shouldSearch: false };
-    case 'reset':
-      return { ...newValues, shouldSearch: false };
-    default:
-      throw new Error();
-  }
+  return updatedQuery;
 };
 
 const SearchFilterContainer = ({
@@ -41,7 +45,8 @@ const SearchFilterContainer = ({
   groupAfterDesktop,
   filterBy,
   filterByProperty,
-  shouldAddFilters
+  shouldAddFilters,
+  listComponentName
 }) => {
   const router = useRouter();
   const { asPath } = router;
@@ -49,15 +54,10 @@ const SearchFilterContainer = ({
   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 {
-    url: currentUrl,
-    query: { sort, sortby },
-    query
-  } = parseUrl(urlPath);
-  const [filterValues, dispatch] = useReducer(
-    reducer,
-    getInitialFilterValues(null, filters, query)
-  );
+  const { url: currentUrl, query } = parseUrl(urlPath);
+  const updatedQuery = getFiltersUrlQuery(query, listComponentName);
+
+  const [filterValues, dispatch] = useReducer(searchFilterReducer, null);
 
   useEffect(
     () => {
@@ -66,34 +66,19 @@ const SearchFilterContainer = ({
     [asPath]
   );
 
-  const hasUrl = !!url;
-
-  const sortValues = sort && sortby ? stringify({ sort, sortby }) : '';
-  const baseQuery = sortValues ? `${currentUrl}?${sortValues}` : currentUrl;
-
   const action = getSearchPublishedContent(RAW_RESULTS);
-  const checkboxSelectValues = [];
-  const rangeValues = [];
-
-  filters.forEach(({ type, propsToDisplay }) => {
-    if (CHECKBOX_SELECT.includes(type)) {
-      checkboxSelectValues.push(propsToDisplay[0]);
-    } else if (type === RANGE) {
-      rangeValues.push(...propsToDisplay);
-    }
-  });
+  const [checkboxSelectValues, rangeValues] = getFilterRangesAndCheckboxesValues(filters);
 
   const { docType } = getEntityData(entity);
 
-  const filtersQuery = shouldAddFilters
-    ? buildFiltersQuery({
-        query: filterValues,
-        filterBy,
-        filterByProperty,
-        rangeValues,
-        queryKeys: Object.keys(query)
-      })
-    : [];
+  const filtersQuery = buildFiltersQuery({
+    shouldAddFilters,
+    query: filterValues || {},
+    filterBy,
+    filterByProperty,
+    rangeValues,
+    queryKeys: Object.keys(updatedQuery)
+  });
 
   const rawQueryStringified = buildRawQueryStringified(
     checkboxSelectValues,
@@ -102,7 +87,7 @@ const SearchFilterContainer = ({
     filtersQuery
   );
 
-  const { data, error } = useQuery(action, {
+  const { data, error, loading } = useQuery(action, {
     variables: { rawQueryStringified, limit: 0 }, // we only want aggs so limit=0 for no search results
     skip: !rawQueryStringified
   });
@@ -113,30 +98,32 @@ const SearchFilterContainer = ({
   const { searchPublishedContent: { rawResults: { aggregations: filterData } = {} } = {} } =
     data || {};
 
-  if (filterValues.dataNotSet && filterData) {
-    const initialFilterValues = getInitialFilterValues(filterData, filters, query);
-    dispatch({ newValues: initialFilterValues, shouldSearch: false, type: 'update' });
+  if (!filterValues && !loading && (filterData || !rawQueryStringified)) {
+    const newValues = getFilterValues(filterData, filters, updatedQuery);
+    dispatch({ newValues, shouldSearch: false, type: 'update' });
+    return null;
   }
 
   const handleSearch = newQuery => {
     setDisplaySearchFilter(false);
-
+    const hashBit = asPath.split('#')[1] || '';
+    const parsedHashBit = hashBit ? `#${hashBit}` : '';
+    scrollToFirstList();
     if (!newQuery) {
-      scrollToFirstList();
+      const baseQuery = `${currentUrl}${parsedHashBit}`;
       setUrlPath(baseQuery);
-      return router.push('/Resolver', baseQuery, { shallow: !hasUrl, scroll: false }).then(() => {
+      return router.push('/Resolver', baseQuery, { shallow: !url, scroll: false }).then(() => {
         setKey(`filter-${name}:${Date.now()}`); // remove after range component update
       });
     }
-    const newUrl = buildNewQuery(url, currentUrl, newQuery, sortValues);
-    scrollToFirstList();
+    const newUrl = buildNewUrl(url, currentUrl, newQuery, hashBit);
     setUrlPath(newUrl);
-    return router.push('/Resolver', newUrl, { shallow: !hasUrl, scroll: false });
+    return router.push('/Resolver', newUrl, { shallow: !url, scroll: false });
   };
 
   const scrollToFirstList = () => {
     const [list] = document.getElementsByClassName('list-top');
-    const shouldScrollToFirstList = !hasUrl && list;
+    const shouldScrollToFirstList = !url && list;
 
     if (shouldScrollToFirstList) {
       window.scrollTo({
@@ -147,16 +134,19 @@ const SearchFilterContainer = ({
       window.scrollTo(0, 0);
     }
   };
-  if (!filterValues) return '';
+
+  if (!filterValues) return null;
 
   return (
     <SearchFilter
       key={key}
       setAppliedFilters={dispatch}
+      query={updatedQuery}
+      listComponentName={listComponentName}
       searchFilterRef={searchFilterRef}
       data={filterData}
       filters={filters}
-      hasUrl={hasUrl}
+      hasUrl={!!url}
       entity={entity}
       handleSearch={handleSearch}
       filterValues={filterValues}
@@ -180,7 +170,8 @@ SearchFilterContainer.propTypes = {
   groupAfterDesktop: PropTypes.number,
   filterBy: PropTypes.array,
   filterByProperty: PropTypes.array,
-  shouldAddFilters: PropTypes.bool
+  shouldAddFilters: PropTypes.bool,
+  listComponentName: PropTypes.string
 };
 
 SearchFilterContainer.defaultProps = {
@@ -192,7 +183,8 @@ SearchFilterContainer.defaultProps = {
   groupAfterDesktop: 0,
   filterBy: [],
   filterByProperty: [],
-  shouldAddFilters: false
+  shouldAddFilters: false,
+  listComponentName: ''
 };
 
 export default withTitle(SearchFilterContainer);

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

@@ -29,7 +29,15 @@ const builFilterObject = ({ queryKey, value, filters, isRange, isInQuery }) => {
     filters.push({ match: { [key]: filterValue } });
   });
 };
-const buildFiltersQuery = ({ query, filterBy, filterByProperty, rangeValues, queryKeys }) => {
+const buildFiltersQuery = ({
+  shouldAddFilters,
+  query,
+  filterBy,
+  filterByProperty,
+  rangeValues,
+  queryKeys
+}) => {
+  if (!shouldAddFilters) return [];
   const mustFilters = [];
   Object.keys(query).forEach(queryKey => {
     if (QUERY_KEYS_TO_IGNORE.includes(queryKey)) return;

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

@@ -0,0 +1,8 @@
+const buildNewUrl = (url, currentUrl, queryParams, hashBit) => {
+  const encodedQuery = encodeURI(queryParams);
+  const baseUrl = url || currentUrl;
+  const newUrl = encodedQuery ? `${baseUrl}?${encodedQuery}` : `${baseUrl}`;
+  return hashBit ? `${newUrl}#${hashBit}` : newUrl;
+};
+
+export default buildNewUrl;

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

@@ -0,0 +1,33 @@
+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 newQuery = [];
+  const queryKeys = [];
+  const searchValue = filterValues[SEARCH_TERM];
+  const searchKey = buildQueryKey(SEARCH_TERM, listComponentName);
+  queryKeys.push(searchKey);
+  if (searchValue) newQuery.push(`${searchKey}=${searchValue}`);
+
+  filters.forEach(({ propsToDisplay, type }) => {
+    if (type === TEXT_SEARCH) return;
+    propsToDisplay.forEach(prop => {
+      const value = filterValues[prop];
+      const filterKey = buildQueryKey(prop, listComponentName);
+      queryKeys.push(filterKey);
+      const parsedValue = parseFilterValue(filterKey, type, value, newQuery);
+      if (parsedValue && !newQuery.includes(parsedValue)) newQuery.push(parsedValue);
+    });
+  });
+
+  Object.keys(query).forEach(key => {
+    if (queryKeys.indexOf(key) === -1) newQuery.push(`${key}=${query[key]}`);
+  });
+
+  return newQuery.join('&');
+};
+
+export default buildUrlQuery;

package/src/components/SearchFilter/helpers/get-filter-ranges-and-checkboxes-values.js

@@ -0,0 +1,17 @@
+import { RANGE, CHECKBOX_SELECT } from '../constants';
+
+const getFilterRangesAndCheckboxesValues = filters => {
+  const checkboxSelectValues = [];
+  const rangeValues = [];
+
+  filters.forEach(({ type, propsToDisplay }) => {
+    if (CHECKBOX_SELECT.includes(type)) {
+      checkboxSelectValues.push(propsToDisplay[0]);
+    } else if (type === RANGE) {
+      rangeValues.push(...propsToDisplay);
+    }
+  });
+  return [checkboxSelectValues, rangeValues];
+};
+
+export default getFilterRangesAndCheckboxesValues;

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

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

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

@@ -1,4 +1,4 @@
-import buildNewQuery from './build-new-query';
+import buildNewUrl from './build-new-url';
 import buildRawQueryStringified from './build-raw-query-stringified';
 import { decodeValue, encodeValue } from './decode-encode';
 import checkIfRangeUpdated from './check-if-range-updated';
@@ -10,14 +10,15 @@ import getIntersectedProp from './get-intersected-prop';
 import getRangeValue from './get-range-value';
 import getSelectOptions from './get-select-options';
 import isDeviceDesktop from './is-device-desktop';
-import getInitialFilterValues from './get-initial-filter-values';
+import getFilterValues from './get-filter-values';
 import getFilterValueFromQuery from './get-filter-value-from-query';
-import buildQuery from './build-query';
+import buildUrlQuery from './build-url-query';
 import buildFiltersQuery from './build-filters-query';
+import getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';
 
 export {
-  buildQuery,
-  buildNewQuery,
+  buildUrlQuery,
+  buildNewUrl,
   buildRawQueryStringified,
   decodeValue,
   encodeValue,
@@ -30,7 +31,8 @@ export {
   getRangeValue,
   getSelectOptions,
   isDeviceDesktop,
-  getInitialFilterValues,
+  getFilterValues,
   getFilterValueFromQuery,
-  buildFiltersQuery
+  buildFiltersQuery,
+  getFilterRangesAndCheckboxesValues
 };

package/src/components/SearchFilter/index.js

@@ -1,3 +1,3 @@
-import SearchFilterContainer from './SearchFilterContainer';
+import SearchFilter from './SearchFilterContainer';
 
-export default SearchFilterContainer;
+export default SearchFilter;