@blaze-cms/react-page-builder 0.133.0-admin-updates.8 → 0.133.0-admin-updates.11

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

@@ -1 +1 @@
-{"version":3,"file":"build-url-query.js","names":["SEARCH_TERM","TEXT_SEARCH","parseFilterValue","buildQueryKey","buildUrlQuery","filterValues","filters","listComponentName","query","newQuery","queryKeys","searchValue","searchKey","push","forEach","propsToDisplay","type","prop","value","filterKey","parsedValue","includes","Object","keys","key","indexOf","join"],"sources":["../../../../src/components/SearchFilter/helpers/build-url-query.js"],"sourcesContent":["import { SEARCH_TERM, TEXT_SEARCH } from '../constants';\nimport parseFilterValue from './parse-filter-value';\nimport { buildQueryKey } from '../../../helpers';\n\nconst buildUrlQuery = (filterValues, filters, listComponentName = '', query = {}) => {\n  if (!filterValues) return '';\n\n  const newQuery = [];\n  const queryKeys = [];\n  const searchValue = filterValues[SEARCH_TERM];\n  const searchKey = buildQueryKey(SEARCH_TERM, listComponentName);\n  queryKeys.push(searchKey);\n  if (searchValue) newQuery.push(`${searchKey}=${searchValue}`);\n\n  filters.forEach(({ propsToDisplay, type }) => {\n    if (type === TEXT_SEARCH) return;\n    propsToDisplay.forEach(prop => {\n      const value = filterValues[prop];\n      const filterKey = buildQueryKey(prop, listComponentName);\n      queryKeys.push(filterKey);\n      const parsedValue = parseFilterValue(filterKey, type, value, newQuery);\n      if (parsedValue && !newQuery.includes(parsedValue)) newQuery.push(parsedValue);\n    });\n  });\n\n  Object.keys(query).forEach(key => {\n    if (queryKeys.indexOf(key) === -1) newQuery.push(`${key}=${query[key]}`);\n  });\n\n  return newQuery.join('&');\n};\n\nexport default buildUrlQuery;\n"],"mappings":"AAAA,SAASA,WAAW,EAAEC,WAAW,QAAQ,cAAc;AACvD,OAAOC,gBAAgB,MAAM,sBAAsB;AACnD,SAASC,aAAa,QAAQ,kBAAkB;AAEhD,MAAMC,aAAa,GAAGA,CAACC,YAAY,EAAEC,OAAO,EAAEC,iBAAiB,GAAG,EAAE,EAAEC,KAAK,GAAG,CAAC,CAAC,KAAK;EACnF,IAAI,CAACH,YAAY,EAAE,OAAO,EAAE;EAE5B,MAAMI,QAAQ,GAAG,EAAE;EACnB,MAAMC,SAAS,GAAG,EAAE;EACpB,MAAMC,WAAW,GAAGN,YAAY,CAACL,WAAW,CAAC;EAC7C,MAAMY,SAAS,GAAGT,aAAa,CAACH,WAAW,EAAEO,iBAAiB,CAAC;EAC/DG,SAAS,CAACG,IAAI,CAACD,SAAS,CAAC;EACzB,IAAID,WAAW,EAAEF,QAAQ,CAACI,IAAI,CAAE,GAAED,SAAU,IAAGD,WAAY,EAAC,CAAC;EAE7DL,OAAO,CAACQ,OAAO,CAAC,CAAC;IAAEC,cAAc;IAAEC;EAAK,CAAC,KAAK;IAC5C,IAAIA,IAAI,KAAKf,WAAW,EAAE;IAC1Bc,cAAc,CAACD,OAAO,CAACG,IAAI,IAAI;MAC7B,MAAMC,KAAK,GAAGb,YAAY,CAACY,IAAI,CAAC;MAChC,MAAME,SAAS,GAAGhB,aAAa,CAACc,IAAI,EAAEV,iBAAiB,CAAC;MACxDG,SAAS,CAACG,IAAI,CAACM,SAAS,CAAC;MACzB,MAAMC,WAAW,GAAGlB,gBAAgB,CAACiB,SAAS,EAAEH,IAAI,EAAEE,KAAK,EAAET,QAAQ,CAAC;MACtE,IAAIW,WAAW,IAAI,CAACX,QAAQ,CAACY,QAAQ,CAACD,WAAW,CAAC,EAAEX,QAAQ,CAACI,IAAI,CAACO,WAAW,CAAC;IAChF,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFE,MAAM,CAACC,IAAI,CAACf,KAAK,CAAC,CAACM,OAAO,CAACU,GAAG,IAAI;IAChC,IAAId,SAAS,CAACe,OAAO,CAACD,GAAG,CAAC,KAAK,CAAC,CAAC,EAAEf,QAAQ,CAACI,IAAI,CAAE,GAAEW,GAAI,IAAGhB,KAAK,CAACgB,GAAG,CAAE,EAAC,CAAC;EAC1E,CAAC,CAAC;EAEF,OAAOf,QAAQ,CAACiB,IAAI,CAAC,GAAG,CAAC;AAC3B,CAAC;AAED,eAAetB,aAAa"}
+{"version":3,"file":"build-url-query.js","names":["SEARCH_TERM","TEXT_SEARCH","parseFilterValue","buildQueryKey","buildUrlQuery","filterValues","filters","listComponentName","query","newQuery","queryKeys","searchValue","searchKey","push","forEach","propsToDisplay","type","prop","value","filterKey","parsedValue","includes","Object","keys","key","indexOf","join"],"sources":["../../../../src/components/SearchFilter/helpers/build-url-query.js"],"sourcesContent":["import { SEARCH_TERM, TEXT_SEARCH } from '../constants';\nimport parseFilterValue from './parse-filter-value';\nimport { buildQueryKey } from '../../../helpers';\n\nconst buildUrlQuery = (filterValues, filters, listComponentName = '', query = {}) => {\n  const newQuery = [];\n  const queryKeys = [];\n  const searchValue = filterValues[SEARCH_TERM];\n  const searchKey = buildQueryKey(SEARCH_TERM, listComponentName);\n  queryKeys.push(searchKey);\n  if (searchValue) newQuery.push(`${searchKey}=${searchValue}`);\n\n  filters.forEach(({ propsToDisplay, type }) => {\n    if (type === TEXT_SEARCH) return;\n    propsToDisplay.forEach(prop => {\n      const value = filterValues[prop];\n      const filterKey = buildQueryKey(prop, listComponentName);\n      queryKeys.push(filterKey);\n      const parsedValue = parseFilterValue(filterKey, type, value, newQuery);\n      if (parsedValue && !newQuery.includes(parsedValue)) newQuery.push(parsedValue);\n    });\n  });\n\n  Object.keys(query).forEach(key => {\n    if (queryKeys.indexOf(key) === -1) newQuery.push(`${key}=${query[key]}`);\n  });\n\n  return newQuery.join('&');\n};\n\nexport default buildUrlQuery;\n"],"mappings":"AAAA,SAASA,WAAW,EAAEC,WAAW,QAAQ,cAAc;AACvD,OAAOC,gBAAgB,MAAM,sBAAsB;AACnD,SAASC,aAAa,QAAQ,kBAAkB;AAEhD,MAAMC,aAAa,GAAGA,CAACC,YAAY,EAAEC,OAAO,EAAEC,iBAAiB,GAAG,EAAE,EAAEC,KAAK,GAAG,CAAC,CAAC,KAAK;EACnF,MAAMC,QAAQ,GAAG,EAAE;EACnB,MAAMC,SAAS,GAAG,EAAE;EACpB,MAAMC,WAAW,GAAGN,YAAY,CAACL,WAAW,CAAC;EAC7C,MAAMY,SAAS,GAAGT,aAAa,CAACH,WAAW,EAAEO,iBAAiB,CAAC;EAC/DG,SAAS,CAACG,IAAI,CAACD,SAAS,CAAC;EACzB,IAAID,WAAW,EAAEF,QAAQ,CAACI,IAAI,CAAE,GAAED,SAAU,IAAGD,WAAY,EAAC,CAAC;EAE7DL,OAAO,CAACQ,OAAO,CAAC,CAAC;IAAEC,cAAc;IAAEC;EAAK,CAAC,KAAK;IAC5C,IAAIA,IAAI,KAAKf,WAAW,EAAE;IAC1Bc,cAAc,CAACD,OAAO,CAACG,IAAI,IAAI;MAC7B,MAAMC,KAAK,GAAGb,YAAY,CAACY,IAAI,CAAC;MAChC,MAAME,SAAS,GAAGhB,aAAa,CAACc,IAAI,EAAEV,iBAAiB,CAAC;MACxDG,SAAS,CAACG,IAAI,CAACM,SAAS,CAAC;MACzB,MAAMC,WAAW,GAAGlB,gBAAgB,CAACiB,SAAS,EAAEH,IAAI,EAAEE,KAAK,EAAET,QAAQ,CAAC;MACtE,IAAIW,WAAW,IAAI,CAACX,QAAQ,CAACY,QAAQ,CAACD,WAAW,CAAC,EAAEX,QAAQ,CAACI,IAAI,CAACO,WAAW,CAAC;IAChF,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFE,MAAM,CAACC,IAAI,CAACf,KAAK,CAAC,CAACM,OAAO,CAACU,GAAG,IAAI;IAChC,IAAId,SAAS,CAACe,OAAO,CAACD,GAAG,CAAC,KAAK,CAAC,CAAC,EAAEf,QAAQ,CAACI,IAAI,CAAE,GAAEW,GAAI,IAAGhB,KAAK,CAACgB,GAAG,CAAE,EAAC,CAAC;EAC1E,CAAC,CAAC;EAEF,OAAOf,QAAQ,CAACiB,IAAI,CAAC,GAAG,CAAC;AAC3B,CAAC;AAED,eAAetB,aAAa"}

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

