@blaze-cms/react-page-builder 0.124.0 → 0.124.1-alpha.1

package/lib-es/components/SearchFilter/SearchFilterContainer.js

@@ -95,7 +95,7 @@ const SearchFilterContainer = ({
   const {
     docType
   } = getEntityData(entity);
-  const filtersQuery = shouldAddFilters ? buildFiltersQuery(filterValues || query, filterBy, filterByProperty) : [];
+  const filtersQuery = shouldAddFilters ? buildFiltersQuery(filterValues || query, filterBy, filterByProperty, rangeValues) : [];
   const rawQueryStringified = buildRawQueryStringified(checkboxSelectValues, rangeValues, docType, filtersQuery);
   const {
     data,

package/lib-es/components/SearchFilter/SearchFilterContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchFilterContainer.js","names":["React","useState","useRef","useReducer","useRouter","useQuery","PropTypes","parseUrl","stringify","SearchFilter","withTitle","getSearchPublishedContent","buildNewQuery","buildRawQueryStringified","getInitialFilterValues","buildFiltersQuery","getEntityData","RAW_RESULTS","RANGE","CHECKBOX_SELECT","SCROLL_OFFSET","reducer","state","action","newValues","type","shouldSearch","Error","SearchFilterContainer","entity","url","filters","name","isCollapsedOnResponsive","groupAfterMobile","groupAfterDesktop","filterBy","filterByProperty","shouldAddFilters","router","asPath","searchFilterRef","key","setKey","displaySearchFilter","setDisplaySearchFilter","currentUrl","query","sort","sortby","filterValues","dispatch","hasUrl","sortValues","baseQuery","checkboxSelectValues","rangeValues","forEach","propsToDisplay","includes","push","docType","filtersQuery","rawQueryStringified","data","error","variables","limit","skip","message","length","searchPublishedContent","rawResults","aggregations","filterData","dataNotSet","initialFilterValues","handleSearch","newQuery","scrollToFirstList","shallow","scroll","then","Date","now","newUrl","list","document","getElementsByClassName","shouldScrollToFirstList","window","scrollTo","left","top","pageYOffset","getBoundingClientRect","propTypes","string","array","isRequired","bool","number","defaultProps"],"sources":["../../../src/components/SearchFilter/SearchFilterContainer.js"],"sourcesContent":["import React, { useState, useRef, useReducer } from 'react';\nimport { useRouter } from 'next/router';\nimport { useQuery } from '@apollo/client';\nimport PropTypes from 'prop-types';\nimport { parseUrl, stringify } from 'query-string';\nimport SearchFilter from './SearchFilter';\nimport { withTitle } from '../../HOC';\nimport { getSearchPublishedContent } from '../../application/query';\nimport {\n  buildNewQuery,\n  buildRawQueryStringified,\n  getInitialFilterValues,\n  buildFiltersQuery\n} from './helpers';\nimport { getEntityData } from '../../helpers';\nimport { RAW_RESULTS, RANGE, CHECKBOX_SELECT } from './constants';\nimport { SCROLL_OFFSET } from '../../constants';\n\nconst reducer = (state, action) => {\n  const { newValues, type, shouldSearch = true } = action;\n\n  switch (type) {\n    case 'update':\n      return { ...state, ...newValues, shouldSearch };\n    case 'resetSearch':\n      return { ...state, shouldSearch: false };\n    case 'reset':\n      return { ...newValues, shouldSearch };\n    default:\n      throw new Error();\n  }\n};\n\nconst SearchFilterContainer = ({\n  entity,\n  url,\n  filters,\n  name,\n  isCollapsedOnResponsive,\n  groupAfterMobile,\n  groupAfterDesktop,\n  filterBy,\n  filterByProperty,\n  shouldAddFilters\n}) => {\n  const router = useRouter();\n  const { asPath } = router;\n  const searchFilterRef = useRef(null);\n  const [key, setKey] = useState(`filter-${name}`);\n  const [displaySearchFilter, setDisplaySearchFilter] = useState(false);\n  const {\n    url: currentUrl,\n    query: { sort, sortby },\n    query\n  } = parseUrl(asPath);\n  const [filterValues, dispatch] = useReducer(\n    reducer,\n    getInitialFilterValues(null, filters, query)\n  );\n  const hasUrl = !!url;\n\n  const sortValues = sort && sortby ? stringify({ sort, sortby }) : '';\n  const baseQuery = sortValues ? `${currentUrl}?${sortValues}` : currentUrl;\n\n  const action = getSearchPublishedContent(RAW_RESULTS);\n  const checkboxSelectValues = [];\n  const rangeValues = [];\n\n  filters.forEach(({ type, propsToDisplay }) => {\n    if (CHECKBOX_SELECT.includes(type)) {\n      checkboxSelectValues.push(propsToDisplay[0]);\n    } else if (type === RANGE) {\n      rangeValues.push(...propsToDisplay);\n    }\n  });\n\n  const { docType } = getEntityData(entity);\n\n  const filtersQuery = shouldAddFilters\n    ? buildFiltersQuery(filterValues || query, filterBy, filterByProperty)\n    : [];\n\n  const rawQueryStringified = buildRawQueryStringified(\n    checkboxSelectValues,\n    rangeValues,\n    docType,\n    filtersQuery\n  );\n\n  const { data, error } = useQuery(action, {\n    variables: { rawQueryStringified, limit: 0 }, // we only want aggs so limit=0 for no search results\n    skip: !rawQueryStringified\n  });\n\n  if (error) return error.message;\n  if (!filters.length) return null;\n\n  const { searchPublishedContent: { rawResults: { aggregations: filterData } = {} } = {} } =\n    data || {};\n\n  if (filterValues.dataNotSet && filterData) {\n    const initialFilterValues = getInitialFilterValues(filterData, filters, query);\n    dispatch({ newValues: initialFilterValues, shouldSearch: false, type: 'update' });\n  }\n\n  const handleSearch = newQuery => {\n    setDisplaySearchFilter(false);\n\n    if (!newQuery) {\n      scrollToFirstList();\n      return router.push('/Resolver', baseQuery, { shallow: !hasUrl, scroll: false }).then(() => {\n        setKey(`filter-${name}:${Date.now()}`); // remove after range component update\n      });\n    }\n    const newUrl = buildNewQuery(url, currentUrl, newQuery, sortValues);\n    scrollToFirstList();\n    return router.push('/Resolver', newUrl, { shallow: !hasUrl, scroll: false });\n  };\n\n  const scrollToFirstList = () => {\n    const [list] = document.getElementsByClassName('list-top');\n    const shouldScrollToFirstList = !hasUrl && list;\n\n    if (shouldScrollToFirstList) {\n      window.scrollTo({\n        left: 0,\n        top: window.pageYOffset - SCROLL_OFFSET + list.getBoundingClientRect().top\n      });\n    } else {\n      window.scrollTo(0, 0);\n    }\n  };\n  if (!filterValues) return '';\n\n  return (\n    <SearchFilter\n      key={key}\n      setAppliedFilters={dispatch}\n      searchFilterRef={searchFilterRef}\n      data={filterData}\n      filters={filters}\n      hasUrl={hasUrl}\n      entity={entity}\n      handleSearch={handleSearch}\n      filterValues={filterValues}\n      name={name}\n      isCollapsedOnResponsive={isCollapsedOnResponsive}\n      displaySearchFilter={displaySearchFilter}\n      setDisplaySearchFilter={setDisplaySearchFilter}\n      groupAfterMobile={groupAfterMobile}\n      groupAfterDesktop={groupAfterDesktop}\n    />\n  );\n};\n\nSearchFilterContainer.propTypes = {\n  entity: PropTypes.string,\n  url: PropTypes.string,\n  filters: PropTypes.array,\n  name: PropTypes.string.isRequired,\n  isCollapsedOnResponsive: PropTypes.bool,\n  groupAfterMobile: PropTypes.number,\n  groupAfterDesktop: PropTypes.number,\n  filterBy: PropTypes.array,\n  filterByProperty: PropTypes.array,\n  shouldAddFilters: PropTypes.bool\n};\n\nSearchFilterContainer.defaultProps = {\n  url: null,\n  filters: [],\n  entity: '',\n  isCollapsedOnResponsive: true,\n  groupAfterMobile: 0,\n  groupAfterDesktop: 0,\n  filterBy: [],\n  filterByProperty: [],\n  shouldAddFilters: false\n};\n\nexport default withTitle(SearchFilterContainer);\n"],"mappings":"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"}
+{"version":3,"file":"SearchFilterContainer.js","names":["React","useState","useRef","useReducer","useRouter","useQuery","PropTypes","parseUrl","stringify","SearchFilter","withTitle","getSearchPublishedContent","buildNewQuery","buildRawQueryStringified","getInitialFilterValues","buildFiltersQuery","getEntityData","RAW_RESULTS","RANGE","CHECKBOX_SELECT","SCROLL_OFFSET","reducer","state","action","newValues","type","shouldSearch","Error","SearchFilterContainer","entity","url","filters","name","isCollapsedOnResponsive","groupAfterMobile","groupAfterDesktop","filterBy","filterByProperty","shouldAddFilters","router","asPath","searchFilterRef","key","setKey","displaySearchFilter","setDisplaySearchFilter","currentUrl","query","sort","sortby","filterValues","dispatch","hasUrl","sortValues","baseQuery","checkboxSelectValues","rangeValues","forEach","propsToDisplay","includes","push","docType","filtersQuery","rawQueryStringified","data","error","variables","limit","skip","message","length","searchPublishedContent","rawResults","aggregations","filterData","dataNotSet","initialFilterValues","handleSearch","newQuery","scrollToFirstList","shallow","scroll","then","Date","now","newUrl","list","document","getElementsByClassName","shouldScrollToFirstList","window","scrollTo","left","top","pageYOffset","getBoundingClientRect","propTypes","string","array","isRequired","bool","number","defaultProps"],"sources":["../../../src/components/SearchFilter/SearchFilterContainer.js"],"sourcesContent":["import React, { useState, useRef, useReducer } from 'react';\nimport { useRouter } from 'next/router';\nimport { useQuery } from '@apollo/client';\nimport PropTypes from 'prop-types';\nimport { parseUrl, stringify } from 'query-string';\nimport SearchFilter from './SearchFilter';\nimport { withTitle } from '../../HOC';\nimport { getSearchPublishedContent } from '../../application/query';\nimport {\n  buildNewQuery,\n  buildRawQueryStringified,\n  getInitialFilterValues,\n  buildFiltersQuery\n} from './helpers';\nimport { getEntityData } from '../../helpers';\nimport { RAW_RESULTS, RANGE, CHECKBOX_SELECT } from './constants';\nimport { SCROLL_OFFSET } from '../../constants';\n\nconst reducer = (state, action) => {\n  const { newValues, type, shouldSearch = true } = action;\n\n  switch (type) {\n    case 'update':\n      return { ...state, ...newValues, shouldSearch };\n    case 'resetSearch':\n      return { ...state, shouldSearch: false };\n    case 'reset':\n      return { ...newValues, shouldSearch };\n    default:\n      throw new Error();\n  }\n};\n\nconst SearchFilterContainer = ({\n  entity,\n  url,\n  filters,\n  name,\n  isCollapsedOnResponsive,\n  groupAfterMobile,\n  groupAfterDesktop,\n  filterBy,\n  filterByProperty,\n  shouldAddFilters\n}) => {\n  const router = useRouter();\n  const { asPath } = router;\n  const searchFilterRef = useRef(null);\n  const [key, setKey] = useState(`filter-${name}`);\n  const [displaySearchFilter, setDisplaySearchFilter] = useState(false);\n  const {\n    url: currentUrl,\n    query: { sort, sortby },\n    query\n  } = parseUrl(asPath);\n  const [filterValues, dispatch] = useReducer(\n    reducer,\n    getInitialFilterValues(null, filters, query)\n  );\n  const hasUrl = !!url;\n\n  const sortValues = sort && sortby ? stringify({ sort, sortby }) : '';\n  const baseQuery = sortValues ? `${currentUrl}?${sortValues}` : currentUrl;\n\n  const action = getSearchPublishedContent(RAW_RESULTS);\n  const checkboxSelectValues = [];\n  const rangeValues = [];\n\n  filters.forEach(({ type, propsToDisplay }) => {\n    if (CHECKBOX_SELECT.includes(type)) {\n      checkboxSelectValues.push(propsToDisplay[0]);\n    } else if (type === RANGE) {\n      rangeValues.push(...propsToDisplay);\n    }\n  });\n\n  const { docType } = getEntityData(entity);\n\n  const filtersQuery = shouldAddFilters\n    ? buildFiltersQuery(filterValues || query, filterBy, filterByProperty, rangeValues)\n    : [];\n\n  const rawQueryStringified = buildRawQueryStringified(\n    checkboxSelectValues,\n    rangeValues,\n    docType,\n    filtersQuery\n  );\n\n  const { data, error } = useQuery(action, {\n    variables: { rawQueryStringified, limit: 0 }, // we only want aggs so limit=0 for no search results\n    skip: !rawQueryStringified\n  });\n\n  if (error) return error.message;\n  if (!filters.length) return null;\n\n  const { searchPublishedContent: { rawResults: { aggregations: filterData } = {} } = {} } =\n    data || {};\n\n  if (filterValues.dataNotSet && filterData) {\n    const initialFilterValues = getInitialFilterValues(filterData, filters, query);\n    dispatch({ newValues: initialFilterValues, shouldSearch: false, type: 'update' });\n  }\n\n  const handleSearch = newQuery => {\n    setDisplaySearchFilter(false);\n\n    if (!newQuery) {\n      scrollToFirstList();\n      return router.push('/Resolver', baseQuery, { shallow: !hasUrl, scroll: false }).then(() => {\n        setKey(`filter-${name}:${Date.now()}`); // remove after range component update\n      });\n    }\n    const newUrl = buildNewQuery(url, currentUrl, newQuery, sortValues);\n    scrollToFirstList();\n    return router.push('/Resolver', newUrl, { shallow: !hasUrl, scroll: false });\n  };\n\n  const scrollToFirstList = () => {\n    const [list] = document.getElementsByClassName('list-top');\n    const shouldScrollToFirstList = !hasUrl && list;\n\n    if (shouldScrollToFirstList) {\n      window.scrollTo({\n        left: 0,\n        top: window.pageYOffset - SCROLL_OFFSET + list.getBoundingClientRect().top\n      });\n    } else {\n      window.scrollTo(0, 0);\n    }\n  };\n  if (!filterValues) return '';\n\n  return (\n    <SearchFilter\n      key={key}\n      setAppliedFilters={dispatch}\n      searchFilterRef={searchFilterRef}\n      data={filterData}\n      filters={filters}\n      hasUrl={hasUrl}\n      entity={entity}\n      handleSearch={handleSearch}\n      filterValues={filterValues}\n      name={name}\n      isCollapsedOnResponsive={isCollapsedOnResponsive}\n      displaySearchFilter={displaySearchFilter}\n      setDisplaySearchFilter={setDisplaySearchFilter}\n      groupAfterMobile={groupAfterMobile}\n      groupAfterDesktop={groupAfterDesktop}\n    />\n  );\n};\n\nSearchFilterContainer.propTypes = {\n  entity: PropTypes.string,\n  url: PropTypes.string,\n  filters: PropTypes.array,\n  name: PropTypes.string.isRequired,\n  isCollapsedOnResponsive: PropTypes.bool,\n  groupAfterMobile: PropTypes.number,\n  groupAfterDesktop: PropTypes.number,\n  filterBy: PropTypes.array,\n  filterByProperty: PropTypes.array,\n  shouldAddFilters: PropTypes.bool\n};\n\nSearchFilterContainer.defaultProps = {\n  url: null,\n  filters: [],\n  entity: '',\n  isCollapsedOnResponsive: true,\n  groupAfterMobile: 0,\n  groupAfterDesktop: 0,\n  filterBy: [],\n  filterByProperty: [],\n  shouldAddFilters: false\n};\n\nexport default withTitle(SearchFilterContainer);\n"],"mappings":"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"}

package/lib-es/components/SearchFilter/components/Range.js

@@ -13,7 +13,7 @@ import Select from '@blaze-react/select';
 import { parseUrl } from 'query-string';
 import { useGetSingleEntitySchema } from '../../../hooks';
 import { withTitle } from '../../../HOC';
-import { getSelectOptions, getIntersectedProp, getRangeValue } from '../helpers';
+import { getSelectOptions, getIntersectedProp, getRangeValue, calculateMinMax } from '../helpers';
 import { decodeValue } from '../helpers/decode-encode';
 
 const Range = ({
@@ -21,6 +21,7 @@ const Range = ({
   label,
   entity,
   propsToDisplay,
+  dataAggregations,
   updateFilterValues,
   filterValues,
   shouldSearch
@@ -41,12 +42,23 @@ const Range = ({
     loading
   } = useGetSingleEntitySchema(entity, !hasMultipleOptions);
   if (loading || !rangeOption || !rangeValue) return '';
-  const options = getSelectOptions(getEntitySchema, propsToDisplay);
+  const options = getSelectOptions(getEntitySchema, propsToDisplay); // get range from aggregations so it updates
+
   const {
     min,
     max
-  } = rangeValue;
+  } = calculateMinMax(dataAggregations[rangeOption], rangeInterval);
   const shouldShowRange = rangeOption && min !== max;
+  const minValue = rangeValue.minValue < min ? min : rangeValue.minValue;
+  const maxValue = rangeValue.maxValue > max ? max : rangeValue.maxValue;
+
+  const valueToUse = _objectSpread(_objectSpread({}, rangeValue), {}, {
+    min,
+    max,
+    minValue,
+    maxValue
+  });
+
   const handleChange = debounce((option, value) => {
     updateFilterValues({
       [option]: _objectSpread(_objectSpread({}, value), {}, {
@@ -76,10 +88,10 @@ const Range = ({
       updateFilterValues(updatedOptions, false);
     }
   })), shouldShowRange && /*#__PURE__*/React.createElement(RangeFilter, {
-    key: rangeOption,
+    key: `${rangeOption}-${minValue}-${maxValue}`,
     name: rangeOption,
     label: hasMultipleOptions ? '' : label,
-    value: rangeValue,
+    value: valueToUse,
     id: rangeOption,
     onChange: ({
       value
@@ -96,7 +108,8 @@ Range.propTypes = {
   updateFilterValues: PropTypes.func.isRequired,
   shouldSearch: PropTypes.bool,
   rangeInterval: PropTypes.number,
-  label: PropTypes.string
+  label: PropTypes.string,
+  dataAggregations: PropTypes.object.isRequired
 };
 Range.defaultProps = {
   shouldSearch: false,

package/lib-es/components/SearchFilter/components/Range.js.map

@@ -1 +1 @@
-{"version":3,"file":"Range.js","names":["React","PropTypes","debounce","RangeFilter","useRouter","Select","parseUrl","useGetSingleEntitySchema","withTitle","getSelectOptions","getIntersectedProp","getRangeValue","decodeValue","Range","rangeInterval","label","entity","propsToDisplay","updateFilterValues","filterValues","shouldSearch","router","debounceAmount","query","asPath","hasMultipleOptions","length","initialRangeOption","rangeOption","selectedOption","rangeValue","data","getEntitySchema","loading","options","min","max","shouldShowRange","handleChange","option","value","updatedOptions","forEach","prop","eMin","eMax","initValue","propTypes","array","isRequired","string","object","func","bool","number","defaultProps"],"sources":["../../../../src/components/SearchFilter/components/Range.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport debounce from 'lodash.debounce';\nimport RangeFilter from '@blaze-react/range-filter';\nimport { useRouter } from 'next/router';\nimport Select from '@blaze-react/select';\nimport { parseUrl } from 'query-string';\nimport { useGetSingleEntitySchema } from '../../../hooks';\nimport { withTitle } from '../../../HOC';\nimport { getSelectOptions, getIntersectedProp, getRangeValue } from '../helpers';\nimport { decodeValue } from '../helpers/decode-encode';\n\nconst Range = ({\n  rangeInterval,\n  label,\n  entity,\n  propsToDisplay,\n  updateFilterValues,\n  filterValues,\n  shouldSearch\n}) => {\n  const router = useRouter();\n  const debounceAmount = shouldSearch ? 1200 : 100;\n  const { query } = parseUrl(decodeValue(router.asPath));\n  const hasMultipleOptions = propsToDisplay.length > 1;\n  const initialRangeOption = getIntersectedProp(query, propsToDisplay) || propsToDisplay[0];\n  const rangeOption =\n    (filterValues[initialRangeOption] && filterValues[initialRangeOption].selectedOption) ||\n    initialRangeOption;\n  const rangeValue = filterValues[rangeOption];\n\n  const { data: { getEntitySchema = {} } = {}, loading } = useGetSingleEntitySchema(\n    entity,\n    !hasMultipleOptions\n  );\n\n  if (loading || !rangeOption || !rangeValue) return '';\n\n  const options = getSelectOptions(getEntitySchema, propsToDisplay);\n  const { min, max } = rangeValue;\n  const shouldShowRange = rangeOption && min !== max;\n\n  const handleChange = debounce((option, value) => {\n    updateFilterValues({ [option]: { ...value, selectedOption: rangeOption } }, shouldSearch);\n  }, debounceAmount);\n\n  return (\n    <>\n      {hasMultipleOptions && (\n        <>\n          <label>{label}</label>\n          <Select\n            value={rangeOption}\n            id={rangeOption}\n            options={options}\n            required\n            onChange={({ value }) => {\n              const updatedOptions = {};\n              propsToDisplay.forEach(prop => {\n                const { min: eMin, max: eMax } = filterValues[prop];\n                const initValue = getRangeValue(null, rangeInterval, eMin, eMax);\n                updatedOptions[prop] = { ...initValue, selectedOption: value };\n              });\n\n              updateFilterValues(updatedOptions, false);\n            }}\n          />\n        </>\n      )}\n      {shouldShowRange && (\n        <RangeFilter\n          key={rangeOption}\n          name={rangeOption}\n          label={hasMultipleOptions ? '' : label}\n          value={rangeValue}\n          id={rangeOption}\n          onChange={({ value }) => {\n            handleChange(rangeOption, value);\n          }}\n        />\n      )}\n    </>\n  );\n};\n\nRange.propTypes = {\n  propsToDisplay: PropTypes.array.isRequired,\n  entity: PropTypes.string.isRequired,\n  filterValues: PropTypes.object.isRequired,\n  updateFilterValues: PropTypes.func.isRequired,\n  shouldSearch: PropTypes.bool,\n  rangeInterval: PropTypes.number,\n  label: PropTypes.string\n};\n\nRange.defaultProps = {\n  shouldSearch: false,\n  rangeInterval: 1,\n  label: ''\n};\n\nexport default withTitle(Range);\n"],"mappings":"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"}
+{"version":3,"file":"Range.js","names":["React","PropTypes","debounce","RangeFilter","useRouter","Select","parseUrl","useGetSingleEntitySchema","withTitle","getSelectOptions","getIntersectedProp","getRangeValue","calculateMinMax","decodeValue","Range","rangeInterval","label","entity","propsToDisplay","dataAggregations","updateFilterValues","filterValues","shouldSearch","router","debounceAmount","query","asPath","hasMultipleOptions","length","initialRangeOption","rangeOption","selectedOption","rangeValue","data","getEntitySchema","loading","options","min","max","shouldShowRange","minValue","maxValue","valueToUse","handleChange","option","value","updatedOptions","forEach","prop","eMin","eMax","initValue","propTypes","array","isRequired","string","object","func","bool","number","defaultProps"],"sources":["../../../../src/components/SearchFilter/components/Range.js"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport debounce from 'lodash.debounce';\nimport RangeFilter from '@blaze-react/range-filter';\nimport { useRouter } from 'next/router';\nimport Select from '@blaze-react/select';\nimport { parseUrl } from 'query-string';\nimport { useGetSingleEntitySchema } from '../../../hooks';\nimport { withTitle } from '../../../HOC';\nimport { getSelectOptions, getIntersectedProp, getRangeValue, calculateMinMax } from '../helpers';\nimport { decodeValue } from '../helpers/decode-encode';\n\nconst Range = ({\n  rangeInterval,\n  label,\n  entity,\n  propsToDisplay,\n  dataAggregations,\n  updateFilterValues,\n  filterValues,\n  shouldSearch\n}) => {\n  const router = useRouter();\n  const debounceAmount = shouldSearch ? 1200 : 100;\n  const { query } = parseUrl(decodeValue(router.asPath));\n  const hasMultipleOptions = propsToDisplay.length > 1;\n  const initialRangeOption = getIntersectedProp(query, propsToDisplay) || propsToDisplay[0];\n  const rangeOption =\n    (filterValues[initialRangeOption] && filterValues[initialRangeOption].selectedOption) ||\n    initialRangeOption;\n  const rangeValue = filterValues[rangeOption];\n\n  const { data: { getEntitySchema = {} } = {}, loading } = useGetSingleEntitySchema(\n    entity,\n    !hasMultipleOptions\n  );\n\n  if (loading || !rangeOption || !rangeValue) return '';\n\n  const options = getSelectOptions(getEntitySchema, propsToDisplay);\n  // get range from aggregations so it updates\n  const { min, max } = calculateMinMax(dataAggregations[rangeOption], rangeInterval);\n  const shouldShowRange = rangeOption && min !== max;\n  const minValue = rangeValue.minValue < min ? min : rangeValue.minValue;\n  const maxValue = rangeValue.maxValue > max ? max : rangeValue.maxValue;\n  const valueToUse = { ...rangeValue, min, max, minValue, maxValue };\n\n  const handleChange = debounce((option, value) => {\n    updateFilterValues({ [option]: { ...value, selectedOption: rangeOption } }, shouldSearch);\n  }, debounceAmount);\n\n  return (\n    <>\n      {hasMultipleOptions && (\n        <>\n          <label>{label}</label>\n          <Select\n            value={rangeOption}\n            id={rangeOption}\n            options={options}\n            required\n            onChange={({ value }) => {\n              const updatedOptions = {};\n              propsToDisplay.forEach(prop => {\n                const { min: eMin, max: eMax } = filterValues[prop];\n                const initValue = getRangeValue(null, rangeInterval, eMin, eMax);\n                updatedOptions[prop] = { ...initValue, selectedOption: value };\n              });\n\n              updateFilterValues(updatedOptions, false);\n            }}\n          />\n        </>\n      )}\n      {shouldShowRange && (\n        <RangeFilter\n          key={`${rangeOption}-${minValue}-${maxValue}`}\n          name={rangeOption}\n          label={hasMultipleOptions ? '' : label}\n          value={valueToUse}\n          id={rangeOption}\n          onChange={({ value }) => {\n            handleChange(rangeOption, value);\n          }}\n        />\n      )}\n    </>\n  );\n};\n\nRange.propTypes = {\n  propsToDisplay: PropTypes.array.isRequired,\n  entity: PropTypes.string.isRequired,\n  filterValues: PropTypes.object.isRequired,\n  updateFilterValues: PropTypes.func.isRequired,\n  shouldSearch: PropTypes.bool,\n  rangeInterval: PropTypes.number,\n  label: PropTypes.string,\n  dataAggregations: PropTypes.object.isRequired\n};\n\nRange.defaultProps = {\n  shouldSearch: false,\n  rangeInterval: 1,\n  label: ''\n};\n\nexport default withTitle(Range);\n"],"mappings":"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"}

package/lib-es/components/SearchFilter/helpers/build-filters-query.js

@@ -1,4 +1,23 @@
-const builFilterObject = (key, value, filters) => {
+const QUERY_KEYS_TO_IGNORE = ['dataNotSet', 'shouldSearch', 'search_term'];
+
+const builFilterObject = (queryKey, value, filters, isRange) => {
+  if (isRange) {
+    // don't add to query if value matches range values
+    if (value.min !== value.minValue && value.max !== value.maxValue) {
+      filters.push({
+        range: {
+          [queryKey]: {
+            gte: Number(value.min),
+            lte: Number(value.max)
+          }
+        }
+      });
+    }
+
+    return;
+  }
+
+  const key = isRange ? queryKey : `${queryKey}.keyword`;
   const isArray = Array.isArray(value);
 
   if (!isArray) {
@@ -20,14 +39,14 @@ const builFilterObject = (key, value, filters) => {
   });
 };
 
-const buildFiltersQuery = (query, filterBy, filterByProperty) => {
+const buildFiltersQuery = (query, filterBy, filterByProperty, rangeValues) => {
   const mustFilters = [];
   Object.keys(query).forEach(queryKey => {
-    if (queryKey === 'search_term' || queryKey === 'shouldSearch') return;
+    if (QUERY_KEYS_TO_IGNORE.includes(queryKey)) return;
     if (!queryKey || !query[queryKey]) return;
     const queryValue = query[queryKey];
-    const queryKeyword = `${queryKey}.keyword`;
-    builFilterObject(queryKeyword, queryValue, mustFilters);
+    const isRange = rangeValues.includes(queryKey);
+    builFilterObject(queryKey, queryValue, mustFilters, isRange);
   });
 
   if (filterByProperty && filterByProperty.length) {

package/lib-es/components/SearchFilter/helpers/build-filters-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-filters-query.js","names":["builFilterObject","key","value","filters","isArray","Array","singleFilterObj","match","push","forEach","filterValue","buildFiltersQuery","query","filterBy","filterByProperty","mustFilters","Object","keys","queryKey","queryValue","queryKeyword","length","filterByPropOption","filterByPropKey","split","filterByOption","indexOf","filteryByValue","filterByKeyword"],"sources":["../../../../src/components/SearchFilter/helpers/build-filters-query.js"],"sourcesContent":["const builFilterObject = (key, value, filters) => {\n  const isArray = Array.isArray(value);\n  if (!isArray) {\n    const singleFilterObj = { match: { [key]: value } };\n    filters.push(singleFilterObj);\n    return;\n  }\n\n  value.forEach(filterValue => {\n    filters.push({ match: { [key]: filterValue } });\n  });\n};\nconst buildFiltersQuery = (query, filterBy, filterByProperty) => {\n  const mustFilters = [];\n  Object.keys(query).forEach(queryKey => {\n    if (queryKey === 'search_term' || queryKey === 'shouldSearch') return;\n    if (!queryKey || !query[queryKey]) return;\n    const queryValue = query[queryKey];\n    const queryKeyword = `${queryKey}.keyword`;\n    builFilterObject(queryKeyword, queryValue, mustFilters);\n  });\n\n  if (filterByProperty && filterByProperty.length) {\n    filterByProperty &&\n      filterByProperty.forEach(filterByPropOption => {\n        const [filterByPropKey] = filterByPropOption.split('/');\n        filterBy.forEach(filterByOption => {\n          if (filterByOption.indexOf(filterByPropKey) === -1) return;\n          const [, filteryByValue] = filterByOption.split('/');\n          const filterByKeyword = `${filterByPropKey}.keyword`;\n          if (!filteryByValue) return;\n          mustFilters.push({ match: { [filterByKeyword]: filteryByValue } });\n        });\n      });\n  }\n\n  return mustFilters;\n};\n\nexport default buildFiltersQuery;\n"],"mappings":"AAAA,MAAMA,gBAAgB,GAAG,CAACC,GAAD,EAAMC,KAAN,EAAaC,OAAb,KAAyB;EAChD,MAAMC,OAAO,GAAGC,KAAK,CAACD,OAAN,CAAcF,KAAd,CAAhB;;EACA,IAAI,CAACE,OAAL,EAAc;IACZ,MAAME,eAAe,GAAG;MAAEC,KAAK,EAAE;QAAE,CAACN,GAAD,GAAOC;MAAT;IAAT,CAAxB;IACAC,OAAO,CAACK,IAAR,CAAaF,eAAb;IACA;EACD;;EAEDJ,KAAK,CAACO,OAAN,CAAcC,WAAW,IAAI;IAC3BP,OAAO,CAACK,IAAR,CAAa;MAAED,KAAK,EAAE;QAAE,CAACN,GAAD,GAAOS;MAAT;IAAT,CAAb;EACD,CAFD;AAGD,CAXD;;AAYA,MAAMC,iBAAiB,GAAG,CAACC,KAAD,EAAQC,QAAR,EAAkBC,gBAAlB,KAAuC;EAC/D,MAAMC,WAAW,GAAG,EAApB;EACAC,MAAM,CAACC,IAAP,CAAYL,KAAZ,EAAmBH,OAAnB,CAA2BS,QAAQ,IAAI;IACrC,IAAIA,QAAQ,KAAK,aAAb,IAA8BA,QAAQ,KAAK,cAA/C,EAA+D;IAC/D,IAAI,CAACA,QAAD,IAAa,CAACN,KAAK,CAACM,QAAD,CAAvB,EAAmC;IACnC,MAAMC,UAAU,GAAGP,KAAK,CAACM,QAAD,CAAxB;IACA,MAAME,YAAY,GAAI,GAAEF,QAAS,UAAjC;IACAlB,gBAAgB,CAACoB,YAAD,EAAeD,UAAf,EAA2BJ,WAA3B,CAAhB;EACD,CAND;;EAQA,IAAID,gBAAgB,IAAIA,gBAAgB,CAACO,MAAzC,EAAiD;IAC/CP,gBAAgB,IACdA,gBAAgB,CAACL,OAAjB,CAAyBa,kBAAkB,IAAI;MAC7C,MAAM,CAACC,eAAD,IAAoBD,kBAAkB,CAACE,KAAnB,CAAyB,GAAzB,CAA1B;MACAX,QAAQ,CAACJ,OAAT,CAAiBgB,cAAc,IAAI;QACjC,IAAIA,cAAc,CAACC,OAAf,CAAuBH,eAAvB,MAA4C,CAAC,CAAjD,EAAoD;QACpD,MAAM,GAAGI,cAAH,IAAqBF,cAAc,CAACD,KAAf,CAAqB,GAArB,CAA3B;QACA,MAAMI,eAAe,GAAI,GAAEL,eAAgB,UAA3C;QACA,IAAI,CAACI,cAAL,EAAqB;QACrBZ,WAAW,CAACP,IAAZ,CAAiB;UAAED,KAAK,EAAE;YAAE,CAACqB,eAAD,GAAmBD;UAArB;QAAT,CAAjB;MACD,CAND;IAOD,CATD,CADF;EAWD;;EAED,OAAOZ,WAAP;AACD,CAzBD;;AA2BA,eAAeJ,iBAAf"}
+{"version":3,"file":"build-filters-query.js","names":["QUERY_KEYS_TO_IGNORE","builFilterObject","queryKey","value","filters","isRange","min","minValue","max","maxValue","push","range","gte","Number","lte","key","isArray","Array","singleFilterObj","match","forEach","filterValue","buildFiltersQuery","query","filterBy","filterByProperty","rangeValues","mustFilters","Object","keys","includes","queryValue","length","filterByPropOption","filterByPropKey","split","filterByOption","indexOf","filteryByValue","filterByKeyword"],"sources":["../../../../src/components/SearchFilter/helpers/build-filters-query.js"],"sourcesContent":["const QUERY_KEYS_TO_IGNORE = ['dataNotSet', 'shouldSearch', 'search_term'];\n\nconst builFilterObject = (queryKey, value, filters, isRange) => {\n  if (isRange) {\n    // don't add to query if value matches range values\n    if (value.min !== value.minValue && value.max !== value.maxValue) {\n      filters.push({\n        range: {\n          [queryKey]: {\n            gte: Number(value.min),\n            lte: Number(value.max)\n          }\n        }\n      });\n    }\n    return;\n  }\n\n  const key = isRange ? queryKey : `${queryKey}.keyword`;\n\n  const isArray = Array.isArray(value);\n  if (!isArray) {\n    const singleFilterObj = { match: { [key]: value } };\n    filters.push(singleFilterObj);\n    return;\n  }\n\n  value.forEach(filterValue => {\n    filters.push({ match: { [key]: filterValue } });\n  });\n};\nconst buildFiltersQuery = (query, filterBy, filterByProperty, rangeValues) => {\n  const mustFilters = [];\n  Object.keys(query).forEach(queryKey => {\n    if (QUERY_KEYS_TO_IGNORE.includes(queryKey)) return;\n    if (!queryKey || !query[queryKey]) return;\n    const queryValue = query[queryKey];\n\n    const isRange = rangeValues.includes(queryKey);\n    builFilterObject(queryKey, queryValue, mustFilters, isRange);\n  });\n\n  if (filterByProperty && filterByProperty.length) {\n    filterByProperty &&\n      filterByProperty.forEach(filterByPropOption => {\n        const [filterByPropKey] = filterByPropOption.split('/');\n        filterBy.forEach(filterByOption => {\n          if (filterByOption.indexOf(filterByPropKey) === -1) return;\n          const [, filteryByValue] = filterByOption.split('/');\n          const filterByKeyword = `${filterByPropKey}.keyword`;\n          if (!filteryByValue) return;\n          mustFilters.push({ match: { [filterByKeyword]: filteryByValue } });\n        });\n      });\n  }\n\n  return mustFilters;\n};\n\nexport default buildFiltersQuery;\n"],"mappings":"AAAA,MAAMA,oBAAoB,GAAG,CAAC,YAAD,EAAe,cAAf,EAA+B,aAA/B,CAA7B;;AAEA,MAAMC,gBAAgB,GAAG,CAACC,QAAD,EAAWC,KAAX,EAAkBC,OAAlB,EAA2BC,OAA3B,KAAuC;EAC9D,IAAIA,OAAJ,EAAa;IACX;IACA,IAAIF,KAAK,CAACG,GAAN,KAAcH,KAAK,CAACI,QAApB,IAAgCJ,KAAK,CAACK,GAAN,KAAcL,KAAK,CAACM,QAAxD,EAAkE;MAChEL,OAAO,CAACM,IAAR,CAAa;QACXC,KAAK,EAAE;UACL,CAACT,QAAD,GAAY;YACVU,GAAG,EAAEC,MAAM,CAACV,KAAK,CAACG,GAAP,CADD;YAEVQ,GAAG,EAAED,MAAM,CAACV,KAAK,CAACK,GAAP;UAFD;QADP;MADI,CAAb;IAQD;;IACD;EACD;;EAED,MAAMO,GAAG,GAAGV,OAAO,GAAGH,QAAH,GAAe,GAAEA,QAAS,UAA7C;EAEA,MAAMc,OAAO,GAAGC,KAAK,CAACD,OAAN,CAAcb,KAAd,CAAhB;;EACA,IAAI,CAACa,OAAL,EAAc;IACZ,MAAME,eAAe,GAAG;MAAEC,KAAK,EAAE;QAAE,CAACJ,GAAD,GAAOZ;MAAT;IAAT,CAAxB;IACAC,OAAO,CAACM,IAAR,CAAaQ,eAAb;IACA;EACD;;EAEDf,KAAK,CAACiB,OAAN,CAAcC,WAAW,IAAI;IAC3BjB,OAAO,CAACM,IAAR,CAAa;MAAES,KAAK,EAAE;QAAE,CAACJ,GAAD,GAAOM;MAAT;IAAT,CAAb;EACD,CAFD;AAGD,CA5BD;;AA6BA,MAAMC,iBAAiB,GAAG,CAACC,KAAD,EAAQC,QAAR,EAAkBC,gBAAlB,EAAoCC,WAApC,KAAoD;EAC5E,MAAMC,WAAW,GAAG,EAApB;EACAC,MAAM,CAACC,IAAP,CAAYN,KAAZ,EAAmBH,OAAnB,CAA2BlB,QAAQ,IAAI;IACrC,IAAIF,oBAAoB,CAAC8B,QAArB,CAA8B5B,QAA9B,CAAJ,EAA6C;IAC7C,IAAI,CAACA,QAAD,IAAa,CAACqB,KAAK,CAACrB,QAAD,CAAvB,EAAmC;IACnC,MAAM6B,UAAU,GAAGR,KAAK,CAACrB,QAAD,CAAxB;IAEA,MAAMG,OAAO,GAAGqB,WAAW,CAACI,QAAZ,CAAqB5B,QAArB,CAAhB;IACAD,gBAAgB,CAACC,QAAD,EAAW6B,UAAX,EAAuBJ,WAAvB,EAAoCtB,OAApC,CAAhB;EACD,CAPD;;EASA,IAAIoB,gBAAgB,IAAIA,gBAAgB,CAACO,MAAzC,EAAiD;IAC/CP,gBAAgB,IACdA,gBAAgB,CAACL,OAAjB,CAAyBa,kBAAkB,IAAI;MAC7C,MAAM,CAACC,eAAD,IAAoBD,kBAAkB,CAACE,KAAnB,CAAyB,GAAzB,CAA1B;MACAX,QAAQ,CAACJ,OAAT,CAAiBgB,cAAc,IAAI;QACjC,IAAIA,cAAc,CAACC,OAAf,CAAuBH,eAAvB,MAA4C,CAAC,CAAjD,EAAoD;QACpD,MAAM,GAAGI,cAAH,IAAqBF,cAAc,CAACD,KAAf,CAAqB,GAArB,CAA3B;QACA,MAAMI,eAAe,GAAI,GAAEL,eAAgB,UAA3C;QACA,IAAI,CAACI,cAAL,EAAqB;QACrBX,WAAW,CAACjB,IAAZ,CAAiB;UAAES,KAAK,EAAE;YAAE,CAACoB,eAAD,GAAmBD;UAArB;QAAT,CAAjB;MACD,CAND;IAOD,CATD,CADF;EAWD;;EAED,OAAOX,WAAP;AACD,CA1BD;;AA4BA,eAAeL,iBAAf"}

package/lib-es/components/SearchFilter/helpers/build-raw-query-stringified.js

@@ -1,6 +1,6 @@
 import { KEYWORD, SIZE } from '../constants';
 
-const buildRawQueryStringified = (checkboxSelectValues, rangeValues, entity, mustFilters) => {
+const buildRawQueryStringified = (checkboxSelectValues, rangeValues, entity, mustFilters = []) => {
   if (!checkboxSelectValues.length && !rangeValues.length) return '';
   const aggs = {};
   checkboxSelectValues.forEach(fieldName => {
@@ -18,21 +18,26 @@ const buildRawQueryStringified = (checkboxSelectValues, rangeValues, entity, mus
       }
     };
   });
+  const boolFilter = {
+    should: [{
+      match: {
+        docType: entity
+      }
+    }],
+    minimum_should_match: 1
+  };
+
+  if (mustFilters.length) {
+    boolFilter.must = mustFilters;
+  }
+
   return JSON.stringify({
     aggs,
     size: 0,
     query: {
       bool: {
         filter: {
-          bool: {
-            should: [{
-              match: {
-                docType: entity
-              }
-            }],
-            must: mustFilters,
-            minimum_should_match: 1
-          }
+          bool: boolFilter
         }
       }
     }

package/lib-es/components/SearchFilter/helpers/build-raw-query-stringified.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-raw-query-stringified.js","names":["KEYWORD","SIZE","buildRawQueryStringified","checkboxSelectValues","rangeValues","entity","mustFilters","length","aggs","forEach","fieldName","terms","field","size","stats","JSON","stringify","query","bool","filter","should","match","docType","must","minimum_should_match"],"sources":["../../../../src/components/SearchFilter/helpers/build-raw-query-stringified.js"],"sourcesContent":["import { KEYWORD, SIZE } from '../constants';\n\nconst buildRawQueryStringified = (checkboxSelectValues, rangeValues, entity, mustFilters) => {\n  if (!checkboxSelectValues.length && !rangeValues.length) return '';\n\n  const aggs = {};\n\n  checkboxSelectValues.forEach(fieldName => {\n    aggs[fieldName] = {\n      terms: {\n        field: `${fieldName}.${KEYWORD}`,\n        size: SIZE\n      }\n    };\n  });\n\n  rangeValues.forEach(fieldName => {\n    aggs[fieldName] = {\n      stats: {\n        field: fieldName\n      }\n    };\n  });\n\n  return JSON.stringify({\n    aggs,\n    size: 0,\n    query: {\n      bool: {\n        filter: {\n          bool: {\n            should: [\n              {\n                match: {\n                  docType: entity\n                }\n              }\n            ],\n            must: mustFilters,\n            minimum_should_match: 1\n          }\n        }\n      }\n    }\n  });\n};\n\nexport default buildRawQueryStringified;\n"],"mappings":"AAAA,SAASA,OAAT,EAAkBC,IAAlB,QAA8B,cAA9B;;AAEA,MAAMC,wBAAwB,GAAG,CAACC,oBAAD,EAAuBC,WAAvB,EAAoCC,MAApC,EAA4CC,WAA5C,KAA4D;EAC3F,IAAI,CAACH,oBAAoB,CAACI,MAAtB,IAAgC,CAACH,WAAW,CAACG,MAAjD,EAAyD,OAAO,EAAP;EAEzD,MAAMC,IAAI,GAAG,EAAb;EAEAL,oBAAoB,CAACM,OAArB,CAA6BC,SAAS,IAAI;IACxCF,IAAI,CAACE,SAAD,CAAJ,GAAkB;MAChBC,KAAK,EAAE;QACLC,KAAK,EAAG,GAAEF,SAAU,IAAGV,OAAQ,EAD1B;QAELa,IAAI,EAAEZ;MAFD;IADS,CAAlB;EAMD,CAPD;EASAG,WAAW,CAACK,OAAZ,CAAoBC,SAAS,IAAI;IAC/BF,IAAI,CAACE,SAAD,CAAJ,GAAkB;MAChBI,KAAK,EAAE;QACLF,KAAK,EAAEF;MADF;IADS,CAAlB;EAKD,CAND;EAQA,OAAOK,IAAI,CAACC,SAAL,CAAe;IACpBR,IADoB;IAEpBK,IAAI,EAAE,CAFc;IAGpBI,KAAK,EAAE;MACLC,IAAI,EAAE;QACJC,MAAM,EAAE;UACND,IAAI,EAAE;YACJE,MAAM,EAAE,CACN;cACEC,KAAK,EAAE;gBACLC,OAAO,EAAEjB;cADJ;YADT,CADM,CADJ;YAQJkB,IAAI,EAAEjB,WARF;YASJkB,oBAAoB,EAAE;UATlB;QADA;MADJ;IADD;EAHa,CAAf,CAAP;AAqBD,CA3CD;;AA6CA,eAAetB,wBAAf"}
+{"version":3,"file":"build-raw-query-stringified.js","names":["KEYWORD","SIZE","buildRawQueryStringified","checkboxSelectValues","rangeValues","entity","mustFilters","length","aggs","forEach","fieldName","terms","field","size","stats","boolFilter","should","match","docType","minimum_should_match","must","JSON","stringify","query","bool","filter"],"sources":["../../../../src/components/SearchFilter/helpers/build-raw-query-stringified.js"],"sourcesContent":["import { KEYWORD, SIZE } from '../constants';\n\nconst buildRawQueryStringified = (checkboxSelectValues, rangeValues, entity, mustFilters = []) => {\n  if (!checkboxSelectValues.length && !rangeValues.length) return '';\n\n  const aggs = {};\n\n  checkboxSelectValues.forEach(fieldName => {\n    aggs[fieldName] = {\n      terms: {\n        field: `${fieldName}.${KEYWORD}`,\n        size: SIZE\n      }\n    };\n  });\n\n  rangeValues.forEach(fieldName => {\n    aggs[fieldName] = {\n      stats: {\n        field: fieldName\n      }\n    };\n  });\n\n  const boolFilter = {\n    should: [\n      {\n        match: {\n          docType: entity\n        }\n      }\n    ],\n    minimum_should_match: 1\n  };\n\n  if (mustFilters.length) {\n    boolFilter.must = mustFilters;\n  }\n\n  return JSON.stringify({\n    aggs,\n    size: 0,\n    query: {\n      bool: {\n        filter: {\n          bool: boolFilter\n        }\n      }\n    }\n  });\n};\n\nexport default buildRawQueryStringified;\n"],"mappings":"AAAA,SAASA,OAAT,EAAkBC,IAAlB,QAA8B,cAA9B;;AAEA,MAAMC,wBAAwB,GAAG,CAACC,oBAAD,EAAuBC,WAAvB,EAAoCC,MAApC,EAA4CC,WAAW,GAAG,EAA1D,KAAiE;EAChG,IAAI,CAACH,oBAAoB,CAACI,MAAtB,IAAgC,CAACH,WAAW,CAACG,MAAjD,EAAyD,OAAO,EAAP;EAEzD,MAAMC,IAAI,GAAG,EAAb;EAEAL,oBAAoB,CAACM,OAArB,CAA6BC,SAAS,IAAI;IACxCF,IAAI,CAACE,SAAD,CAAJ,GAAkB;MAChBC,KAAK,EAAE;QACLC,KAAK,EAAG,GAAEF,SAAU,IAAGV,OAAQ,EAD1B;QAELa,IAAI,EAAEZ;MAFD;IADS,CAAlB;EAMD,CAPD;EASAG,WAAW,CAACK,OAAZ,CAAoBC,SAAS,IAAI;IAC/BF,IAAI,CAACE,SAAD,CAAJ,GAAkB;MAChBI,KAAK,EAAE;QACLF,KAAK,EAAEF;MADF;IADS,CAAlB;EAKD,CAND;EAQA,MAAMK,UAAU,GAAG;IACjBC,MAAM,EAAE,CACN;MACEC,KAAK,EAAE;QACLC,OAAO,EAAEb;MADJ;IADT,CADM,CADS;IAQjBc,oBAAoB,EAAE;EARL,CAAnB;;EAWA,IAAIb,WAAW,CAACC,MAAhB,EAAwB;IACtBQ,UAAU,CAACK,IAAX,GAAkBd,WAAlB;EACD;;EAED,OAAOe,IAAI,CAACC,SAAL,CAAe;IACpBd,IADoB;IAEpBK,IAAI,EAAE,CAFc;IAGpBU,KAAK,EAAE;MACLC,IAAI,EAAE;QACJC,MAAM,EAAE;UACND,IAAI,EAAET;QADA;MADJ;IADD;EAHa,CAAf,CAAP;AAWD,CAhDD;;AAkDA,eAAeb,wBAAf"}

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

@@ -6,10 +6,11 @@ const getInitialFilterValues = (filterData, filters, query) => {
   filterValues[SEARCH_TERM] = query[SEARCH_TERM] || '';
 
   if (!filterData) {
-    filters.forEach(({
-      propsToDisplay: [key]
-    }) => {
-      filterValues[key] = null;
+    filters.forEach(filterProps => {
+      const {
+        propsToDisplay: [key]
+      } = filterProps;
+      filterValues[key] = query[key] ? getFilterValueFromQuery(key, filterProps, {}, query) : null;
     });
     filterValues.dataNotSet = true;
     return filterValues;

package/lib-es/components/SearchFilter/helpers/get-initial-filter-values.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-initial-filter-values.js","names":["SEARCH_TERM","getFilterValueFromQuery","getInitialFilterValues","filterData","filters","query","filterValues","forEach","propsToDisplay","key","dataNotSet","Object","keys","filterProps","find","prop"],"sources":["../../../../src/components/SearchFilter/helpers/get-initial-filter-values.js"],"sourcesContent":["import { SEARCH_TERM } from '../constants';\nimport getFilterValueFromQuery from './get-filter-value-from-query';\n\nconst getInitialFilterValues = (filterData, filters, query) => {\n  const filterValues = {};\n  filterValues[SEARCH_TERM] = query[SEARCH_TERM] || '';\n\n  if (!filterData) {\n    filters.forEach(({ propsToDisplay: [key] }) => {\n      filterValues[key] = null;\n    });\n    filterValues.dataNotSet = true;\n    return filterValues;\n  }\n\n  Object.keys(filterData).forEach(key => {\n    const filterProps =\n      filters.find(({ propsToDisplay }) => propsToDisplay.find(prop => key === prop)) || {};\n    filterValues[key] = getFilterValueFromQuery(key, filterProps, filterData[key], query);\n  });\n\n  filterValues.dataNotSet = false;\n\n  return filterValues;\n};\n\nexport default getInitialFilterValues;\n"],"mappings":"AAAA,SAASA,WAAT,QAA4B,cAA5B;AACA,OAAOC,uBAAP,MAAoC,+BAApC;;AAEA,MAAMC,sBAAsB,GAAG,CAACC,UAAD,EAAaC,OAAb,EAAsBC,KAAtB,KAAgC;EAC7D,MAAMC,YAAY,GAAG,EAArB;EACAA,YAAY,CAACN,WAAD,CAAZ,GAA4BK,KAAK,CAACL,WAAD,CAAL,IAAsB,EAAlD;;EAEA,IAAI,CAACG,UAAL,EAAiB;IACfC,OAAO,CAACG,OAAR,CAAgB,CAAC;MAAEC,cAAc,EAAE,CAACC,GAAD;IAAlB,CAAD,KAA+B;MAC7CH,YAAY,CAACG,GAAD,CAAZ,GAAoB,IAApB;IACD,CAFD;IAGAH,YAAY,CAACI,UAAb,GAA0B,IAA1B;IACA,OAAOJ,YAAP;EACD;;EAEDK,MAAM,CAACC,IAAP,CAAYT,UAAZ,EAAwBI,OAAxB,CAAgCE,GAAG,IAAI;IACrC,MAAMI,WAAW,GACfT,OAAO,CAACU,IAAR,CAAa,CAAC;MAAEN;IAAF,CAAD,KAAwBA,cAAc,CAACM,IAAf,CAAoBC,IAAI,IAAIN,GAAG,KAAKM,IAApC,CAArC,KAAmF,EADrF;IAEAT,YAAY,CAACG,GAAD,CAAZ,GAAoBR,uBAAuB,CAACQ,GAAD,EAAMI,WAAN,EAAmBV,UAAU,CAACM,GAAD,CAA7B,EAAoCJ,KAApC,CAA3C;EACD,CAJD;EAMAC,YAAY,CAACI,UAAb,GAA0B,KAA1B;EAEA,OAAOJ,YAAP;AACD,CArBD;;AAuBA,eAAeJ,sBAAf"}
+{"version":3,"file":"get-initial-filter-values.js","names":["SEARCH_TERM","getFilterValueFromQuery","getInitialFilterValues","filterData","filters","query","filterValues","forEach","filterProps","propsToDisplay","key","dataNotSet","Object","keys","find","prop"],"sources":["../../../../src/components/SearchFilter/helpers/get-initial-filter-values.js"],"sourcesContent":["import { SEARCH_TERM } from '../constants';\nimport getFilterValueFromQuery from './get-filter-value-from-query';\n\nconst getInitialFilterValues = (filterData, filters, query) => {\n  const filterValues = {};\n  filterValues[SEARCH_TERM] = query[SEARCH_TERM] || '';\n\n  if (!filterData) {\n    filters.forEach(filterProps => {\n      const {\n        propsToDisplay: [key]\n      } = filterProps;\n      filterValues[key] = query[key] ? getFilterValueFromQuery(key, filterProps, {}, query) : null;\n    });\n    filterValues.dataNotSet = true;\n    return filterValues;\n  }\n\n  Object.keys(filterData).forEach(key => {\n    const filterProps =\n      filters.find(({ propsToDisplay }) => propsToDisplay.find(prop => key === prop)) || {};\n    filterValues[key] = getFilterValueFromQuery(key, filterProps, filterData[key], query);\n  });\n\n  filterValues.dataNotSet = false;\n\n  return filterValues;\n};\n\nexport default getInitialFilterValues;\n"],"mappings":"AAAA,SAASA,WAAT,QAA4B,cAA5B;AACA,OAAOC,uBAAP,MAAoC,+BAApC;;AAEA,MAAMC,sBAAsB,GAAG,CAACC,UAAD,EAAaC,OAAb,EAAsBC,KAAtB,KAAgC;EAC7D,MAAMC,YAAY,GAAG,EAArB;EACAA,YAAY,CAACN,WAAD,CAAZ,GAA4BK,KAAK,CAACL,WAAD,CAAL,IAAsB,EAAlD;;EAEA,IAAI,CAACG,UAAL,EAAiB;IACfC,OAAO,CAACG,OAAR,CAAgBC,WAAW,IAAI;MAC7B,MAAM;QACJC,cAAc,EAAE,CAACC,GAAD;MADZ,IAEFF,WAFJ;MAGAF,YAAY,CAACI,GAAD,CAAZ,GAAoBL,KAAK,CAACK,GAAD,CAAL,GAAaT,uBAAuB,CAACS,GAAD,EAAMF,WAAN,EAAmB,EAAnB,EAAuBH,KAAvB,CAApC,GAAoE,IAAxF;IACD,CALD;IAMAC,YAAY,CAACK,UAAb,GAA0B,IAA1B;IACA,OAAOL,YAAP;EACD;;EAEDM,MAAM,CAACC,IAAP,CAAYV,UAAZ,EAAwBI,OAAxB,CAAgCG,GAAG,IAAI;IACrC,MAAMF,WAAW,GACfJ,OAAO,CAACU,IAAR,CAAa,CAAC;MAAEL;IAAF,CAAD,KAAwBA,cAAc,CAACK,IAAf,CAAoBC,IAAI,IAAIL,GAAG,KAAKK,IAApC,CAArC,KAAmF,EADrF;IAEAT,YAAY,CAACI,GAAD,CAAZ,GAAoBT,uBAAuB,CAACS,GAAD,EAAMF,WAAN,EAAmBL,UAAU,CAACO,GAAD,CAA7B,EAAoCL,KAApC,CAA3C;EACD,CAJD;EAMAC,YAAY,CAACK,UAAb,GAA0B,KAA1B;EAEA,OAAOL,YAAP;AACD,CAxBD;;AA0BA,eAAeJ,sBAAf"}

package/lib-es/components/SearchFilter/helpers/get-range-value.js

@@ -14,8 +14,8 @@ const getRangeValue = (rawQueryProp, rangeInterval, _min, _max) => {
     const updatedMinValue = Number(queryParamMin);
     const updatedMaxValue = Number(queryParamMax);
     return {
-      min,
-      max,
+      min: Number.isNaN(min) ? updatedMinValue : min,
+      max: Number.isNaN(max) ? updatedMaxValue : max,
       step: rangeInterval,
       maxValue: updatedMaxValue,
       minValue: updatedMinValue

package/lib-es/components/SearchFilter/helpers/get-range-value.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-range-value.js","names":["calculateMinMax","getRangeValue","rawQueryProp","rangeInterval","_min","_max","min","max","queryParamMin","queryParamMax","Array","isArray","split","updatedMinValue","Number","updatedMaxValue","step","maxValue","minValue"],"sources":["../../../../src/components/SearchFilter/helpers/get-range-value.js"],"sourcesContent":["import calculateMinMax from './calculate-min-max';\n\nconst getRangeValue = (rawQueryProp, rangeInterval, _min, _max) => {\n  const { min, max } = calculateMinMax({ min: _min, max: _max }, rangeInterval);\n\n  if (rawQueryProp) {\n    const [queryParamMin, queryParamMax] = Array.isArray(rawQueryProp)\n      ? rawQueryProp[0].split('-')\n      : rawQueryProp.split('-');\n    const updatedMinValue = Number(queryParamMin);\n    const updatedMaxValue = Number(queryParamMax);\n\n    return {\n      min,\n      max,\n      step: rangeInterval,\n      maxValue: updatedMaxValue,\n      minValue: updatedMinValue\n    };\n  }\n\n  return {\n    max,\n    min,\n    step: rangeInterval,\n    maxValue: max,\n    minValue: min\n  };\n};\n\nexport default getRangeValue;\n"],"mappings":"AAAA,OAAOA,eAAP,MAA4B,qBAA5B;;AAEA,MAAMC,aAAa,GAAG,CAACC,YAAD,EAAeC,aAAf,EAA8BC,IAA9B,EAAoCC,IAApC,KAA6C;EACjE,MAAM;IAAEC,GAAF;IAAOC;EAAP,IAAeP,eAAe,CAAC;IAAEM,GAAG,EAAEF,IAAP;IAAaG,GAAG,EAAEF;EAAlB,CAAD,EAA2BF,aAA3B,CAApC;;EAEA,IAAID,YAAJ,EAAkB;IAChB,MAAM,CAACM,aAAD,EAAgBC,aAAhB,IAAiCC,KAAK,CAACC,OAAN,CAAcT,YAAd,IACnCA,YAAY,CAAC,CAAD,CAAZ,CAAgBU,KAAhB,CAAsB,GAAtB,CADmC,GAEnCV,YAAY,CAACU,KAAb,CAAmB,GAAnB,CAFJ;IAGA,MAAMC,eAAe,GAAGC,MAAM,CAACN,aAAD,CAA9B;IACA,MAAMO,eAAe,GAAGD,MAAM,CAACL,aAAD,CAA9B;IAEA,OAAO;MACLH,GADK;MAELC,GAFK;MAGLS,IAAI,EAAEb,aAHD;MAILc,QAAQ,EAAEF,eAJL;MAKLG,QAAQ,EAAEL;IALL,CAAP;EAOD;;EAED,OAAO;IACLN,GADK;IAELD,GAFK;IAGLU,IAAI,EAAEb,aAHD;IAILc,QAAQ,EAAEV,GAJL;IAKLW,QAAQ,EAAEZ;EALL,CAAP;AAOD,CA1BD;;AA4BA,eAAeL,aAAf"}
+{"version":3,"file":"get-range-value.js","names":["calculateMinMax","getRangeValue","rawQueryProp","rangeInterval","_min","_max","min","max","queryParamMin","queryParamMax","Array","isArray","split","updatedMinValue","Number","updatedMaxValue","isNaN","step","maxValue","minValue"],"sources":["../../../../src/components/SearchFilter/helpers/get-range-value.js"],"sourcesContent":["import calculateMinMax from './calculate-min-max';\n\nconst getRangeValue = (rawQueryProp, rangeInterval, _min, _max) => {\n  const { min, max } = calculateMinMax({ min: _min, max: _max }, rangeInterval);\n\n  if (rawQueryProp) {\n    const [queryParamMin, queryParamMax] = Array.isArray(rawQueryProp)\n      ? rawQueryProp[0].split('-')\n      : rawQueryProp.split('-');\n    const updatedMinValue = Number(queryParamMin);\n    const updatedMaxValue = Number(queryParamMax);\n\n    return {\n      min: Number.isNaN(min) ? updatedMinValue : min,\n      max: Number.isNaN(max) ? updatedMaxValue : max,\n      step: rangeInterval,\n      maxValue: updatedMaxValue,\n      minValue: updatedMinValue\n    };\n  }\n\n  return {\n    max,\n    min,\n    step: rangeInterval,\n    maxValue: max,\n    minValue: min\n  };\n};\n\nexport default getRangeValue;\n"],"mappings":"AAAA,OAAOA,eAAP,MAA4B,qBAA5B;;AAEA,MAAMC,aAAa,GAAG,CAACC,YAAD,EAAeC,aAAf,EAA8BC,IAA9B,EAAoCC,IAApC,KAA6C;EACjE,MAAM;IAAEC,GAAF;IAAOC;EAAP,IAAeP,eAAe,CAAC;IAAEM,GAAG,EAAEF,IAAP;IAAaG,GAAG,EAAEF;EAAlB,CAAD,EAA2BF,aAA3B,CAApC;;EAEA,IAAID,YAAJ,EAAkB;IAChB,MAAM,CAACM,aAAD,EAAgBC,aAAhB,IAAiCC,KAAK,CAACC,OAAN,CAAcT,YAAd,IACnCA,YAAY,CAAC,CAAD,CAAZ,CAAgBU,KAAhB,CAAsB,GAAtB,CADmC,GAEnCV,YAAY,CAACU,KAAb,CAAmB,GAAnB,CAFJ;IAGA,MAAMC,eAAe,GAAGC,MAAM,CAACN,aAAD,CAA9B;IACA,MAAMO,eAAe,GAAGD,MAAM,CAACL,aAAD,CAA9B;IAEA,OAAO;MACLH,GAAG,EAAEQ,MAAM,CAACE,KAAP,CAAaV,GAAb,IAAoBO,eAApB,GAAsCP,GADtC;MAELC,GAAG,EAAEO,MAAM,CAACE,KAAP,CAAaT,GAAb,IAAoBQ,eAApB,GAAsCR,GAFtC;MAGLU,IAAI,EAAEd,aAHD;MAILe,QAAQ,EAAEH,eAJL;MAKLI,QAAQ,EAAEN;IALL,CAAP;EAOD;;EAED,OAAO;IACLN,GADK;IAELD,GAFK;IAGLW,IAAI,EAAEd,aAHD;IAILe,QAAQ,EAAEX,GAJL;IAKLY,QAAQ,EAAEb;EALL,CAAP;AAOD,CA1BD;;AA4BA,eAAeL,aAAf"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.124.0",
+  "version": "0.124.1-alpha.1",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -85,5 +85,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "db99e69def55f8ea7fa5e670bee910103b291ca9"
+  "gitHead": "88f06417684a6d3b31723152b154a343739e9a89"
 }

package/src/components/SearchFilter/SearchFilterContainer.js

@@ -77,7 +77,7 @@ const SearchFilterContainer = ({
   const { docType } = getEntityData(entity);
 
   const filtersQuery = shouldAddFilters
-    ? buildFiltersQuery(filterValues || query, filterBy, filterByProperty)
+    ? buildFiltersQuery(filterValues || query, filterBy, filterByProperty, rangeValues)
     : [];
 
   const rawQueryStringified = buildRawQueryStringified(

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

@@ -7,7 +7,7 @@ import Select from '@blaze-react/select';
 import { parseUrl } from 'query-string';
 import { useGetSingleEntitySchema } from '../../../hooks';
 import { withTitle } from '../../../HOC';
-import { getSelectOptions, getIntersectedProp, getRangeValue } from '../helpers';
+import { getSelectOptions, getIntersectedProp, getRangeValue, calculateMinMax } from '../helpers';
 import { decodeValue } from '../helpers/decode-encode';
 
 const Range = ({
@@ -15,6 +15,7 @@ const Range = ({
   label,
   entity,
   propsToDisplay,
+  dataAggregations,
   updateFilterValues,
   filterValues,
   shouldSearch
@@ -37,8 +38,12 @@ const Range = ({
   if (loading || !rangeOption || !rangeValue) return '';
 
   const options = getSelectOptions(getEntitySchema, propsToDisplay);
-  const { min, max } = rangeValue;
+  // get range from aggregations so it updates
+  const { min, max } = calculateMinMax(dataAggregations[rangeOption], rangeInterval);
   const shouldShowRange = rangeOption && min !== max;
+  const minValue = rangeValue.minValue < min ? min : rangeValue.minValue;
+  const maxValue = rangeValue.maxValue > max ? max : rangeValue.maxValue;
+  const valueToUse = { ...rangeValue, min, max, minValue, maxValue };
 
   const handleChange = debounce((option, value) => {
     updateFilterValues({ [option]: { ...value, selectedOption: rangeOption } }, shouldSearch);
@@ -69,10 +74,10 @@ const Range = ({
       )}
       {shouldShowRange && (
         <RangeFilter
-          key={rangeOption}
+          key={`${rangeOption}-${minValue}-${maxValue}`}
           name={rangeOption}
           label={hasMultipleOptions ? '' : label}
-          value={rangeValue}
+          value={valueToUse}
           id={rangeOption}
           onChange={({ value }) => {
             handleChange(rangeOption, value);
@@ -90,7 +95,8 @@ Range.propTypes = {
   updateFilterValues: PropTypes.func.isRequired,
   shouldSearch: PropTypes.bool,
   rangeInterval: PropTypes.number,
-  label: PropTypes.string
+  label: PropTypes.string,
+  dataAggregations: PropTypes.object.isRequired
 };
 
 Range.defaultProps = {

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

@@ -1,4 +1,23 @@
-const builFilterObject = (key, value, filters) => {
+const QUERY_KEYS_TO_IGNORE = ['dataNotSet', 'shouldSearch', 'search_term'];
+
+const builFilterObject = (queryKey, value, filters, isRange) => {
+  if (isRange) {
+    // don't add to query if value matches range values
+    if (value.min !== value.minValue && value.max !== value.maxValue) {
+      filters.push({
+        range: {
+          [queryKey]: {
+            gte: Number(value.min),
+            lte: Number(value.max)
+          }
+        }
+      });
+    }
+    return;
+  }
+
+  const key = isRange ? queryKey : `${queryKey}.keyword`;
+
   const isArray = Array.isArray(value);
   if (!isArray) {
     const singleFilterObj = { match: { [key]: value } };
@@ -10,14 +29,15 @@ const builFilterObject = (key, value, filters) => {
     filters.push({ match: { [key]: filterValue } });
   });
 };
-const buildFiltersQuery = (query, filterBy, filterByProperty) => {
+const buildFiltersQuery = (query, filterBy, filterByProperty, rangeValues) => {
   const mustFilters = [];
   Object.keys(query).forEach(queryKey => {
-    if (queryKey === 'search_term' || queryKey === 'shouldSearch') return;
+    if (QUERY_KEYS_TO_IGNORE.includes(queryKey)) return;
     if (!queryKey || !query[queryKey]) return;
     const queryValue = query[queryKey];
-    const queryKeyword = `${queryKey}.keyword`;
-    builFilterObject(queryKeyword, queryValue, mustFilters);
+
+    const isRange = rangeValues.includes(queryKey);
+    builFilterObject(queryKey, queryValue, mustFilters, isRange);
   });
 
   if (filterByProperty && filterByProperty.length) {

package/src/components/SearchFilter/helpers/build-raw-query-stringified.js

@@ -1,6 +1,6 @@
 import { KEYWORD, SIZE } from '../constants';
 
-const buildRawQueryStringified = (checkboxSelectValues, rangeValues, entity, mustFilters) => {
+const buildRawQueryStringified = (checkboxSelectValues, rangeValues, entity, mustFilters = []) => {
   if (!checkboxSelectValues.length && !rangeValues.length) return '';
 
   const aggs = {};
@@ -22,23 +22,28 @@ const buildRawQueryStringified = (checkboxSelectValues, rangeValues, entity, mus
     };
   });
 
+  const boolFilter = {
+    should: [
+      {
+        match: {
+          docType: entity
+        }
+      }
+    ],
+    minimum_should_match: 1
+  };
+
+  if (mustFilters.length) {
+    boolFilter.must = mustFilters;
+  }
+
   return JSON.stringify({
     aggs,
     size: 0,
     query: {
       bool: {
         filter: {
-          bool: {
-            should: [
-              {
-                match: {
-                  docType: entity
-                }
-              }
-            ],
-            must: mustFilters,
-            minimum_should_match: 1
-          }
+          bool: boolFilter
         }
       }
     }

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

@@ -6,8 +6,11 @@ const getInitialFilterValues = (filterData, filters, query) => {
   filterValues[SEARCH_TERM] = query[SEARCH_TERM] || '';
 
   if (!filterData) {
-    filters.forEach(({ propsToDisplay: [key] }) => {
-      filterValues[key] = null;
+    filters.forEach(filterProps => {
+      const {
+        propsToDisplay: [key]
+      } = filterProps;
+      filterValues[key] = query[key] ? getFilterValueFromQuery(key, filterProps, {}, query) : null;
     });
     filterValues.dataNotSet = true;
     return filterValues;

package/src/components/SearchFilter/helpers/get-range-value.js

@@ -11,8 +11,8 @@ const getRangeValue = (rawQueryProp, rangeInterval, _min, _max) => {
     const updatedMaxValue = Number(queryParamMax);
 
     return {
-      min,
-      max,
+      min: Number.isNaN(min) ? updatedMinValue : min,
+      max: Number.isNaN(max) ? updatedMaxValue : max,
       step: rangeInterval,
       maxValue: updatedMaxValue,
       minValue: updatedMinValue

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

@@ -9,6 +9,12 @@ jest.mock('next/router', () => ({
 const getMockedProps = overrides => ({
   rangeInterval: 100,
   label: 'GLabel',
+  dataAggregations: {
+    name: {
+      min: 0,
+      max: 6600
+    }
+  },
   filterValues: {
     name: {
       max: 6600,
@@ -41,6 +47,12 @@ describe('Range component', () => {
 
   it('should match snapshot large values formatted correctly', async () => {
     const mockedProps = getMockedProps({
+      dataAggregations: {
+        name: {
+          min: 9995,
+          max: 10000
+        }
+      },
       filterValues: {
         name: {
           min: 9999,
@@ -59,6 +71,12 @@ describe('Range component', () => {
 
   it('should match snapshot with interval and rounded min & max values', async () => {
     const mockedProps = getMockedProps({
+      dataAggregations: {
+        name: {
+          min: 15.5,
+          max: 49.5
+        }
+      },
       filterValues: {
         name: {
           min: 15.5,
@@ -77,6 +95,12 @@ describe('Range component', () => {
 
   it('should match snapshot with adjusted min & max values based on interval', async () => {
     const mockedProps = getMockedProps({
+      dataAggregations: {
+        name: {
+          min: 6,
+          max: 8
+        }
+      },
       filterValues: {
         name: {
           min: 6,