npm - @blaze-cms/react-page-builder - Versions diffs - 0.131.0-project-admin-customisations.2 → 0.131.1 - Mend

@blaze-cms/react-page-builder 0.131.0-project-admin-customisations.2 → 0.131.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (256) hide show

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

	@@ -1 +1 @@
1	- {"version":3,"file":"build-filters-query.js","names":["QUERY_KEYS_TO_IGNORE","builFilterObject","_ref","queryKey","value","filters","isRange","isInQuery","min","minValue","max","maxValue","push","range","_defineProperty2","gte","Number","lte","key","concat","isArray","Array","singleFilterObj","match","forEach","filterValue","buildFiltersQuery","_ref2","~~shouldAddFilters","~~query","filterBy","filterByProperty","rangeValues","queryKeys","mustFilters","Object","keys","includes","queryValue","length","filterByPropOption","_filterByPropOption$s","split","_filterByPropOption$s2","_slicedToArray2","filterByPropKey","filterByOption","indexOf","_filterByOption$split","_filterByOption$split2","filteryByValue","filterByKeyword","_default","exports"],"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 = ({~~\n shouldAddFilters,\n~~ query~~,\n~~ filterBy~~,\n~~ filterByProperty~~,\n~~ rangeValues~~,\n~~ queryKeys\n}) => {\n ~~if (!shouldAddFilters) return [];\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":";;;;;;;;;;;;;;;;;;;AAAA,IAAMA,oBAAoB,GAAG,CAAC,YAAY,EAAE,cAAc,EAAE,aAAa,CAAC;AAE1E,IAAMC,gBAAgB,GAAG,SAAnBA,gBAAgBA,CAAAC,IAAA,EAAyD;EAAA,IAAnDC,QAAQ,GAAAD,IAAA,CAARC,QAAQ;IAAEC,KAAK,GAAAF,IAAA,CAALE,KAAK;IAAEC,OAAO,GAAAH,IAAA,CAAPG,OAAO;IAAEC,OAAO,GAAAJ,IAAA,CAAPI,OAAO;IAAEC,SAAS,GAAAL,IAAA,CAATK,SAAS;EACtE,IAAID,OAAO,EAAE;IACX;IACA,IAAIC,SAAS,IAAKH,KAAK,CAACI,GAAG,KAAKJ,KAAK,CAACK,QAAQ,IAAIL,KAAK,CAACM,GAAG,KAAKN,KAAK,CAACO,QAAS,EAAE;MAC/EN,OAAO,CAACO,IAAI,CAAC;QACXC,KAAK,MAAAC,gBAAA,iBACFX,QAAQ,EAAG;UACVY,GAAG,EAAEC,MAAM,CAACZ,KAAK,CAACK,QAAQ,CAAC;UAC3BQ,GAAG,EAAED,MAAM,CAACZ,KAAK,CAACO,QAAQ;QAC5B,CAAC;MAEL,CAAC,CAAC;IACJ;IACA;EACF;EAEA,IAAMO,GAAG,GAAGZ,OAAO,GAAGH,QAAQ,MAAAgB,MAAA,CAAMhB,QAAQ,aAAU;EAEtD,IAAMiB,OAAO,GAAGC,KAAK,CAACD,OAAO,CAAChB,KAAK,CAAC;EACpC,IAAI,CAACgB,OAAO,EAAE;IACZ,IAAME,eAAe,GAAG;MAAEC,KAAK,MAAAT,gBAAA,iBAAKI,GAAG,EAAGd,KAAK;IAAG,CAAC;IACnDC,OAAO,CAACO,IAAI,CAACU,eAAe,CAAC;IAC7B;EACF;EAEAlB,KAAK,CAACoB,OAAO,CAAC,UAAAC,WAAW,EAAI;IAC3BpB,OAAO,CAACO,IAAI,CAAC;MAAEW,KAAK,MAAAT,gBAAA,iBAAKI,GAAG,EAAGO,WAAW;IAAG,CAAC,CAAC;EACjD,CAAC,CAAC;AACJ,CAAC;AACD,IAAMC,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAAC,KAAA,~~EAOjB~~;EAAA,~~IANJC~~,~~gBAAgB~~,GAAAD,KAAA,~~CAAhBC~~,~~gBAAgB;IAChBC,~~KAAK~~,GAAAF,KAAA,CAALE,KAAK~~;~~IACLC~~,QAAQ,~~GAAAH~~,KAAA,~~CAARG~~,QAAQ;~~IACRC~~,gBAAgB,~~GAAAJ~~,KAAA,~~CAAhBI~~,gBAAgB;~~IAChBC~~,WAAW,~~GAAAL~~,KAAA,~~CAAXK~~,WAAW;~~IACXC~~,SAAS,~~GAAAN~~,KAAA,~~CAATM~~,SAAS;~~EAET~~,~~IAAI~~,~~CAACL,gBAAgB,EAAE,OAAO,EAAE;EAChC,IAAMM,~~WAAW,GAAG,EAAE;EACtBC,MAAM,CAACC,IAAI,CAACP,KAAK,CAAC,~~CAACL~~,OAAO,CAAC,UAAArB,QAAQ,EAAI;IACrC,IAAIH,oBAAoB,~~CAACqC~~,QAAQ,~~CAAClC~~,QAAQ,CAAC,EAAE;IAC7C,IAAI,CAACA,QAAQ,IAAI,~~CAAC0B~~,KAAK,~~CAAC1B~~,QAAQ,CAAC,EAAE;IACnC,~~IAAMmC~~,UAAU,GAAGT,KAAK,~~CAAC1B~~,QAAQ,CAAC;IAElC,IAAMG,OAAO,~~GAAG0B~~,WAAW,CAACK,QAAQ,~~CAAClC~~,QAAQ,CAAC;IAC9C,IAAMI,SAAS,~~GAAG0B~~,SAAS,CAACI,QAAQ,~~CAAClC~~,QAAQ,CAAC;IAC9CF,gBAAgB,CAAC;MAAEE,QAAQ,EAARA,QAAQ;MAAEC,KAAK,~~EAAEkC~~,UAAU;~~MAAEjC~~,OAAO,~~EAAE6B~~,WAAW;~~MAAE5B~~,OAAO,EAAPA,OAAO;MAAEC,SAAS,EAATA;IAAU,CAAC,CAAC;EAC7F,CAAC,CAAC;EAEF,~~IAAIwB~~,gBAAgB,IAAIA,gBAAgB,CAACQ,MAAM,EAAE;IAC/CR,gBAAgB,IACdA,gBAAgB,~~CAACP~~,OAAO,CAAC,~~UAAAgB~~,kBAAkB,EAAI;MAC7C,IAAAC,qBAAA,GAA0BD,kBAAkB,CAACE,KAAK,CAAC,GAAG,CAAC;QAAAC,sBAAA,OAAAC,eAAA,aAAAH,qBAAA;QAAhDI,eAAe,GAAAF,sBAAA;MACtBb,QAAQ,~~CAACN~~,OAAO,CAAC,~~UAAAsB~~,cAAc,EAAI;QACjC,IAAIA,cAAc,CAACC,OAAO,CAACF,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE;QACpD,IAAAG,qBAAA,GAA2BF,cAAc,CAACJ,KAAK,CAAC,GAAG,CAAC;UAAAO,sBAAA,OAAAL,eAAA,aAAAI,qBAAA;UAA3CE,cAAc,GAAAD,sBAAA;QACvB,IAAME,eAAe,~~MAAAhC~~,MAAA,~~CAAM0B~~,eAAe,aAAU;QACpD,IAAI,CAACK,cAAc,EAAE;QACrBhB,WAAW,~~CAACtB~~,IAAI,CAAC;UAAEW,KAAK,MAAAT,gBAAA,~~iBAAKqC~~,eAAe,EAAGD,cAAc;QAAG,CAAC,CAAC;MACpE,CAAC,CAAC;IACJ,CAAC,CAAC;EACN;EAEA,OAAOhB,WAAW;AACpB,CAAC;AAAC,IAAAkB,QAAA,~~GAEa1B~~,iBAAiB;~~AAAA2B~~,OAAA,cAAAD,QAAA"}
1	+ {"version":3,"file":"build-filters-query.js","names":["QUERY_KEYS_TO_IGNORE","builFilterObject","_ref","queryKey","value","filters","isRange","isInQuery","min","minValue","max","maxValue","push","range","_defineProperty2","gte","Number","lte","key","concat","isArray","Array","singleFilterObj","match","forEach","filterValue","buildFiltersQuery","_ref2","query","filterBy","filterByProperty","rangeValues","queryKeys","mustFilters","Object","keys","includes","queryValue","length","filterByPropOption","_filterByPropOption$s","split","_filterByPropOption$s2","_slicedToArray2","filterByPropKey","filterByOption","indexOf","_filterByOption$split","_filterByOption$split2","filteryByValue","filterByKeyword","_default","exports"],"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":";;;;;;;;;;;;;;;;;;;AAAA,IAAMA,oBAAoB,GAAG,CAAC,YAAY,EAAE,cAAc,EAAE,aAAa,CAAC;AAE1E,IAAMC,gBAAgB,GAAG,SAAnBA,gBAAgBA,CAAAC,IAAA,EAAyD;EAAA,IAAnDC,QAAQ,GAAAD,IAAA,CAARC,QAAQ;IAAEC,KAAK,GAAAF,IAAA,CAALE,KAAK;IAAEC,OAAO,GAAAH,IAAA,CAAPG,OAAO;IAAEC,OAAO,GAAAJ,IAAA,CAAPI,OAAO;IAAEC,SAAS,GAAAL,IAAA,CAATK,SAAS;EACtE,IAAID,OAAO,EAAE;IACX;IACA,IAAIC,SAAS,IAAKH,KAAK,CAACI,GAAG,KAAKJ,KAAK,CAACK,QAAQ,IAAIL,KAAK,CAACM,GAAG,KAAKN,KAAK,CAACO,QAAS,EAAE;MAC/EN,OAAO,CAACO,IAAI,CAAC;QACXC,KAAK,MAAAC,gBAAA,iBACFX,QAAQ,EAAG;UACVY,GAAG,EAAEC,MAAM,CAACZ,KAAK,CAACK,QAAQ,CAAC;UAC3BQ,GAAG,EAAED,MAAM,CAACZ,KAAK,CAACO,QAAQ;QAC5B,CAAC;MAEL,CAAC,CAAC;IACJ;IACA;EACF;EAEA,IAAMO,GAAG,GAAGZ,OAAO,GAAGH,QAAQ,MAAAgB,MAAA,CAAMhB,QAAQ,aAAU;EAEtD,IAAMiB,OAAO,GAAGC,KAAK,CAACD,OAAO,CAAChB,KAAK,CAAC;EACpC,IAAI,CAACgB,OAAO,EAAE;IACZ,IAAME,eAAe,GAAG;MAAEC,KAAK,MAAAT,gBAAA,iBAAKI,GAAG,EAAGd,KAAK;IAAG,CAAC;IACnDC,OAAO,CAACO,IAAI,CAACU,eAAe,CAAC;IAC7B;EACF;EAEAlB,KAAK,CAACoB,OAAO,CAAC,UAAAC,WAAW,EAAI;IAC3BpB,OAAO,CAACO,IAAI,CAAC;MAAEW,KAAK,MAAAT,gBAAA,iBAAKI,GAAG,EAAGO,WAAW;IAAG,CAAC,CAAC;EACjD,CAAC,CAAC;AACJ,CAAC;AACD,IAAMC,iBAAiB,GAAG,SAApBA,iBAAiBA,CAAAC,KAAA,EAAsE;EAAA,IAAhEC,KAAK,GAAAD,KAAA,CAALC,KAAK;IAAEC,QAAQ,GAAAF,KAAA,CAARE,QAAQ;IAAEC,gBAAgB,GAAAH,KAAA,CAAhBG,gBAAgB;IAAEC,WAAW,GAAAJ,KAAA,CAAXI,WAAW;IAAEC,SAAS,GAAAL,KAAA,CAATK,SAAS;EACpF,IAAMC,WAAW,GAAG,EAAE;EACtBC,MAAM,CAACC,IAAI,CAACP,KAAK,CAAC,CAACJ,OAAO,CAAC,UAAArB,QAAQ,EAAI;IACrC,IAAIH,oBAAoB,CAACoC,QAAQ,CAACjC,QAAQ,CAAC,EAAE;IAC7C,IAAI,CAACA,QAAQ,IAAI,CAACyB,KAAK,CAACzB,QAAQ,CAAC,EAAE;IACnC,IAAMkC,UAAU,GAAGT,KAAK,CAACzB,QAAQ,CAAC;IAElC,IAAMG,OAAO,GAAGyB,WAAW,CAACK,QAAQ,CAACjC,QAAQ,CAAC;IAC9C,IAAMI,SAAS,GAAGyB,SAAS,CAACI,QAAQ,CAACjC,QAAQ,CAAC;IAC9CF,gBAAgB,CAAC;MAAEE,QAAQ,EAARA,QAAQ;MAAEC,KAAK,EAAEiC,UAAU;MAAEhC,OAAO,EAAE4B,WAAW;MAAE3B,OAAO,EAAPA,OAAO;MAAEC,SAAS,EAATA;IAAU,CAAC,CAAC;EAC7F,CAAC,CAAC;EAEF,IAAIuB,gBAAgB,IAAIA,gBAAgB,CAACQ,MAAM,EAAE;IAC/CR,gBAAgB,IACdA,gBAAgB,CAACN,OAAO,CAAC,UAAAe,kBAAkB,EAAI;MAC7C,IAAAC,qBAAA,GAA0BD,kBAAkB,CAACE,KAAK,CAAC,GAAG,CAAC;QAAAC,sBAAA,OAAAC,eAAA,aAAAH,qBAAA;QAAhDI,eAAe,GAAAF,sBAAA;MACtBb,QAAQ,CAACL,OAAO,CAAC,UAAAqB,cAAc,EAAI;QACjC,IAAIA,cAAc,CAACC,OAAO,CAACF,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE;QACpD,IAAAG,qBAAA,GAA2BF,cAAc,CAACJ,KAAK,CAAC,GAAG,CAAC;UAAAO,sBAAA,OAAAL,eAAA,aAAAI,qBAAA;UAA3CE,cAAc,GAAAD,sBAAA;QACvB,IAAME,eAAe,MAAA/B,MAAA,CAAMyB,eAAe,aAAU;QACpD,IAAI,CAACK,cAAc,EAAE;QACrBhB,WAAW,CAACrB,IAAI,CAAC;UAAEW,KAAK,MAAAT,gBAAA,iBAAKoC,eAAe,EAAGD,cAAc;QAAG,CAAC,CAAC;MACpE,CAAC,CAAC;IACJ,CAAC,CAAC;EACN;EAEA,OAAOhB,WAAW;AACpB,CAAC;AAAC,IAAAkB,QAAA,GAEazB,iBAAiB;AAAA0B,OAAA,cAAAD,QAAA"}