@@ -0,0 +1,21 @@
+import { SEARCH_TERM, TEXT_SEARCH } from '../constants';
+import getFilterValueFromQuery from './get-filter-value-from-query';
+import { buildQueryKey } from '../../../helpers';
+const getInitialFilterValues = (filterData, filters, query, listComponentName) => {
+  const filterValues = {};
+  const searchQueryKey = buildQueryKey(SEARCH_TERM, listComponentName);
+  filterValues[SEARCH_TERM] = query[searchQueryKey] || '';
+  filters.forEach(filterProps => {
+    const {
+      propsToDisplay: [key],
+      type
+    } = filterProps;
+    if (type === TEXT_SEARCH) return;
+    const data = filterData && filterData[key] ? filterData[key] : {};
+    const queryKey = buildQueryKey(key, listComponentName);
+    filterValues[key] = getFilterValueFromQuery(queryKey, filterProps, data, query);
+  });
+  return filterValues;
+};
+export default getInitialFilterValues;
+//# sourceMappingURL=get-initial-filter-values.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"get-initial-filter-values.js","names":["SEARCH_TERM","TEXT_SEARCH","getFilterValueFromQuery","buildQueryKey","getInitialFilterValues","filterData","filters","query","listComponentName","filterValues","searchQueryKey","forEach","filterProps","propsToDisplay","key","type","data","queryKey"],"sources":["../../../../src/components/SearchFilter/helpers/get-initial-filter-values.js"],"sourcesContent":["import { SEARCH_TERM, TEXT_SEARCH } from '../constants';\nimport getFilterValueFromQuery from './get-filter-value-from-query';\nimport { buildQueryKey } from '../../../helpers';\n\nconst getInitialFilterValues = (filterData, filters, query, listComponentName) => {\n  const filterValues = {};\n  const searchQueryKey = buildQueryKey(SEARCH_TERM, listComponentName);\n  filterValues[SEARCH_TERM] = query[searchQueryKey] || '';\n\n  filters.forEach(filterProps => {\n    const {\n      propsToDisplay: [key],\n      type\n    } = filterProps;\n    if (type === TEXT_SEARCH) return;\n    const data = filterData && filterData[key] ? filterData[key] : {};\n    const queryKey = buildQueryKey(key, listComponentName);\n    filterValues[key] = getFilterValueFromQuery(queryKey, filterProps, data, query);\n  });\n\n  return filterValues;\n};\n\nexport default getInitialFilterValues;\n"],"mappings":"AAAA,SAASA,WAAW,EAAEC,WAAW,QAAQ,cAAc;AACvD,OAAOC,uBAAuB,MAAM,+BAA+B;AACnE,SAASC,aAAa,QAAQ,kBAAkB;AAEhD,MAAMC,sBAAsB,GAAGA,CAACC,UAAU,EAAEC,OAAO,EAAEC,KAAK,EAAEC,iBAAiB,KAAK;EAChF,MAAMC,YAAY,GAAG,CAAC,CAAC;EACvB,MAAMC,cAAc,GAAGP,aAAa,CAACH,WAAW,EAAEQ,iBAAiB,CAAC;EACpEC,YAAY,CAACT,WAAW,CAAC,GAAGO,KAAK,CAACG,cAAc,CAAC,IAAI,EAAE;EAEvDJ,OAAO,CAACK,OAAO,CAACC,WAAW,IAAI;IAC7B,MAAM;MACJC,cAAc,EAAE,CAACC,GAAG,CAAC;MACrBC;IACF,CAAC,GAAGH,WAAW;IACf,IAAIG,IAAI,KAAKd,WAAW,EAAE;IAC1B,MAAMe,IAAI,GAAGX,UAAU,IAAIA,UAAU,CAACS,GAAG,CAAC,GAAGT,UAAU,CAACS,GAAG,CAAC,GAAG,CAAC,CAAC;IACjE,MAAMG,QAAQ,GAAGd,aAAa,CAACW,GAAG,EAAEN,iBAAiB,CAAC;IACtDC,YAAY,CAACK,GAAG,CAAC,GAAGZ,uBAAuB,CAACe,QAAQ,EAAEL,WAAW,EAAEI,IAAI,EAAET,KAAK,CAAC;EACjF,CAAC,CAAC;EAEF,OAAOE,YAAY;AACrB,CAAC;AAED,eAAeL,sBAAsB"}

