@blaze-cms/react-page-builder 0.124.1-alpha.2 → 0.124.1-alpha.3

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

@@ -1,14 +1,20 @@
 const QUERY_KEYS_TO_IGNORE = ['dataNotSet', 'shouldSearch', 'search_term'];
 
-const builFilterObject = (queryKey, value, filters, isRange) => {
+const builFilterObject = ({
+  queryKey,
+  value,
+  filters,
+  isRange,
+  isInQuery
+}) => {
   if (isRange) {
     // don't add to query if value matches range values
-    if (value.min !== value.minValue && value.max !== value.maxValue) {
+    if (isInQuery || value.min !== value.minValue && value.max !== value.maxValue) {
       filters.push({
         range: {
           [queryKey]: {
-            gte: Number(value.min),
-            lte: Number(value.max)
+            gte: Number(value.minValue),
+            lte: Number(value.maxValue)
           }
         }
       });
@@ -39,14 +45,27 @@ const builFilterObject = (queryKey, value, filters, isRange) => {
   });
 };
 
-const buildFiltersQuery = (query, filterBy, filterByProperty, rangeValues) => {
+const buildFiltersQuery = ({
+  query,
+  filterBy,
+  filterByProperty,
+  rangeValues,
+  queryKeys
+}) => {
   const mustFilters = [];
   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);
-    builFilterObject(queryKey, queryValue, mustFilters, isRange);
+    const isInQuery = queryKeys.includes(queryKey);
+    builFilterObject({
+      queryKey,
+      value: queryValue,
+      filters: mustFilters,
+      isRange,
+      isInQuery
+    });
   });
 
   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":["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"}
+{"version":3,"file":"build-filters-query.js","names":["QUERY_KEYS_TO_IGNORE","builFilterObject","queryKey","value","filters","isRange","isInQuery","min","minValue","max","maxValue","push","range","gte","Number","lte","key","isArray","Array","singleFilterObj","match","forEach","filterValue","buildFiltersQuery","query","filterBy","filterByProperty","rangeValues","queryKeys","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, isInQuery }) => {\n  if (isRange) {\n    // don't add to query if value matches range values\n    if (isInQuery || (value.min !== value.minValue && value.max !== value.maxValue)) {\n      filters.push({\n        range: {\n          [queryKey]: {\n            gte: Number(value.minValue),\n            lte: Number(value.maxValue)\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, queryKeys }) => {\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    const isInQuery = queryKeys.includes(queryKey);\n    builFilterObject({ queryKey, value: queryValue, filters: mustFilters, isRange, isInQuery });\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":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.124.1-alpha.2",
+  "version": "0.124.1-alpha.3",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -85,5 +85,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "0e1d785e22450229007f0171ed1e204df7963e4f"
+  "gitHead": "25aa010b1846146fab034b6ce1323144ec0bf23c"
 }

package/src/components/SearchFilter/SearchFilterContainer.js

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

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

@@ -40,7 +40,6 @@ const Range = ({
   const options = getSelectOptions(getEntitySchema, propsToDisplay);
   // 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 };
@@ -72,18 +71,16 @@ const Range = ({
           />
         </>
       )}
-      {shouldShowRange && (
-        <RangeFilter
-          key={`${rangeOption}-${minValue}-${maxValue}`}
-          name={rangeOption}
-          label={hasMultipleOptions ? '' : label}
-          value={valueToUse}
-          id={rangeOption}
-          onChange={({ value }) => {
-            handleChange(rangeOption, value);
-          }}
-        />
-      )}
+      <RangeFilter
+        key={`${rangeOption}-${minValue}-${maxValue}`}
+        name={rangeOption}
+        label={hasMultipleOptions ? '' : label}
+        value={valueToUse}
+        id={rangeOption}
+        onChange={({ value }) => {
+          handleChange(rangeOption, value);
+        }}
+      />
     </>
   );
 };

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

@@ -1,14 +1,14 @@
 const QUERY_KEYS_TO_IGNORE = ['dataNotSet', 'shouldSearch', 'search_term'];
 
-const builFilterObject = (queryKey, value, filters, isRange) => {
+const builFilterObject = ({ queryKey, value, filters, isRange, isInQuery }) => {
   if (isRange) {
     // don't add to query if value matches range values
-    if (value.min !== value.minValue && value.max !== value.maxValue) {
+    if (isInQuery || (value.min !== value.minValue && value.max !== value.maxValue)) {
       filters.push({
         range: {
           [queryKey]: {
-            gte: Number(value.min),
-            lte: Number(value.max)
+            gte: Number(value.minValue),
+            lte: Number(value.maxValue)
           }
         }
       });
@@ -29,7 +29,7 @@ const builFilterObject = (queryKey, value, filters, isRange) => {
     filters.push({ match: { [key]: filterValue } });
   });
 };
-const buildFiltersQuery = (query, filterBy, filterByProperty, rangeValues) => {
+const buildFiltersQuery = ({ query, filterBy, filterByProperty, rangeValues, queryKeys }) => {
   const mustFilters = [];
   Object.keys(query).forEach(queryKey => {
     if (QUERY_KEYS_TO_IGNORE.includes(queryKey)) return;
@@ -37,7 +37,8 @@ const buildFiltersQuery = (query, filterBy, filterByProperty, rangeValues) => {
     const queryValue = query[queryKey];
 
     const isRange = rangeValues.includes(queryKey);
-    builFilterObject(queryKey, queryValue, mustFilters, isRange);
+    const isInQuery = queryKeys.includes(queryKey);
+    builFilterObject({ queryKey, value: queryValue, filters: mustFilters, isRange, isInQuery });
   });
 
   if (filterByProperty && filterByProperty.length) {