package/lib/components/SearchFilter/helpers/build-new-query.js ADDED Viewed

@@ -0,0 +1,15 @@
+"use strict";
+require("core-js/modules/es.object.define-property.js");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+require("core-js/modules/es.array.concat.js");
+var buildNewQuery = function buildNewQuery(url, currentUrl, queryParams, sortValues) {
+  var newUrl = url ? "".concat(url, "?").concat(queryParams) : "".concat(currentUrl, "?").concat(queryParams);
+  return sortValues ? "".concat(newUrl, "&").concat(sortValues) : newUrl;
+};
+var _default = buildNewQuery;
+exports["default"] = _default;
+//# sourceMappingURL=build-new-query.js.map

package/lib/components/SearchFilter/helpers/build-new-query.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"build-new-query.js","names":["buildNewQuery","url","currentUrl","queryParams","sortValues","newUrl","concat","_default","exports"],"sources":["../../../../src/components/SearchFilter/helpers/build-new-query.js"],"sourcesContent":["const buildNewQuery = (url, currentUrl, queryParams, sortValues) => {\n const newUrl = url ? `${url}?${queryParams}` : `${currentUrl}?${queryParams}`;\n return sortValues ? `${newUrl}&${sortValues}` : newUrl;\n};\n\nexport default buildNewQuery;\n"],"mappings":";;;;;;;;AAAA,IAAMA,aAAa,GAAG,SAAhBA,aAAaA,CAAIC,GAAG,EAAEC,UAAU,EAAEC,WAAW,EAAEC,UAAU,EAAK;EAClE,IAAMC,MAAM,GAAGJ,GAAG,MAAAK,MAAA,CAAML,GAAG,OAAAK,MAAA,CAAIH,WAAW,OAAAG,MAAA,CAAQJ,UAAU,OAAAI,MAAA,CAAIH,WAAW,CAAE;EAC7E,OAAOC,UAAU,MAAAE,MAAA,CAAMD,MAAM,OAAAC,MAAA,CAAIF,UAAU,IAAKC,MAAM;AACxD,CAAC;AAAC,IAAAE,QAAA,GAEaP,aAAa;AAAAQ,OAAA,cAAAD,QAAA"}

package/lib/components/SearchFilter/helpers/build-query.js ADDED Viewed

@@ -0,0 +1,37 @@
+"use strict";
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+require("core-js/modules/es.array.concat.js");
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/es.array.includes.js");
+require("core-js/modules/es.array.join.js");
+var _constants = require("../constants");
+var _parseFilterValue = _interopRequireDefault(require("./parse-filter-value"));
+var buildQuery = function buildQuery(filterValues, filters) {
+  var newQuery = [];
+  var searchValue = filterValues[_constants.SEARCH_TERM] ? encodeURIComponent(filterValues[_constants.SEARCH_TERM]) : '';
+  if (searchValue) newQuery.push("".concat(_constants.SEARCH_TERM, "=").concat(searchValue));
+  filters.forEach(function (_ref) {
+    var propsToDisplay = _ref.propsToDisplay,
+      type = _ref.type;
+    if (type === _constants.TEXT_SEARCH) return;
+    propsToDisplay.forEach(function (prop) {
+      var value = filterValues[prop];
+      var parsedValue = (0, _parseFilterValue["default"])(prop, type, value);
+      if (parsedValue && !newQuery.includes(parsedValue)) {
+        newQuery.push(parsedValue);
+      }
+    });
+  });
+  return newQuery.join('&');
+};
+var _default = buildQuery;
+exports["default"] = _default;
+//# sourceMappingURL=build-query.js.map

package/lib/components/SearchFilter/helpers/build-query.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"build-query.js","names":["_constants","require","_parseFilterValue","_interopRequireDefault","buildQuery","filterValues","filters","newQuery","searchValue","SEARCH_TERM","encodeURIComponent","push","concat","forEach","_ref","propsToDisplay","type","TEXT_SEARCH","prop","value","parsedValue","parseFilterValue","includes","join","_default","exports"],"sources":["../../../../src/components/SearchFilter/helpers/build-query.js"],"sourcesContent":["import { SEARCH_TERM, TEXT_SEARCH } from '../constants';\nimport parseFilterValue from './parse-filter-value';\n\nconst buildQuery = (filterValues, filters) => {\n const newQuery = [];\n const searchValue = filterValues[SEARCH_TERM]\n ? encodeURIComponent(filterValues[SEARCH_TERM])\n : '';\n if (searchValue) newQuery.push(`${SEARCH_TERM}=${searchValue}`);\n\n filters.forEach(({ propsToDisplay, type }) => {\n if (type === TEXT_SEARCH) return;\n\n propsToDisplay.forEach(prop => {\n const value = filterValues[prop];\n const parsedValue = parseFilterValue(prop, type, value);\n if (parsedValue && !newQuery.includes(parsedValue)) {\n newQuery.push(parsedValue);\n }\n });\n });\n\n return newQuery.join('&');\n};\n\nexport default buildQuery;\n"],"mappings":";;;;;;;;;;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,iBAAA,GAAAC,sBAAA,CAAAF,OAAA;AAEA,IAAMG,UAAU,GAAG,SAAbA,UAAUA,CAAIC,YAAY,EAAEC,OAAO,EAAK;EAC5C,IAAMC,QAAQ,GAAG,EAAE;EACnB,IAAMC,WAAW,GAAGH,YAAY,CAACI,sBAAW,CAAC,GACzCC,kBAAkB,CAACL,YAAY,CAACI,sBAAW,CAAC,CAAC,GAC7C,EAAE;EACN,IAAID,WAAW,EAAED,QAAQ,CAACI,IAAI,IAAAC,MAAA,CAAIH,sBAAW,OAAAG,MAAA,CAAIJ,WAAW,CAAE,CAAC;EAE/DF,OAAO,CAACO,OAAO,CAAC,UAAAC,IAAA,EAA8B;IAAA,IAA3BC,cAAc,GAAAD,IAAA,CAAdC,cAAc;MAAEC,IAAI,GAAAF,IAAA,CAAJE,IAAI;IACrC,IAAIA,IAAI,KAAKC,sBAAW,EAAE;IAE1BF,cAAc,CAACF,OAAO,CAAC,UAAAK,IAAI,EAAI;MAC7B,IAAMC,KAAK,GAAGd,YAAY,CAACa,IAAI,CAAC;MAChC,IAAME,WAAW,GAAG,IAAAC,4BAAgB,EAACH,IAAI,EAAEF,IAAI,EAAEG,KAAK,CAAC;MACvD,IAAIC,WAAW,IAAI,CAACb,QAAQ,CAACe,QAAQ,CAACF,WAAW,CAAC,EAAE;QAClDb,QAAQ,CAACI,IAAI,CAACS,WAAW,CAAC;MAC5B;IACF,CAAC,CAAC;EACJ,CAAC,CAAC;EAEF,OAAOb,QAAQ,CAACgB,IAAI,CAAC,GAAG,CAAC;AAC3B,CAAC;AAAC,IAAAC,QAAA,GAEapB,UAAU;AAAAqB,OAAA,cAAAD,QAAA"}

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

@@ -0,0 +1,43 @@
+"use strict";
+require("core-js/modules/es.object.define-property.js");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+require("core-js/modules/es.array.for-each.js");
+require("core-js/modules/es.object.to-string.js");
+require("core-js/modules/web.dom-collections.for-each.js");
+require("core-js/modules/es.object.keys.js");
+require("core-js/modules/es.array.find.js");
+var _constants = require("../constants");
+var _getFilterValueFromQuery = _interopRequireDefault(require("./get-filter-value-from-query"));
+var getInitialFilterValues = function getInitialFilterValues(filterData, filters, query) {
+  var filterValues = {};
+  filterValues[_constants.SEARCH_TERM] = query[_constants.SEARCH_TERM] || '';
+  if (!filterData) {
+    filters.forEach(function (filterProps) {
+      var _filterProps$propsToD = (0, _slicedToArray2["default"])(filterProps.propsToDisplay, 1),
+        key = _filterProps$propsToD[0];
+      filterValues[key] = query[key] ? (0, _getFilterValueFromQuery["default"])(key, filterProps, {}, query) : null;
+    });
+    filterValues.dataNotSet = true;
+    return filterValues;
+  }
+  Object.keys(filterData).forEach(function (key) {
+    var filterProps = filters.find(function (_ref) {
+      var propsToDisplay = _ref.propsToDisplay;
+      return propsToDisplay.find(function (prop) {
+        return key === prop;
+      });
+    }) || {};
+    filterValues[key] = (0, _getFilterValueFromQuery["default"])(key, filterProps, filterData[key], query);
+  });
+  filterValues.dataNotSet = false;
+  return filterValues;
+};
+var _default = getInitialFilterValues;
+exports["default"] = _default;
+//# sourceMappingURL=get-initial-filter-values.js.map

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