package/lib-es/components/SearchFilter/helpers/get-updated-filter-by.js

@@ -0,0 +1,19 @@
+const getUpdatedFilterBy = (filterBy, filterByProperty, parentData) => {
+  if (!parentData || filterBy && filterBy.length) return {
+    updatedFilterBy: filterBy,
+    updatedFilterByProperty: filterByProperty
+  };
+  const updatedFilterBy = [];
+  filterByProperty.forEach(property => {
+    const [key] = property.split('/');
+    const filterData = parentData[key];
+    if (!filterData) return;
+    if (Array.isArray(filterData)) filterData.forEach(dat => updatedFilterBy.push(`${key}/${dat}`));else updatedFilterBy.push(`${key}/${filterData}`);
+  });
+  return {
+    updatedFilterBy,
+    updatedFilterByProperty: filterByProperty
+  };
+};
+export default getUpdatedFilterBy;
+//# sourceMappingURL=get-updated-filter-by.js.map

package/lib-es/components/SearchFilter/helpers/get-updated-filter-by.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-updated-filter-by.js","names":["getUpdatedFilterBy","filterBy","filterByProperty","parentData","length","updatedFilterBy","updatedFilterByProperty","forEach","property","key","split","filterData","Array","isArray","dat","push"],"sources":["../../../../src/components/SearchFilter/helpers/get-updated-filter-by.js"],"sourcesContent":["const getUpdatedFilterBy = (filterBy, filterByProperty, parentData) => {\n  if (!parentData || (filterBy && filterBy.length))\n    return { updatedFilterBy: filterBy, updatedFilterByProperty: filterByProperty };\n\n  const updatedFilterBy = [];\n  filterByProperty.forEach(property => {\n    const [key] = property.split('/');\n    const filterData = parentData[key];\n\n    if (!filterData) return;\n    if (Array.isArray(filterData)) filterData.forEach(dat => updatedFilterBy.push(`${key}/${dat}`));\n    else updatedFilterBy.push(`${key}/${filterData}`);\n  });\n\n  return { updatedFilterBy, updatedFilterByProperty: filterByProperty };\n};\n\nexport default getUpdatedFilterBy;\n"],"mappings":"AAAA,MAAMA,kBAAkB,GAAGA,CAACC,QAAQ,EAAEC,gBAAgB,EAAEC,UAAU,KAAK;EACrE,IAAI,CAACA,UAAU,IAAKF,QAAQ,IAAIA,QAAQ,CAACG,MAAO,EAC9C,OAAO;IAAEC,eAAe,EAAEJ,QAAQ;IAAEK,uBAAuB,EAAEJ;EAAiB,CAAC;EAEjF,MAAMG,eAAe,GAAG,EAAE;EAC1BH,gBAAgB,CAACK,OAAO,CAACC,QAAQ,IAAI;IACnC,MAAM,CAACC,GAAG,CAAC,GAAGD,QAAQ,CAACE,KAAK,CAAC,GAAG,CAAC;IACjC,MAAMC,UAAU,GAAGR,UAAU,CAACM,GAAG,CAAC;IAElC,IAAI,CAACE,UAAU,EAAE;IACjB,IAAIC,KAAK,CAACC,OAAO,CAACF,UAAU,CAAC,EAAEA,UAAU,CAACJ,OAAO,CAACO,GAAG,IAAIT,eAAe,CAACU,IAAI,CAAE,GAAEN,GAAI,IAAGK,GAAI,EAAC,CAAC,CAAC,CAAC,KAC3FT,eAAe,CAACU,IAAI,CAAE,GAAEN,GAAI,IAAGE,UAAW,EAAC,CAAC;EACnD,CAAC,CAAC;EAEF,OAAO;IAAEN,eAAe;IAAEC,uBAAuB,EAAEJ;EAAiB,CAAC;AACvE,CAAC;AAED,eAAeF,kBAAkB"}

package/lib-es/components/SearchFilter/helpers/index.js

@@ -12,8 +12,9 @@ import getSelectOptions from './get-select-options';
 import isDeviceDesktop from './is-device-desktop';
 import getFilterValues from './get-filter-values';
 import getFilterValueFromQuery from './get-filter-value-from-query';
-import buildUrlQuery from './build-url-query';
 import buildFiltersQuery from './build-filters-query';
 import getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';
-export { buildUrlQuery, buildNewUrl, buildRawQueryStringified, decodeValue, encodeValue, checkIfRangeUpdated, getResponsiveFilterClassnames, getDisplayValue, calculateStep, calculateMinMax, getIntersectedProp, getRangeValue, getSelectOptions, isDeviceDesktop, getFilterValues, getFilterValueFromQuery, buildFiltersQuery, getFilterRangesAndCheckboxesValues };
+import getUpdatedFilterBy from './get-updated-filter-by';
+import buildUrlQuery from './build-url-query';
+export { buildNewUrl, buildRawQueryStringified, decodeValue, encodeValue, checkIfRangeUpdated, getResponsiveFilterClassnames, getDisplayValue, calculateStep, calculateMinMax, getIntersectedProp, getRangeValue, getSelectOptions, isDeviceDesktop, getFilterValues, getFilterValueFromQuery, buildFiltersQuery, getFilterRangesAndCheckboxesValues, getUpdatedFilterBy, buildUrlQuery };
 //# sourceMappingURL=index.js.map