@@ -0,0 +1 @@

+ {"version":3,"file":"get-initial-filter-values.js","names":["_constants","require","_getFilterValueFromQuery","_interopRequireDefault","getInitialFilterValues","filterData","filters","query","filterValues","SEARCH_TERM","forEach","filterProps","_filterProps$propsToD","_slicedToArray2","propsToDisplay","key","getFilterValueFromQuery","dataNotSet","Object","keys","find","_ref","prop","_default","exports"],"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,IAAAA,UAAA,GAAAC,OAAA;AACA,IAAAC,wBAAA,GAAAC,sBAAA,CAAAF,OAAA;AAEA,IAAMG,sBAAsB,GAAG,SAAzBA,sBAAsBA,CAAIC,UAAU,EAAEC,OAAO,EAAEC,KAAK,EAAK;EAC7D,IAAMC,YAAY,GAAG,CAAC,CAAC;EACvBA,YAAY,CAACC,sBAAW,CAAC,GAAGF,KAAK,CAACE,sBAAW,CAAC,IAAI,EAAE;EAEpD,IAAI,CAACJ,UAAU,EAAE;IACfC,OAAO,CAACI,OAAO,CAAC,UAAAC,WAAW,EAAI;MAC7B,IAAAC,qBAAA,OAAAC,eAAA,aAEIF,WAAW,CADbG,cAAc;QAAGC,GAAG,GAAAH,qBAAA;MAEtBJ,YAAY,CAACO,GAAG,CAAC,GAAGR,KAAK,CAACQ,GAAG,CAAC,GAAG,IAAAC,mCAAuB,EAACD,GAAG,EAAEJ,WAAW,EAAE,CAAC,CAAC,EAAEJ,KAAK,CAAC,GAAG,IAAI;IAC9F,CAAC,CAAC;IACFC,YAAY,CAACS,UAAU,GAAG,IAAI;IAC9B,OAAOT,YAAY;EACrB;EAEAU,MAAM,CAACC,IAAI,CAACd,UAAU,CAAC,CAACK,OAAO,CAAC,UAAAK,GAAG,EAAI;IACrC,IAAMJ,WAAW,GACfL,OAAO,CAACc,IAAI,CAAC,UAAAC,IAAA;MAAA,IAAGP,cAAc,GAAAO,IAAA,CAAdP,cAAc;MAAA,OAAOA,cAAc,CAACM,IAAI,CAAC,UAAAE,IAAI;QAAA,OAAIP,GAAG,KAAKO,IAAI;MAAA,EAAC;IAAA,EAAC,IAAI,CAAC,CAAC;IACvFd,YAAY,CAACO,GAAG,CAAC,GAAG,IAAAC,mCAAuB,EAACD,GAAG,EAAEJ,WAAW,EAAEN,UAAU,CAACU,GAAG,CAAC,EAAER,KAAK,CAAC;EACvF,CAAC,CAAC;EAEFC,YAAY,CAACS,UAAU,GAAG,KAAK;EAE/B,OAAOT,YAAY;AACrB,CAAC;AAAC,IAAAe,QAAA,GAEanB,sBAAsB;AAAAoB,OAAA,cAAAD,QAAA"}

package/lib/components/SearchFilter/helpers/index.js CHANGED Viewed

@@ -11,22 +11,22 @@ Object.defineProperty(exports, "buildFiltersQuery", {
     return _buildFiltersQuery["default"];
   }
 });