package/lib-es/components/SearchFilter/helpers/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["buildNewUrl","buildRawQueryStringified","decodeValue","encodeValue","checkIfRangeUpdated","getResponsiveFilterClassnames","getDisplayValue","calculateStep","calculateMinMax","getIntersectedProp","getRangeValue","getSelectOptions","isDeviceDesktop","getFilterValues","getFilterValueFromQuery","buildUrlQuery","buildFiltersQuery","getFilterRangesAndCheckboxesValues"],"sources":["../../../../src/components/SearchFilter/helpers/index.js"],"sourcesContent":["import buildNewUrl from './build-new-url';\nimport buildRawQueryStringified from './build-raw-query-stringified';\nimport { decodeValue, encodeValue } from './decode-encode';\nimport checkIfRangeUpdated from './check-if-range-updated';\nimport getResponsiveFilterClassnames from './get-responsive-filter-classnames';\nimport getDisplayValue from './get-display-value';\nimport calculateStep from './calculate-step';\nimport calculateMinMax from './calculate-min-max';\nimport getIntersectedProp from './get-intersected-prop';\nimport getRangeValue from './get-range-value';\nimport getSelectOptions from './get-select-options';\nimport isDeviceDesktop from './is-device-desktop';\nimport getFilterValues from './get-filter-values';\nimport getFilterValueFromQuery from './get-filter-value-from-query';\nimport buildUrlQuery from './build-url-query';\nimport buildFiltersQuery from './build-filters-query';\nimport getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';\n\nexport {\n  buildUrlQuery,\n  buildNewUrl,\n  buildRawQueryStringified,\n  decodeValue,\n  encodeValue,\n  checkIfRangeUpdated,\n  getResponsiveFilterClassnames,\n  getDisplayValue,\n  calculateStep,\n  calculateMinMax,\n  getIntersectedProp,\n  getRangeValue,\n  getSelectOptions,\n  isDeviceDesktop,\n  getFilterValues,\n  getFilterValueFromQuery,\n  buildFiltersQuery,\n  getFilterRangesAndCheckboxesValues\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,iBAAiB;AACzC,OAAOC,wBAAwB,MAAM,+BAA+B;AACpE,SAASC,WAAW,EAAEC,WAAW,QAAQ,iBAAiB;AAC1D,OAAOC,mBAAmB,MAAM,0BAA0B;AAC1D,OAAOC,6BAA6B,MAAM,oCAAoC;AAC9E,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,aAAa,MAAM,kBAAkB;AAC5C,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,kBAAkB,MAAM,wBAAwB;AACvD,OAAOC,aAAa,MAAM,mBAAmB;AAC7C,OAAOC,gBAAgB,MAAM,sBAAsB;AACnD,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,uBAAuB,MAAM,+BAA+B;AACnE,OAAOC,aAAa,MAAM,mBAAmB;AAC7C,OAAOC,iBAAiB,MAAM,uBAAuB;AACrD,OAAOC,kCAAkC,MAAM,2CAA2C;AAE1F,SACEF,aAAa,EACbf,WAAW,EACXC,wBAAwB,EACxBC,WAAW,EACXC,WAAW,EACXC,mBAAmB,EACnBC,6BAA6B,EAC7BC,eAAe,EACfC,aAAa,EACbC,eAAe,EACfC,kBAAkB,EAClBC,aAAa,EACbC,gBAAgB,EAChBC,eAAe,EACfC,eAAe,EACfC,uBAAuB,EACvBE,iBAAiB,EACjBC,kCAAkC"}
+{"version":3,"file":"index.js","names":["buildNewUrl","buildRawQueryStringified","decodeValue","encodeValue","checkIfRangeUpdated","getResponsiveFilterClassnames","getDisplayValue","calculateStep","calculateMinMax","getIntersectedProp","getRangeValue","getSelectOptions","isDeviceDesktop","getFilterValues","getFilterValueFromQuery","buildFiltersQuery","getFilterRangesAndCheckboxesValues","getUpdatedFilterBy","buildUrlQuery"],"sources":["../../../../src/components/SearchFilter/helpers/index.js"],"sourcesContent":["import buildNewUrl from './build-new-url';\nimport buildRawQueryStringified from './build-raw-query-stringified';\nimport { decodeValue, encodeValue } from './decode-encode';\nimport checkIfRangeUpdated from './check-if-range-updated';\nimport getResponsiveFilterClassnames from './get-responsive-filter-classnames';\nimport getDisplayValue from './get-display-value';\nimport calculateStep from './calculate-step';\nimport calculateMinMax from './calculate-min-max';\nimport getIntersectedProp from './get-intersected-prop';\nimport getRangeValue from './get-range-value';\nimport getSelectOptions from './get-select-options';\nimport isDeviceDesktop from './is-device-desktop';\nimport getFilterValues from './get-filter-values';\nimport getFilterValueFromQuery from './get-filter-value-from-query';\nimport buildFiltersQuery from './build-filters-query';\nimport getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';\nimport getUpdatedFilterBy from './get-updated-filter-by';\nimport buildUrlQuery from './build-url-query';\n\nexport {\n  buildNewUrl,\n  buildRawQueryStringified,\n  decodeValue,\n  encodeValue,\n  checkIfRangeUpdated,\n  getResponsiveFilterClassnames,\n  getDisplayValue,\n  calculateStep,\n  calculateMinMax,\n  getIntersectedProp,\n  getRangeValue,\n  getSelectOptions,\n  isDeviceDesktop,\n  getFilterValues,\n  getFilterValueFromQuery,\n  buildFiltersQuery,\n  getFilterRangesAndCheckboxesValues,\n  getUpdatedFilterBy,\n  buildUrlQuery\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,iBAAiB;AACzC,OAAOC,wBAAwB,MAAM,+BAA+B;AACpE,SAASC,WAAW,EAAEC,WAAW,QAAQ,iBAAiB;AAC1D,OAAOC,mBAAmB,MAAM,0BAA0B;AAC1D,OAAOC,6BAA6B,MAAM,oCAAoC;AAC9E,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,aAAa,MAAM,kBAAkB;AAC5C,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,kBAAkB,MAAM,wBAAwB;AACvD,OAAOC,aAAa,MAAM,mBAAmB;AAC7C,OAAOC,gBAAgB,MAAM,sBAAsB;AACnD,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,uBAAuB,MAAM,+BAA+B;AACnE,OAAOC,iBAAiB,MAAM,uBAAuB;AACrD,OAAOC,kCAAkC,MAAM,2CAA2C;AAC1F,OAAOC,kBAAkB,MAAM,yBAAyB;AACxD,OAAOC,aAAa,MAAM,mBAAmB;AAE7C,SACElB,WAAW,EACXC,wBAAwB,EACxBC,WAAW,EACXC,WAAW,EACXC,mBAAmB,EACnBC,6BAA6B,EAC7BC,eAAe,EACfC,aAAa,EACbC,eAAe,EACfC,kBAAkB,EAClBC,aAAa,EACbC,gBAAgB,EAChBC,eAAe,EACfC,eAAe,EACfC,uBAAuB,EACvBC,iBAAiB,EACjBC,kCAAkC,EAClCC,kBAAkB,EAClBC,aAAa"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.133.0-admin-updates.8",
+  "version": "0.133.0-admin-updates.11",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -89,5 +89,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "d658f426515fedaa18a658d427a12a2b91000287"
+  "gitHead": "3b5697e929af52bb1db369586ea4c36112aa0554"
 }

package/src/components/Button.js

@@ -60,7 +60,12 @@ const Button = props => {
   const logout = () => {
     handleLogout(client);
     if (hasChildren(children)) return setShowChildren(true);
-    return url ? (window.location.href = urlToUse) : router.reload();
+
+    if (!urlToUse) return router.reload();
+
+    return urlToUse.startsWith('/')
+      ? router.push('/Resolver', urlToUse)
+      : (window.location.href = urlToUse);
   };
 
   const handleClick = () => {

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

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

package/src/components/SearchFilter/SearchFilterContainer.js

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

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

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

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

@@ -3,8 +3,6 @@ import parseFilterValue from './parse-filter-value';
 import { buildQueryKey } from '../../../helpers';
 
 const buildUrlQuery = (filterValues, filters, listComponentName = '', query = {}) => {
-  if (!filterValues) return '';
-
   const newQuery = [];
   const queryKeys = [];
   const searchValue = filterValues[SEARCH_TERM];

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

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

package/src/components/SearchFilter/helpers/get-updated-filter-by.js

@@ -0,0 +1,18 @@
+const getUpdatedFilterBy = (filterBy, filterByProperty, parentData) => {
+  if (!parentData || (filterBy && filterBy.length))
+    return { updatedFilterBy: filterBy, updatedFilterByProperty: filterByProperty };
+
+  const updatedFilterBy = [];
+  filterByProperty.forEach(property => {
+    const [key] = property.split('/');
+    const filterData = parentData[key];
+
+    if (!filterData) return;
+    if (Array.isArray(filterData)) filterData.forEach(dat => updatedFilterBy.push(`${key}/${dat}`));
+    else updatedFilterBy.push(`${key}/${filterData}`);
+  });
+
+  return { updatedFilterBy, updatedFilterByProperty: filterByProperty };
+};
+
+export default getUpdatedFilterBy;

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

@@ -12,12 +12,12 @@ import getSelectOptions from './get-select-options';
 import isDeviceDesktop from './is-device-desktop';
 import getFilterValues from './get-filter-values';
 import getFilterValueFromQuery from './get-filter-value-from-query';
-import buildUrlQuery from './build-url-query';
 import buildFiltersQuery from './build-filters-query';
 import getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';
+import getUpdatedFilterBy from './get-updated-filter-by';
+import buildUrlQuery from './build-url-query';
 
 export {
-  buildUrlQuery,
   buildNewUrl,
   buildRawQueryStringified,
   decodeValue,
@@ -34,5 +34,7 @@ export {
   getFilterValues,
   getFilterValueFromQuery,
   buildFiltersQuery,
-  getFilterRangesAndCheckboxesValues
+  getFilterRangesAndCheckboxesValues,
+  getUpdatedFilterBy,
+  buildUrlQuery
 };

package/tests/unit/src/components/SearchFilter/helpers/get-updated-filter-by.test.js

@@ -0,0 +1,28 @@
+import getUpdatedFilterBy from '../../../../../../src/components/SearchFilter/helpers/get-updated-filter-by';
+
+const mockedFilterByProperty = ['categoryId/product', 'subjectIds/product'];
+
+const mockedParentData = {
+  id: 'abc123d',
+  categoryId: null,
+  subjectIds: ['subjectid123s']
+};
+
+describe('getUpdatedFilterBy helper', () => {
+  const mockedFilterBy = [1, 2, 3];
+  const noParentData = getUpdatedFilterBy(mockedFilterBy, [], {});
+  const withFilterBy = getUpdatedFilterBy(mockedFilterBy, [], { id: '123' });
+  const withUpdatedFilterBy = getUpdatedFilterBy([], mockedFilterByProperty, mockedParentData);
+
+  it('should return current filterBy and filterByProperty if no parentData or if filterBy values exist', () => {
+    expect(noParentData).toEqual({ updatedFilterBy: mockedFilterBy, updatedFilterByProperty: [] });
+    expect(withFilterBy).toEqual({ updatedFilterBy: mockedFilterBy, updatedFilterByProperty: [] });
+  });
+
+  it('should return updated filterBy based on parent data matchess', () => {
+    expect(withUpdatedFilterBy).toEqual({
+      updatedFilterBy: ['subjectIds/subjectid123s'],
+      updatedFilterByProperty: mockedFilterByProperty
+    });
+  });
+});