-Object.defineProperty(exports, "buildNewUrl", {
+Object.defineProperty(exports, "buildNewQuery", {
   enumerable: true,
   get: function get() {
-    return _buildNewUrl["default"];
+    return _buildNewQuery["default"];
   }
 });
-Object.defineProperty(exports, "buildRawQueryStringified", {
+Object.defineProperty(exports, "buildQuery", {
   enumerable: true,
   get: function get() {
-    return _buildRawQueryStringified["default"];
+    return _buildQuery["default"];
   }
 });
-Object.defineProperty(exports, "buildUrlQuery", {
+Object.defineProperty(exports, "buildRawQueryStringified", {
   enumerable: true,
   get: function get() {
-    return _buildUrlQuery["default"];
+    return _buildRawQueryStringified["default"];
   }
 });
 Object.defineProperty(exports, "calculateMinMax", {
@@ -65,22 +65,16 @@ Object.defineProperty(exports, "getDisplayValue", {
     return _getDisplayValue["default"];
   }
 });
-Object.defineProperty(exports, "getFilterRangesAndCheckboxesValues", {
-  enumerable: true,
-  get: function get() {
-    return _getFilterRangesAndCheckboxesValues["default"];
-  }
-});
 Object.defineProperty(exports, "getFilterValueFromQuery", {
   enumerable: true,
   get: function get() {
     return _getFilterValueFromQuery["default"];
   }
 });
-Object.defineProperty(exports, "getFilterValues", {
+Object.defineProperty(exports, "getInitialFilterValues", {
   enumerable: true,
   get: function get() {
-    return _getFilterValues["default"];
+    return _getInitialFilterValues["default"];
   }
 });
 Object.defineProperty(exports, "getIntersectedProp", {
@@ -113,7 +107,7 @@ Object.defineProperty(exports, "isDeviceDesktop", {
     return _isDeviceDesktop["default"];
   }
 });
-var _buildNewUrl = _interopRequireDefault(require("./build-new-url"));
+var _buildNewQuery = _interopRequireDefault(require("./build-new-query"));
 var _buildRawQueryStringified = _interopRequireDefault(require("./build-raw-query-stringified"));
 var _decodeEncode = require("./decode-encode");
 var _checkIfRangeUpdated = _interopRequireDefault(require("./check-if-range-updated"));
@@ -125,9 +119,8 @@ var _getIntersectedProp = _interopRequireDefault(require("./get-intersected-prop
 var _getRangeValue = _interopRequireDefault(require("./get-range-value"));
 var _getSelectOptions = _interopRequireDefault(require("./get-select-options"));
 var _isDeviceDesktop = _interopRequireDefault(require("./is-device-desktop"));
-var _getFilterValues = _interopRequireDefault(require("./get-filter-values"));
+var _getInitialFilterValues = _interopRequireDefault(require("./get-initial-filter-values"));
 var _getFilterValueFromQuery = _interopRequireDefault(require("./get-filter-value-from-query"));
-var _buildUrlQuery = _interopRequireDefault(require("./build-url-query"));
+var _buildQuery = _interopRequireDefault(require("./build-query"));
 var _buildFiltersQuery = _interopRequireDefault(require("./build-filters-query"));
-var _getFilterRangesAndCheckboxesValues = _interopRequireDefault(require("./get-filter-ranges-and-checkboxes-values"));
 //# sourceMappingURL=index.js.map

package/lib/components/SearchFilter/helpers/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","names":["~~_buildNewUrl~~","_interopRequireDefault","require","_buildRawQueryStringified","_decodeEncode","_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,IAAAA,~~YAAA~~,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,yBAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AACA,IAAAG,oBAAA,GAAAJ,sBAAA,CAAAC,OAAA;AACA,IAAAI,8BAAA,GAAAL,sBAAA,CAAAC,OAAA;AACA,IAAAK,gBAAA,GAAAN,sBAAA,CAAAC,OAAA;AACA,IAAAM,cAAA,GAAAP,sBAAA,CAAAC,OAAA;AACA,IAAAO,gBAAA,GAAAR,sBAAA,CAAAC,OAAA;AACA,IAAAQ,mBAAA,GAAAT,sBAAA,CAAAC,OAAA;AACA,IAAAS,cAAA,GAAAV,sBAAA,CAAAC,OAAA;AACA,IAAAU,iBAAA,GAAAX,sBAAA,CAAAC,OAAA;AACA,IAAAW,gBAAA,GAAAZ,sBAAA,CAAAC,OAAA;AACA,IAAAY,~~gBAAA~~,GAAAb,sBAAA,CAAAC,OAAA;AACA,IAAAa,wBAAA,GAAAd,sBAAA,CAAAC,OAAA;AACA,IAAAc,~~cAAA~~,GAAAf,sBAAA,CAAAC,OAAA;AACA,IAAAe,kBAAA,GAAAhB,sBAAA,CAAAC,OAAA~~;AACA,IAAAgB,mCAAA,GAAAjB,sBAAA,CAAAC,OAAA~~"}
1	+ {"version":3,"file":"index.js","names":["_buildNewQuery","_interopRequireDefault","require","_buildRawQueryStringified","_decodeEncode","_checkIfRangeUpdated","_getResponsiveFilterClassnames","_getDisplayValue","_calculateStep","_calculateMinMax","_getIntersectedProp","_getRangeValue","_getSelectOptions","_isDeviceDesktop","_getInitialFilterValues","_getFilterValueFromQuery","_buildQuery","_buildFiltersQuery"],"sources":["../../../../src/components/SearchFilter/helpers/index.js"],"sourcesContent":["import buildNewQuery from './build-new-query';\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 getInitialFilterValues from './get-initial-filter-values';\nimport getFilterValueFromQuery from './get-filter-value-from-query';\nimport buildQuery from './build-query';\nimport buildFiltersQuery from './build-filters-query';\n\nexport {\n buildQuery,\n buildNewQuery,\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 getInitialFilterValues,\n getFilterValueFromQuery,\n buildFiltersQuery\n};\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,cAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,yBAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,aAAA,GAAAF,OAAA;AACA,IAAAG,oBAAA,GAAAJ,sBAAA,CAAAC,OAAA;AACA,IAAAI,8BAAA,GAAAL,sBAAA,CAAAC,OAAA;AACA,IAAAK,gBAAA,GAAAN,sBAAA,CAAAC,OAAA;AACA,IAAAM,cAAA,GAAAP,sBAAA,CAAAC,OAAA;AACA,IAAAO,gBAAA,GAAAR,sBAAA,CAAAC,OAAA;AACA,IAAAQ,mBAAA,GAAAT,sBAAA,CAAAC,OAAA;AACA,IAAAS,cAAA,GAAAV,sBAAA,CAAAC,OAAA;AACA,IAAAU,iBAAA,GAAAX,sBAAA,CAAAC,OAAA;AACA,IAAAW,gBAAA,GAAAZ,sBAAA,CAAAC,OAAA;AACA,IAAAY,uBAAA,GAAAb,sBAAA,CAAAC,OAAA;AACA,IAAAa,wBAAA,GAAAd,sBAAA,CAAAC,OAAA;AACA,IAAAc,WAAA,GAAAf,sBAAA,CAAAC,OAAA;AACA,IAAAe,kBAAA,GAAAhB,sBAAA,CAAAC,OAAA"}

package/lib/components/SearchFilter/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","names":["_SearchFilterContainer","_interopRequireDefault","require","_default","~~SearchFilter~~","exports"],"sources":["../../../src/components/SearchFilter/index.js"],"sourcesContent":["import ~~SearchFilter~~ from './SearchFilterContainer';\n\nexport default ~~SearchFilter~~;\n"],"mappings":";;;;;;;;AAAA,IAAAA,sBAAA,GAAAC,sBAAA,CAAAC,OAAA;~~AAAmD~~,IAAAC,QAAA,~~GAEpCC~~,~~iCAAY~~;AAAAC,OAAA,cAAAF,QAAA"}
1	+ {"version":3,"file":"index.js","names":["_SearchFilterContainer","_interopRequireDefault","require","_default","SearchFilterContainer","exports"],"sources":["../../../src/components/SearchFilter/index.js"],"sourcesContent":["import SearchFilterContainer from './SearchFilterContainer';\n\nexport default SearchFilterContainer;\n"],"mappings":";;;;;;;;AAAA,IAAAA,sBAAA,GAAAC,sBAAA,CAAAC,OAAA;AAA4D,IAAAC,QAAA,GAE7CC,iCAAqB;AAAAC,OAAA,cAAAF,QAAA"}

package/lib/components/SearchFilterSort/SearchFilterSort.js CHANGED Viewed

@@ -6,10 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+require("core-js/modules/es.array.sort.js");
 require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.map.js");
-require("core-js/modules/es.array.sort.js");
 var _react = _interopRequireDefault(require("react"));
 var _select = _interopRequireDefault(require("@blaze-react/select"));
 var _router = require("next/router");
@@ -18,31 +17,20 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _constants = require("./constants");
 var _helpers = require("./helpers");
 var _HOC = require("../../HOC");
-var getSortFromQuery = function getSortFromQuery(listComponentName) {
-  var listNameKey = listComponentName ? "pb[".concat(listComponentName, "]") : '';
-  var sortKey = "".concat(listNameKey).concat(listNameKey ? '[sort]' : 'sort');
-  var sortByKey = "".concat(listNameKey).concat(listNameKey ? '[sortby]' : 'sortby');
-  return [sortKey, sortByKey];
-};
 var SearchFilterSort = function SearchFilterSort(_ref) {
-  var filters = _ref.filters,
+  var router = _ref.router,
+    filters = _ref.filters,
     elementLabel = _ref.elementLabel,
     selectLabel = _ref.selectLabel,
-    id = _ref.id,
-    listComponentName = _ref.listComponentName;
-  var router = (0, _router.useRouter)();
+    id = _ref.id;
   var asPath = router.asPath;
-  var _getSortFromQuery = getSortFromQuery(listComponentName),
-    _getSortFromQuery2 = (0, _slicedToArray2["default"])(_getSortFromQuery, 2),
-    sortKey = _getSortFromQuery2[0],
-    sortByKey = _getSortFromQuery2[1];
   var _parseUrl = (0, _queryString.parseUrl)(asPath),
     url = _parseUrl.url,
     query = _parseUrl.query,
     _parseUrl$query = _parseUrl.query,
     _parseUrl$query2 = _parseUrl$query === void 0 ? {} : _parseUrl$query,
-    sort = _parseUrl$query2[sortKey],
-    sortby = _parseUrl$query2[sortByKey];
+    sort = _parseUrl$query2.sort,
+    sortby = _parseUrl$query2.sortby;
   var selectedValue = "".concat(sortby, ":").concat(sort) || '';
   var defaultTextValue = selectLabel || _constants.DEFAULT_SORT;
   var options = filters.map(function (_ref2) {
@@ -53,14 +41,7 @@ var SearchFilterSort = function SearchFilterSort(_ref) {
   });
   var setSortValue = function setSortValue(_ref3) {
     var value = _ref3.value;
-    return (0, _helpers.handleSortUpdate)({
-      router: router,
-      value: value,
-      query: query,
-      url: url,
-      selectLabel: selectLabel,
-      listComponentName: listComponentName
-    });
+    return (0, _helpers.handleSortUpdate)(router, value, query, url, selectLabel);
   };
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "sort-by"
@@ -74,19 +55,18 @@ var SearchFilterSort = function SearchFilterSort(_ref) {
   }));
 };
 SearchFilterSort.propTypes = {
+  router: _propTypes["default"].object.isRequired,
   filters: _propTypes["default"].array,
   elementLabel: _propTypes["default"].string,
   selectLabel: _propTypes["default"].string,
-  id: _propTypes["default"].string,
-  listComponentName: _propTypes["default"].string
+  id: _propTypes["default"].string
 };
 SearchFilterSort.defaultProps = {
   filters: [],
   elementLabel: '',
   selectLabel: '',
-  id: '',
-  listComponentName: ''
+  id: ''
 };
-var _default = (0, _HOC.withTitle)(SearchFilterSort);
+var _default = (0, _router.withRouter)((0, _HOC.withTitle)(SearchFilterSort));
 exports["default"] = _default;
 //# sourceMappingURL=SearchFilterSort.js.map

package/lib/components/SearchFilterSort/SearchFilterSort.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SearchFilterSort.js","names":["_react","_interopRequireDefault","require","_select","_router","_queryString","_propTypes","_constants","_helpers","_HOC","~~getSortFromQuery~~","~~listComponentName~~","~~listNameKey~~","~~concat","sortKey","sortByKey","SearchFilterSort","_ref","~~filters","elementLabel","selectLabel","id","~~router","useRouter","~~asPath","~~_getSortFromQuery","_getSortFromQuery2","_slicedToArray2","~~_parseUrl","parseUrl","url","query","_parseUrl$query","_parseUrl$query2","sort","sortby","selectedValue","defaultTextValue","DEFAULT_SORT","options","map","_ref2","optionLabel","label","propsToDisplay","sortValue","setSortValue","_ref3","value","handleSortUpdate","createElement","className","onChange","propTypes","PropTypes","array","string","defaultProps","_default","withTitle","exports"],"sources":["../../../src/components/SearchFilterSort/SearchFilterSort.js"],"sourcesContent":["import React from 'react';\nimport Select from '@blaze-react/select';\nimport { ~~useRouter~~ } from 'next/router';\nimport { parseUrl } from 'query-string';\nimport PropTypes from 'prop-types';\nimport { DEFAULT_SORT } from './constants';\nimport { handleSortUpdate } from './helpers';\nimport { withTitle } from '../../HOC';\n\nconst ~~getSortFromQuery~~ = ~~listComponentName =>~~ {~~\n const~~ listNameKey = listComponentName ? `pb[${listComponentName}]` : '';\n const sortKey = `${listNameKey}${listNameKey ? '[sort]' : 'sort'}`;\n const sortByKey = `${listNameKey}${listNameKey ? '[sortby]' : 'sortby'}`;\n return [sortKey, ~~sortByKey];\n};\nconst SearchFilterSort = ({~~ filters, elementLabel, selectLabel, id, ~~listComponentName~~ }) => {\n const ~~router = useRouter();\n const~~ { asPath } = router;\n const ~~[sortKey, sortByKey] = getSortFromQuery(listComponentName);\n const~~ { url, query, query: { ~~[sortKey]:~~ sort, ~~[sortByKey]:~~ sortby } = {} } = parseUrl(asPath);\n const selectedValue = `${sortby}:${sort}` \|\| '';\n const defaultTextValue = selectLabel \|\| DEFAULT_SORT;\n const options = filters.map(({ label: optionLabel, propsToDisplay, sort: sortValue }) => [\n `${propsToDisplay[0]}:${sortValue}`,\n optionLabel\n ]);\n\n const setSortValue = ({ value }) ~~=>\n~~ handleSortUpdate({ router, value, query, url, selectLabel~~, listComponentName }~~);\n\n return (\n <div className=\"sort-by\">\n <Select\n label={elementLabel}\n defaultTextValue={defaultTextValue}\n value={selectedValue}\n id={id}\n options={options}\n onChange={setSortValue}\n />\n </div>\n );\n};\n\nSearchFilterSort.propTypes = {\n ~~filters~~: PropTypes.~~array~~,\n ~~elementLabel~~: PropTypes.~~string~~,\n ~~selectLabel~~: PropTypes.string,\n id: PropTypes.string,\n ~~listComponentName~~: PropTypes.string\n};\n\nSearchFilterSort.defaultProps = {\n filters: [],\n elementLabel: '',\n selectLabel: '',\n id: ''~~,\n listComponentName: ''~~\n};\n\nexport default withTitle(SearchFilterSort);\n"],"mappings":"~~;;;;;;;;;;;;~~AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,OAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AACA,IAAAI,UAAA,GAAAL,sBAAA,CAAAC,OAAA;AACA,IAAAK,UAAA,GAAAL,OAAA;AACA,IAAAM,QAAA,GAAAN,OAAA;AACA,IAAAO,IAAA,GAAAP,OAAA;AAEA,IAAMQ,gBAAgB,GAAG,SAAnBA,gBAAgBA,~~CAAGC~~,~~iBAAiB~~,~~EAAI~~;~~EAC5C~~,~~IAAMC~~,~~WAAW~~,~~GAAGD~~,~~iBAAiB~~,~~SAAAE~~,~~MAAA,CAASF,iBAAiB,SAAM,EAAE;EACvE,IAAMG,OAAO,MAAAD,MAAA,CAAMD,WAAW,EAAAC,MAAA,CAAGD,WAAW,GAAG,QAAQ,GAAG,~~MAAM~~,CAAE~~;~~EAClE~~,~~IAAMG,SAAS,MAAAF,MAAA,CAAMD,WAAW,EAAAC,MAAA,CAAGD,WAAW,GAAG,UAAU,GAAG,QAAQ,CAAE;EACxE,~~OAAO,~~CAACE~~,~~OAAO,EAAEC,SAAS,CAAC;AAC7B,CAAC;AACD,IAAMC,gBAAgB,GAAG,SAAnBA,gBAAgBA,CAAAC,~~IAAA,~~EAAsE;EAAA~~,~~IAAhEC,~~OAAO~~,GAAAD,IAAA,CAAPC,OAAO~~;IAAEC,YAAY,~~GAAAF~~,IAAA,~~CAAZE~~,YAAY;IAAEC,WAAW,~~GAAAH~~,IAAA,~~CAAXG~~,WAAW;IAAEC,EAAE,~~GAAAJ~~,IAAA,~~CAAFI~~,EAAE;~~IAAEV~~,~~iBAAiB,GAAAM,IAAA,CAAjBN,iBAAiB;EACnF,IAAMW,MAAM,GAAG,IAAAC,iBAAS,EAAC,CAAC;EAC1B,~~IAAQC,MAAM,~~GAAKF~~,MAAM,~~CAAjBE~~,MAAM;EACd,IAAAC,~~iBAAA,GAA6Bf,gBAAgB,CAACC,iBAAiB,CAAC;IAAAe,kBAAA,OAAAC,eAAA,aAAAF,iBAAA;IAAzDX,OAAO,GAAAY,kBAAA;IAAEX,SAAS,GAAAW,kBAAA;EACzB,IAAAE,~~SAAA,~~GAA6E~~,IAAAC,qBAAQ,~~EAACL~~,MAAM,CAAC;~~IAArFM~~,GAAG,GAAAF,SAAA,CAAHE,GAAG;IAAEC,KAAK,GAAAH,SAAA,CAALG,KAAK;IAAAC,eAAA,GAAAJ,SAAA,CAAEG,KAAK;IAAAE,gBAAA,GAAAD,eAAA,~~cAA6C~~,CAAC,CAAC,GAAAA,eAAA;~~IAAhCE~~,IAAI,GAAAD,gBAAA,~~CAAdnB~~,~~OAAO~~;~~IAAsBqB~~,MAAM,GAAAF,gBAAA,~~CAAlBlB~~,~~SAAS~~;~~EACxD~~,~~IAAMqB~~,aAAa,GAAG,~~GAAAvB~~,MAAA,~~CAAGsB~~,MAAM,~~OAAAtB~~,MAAA,~~CAAIqB~~,IAAI,KAAM,EAAE;EAC/C,~~IAAMG~~,gBAAgB,~~GAAGjB~~,WAAW,~~IAAIkB~~,uBAAY;EACpD,IAAMC,OAAO,~~GAAGrB~~,OAAO,~~CAACsB~~,GAAG,CAAC,UAAAC,KAAA;IAAA,IAAUC,WAAW,GAAAD,KAAA,CAAlBE,KAAK;MAAeC,cAAc,GAAAH,KAAA,CAAdG,cAAc;MAAQC,SAAS,GAAAJ,KAAA,~~CAAfP~~,IAAI;IAAA,OAAkB,~~IAAArB~~,MAAA,~~CACpF+B~~,cAAc,CAAC,CAAC,CAAC,~~OAAA/B~~,MAAA,~~CAAIgC~~,SAAS,GACjCH,WAAW,CACZ;EAAA,EAAC;EAEF,IAAMI,YAAY,GAAG,SAAfA,YAAYA,CAAAC,KAAA;IAAA,IAAMC,KAAK,GAAAD,KAAA,CAALC,KAAK;IAAA,~~OAC3B~~,IAAAC,yBAAgB,~~EAAC;MAAE3B~~,MAAM,~~EAANA~~,~~MAAM;MAAE0B,~~KAAK,~~EAALA~~,KAAK~~;MAAEjB~~,~~KAAK~~,~~EAALA,KAAK;MAAED,~~GAAG,~~EAAHA~~,~~GAAG;MAAEV,~~WAAW,~~EAAXA,WAAW;MAAET,iBAAiB,EAAjBA;IAAkB,~~CAAC~~,CAAC~~;EAAA;~~EAEjF~~,~~oBACEX~~,MAAA,~~YAAAkD~~,aAAA;IAAKC,SAAS,EAAC;EAAS,~~gBACtBnD~~,MAAA,~~YAAAkD~~,aAAA,~~CAAC/C~~,OAAA,WAAM;~~IACLwC~~,KAAK,~~EAAExB~~,YAAa;~~IACpBkB~~,gBAAgB,EAAEA,gBAAiB;IACnCW,KAAK,~~EAAEZ~~,aAAc;~~IACrBf~~,EAAE,EAAEA,EAAG;~~IACPkB~~,OAAO,EAAEA,OAAQ;IACjBa,QAAQ,EAAEN;EAAa,CACxB,CACE,CAAC;AAEV,CAAC;~~AAED9B~~,gBAAgB,~~CAACqC~~,SAAS,GAAG;~~EAC3BnC~~,~~OAAO~~,~~EAAEoC~~,qBAAS,CAACC,~~KAAK~~;~~EACxBpC~~,~~YAAY~~,~~EAAEmC~~,qBAAS,~~CAACE~~,~~MAAM~~;~~EAC9BpC~~,~~WAAW~~,~~EAAEkC~~,qBAAS,~~CAACE~~,MAAM;~~EAC7BnC~~,~~EAAE~~,~~EAAEiC~~,qBAAS,~~CAACE~~,MAAM;~~EACpB7C~~,~~iBAAiB~~,~~EAAE2C~~,qBAAS,~~CAACE~~;~~AAC/B~~,CAAC;~~AAEDxC~~,gBAAgB,~~CAACyC~~,YAAY,GAAG;~~EAC9BvC~~,OAAO,EAAE,EAAE;EACXC,YAAY,EAAE,EAAE;EAChBC,WAAW,EAAE,EAAE;EACfC,EAAE,EAAE~~,EAAE~~;~~EACNV~~,~~iBAAiB,EAAE;AACrB,~~CAAC;AAAC,~~IAAA+C~~,QAAA,GAEa,IAAAC,cAAS,EAAC3C,gBAAgB,CAAC;AAAA4C,OAAA,~~cAAAF~~,QAAA"}
1	+ {"version":3,"file":"SearchFilterSort.js","names":["_react","_interopRequireDefault","require","_select","_router","_queryString","_propTypes","_constants","_helpers","_HOC","SearchFilterSort","_ref","router","filters","elementLabel","selectLabel","id","asPath","_parseUrl","parseUrl","url","query","_parseUrl$query","_parseUrl$query2","sort","sortby","selectedValue","concat","defaultTextValue","DEFAULT_SORT","options","map","_ref2","optionLabel","label","propsToDisplay","sortValue","setSortValue","_ref3","value","handleSortUpdate","createElement","className","onChange","propTypes","PropTypes","object","isRequired","array","string","defaultProps","_default","withRouter","withTitle","exports"],"sources":["../../../src/components/SearchFilterSort/SearchFilterSort.js"],"sourcesContent":["import React from 'react';\nimport Select from '@blaze-react/select';\nimport { withRouter } from 'next/router';\nimport { parseUrl } from 'query-string';\nimport PropTypes from 'prop-types';\nimport { DEFAULT_SORT } from './constants';\nimport { handleSortUpdate } from './helpers';\nimport { withTitle } from '../../HOC';\n\nconst SearchFilterSort = ({ router, filters, elementLabel, selectLabel, id }) => {\n const { asPath } = router;\n const { url, query, query: { sort, sortby } = {} } = parseUrl(asPath);\n const selectedValue = `${sortby}:${sort}` \|\| '';\n const defaultTextValue = selectLabel \|\| DEFAULT_SORT;\n const options = filters.map(({ label: optionLabel, propsToDisplay, sort: sortValue }) => [\n `${propsToDisplay[0]}:${sortValue}`,\n optionLabel\n ]);\n\n const setSortValue = ({ value }) => handleSortUpdate(router, value, query, url, selectLabel);\n\n return (\n <div className=\"sort-by\">\n <Select\n label={elementLabel}\n defaultTextValue={defaultTextValue}\n value={selectedValue}\n id={id}\n options={options}\n onChange={setSortValue}\n />\n </div>\n );\n};\n\nSearchFilterSort.propTypes = {\n router: PropTypes.object.isRequired,\n filters: PropTypes.array,\n elementLabel: PropTypes.string,\n selectLabel: PropTypes.string,\n id: PropTypes.string\n};\n\nSearchFilterSort.defaultProps = {\n filters: [],\n elementLabel: '',\n selectLabel: '',\n id: ''\n};\n\nexport default withRouter(withTitle(SearchFilterSort));\n"],"mappings":"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"}

package/lib/components/SearchFilterSort/helpers/handle-sort-update.js CHANGED Viewed

@@ -6,44 +6,30 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-require("core-js/modules/es.array.concat.js");
 require("core-js/modules/es.array.for-each.js");
 require("core-js/modules/es.object.to-string.js");
 require("core-js/modules/web.dom-collections.for-each.js");
 require("core-js/modules/es.object.keys.js");
 require("core-js/modules/es.array.index-of.js");
+require("core-js/modules/es.array.concat.js");
 var _queryString = require("query-string");
 var _constants = require("../constants");
 var _updateSort = _interopRequireDefault(require("./update-sort"));
-var handleSortUpdate = function handleSortUpdate(_ref) {
-  var router = _ref.router,
-    value = _ref.value,
-    query = _ref.query,
-    url = _ref.url,
-    selectLabel = _ref.selectLabel,
-    listComponentName = _ref.listComponentName;
+var handleSortUpdate = function handleSortUpdate(router, value, query, url, selectLabel) {
   var queryWithoutSort = {};
   var routerOptions = {
     shallow: true,
     scroll: false
   };
-  var asPath = router.asPath;
-  var hashBit = asPath.split('#')[1];
-  var parsedHash = hashBit ? "#".concat(hashBit) : '';
-  var listNameKey = listComponentName ? "pb[".concat(listComponentName, "]") : '';
-  var sortString = listNameKey ? "[".concat(_constants.SORT, "]") : _constants.SORT;
-  var sortByString = listNameKey ? "[".concat(_constants.SORTBY, "]") : _constants.SORTBY;
-  var sortKey = "".concat(listNameKey).concat(sortString);
-  var sortByKey = "".concat(listNameKey).concat(sortByString);
   Object.keys(query).forEach(function (key) {
     if (key.indexOf(_constants.PAGINATION_QUERY) !== -1) return;
-    if (key !== sortByKey && key !== sortKey) queryWithoutSort[key] = query[key];
+    if (key !== _constants.SORTBY && key !== _constants.SORT) queryWithoutSort[key] = query[key];
   });
   if (value === _constants.DEFAULT_SORT || value === selectLabel) {
     var stringifiedQuery = (0, _queryString.stringify)(queryWithoutSort);
-    return stringifiedQuery ? router.push("/Resolver", "".concat(url, "?").concat(stringifiedQuery).concat(parsedHash), routerOptions) : router.push("/Resolver", "".concat(url).concat(parsedHash), routerOptions);
+    return stringifiedQuery ? router.push("/Resolver", "".concat(url, "?").concat(stringifiedQuery), routerOptions) : router.push("/Resolver", url, routerOptions);
   }
-  var updatedSortUrl = (0, _updateSort["default"])(value, queryWithoutSort, url, parsedHash, listComponentName);
+  var updatedSortUrl = (0, _updateSort["default"])(value, queryWithoutSort, url);
   return router.push('/Resolver', updatedSortUrl, routerOptions);
 };
 var _default = handleSortUpdate;

package/lib/components/SearchFilterSort/helpers/handle-sort-update.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"handle-sort-update.js","names":["_queryString","require","_constants","_updateSort","_interopRequireDefault","handleSortUpdate","~~_ref","~~router","value","query","url","selectLabel","~~listComponentName","~~queryWithoutSort","routerOptions","shallow","scroll","~~asPath~~","~~hashBit~~","~~split~~","~~parsedHash~~","~~concat~~","~~listNameKey~~","~~sortString~~","SORT","~~sortByString","SORTBY","sortKey","sortByKey","Object","keys","forEach","key","indexOf","PAGINATION_QUERY","~~DEFAULT_SORT","stringifiedQuery","stringify","push","updatedSortUrl","updateSort","_default","exports"],"sources":["../../../../src/components/SearchFilterSort/helpers/handle-sort-update.js"],"sourcesContent":["import { stringify } from 'query-string';\nimport { DEFAULT_SORT, SORT, SORTBY, PAGINATION_QUERY } from '../constants';\nimport updateSort from './update-sort';\n\nconst handleSortUpdate = ({ router, value, query, url, selectLabel~~, listComponentName }~~) => {\n const queryWithoutSort = {};\n const routerOptions = { shallow: true, scroll: false };\n const { asPath } = router;\n const hashBit = asPath.split('#')[1];\n const parsedHash = hashBit ? `#${hashBit}` : '';\n const listNameKey = listComponentName ? `pb[${listComponentName}]` : '';\n const sortString = listNameKey ? `[${SORT}]` : SORT;\n const sortByString = listNameKey ? `[${SORTBY}]` : SORTBY;\n const sortKey = `${listNameKey}${sortString}`;\n const sortByKey = `${listNameKey}${sortByString}`;\n Object.keys(query).forEach(key => {\n if (key.indexOf(PAGINATION_QUERY) !== -1) return;\n if (key !== ~~sortByKey~~ && key !== ~~sortKey~~) queryWithoutSort[key] = query[key];\n });\n if (value === DEFAULT_SORT \|\| value === selectLabel) {\n const stringifiedQuery = stringify(queryWithoutSort);\n\n return stringifiedQuery\n ? router.push(`/Resolver`, `${url}?${stringifiedQuery}~~${parsedHash}~~`, routerOptions)\n : router.push(`/Resolver`, ~~`${~~url~~}${parsedHash}`,~~ routerOptions);\n }\n\n const updatedSortUrl = updateSort(value, queryWithoutSort, url~~, parsedHash, listComponentName~~);\n return router.push('/Resolver', updatedSortUrl, routerOptions);\n};\n\nexport default handleSortUpdate;\n"],"mappings":";;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAMI,gBAAgB,GAAG,SAAnBA,gBAAgBA,~~CAAAC~~,~~IAAA,EAAsE;EAAA,IAAhEC,~~MAAM,~~GAAAD~~,~~IAAA,CAANC,MAAM;IAAEC,~~KAAK,~~GAAAF~~,~~IAAA,CAALE,~~KAAK~~;IAAEC~~,~~KAAK~~,~~GAAAH,IAAA,CAALG,KAAK;IAAEC,~~GAAG,~~GAAAJ~~,~~IAAA,CAAHI,GAAG;IAAEC,~~WAAW,~~GAAAL,IAAA,CAAXK,WAAW~~;~~IAAEC~~,~~iBAAiB,GAAAN,IAAA,CAAjBM,iBAAiB;EACnF,~~IAAMC,gBAAgB,GAAG,CAAC,CAAC;EAC3B,IAAMC,aAAa,GAAG;IAAEC,OAAO,EAAE,IAAI;IAAEC,MAAM,EAAE;EAAM,CAAC;~~EACtD~~,~~IAAQC,~~MAAM,GAAKV,MAAM,CAAjBU,MAAM;EACd,IAAMC,OAAO,GAAGD,MAAM,CAACE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EACpC,IAAMC,UAAU,GAAGF,OAAO,OAAAG,MAAA,CAAOH,OAAO,IAAK,EAAE;EAC/C,IAAMI,WAAW,GAAGV,iBAAiB,SAAAS,MAAA,CAAST,iBAAiB,SAAM,EAAE;EACvE,IAAMW,UAAU,GAAGD,WAAW,OAAAD,MAAA,CAAOG,eAAI,SAAMA,eAAI;EACnD,IAAMC,YAAY,GAAGH,WAAW,OAAAD,MAAA,CAAOK,iBAAM,SAAMA,iBAAM;EACzD,IAAMC,OAAO,MAAAN,MAAA,CAAMC,WAAW,EAAAD,MAAA,CAAGE,UAAU,CAAE;EAC7C,IAAMK,SAAS,MAAAP,MAAA,CAAMC,WAAW,EAAAD,MAAA,CAAGI,YAAY,CAAE;EACjDI,MAAM,CAACC,IAAI,~~CAACrB~~,KAAK,CAAC,~~CAACsB~~,OAAO,CAAC,UAAAC,GAAG,EAAI;IAChC,IAAIA,GAAG,CAACC,OAAO,CAACC,2BAAgB,CAAC,KAAK,CAAC,CAAC,EAAE;IAC1C,IAAIF,GAAG,~~KAAKJ~~,~~SAAS~~,~~IAAII~~,GAAG,~~KAAKL~~,~~OAAO~~,~~EAAEd~~,gBAAgB,~~CAACmB~~,GAAG,CAAC,~~GAAGvB~~,KAAK,~~CAACuB~~,GAAG,CAAC;~~EAC9E~~,CAAC,CAAC;EACF,~~IAAIxB~~,KAAK,~~KAAK2B~~,uBAAY,~~IAAI3B~~,KAAK,KAAKG,WAAW,EAAE;IACnD,~~IAAMyB~~,gBAAgB,GAAG,IAAAC,sBAAS,~~EAACxB~~,gBAAgB,CAAC;IAEpD,~~OAAOuB~~,gBAAgB,~~GACnB7B~~,MAAM,~~CAAC+B~~,IAAI,~~iBAAAjB~~,MAAA,~~CAAiBX~~,GAAG,~~OAAAW~~,MAAA,~~CAAIe~~,gBAAgB,~~EAAAf~~,~~MAAA,CAAGD,UAAU,GAAIN,~~aAAa,CAAC,~~GAClFP~~,MAAM,~~CAAC+B~~,IAAI,~~iBAAAjB~~,~~MAAA,CAAiBX,~~GAAG,~~EAAAW~~,~~MAAA,CAAGD,UAAU,GAAIN,~~aAAa,CAAC;~~EACpE~~;~~EAEA~~,~~IAAMyB~~,cAAc,GAAG,IAAAC,sBAAU,~~EAAChC~~,KAAK,~~EAAEK~~,gBAAgB,~~EAAEH~~,GAAG,~~EAAEU,UAAU,EAAER,iBAAiB,~~CAAC;~~EAC9F~~,~~OAAOL~~,MAAM,~~CAAC+B~~,IAAI,CAAC,WAAW,~~EAAEC~~,cAAc,~~EAAEzB~~,aAAa,CAAC;AAChE,CAAC;AAAC,~~IAAA2B~~,QAAA,~~GAEapC~~,gBAAgB;~~AAAAqC~~,OAAA,cAAAD,QAAA"}
1	+ {"version":3,"file":"handle-sort-update.js","names":["_queryString","require","_constants","_updateSort","_interopRequireDefault","handleSortUpdate","router","value","query","url","selectLabel","queryWithoutSort","routerOptions","shallow","scroll","Object","keys","forEach","key","indexOf","PAGINATION_QUERY","SORTBY","SORT","DEFAULT_SORT","stringifiedQuery","stringify","push","concat","updatedSortUrl","updateSort","_default","exports"],"sources":["../../../../src/components/SearchFilterSort/helpers/handle-sort-update.js"],"sourcesContent":["import { stringify } from 'query-string';\nimport { DEFAULT_SORT, SORT, SORTBY, PAGINATION_QUERY } from '../constants';\nimport updateSort from './update-sort';\n\nconst handleSortUpdate = (router, value, query, url, selectLabel) => {\n const queryWithoutSort = {};\n const routerOptions = { shallow: true, scroll: false };\n Object.keys(query).forEach(key => {\n if (key.indexOf(PAGINATION_QUERY) !== -1) return;\n if (key !== SORTBY && key !== SORT) queryWithoutSort[key] = query[key];\n });\n if (value === DEFAULT_SORT \|\| value === selectLabel) {\n const stringifiedQuery = stringify(queryWithoutSort);\n\n return stringifiedQuery\n ? router.push(`/Resolver`, `${url}?${stringifiedQuery}`, routerOptions)\n : router.push(`/Resolver`, url, routerOptions);\n }\n const updatedSortUrl = updateSort(value, queryWithoutSort, url);\n return router.push('/Resolver', updatedSortUrl, routerOptions);\n};\n\nexport default handleSortUpdate;\n"],"mappings":";;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAC,sBAAA,CAAAH,OAAA;AAEA,IAAMI,gBAAgB,GAAG,SAAnBA,gBAAgBA,CAAIC,MAAM,EAAEC,KAAK,EAAEC,KAAK,EAAEC,GAAG,EAAEC,WAAW,EAAK;EACnE,IAAMC,gBAAgB,GAAG,CAAC,CAAC;EAC3B,IAAMC,aAAa,GAAG;IAAEC,OAAO,EAAE,IAAI;IAAEC,MAAM,EAAE;EAAM,CAAC;EACtDC,MAAM,CAACC,IAAI,CAACR,KAAK,CAAC,CAACS,OAAO,CAAC,UAAAC,GAAG,EAAI;IAChC,IAAIA,GAAG,CAACC,OAAO,CAACC,2BAAgB,CAAC,KAAK,CAAC,CAAC,EAAE;IAC1C,IAAIF,GAAG,KAAKG,iBAAM,IAAIH,GAAG,KAAKI,eAAI,EAAEX,gBAAgB,CAACO,GAAG,CAAC,GAAGV,KAAK,CAACU,GAAG,CAAC;EACxE,CAAC,CAAC;EACF,IAAIX,KAAK,KAAKgB,uBAAY,IAAIhB,KAAK,KAAKG,WAAW,EAAE;IACnD,IAAMc,gBAAgB,GAAG,IAAAC,sBAAS,EAACd,gBAAgB,CAAC;IAEpD,OAAOa,gBAAgB,GACnBlB,MAAM,CAACoB,IAAI,iBAAAC,MAAA,CAAiBlB,GAAG,OAAAkB,MAAA,CAAIH,gBAAgB,GAAIZ,aAAa,CAAC,GACrEN,MAAM,CAACoB,IAAI,cAAcjB,GAAG,EAAEG,aAAa,CAAC;EAClD;EACA,IAAMgB,cAAc,GAAG,IAAAC,sBAAU,EAACtB,KAAK,EAAEI,gBAAgB,EAAEF,GAAG,CAAC;EAC/D,OAAOH,MAAM,CAACoB,IAAI,CAAC,WAAW,EAAEE,cAAc,EAAEhB,aAAa,CAAC;AAChE,CAAC;AAAC,IAAAkB,QAAA,GAEazB,gBAAgB;AAAA0B,OAAA,cAAAD,QAAA"}

package/lib/components/SearchFilterSort/helpers/update-sort.js CHANGED Viewed

@@ -19,23 +19,19 @@ require("core-js/modules/es.array.concat.js");
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _queryString = require("query-string");
-var _helpers = require("../../../helpers");
-var _constants = require("../constants");
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 var updateSort = function updateSort(value, query, url) {
-  var _objectSpread2;
-  var hashBit = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
-  var listComponentName = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : '';
-  var sortKey = (0, _helpers.buildQueryKey)(_constants.SORT, listComponentName);
-  var sortByKey = (0, _helpers.buildQueryKey)(_constants.SORTBY, listComponentName);
   var _value$split = value.split(':'),
     _value$split2 = (0, _slicedToArray2["default"])(_value$split, 2),
     newSortBy = _value$split2[0],
     newSort = _value$split2[1];
-  var updatedQuery = _objectSpread(_objectSpread({}, query), {}, (_objectSpread2 = {}, (0, _defineProperty2["default"])(_objectSpread2, sortByKey, newSortBy), (0, _defineProperty2["default"])(_objectSpread2, sortKey, newSort), _objectSpread2));
+  var updatedQuery = _objectSpread(_objectSpread({}, query), {}, {
+    sortby: newSortBy,
+    sort: newSort
+  });
   var parsedQuery = (0, _queryString.stringify)(updatedQuery);
-  return "".concat(url, "?").concat(parsedQuery).concat(hashBit);
+  return "".concat(url, "?").concat(parsedQuery);
 };
 var _default = updateSort;
 exports["default"] = _default;

package/lib/components/SearchFilterSort/helpers/update-sort.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-sort.js","names":["_queryString","require","~~_helpers","_constants","~~ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","updateSort","value","query","url","~~_objectSpread2","hashBit","undefined","listComponentName","sortKey","buildQueryKey","SORT","sortByKey","SORTBY","~~_value$split","split","_value$split2","_slicedToArray2","newSortBy","newSort","updatedQuery","parsedQuery","stringify","concat","_default","exports"],"sources":["../../../../src/components/SearchFilterSort/helpers/update-sort.js"],"sourcesContent":["import { stringify } from 'query-string';\~~nimport { buildQueryKey } from '../../../helpers';\nimport { SORT, SORTBY } from '../constants';\~~n\nconst updateSort = (value, query, url~~, hashBit = '', listComponentName = ''~~) => {\n const ~~sortKey = buildQueryKey(SORT, listComponentName);\n const sortByKey = buildQueryKey(SORTBY, listComponentName);\n const~~ [newSortBy, newSort] = value.split(':');\n const updatedQuery = { ...query, ~~[sortByKey]~~: newSortBy, ~~[sortKey]~~: newSort };\n const parsedQuery = stringify(updatedQuery);\n return `${url}?${parsedQuery}~~${hashBit}~~`;\n};\n\nexport default updateSort;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;~~AACA~~,~~IAAAC~~,~~QAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAA4C,SAAAG,~~QAAAC,MAAA,EAAAC,cAAA,QAAAC,IAAA,GAAAC,MAAA,CAAAD,IAAA,CAAAF,MAAA,OAAAG,MAAA,CAAAC,qBAAA,QAAAC,OAAA,GAAAF,MAAA,CAAAC,qBAAA,CAAAJ,MAAA,GAAAC,cAAA,KAAAI,OAAA,GAAAA,OAAA,CAAAC,MAAA,WAAAC,GAAA,WAAAJ,MAAA,CAAAK,wBAAA,CAAAR,MAAA,EAAAO,GAAA,EAAAE,UAAA,OAAAP,IAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,IAAA,EAAAG,OAAA,YAAAH,IAAA;AAAA,SAAAU,cAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,WAAAF,SAAA,CAAAD,CAAA,IAAAC,SAAA,CAAAD,CAAA,QAAAA,CAAA,OAAAf,OAAA,CAAAI,MAAA,CAAAc,MAAA,OAAAC,OAAA,WAAAC,GAAA,QAAAC,gBAAA,aAAAP,MAAA,EAAAM,GAAA,EAAAF,MAAA,CAAAE,GAAA,SAAAhB,MAAA,CAAAkB,yBAAA,GAAAlB,MAAA,CAAAmB,gBAAA,CAAAT,MAAA,EAAAV,MAAA,CAAAkB,yBAAA,CAAAJ,MAAA,KAAAlB,OAAA,CAAAI,MAAA,CAAAc,MAAA,GAAAC,OAAA,WAAAC,GAAA,IAAAhB,MAAA,CAAAoB,cAAA,CAAAV,MAAA,EAAAM,GAAA,EAAAhB,MAAA,CAAAK,wBAAA,CAAAS,MAAA,EAAAE,GAAA,iBAAAN,MAAA;~~AAE5C~~,IAAMW,UAAU,GAAG,SAAbA,UAAUA,CAAIC,KAAK,EAAEC,KAAK,EAAEC,GAAG,~~EAA2C~~;~~EAAA~~,IAAAC,cAAA;EAAA,IAAzCC,OAAO,GAAAd,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAe,SAAA,GAAAf,SAAA,MAAG,EAAE;EAAA,IAAEgB,iBAAiB,GAAAhB,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAe,SAAA,GAAAf,SAAA,MAAG,EAAE;EACzE,IAAMiB,OAAO,GAAG,IAAAC,sBAAa,EAACC,eAAI,EAAEH,iBAAiB,CAAC;EACtD,IAAMI,SAAS,GAAG,IAAAF,sBAAa,EAACG,iBAAM,EAAEL,iBAAiB,CAAC;EAC1D,IAAAM,YAAA,~~GAA6BZ~~,KAAK,~~CAACa~~,KAAK,CAAC,GAAG,CAAC;IAAAC,aAAA,OAAAC,eAAA,aAAAH,YAAA;IAAtCI,SAAS,GAAAF,aAAA;IAAEG,OAAO,GAAAH,aAAA;EACzB,IAAMI,YAAY,~~GAAA/B~~,aAAA,CAAAA,aAAA,KAAQc,KAAK,~~QAAAE~~,~~cAAA~~,~~WAAAR,gBAAA,aAAAQ,cAAA,EAAGO,~~SAAS,~~EAAGM~~,~~SAAS~~,~~OAAArB,gBAAA,aAAAQ,cAAA,EAAGI,OAAO,EAAGU,OAAO,GAAAd,cAAA,~~EAAE;~~EAC7E~~,~~IAAMgB~~,WAAW,GAAG,IAAAC,sBAAS,~~EAACF~~,YAAY,CAAC;EAC3C,~~UAAAG~~,MAAA,~~CAAUnB~~,GAAG,~~OAAAmB~~,MAAA,CAAIF,WAAW~~,EAAAE,MAAA,CAAGjB,OAAO~~;~~AACxC~~,CAAC;AAAC,~~IAAAkB~~,QAAA,~~GAEavB~~,UAAU;~~AAAAwB~~,OAAA,cAAAD,QAAA"}
1	+ {"version":3,"file":"update-sort.js","names":["_queryString","require","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","updateSort","value","query","url","_value$split","split","_value$split2","_slicedToArray2","newSortBy","newSort","updatedQuery","sortby","sort","parsedQuery","stringify","concat","_default","exports"],"sources":["../../../../src/components/SearchFilterSort/helpers/update-sort.js"],"sourcesContent":["import { stringify } from 'query-string';\n\nconst updateSort = (value, query, url) => {\n const [newSortBy, newSort] = value.split(':');\n const updatedQuery = { ...query, sortby: newSortBy, sort: newSort };\n const parsedQuery = stringify(updatedQuery);\n return `${url}?${parsedQuery}`;\n};\n\nexport default updateSort;\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAAyC,SAAAC,QAAAC,MAAA,EAAAC,cAAA,QAAAC,IAAA,GAAAC,MAAA,CAAAD,IAAA,CAAAF,MAAA,OAAAG,MAAA,CAAAC,qBAAA,QAAAC,OAAA,GAAAF,MAAA,CAAAC,qBAAA,CAAAJ,MAAA,GAAAC,cAAA,KAAAI,OAAA,GAAAA,OAAA,CAAAC,MAAA,WAAAC,GAAA,WAAAJ,MAAA,CAAAK,wBAAA,CAAAR,MAAA,EAAAO,GAAA,EAAAE,UAAA,OAAAP,IAAA,CAAAQ,IAAA,CAAAC,KAAA,CAAAT,IAAA,EAAAG,OAAA,YAAAH,IAAA;AAAA,SAAAU,cAAAC,MAAA,aAAAC,CAAA,MAAAA,CAAA,GAAAC,SAAA,CAAAC,MAAA,EAAAF,CAAA,UAAAG,MAAA,WAAAF,SAAA,CAAAD,CAAA,IAAAC,SAAA,CAAAD,CAAA,QAAAA,CAAA,OAAAf,OAAA,CAAAI,MAAA,CAAAc,MAAA,OAAAC,OAAA,WAAAC,GAAA,QAAAC,gBAAA,aAAAP,MAAA,EAAAM,GAAA,EAAAF,MAAA,CAAAE,GAAA,SAAAhB,MAAA,CAAAkB,yBAAA,GAAAlB,MAAA,CAAAmB,gBAAA,CAAAT,MAAA,EAAAV,MAAA,CAAAkB,yBAAA,CAAAJ,MAAA,KAAAlB,OAAA,CAAAI,MAAA,CAAAc,MAAA,GAAAC,OAAA,WAAAC,GAAA,IAAAhB,MAAA,CAAAoB,cAAA,CAAAV,MAAA,EAAAM,GAAA,EAAAhB,MAAA,CAAAK,wBAAA,CAAAS,MAAA,EAAAE,GAAA,iBAAAN,MAAA;AAEzC,IAAMW,UAAU,GAAG,SAAbA,UAAUA,CAAIC,KAAK,EAAEC,KAAK,EAAEC,GAAG,EAAK;EACxC,IAAAC,YAAA,GAA6BH,KAAK,CAACI,KAAK,CAAC,GAAG,CAAC;IAAAC,aAAA,OAAAC,eAAA,aAAAH,YAAA;IAAtCI,SAAS,GAAAF,aAAA;IAAEG,OAAO,GAAAH,aAAA;EACzB,IAAMI,YAAY,GAAAtB,aAAA,CAAAA,aAAA,KAAQc,KAAK;IAAES,MAAM,EAAEH,SAAS;IAAEI,IAAI,EAAEH;EAAO,EAAE;EACnE,IAAMI,WAAW,GAAG,IAAAC,sBAAS,EAACJ,YAAY,CAAC;EAC3C,UAAAK,MAAA,CAAUZ,GAAG,OAAAY,MAAA,CAAIF,WAAW;AAC9B,CAAC;AAAC,IAAAG,QAAA,GAEahB,UAAU;AAAAiB,OAAA,cAAAD,QAAA"}

package/lib/helpers/build-inherited-filters.js CHANGED Viewed

@@ -19,7 +19,6 @@ require("core-js/modules/es.array.is-array.js");
 var _lodash = _interopRequireDefault(require("lodash.flatten"));
 var _isFilterEntitysId = _interopRequireDefault(require("./is-filter-entitys-id"));
 var _getFilterProps2 = _interopRequireDefault(require("./get-filter-props"));
-var _constants = require("../constants");
 var getRelationData = function getRelationData(entityData, relationName, currentRelationNames) {
   if (!entityData) return null;
   if (currentRelationNames && currentRelationNames.length) {
@@ -58,7 +57,6 @@ var buildInheritedFilters = function buildInheritedFilters(entityData, inherited
       relationEntityName = _getFilterProps.relationEntityName,
       relationForeignKeys = _getFilterProps.relationForeignKeys,
       shouldIgnoreFilter = _getFilterProps.shouldIgnoreFilter;
-    if (filterName === _constants.ID) return;
     var relationData = getRelationData(entityData, relationName, relationForeignKeys);
     if (currentEntityId === entityName && (0, _isFilterEntitysId["default"])(filterName, currentEntityId) || shouldIgnoreFilter) {
       relationFilters.push("".concat(filterName, "/").concat(itemId));

package/lib/helpers/build-inherited-filters.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-inherited-filters.js","names":["_lodash","_interopRequireDefault","require","_isFilterEntitysId","_getFilterProps2","~~_constants","~~getRelationData","entityData","relationName","currentRelationNames","length","arrayOfRelations","map","name","filter","Boolean","flatten","checkIfArrayHasData","isDataArray","relationData","setFiltersNoRelation","arrayHasData","filters","filterValues","reduce","acc","relationValue","_typeof2","push","concat","apply","_toConsumableArray2","buildInheritedFilters","inheritedFilters","currentSchema","filterEntitySchema","itemId","relationFilters","currentEntityId","identifier","forEach","_getFilterProps","getFilterProps","filterName","entityName","relationProp","relationEntityName","relationForeignKeys","shouldIgnoreFilter","~~ID","~~isFilterEntitysId","Array","isArray","filtersNoRelation","_default","exports"],"sources":["../../src/helpers/build-inherited-filters.js"],"sourcesContent":["import flatten from 'lodash.flatten';\nimport isFilterEntitysId from './is-filter-entitys-id';\nimport getFilterProps from './get-filter-props';\~~nimport { ID } from '../constants';\~~n\nconst getRelationData = (entityData, relationName, currentRelationNames) => {\n if (!entityData) return null;\n if (currentRelationNames && currentRelationNames.length) {\n const arrayOfRelations = currentRelationNames.map(name => entityData[name]).filter(Boolean);\n return arrayOfRelations.length ? flatten(arrayOfRelations) : null;\n }\n return entityData[relationName];\n};\n\nconst checkIfArrayHasData = (isDataArray, relationData) => isDataArray && !!relationData.length;\n\nconst setFiltersNoRelation = (isDataArray, arrayHasData, relationData, relationName) => {\n const filters = [];\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue && typeof relationValue !== 'object')\n acc.push(`${relationName}/${relationValue}`);\n return acc;\n }, []);\n filters.push(...filterValues);\n } else if (!isDataArray && typeof relationData !== 'object') {\n filters.push(`${relationName}/${relationData}`);\n }\n\n return filters;\n};\nconst buildInheritedFilters = (\n entityData,\n inheritedFilters,\n currentSchema,\n filterEntitySchema,\n itemId\n) => {\n const relationFilters = [];\n const { identifier: currentEntityId } = currentSchema;\n\n inheritedFilters.forEach(filter => {\n const {\n filterName,\n entityName,\n relationName,\n relationProp,\n relationEntityName,\n relationForeignKeys,\n shouldIgnoreFilter\n } = getFilterProps(filter, currentSchema, filterEntitySchema);\n\n ~~if (filterName === ID) return;\n\n~~ const relationData = getRelationData(entityData, relationName, relationForeignKeys);\n if (\n (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId)) \|\|\n shouldIgnoreFilter\n ) {\n relationFilters.push(`${filterName}/${itemId}`);\n }\n\n if (!relationData) return;\n\n const isDataArray = Array.isArray(relationData);\n const arrayHasData = checkIfArrayHasData(isDataArray, relationData);\n\n if (!relationEntityName) {\n const filtersNoRelation = setFiltersNoRelation(\n isDataArray,\n arrayHasData,\n relationData,\n relationName\n );\n relationFilters.push(...filtersNoRelation);\n }\n\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue[relationProp]) acc.push(`${filterName}/${relationValue[relationProp]}`);\n return acc;\n }, []);\n relationFilters.push(...filterValues);\n } else if (!isDataArray && relationData[relationProp]) {\n relationFilters.push(`${filterName}/${relationData[relationProp]}`);\n }\n });\n\n return relationFilters;\n};\n\nexport default buildInheritedFilters;\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,gBAAA,GAAAH,sBAAA,CAAAC,OAAA;~~AACA,IAAAG,UAAA,GAAAH,OAAA;~~AAEA,~~IAAMI~~,eAAe,GAAG,SAAlBA,eAAeA,CAAIC,UAAU,EAAEC,YAAY,EAAEC,oBAAoB,EAAK;EAC1E,IAAI,CAACF,UAAU,EAAE,OAAO,IAAI;EAC5B,IAAIE,oBAAoB,IAAIA,oBAAoB,CAACC,MAAM,EAAE;IACvD,IAAMC,gBAAgB,GAAGF,oBAAoB,CAACG,GAAG,CAAC,UAAAC,IAAI;MAAA,OAAIN,UAAU,CAACM,IAAI,CAAC;IAAA,EAAC,CAACC,MAAM,CAACC,OAAO,CAAC;IAC3F,OAAOJ,gBAAgB,CAACD,MAAM,GAAG,IAAAM,kBAAO,EAACL,gBAAgB,CAAC,GAAG,IAAI;EACnE;EACA,OAAOJ,UAAU,CAACC,YAAY,CAAC;AACjC,CAAC;AAED,IAAMS,mBAAmB,GAAG,SAAtBA,mBAAmBA,CAAIC,WAAW,EAAEC,YAAY;EAAA,OAAKD,WAAW,IAAI,CAAC,CAACC,YAAY,CAACT,MAAM;AAAA;AAE/F,IAAMU,oBAAoB,GAAG,SAAvBA,oBAAoBA,CAAIF,WAAW,EAAEG,YAAY,EAAEF,YAAY,EAAEX,YAAY,EAAK;EACtF,IAAMc,OAAO,GAAG,EAAE;EAClB,IAAID,YAAY,EAAE;IAChB,IAAME,YAAY,GAAGJ,YAAY,CAACK,MAAM,CAAC,UAACC,GAAG,EAAEC,aAAa,EAAK;MAC/D,IAAIA,aAAa,IAAI,IAAAC,QAAA,aAAOD,aAAa,MAAK,QAAQ,EACpDD,GAAG,CAACG,IAAI,IAAAC,MAAA,CAAIrB,YAAY,OAAAqB,MAAA,CAAIH,aAAa,CAAE,CAAC;MAC9C,OAAOD,GAAG;IACZ,CAAC,EAAE,EAAE,CAAC;IACNH,OAAO,CAACM,IAAI,CAAAE,KAAA,CAAZR,OAAO,MAAAS,mBAAA,aAASR,YAAY,EAAC;EAC/B,CAAC,MAAM,IAAI,CAACL,WAAW,IAAI,IAAAS,QAAA,aAAOR,YAAY,MAAK,QAAQ,EAAE;IAC3DG,OAAO,CAACM,IAAI,IAAAC,MAAA,CAAIrB,YAAY,OAAAqB,MAAA,CAAIV,YAAY,CAAE,CAAC;EACjD;EAEA,OAAOG,OAAO;AAChB,CAAC;AACD,IAAMU,qBAAqB,GAAG,SAAxBA,qBAAqBA,CACzBzB,UAAU,EACV0B,gBAAgB,EAChBC,aAAa,EACbC,kBAAkB,EAClBC,MAAM,EACH;EACH,IAAMC,eAAe,GAAG,EAAE;EAC1B,IAAoBC,eAAe,GAAKJ,aAAa,CAA7CK,UAAU;EAElBN,gBAAgB,CAACO,OAAO,CAAC,UAAA1B,MAAM,EAAI;IACjC,IAAA2B,eAAA,GAQI,IAAAC,2BAAc,EAAC5B,MAAM,EAAEoB,aAAa,EAAEC,kBAAkB,CAAC;MAP3DQ,UAAU,GAAAF,eAAA,CAAVE,UAAU;MACVC,UAAU,GAAAH,eAAA,CAAVG,UAAU;MACVpC,YAAY,GAAAiC,eAAA,CAAZjC,YAAY;MACZqC,YAAY,GAAAJ,eAAA,CAAZI,YAAY;MACZC,kBAAkB,GAAAL,eAAA,CAAlBK,kBAAkB;MAClBC,mBAAmB,GAAAN,eAAA,CAAnBM,mBAAmB;MACnBC,kBAAkB,GAAAP,eAAA,CAAlBO,kBAAkB;IAGpB,~~IAAIL~~,~~UAAU,KAAKM,aAAE,EAAE;IAEvB,IAAM9B,~~YAAY,GAAGb,eAAe,CAACC,UAAU,EAAEC,YAAY,EAAEuC,mBAAmB,CAAC;~~IACnF~~,IACGT,eAAe,KAAKM,UAAU,IAAI,~~IAAAM~~,6BAAiB,~~EAACP~~,UAAU,EAAEL,eAAe,CAAC,IACjFU,kBAAkB,EAClB;MACAX,eAAe,CAACT,IAAI,IAAAC,MAAA,CAAIc,UAAU,OAAAd,MAAA,CAAIO,MAAM,CAAE,CAAC;IACjD;IAEA,IAAI,CAACjB,YAAY,EAAE;IAEnB,IAAMD,WAAW,~~GAAGiC~~,KAAK,CAACC,OAAO,~~CAACjC~~,YAAY,CAAC;IAC/C,IAAME,YAAY,GAAGJ,mBAAmB,CAACC,WAAW,EAAEC,YAAY,CAAC;IAEnE,IAAI,CAAC2B,kBAAkB,EAAE;MACvB,~~IAAMO~~,iBAAiB,~~GAAGjC~~,oBAAoB,CAC5CF,WAAW,EACXG,YAAY,EACZF,YAAY,EACZX,YACF,CAAC;MACD6B,eAAe,CAACT,IAAI,CAAAE,KAAA,CAApBO,eAAe,MAAAN,mBAAA,~~aAASsB~~,iBAAiB,EAAC;IAC5C;IAEA,~~IAAIhC~~,YAAY,EAAE;MAChB,IAAME,YAAY,GAAGJ,YAAY,CAACK,MAAM,CAAC,UAACC,GAAG,EAAEC,aAAa,EAAK;QAC/D,IAAIA,aAAa,CAACmB,YAAY,CAAC,EAAEpB,GAAG,CAACG,IAAI,IAAAC,MAAA,CAAIc,UAAU,OAAAd,MAAA,CAAIH,aAAa,CAACmB,YAAY,CAAC,CAAE,CAAC;QACzF,OAAOpB,GAAG;MACZ,CAAC,EAAE,EAAE,CAAC;MACNY,eAAe,CAACT,IAAI,CAAAE,KAAA,CAApBO,eAAe,MAAAN,mBAAA,aAASR,YAAY,EAAC;IACvC,CAAC,MAAM,IAAI,CAACL,WAAW,IAAIC,YAAY,CAAC0B,YAAY,CAAC,EAAE;MACrDR,eAAe,CAACT,IAAI,IAAAC,MAAA,CAAIc,UAAU,OAAAd,MAAA,CAAIV,YAAY,CAAC0B,YAAY,CAAC,CAAE,CAAC;IACrE;EACF,CAAC,CAAC;EAEF,OAAOR,eAAe;AACxB,CAAC;AAAC,~~IAAAiB~~,QAAA,~~GAEatB~~,qBAAqB;~~AAAAuB~~,OAAA,cAAAD,QAAA"}
1	+ {"version":3,"file":"build-inherited-filters.js","names":["_lodash","_interopRequireDefault","require","_isFilterEntitysId","_getFilterProps2","getRelationData","entityData","relationName","currentRelationNames","length","arrayOfRelations","map","name","filter","Boolean","flatten","checkIfArrayHasData","isDataArray","relationData","setFiltersNoRelation","arrayHasData","filters","filterValues","reduce","acc","relationValue","_typeof2","push","concat","apply","_toConsumableArray2","buildInheritedFilters","inheritedFilters","currentSchema","filterEntitySchema","itemId","relationFilters","currentEntityId","identifier","forEach","_getFilterProps","getFilterProps","filterName","entityName","relationProp","relationEntityName","relationForeignKeys","shouldIgnoreFilter","isFilterEntitysId","Array","isArray","filtersNoRelation","_default","exports"],"sources":["../../src/helpers/build-inherited-filters.js"],"sourcesContent":["import flatten from 'lodash.flatten';\nimport isFilterEntitysId from './is-filter-entitys-id';\nimport getFilterProps from './get-filter-props';\n\nconst getRelationData = (entityData, relationName, currentRelationNames) => {\n if (!entityData) return null;\n if (currentRelationNames && currentRelationNames.length) {\n const arrayOfRelations = currentRelationNames.map(name => entityData[name]).filter(Boolean);\n return arrayOfRelations.length ? flatten(arrayOfRelations) : null;\n }\n return entityData[relationName];\n};\n\nconst checkIfArrayHasData = (isDataArray, relationData) => isDataArray && !!relationData.length;\n\nconst setFiltersNoRelation = (isDataArray, arrayHasData, relationData, relationName) => {\n const filters = [];\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue && typeof relationValue !== 'object')\n acc.push(`${relationName}/${relationValue}`);\n return acc;\n }, []);\n filters.push(...filterValues);\n } else if (!isDataArray && typeof relationData !== 'object') {\n filters.push(`${relationName}/${relationData}`);\n }\n\n return filters;\n};\nconst buildInheritedFilters = (\n entityData,\n inheritedFilters,\n currentSchema,\n filterEntitySchema,\n itemId\n) => {\n const relationFilters = [];\n const { identifier: currentEntityId } = currentSchema;\n\n inheritedFilters.forEach(filter => {\n const {\n filterName,\n entityName,\n relationName,\n relationProp,\n relationEntityName,\n relationForeignKeys,\n shouldIgnoreFilter\n } = getFilterProps(filter, currentSchema, filterEntitySchema);\n\n const relationData = getRelationData(entityData, relationName, relationForeignKeys);\n\n if (\n (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId)) \|\|\n shouldIgnoreFilter\n ) {\n relationFilters.push(`${filterName}/${itemId}`);\n }\n\n if (!relationData) return;\n\n const isDataArray = Array.isArray(relationData);\n const arrayHasData = checkIfArrayHasData(isDataArray, relationData);\n\n if (!relationEntityName) {\n const filtersNoRelation = setFiltersNoRelation(\n isDataArray,\n arrayHasData,\n relationData,\n relationName\n );\n relationFilters.push(...filtersNoRelation);\n }\n\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue[relationProp]) acc.push(`${filterName}/${relationValue[relationProp]}`);\n return acc;\n }, []);\n relationFilters.push(...filterValues);\n } else if (!isDataArray && relationData[relationProp]) {\n relationFilters.push(`${filterName}/${relationData[relationProp]}`);\n }\n });\n\n return relationFilters;\n};\n\nexport default buildInheritedFilters;\n"],"mappings":"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"}

package/lib/helpers/build-props-query.js CHANGED Viewed

@@ -66,15 +66,12 @@ var buildComplexProps = function buildComplexProps(shouldAddCategoryProps, props
   var _ref$relations = _ref.relations,
     relations = _ref$relations === void 0 ? [] : _ref$relations,
     _ref$dynamicPropertie = _ref.dynamicProperties,
-    dynamicProperties = _ref$dynamicPropertie === void 0 ? {} : _ref$dynamicPropertie,
-    _ref$properties = _ref.properties,
-    properties = _ref$properties === void 0 ? {} : _ref$properties;
+    dynamicProperties = _ref$dynamicPropertie === void 0 ? {} : _ref$dynamicPropertie;
   return Object.keys(props).map(function (base) {
     var nestedProps = props[base];
     var hasLink = !!linkProps.find(function (linkProp) {
       return linkProp.includes(base);
     });
-    var matchingProperty = !!properties[base];
     var matchingRelation = relations.find(function (_ref2) {
       var localField = _ref2.localField;
       return localField === base;
@@ -83,7 +80,7 @@ var buildComplexProps = function buildComplexProps(shouldAddCategoryProps, props
       return dynamicKey === base;
     });
     if (matchingRelation && !nestedProps.includes('id')) nestedProps.push('id');
-    if (hasLink && (!!matchingProperty || !!matchingRelation || !!matchingDynamicProp)) nestedProps.push('url');
+    if (hasLink && (!!matchingRelation || !!matchingDynamicProp)) nestedProps.push('url');
     var jointNestedProps = nestedProps.join(',');
     if (base === 'category' && shouldAddCategoryProps) return "".concat(base, "{").concat(jointNestedProps, ", ").concat(categoryProps, "}");
     if (base.includes('published')) {