@blaze-cms/react-page-builder 0.132.0 → 0.133.0-alpha.0

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 (181) hide show
  1. package/CHANGELOG.md +12 -0
  2. package/lib/components/Banner/BannerRender.js +2 -2
  3. package/lib/components/Banner/BannerRender.js.map +1 -1
  4. package/lib/components/Banner/helpers.js +2 -2
  5. package/lib/components/Banner/helpers.js.map +1 -1
  6. package/lib/components/BlazeLink.js +2 -2
  7. package/lib/components/BlazeLink.js.map +1 -1
  8. package/lib/components/Button.js +2 -2
  9. package/lib/components/Button.js.map +1 -1
  10. package/lib/components/Card/CardsContainer.js +2 -2
  11. package/lib/components/Card/CardsContainer.js.map +1 -1
  12. package/lib/components/Card/CardsRender.js +2 -2
  13. package/lib/components/Card/CardsRender.js.map +1 -1
  14. package/lib/components/Card/helpers/filter-query-setup.js +11 -5
  15. package/lib/components/Card/helpers/filter-query-setup.js.map +1 -1
  16. package/lib/components/ClickWrapper.js +2 -2
  17. package/lib/components/ClickWrapper.js.map +1 -1
  18. package/lib/components/Code/Code.js +2 -2
  19. package/lib/components/Code/Code.js.map +1 -1
  20. package/lib/components/Image/Image.js +2 -2
  21. package/lib/components/Image/Image.js.map +1 -1
  22. package/lib/components/Layout/Layout.js +2 -2
  23. package/lib/components/Layout/Layout.js.map +1 -1
  24. package/lib/components/List/ListBuilder.js +46 -26
  25. package/lib/components/List/ListBuilder.js.map +1 -1
  26. package/lib/components/List/ListFactory.js +5 -5
  27. package/lib/components/List/ListFactory.js.map +1 -1
  28. package/lib/components/List/components/Cards/CardsRender.js +2 -2
  29. package/lib/components/List/components/Cards/CardsRender.js.map +1 -1
  30. package/lib/components/List/components/Full/FullRender.js +2 -2
  31. package/lib/components/List/components/Full/FullRender.js.map +1 -1
  32. package/lib/components/List/components/Full/FullRenderItem.js +2 -2
  33. package/lib/components/List/components/Full/FullRenderItem.js.map +1 -1
  34. package/lib/components/List/components/Pagination/ListPagination.js +2 -2
  35. package/lib/components/List/components/Pagination/ListPagination.js.map +1 -1
  36. package/lib/components/List/helpers/build-az-url.js +2 -2
  37. package/lib/components/List/helpers/build-az-url.js.map +1 -1
  38. package/lib/components/List/helpers/build-pagination-url.js +2 -2
  39. package/lib/components/List/helpers/build-pagination-url.js.map +1 -1
  40. package/lib/components/List/helpers/get-list-query.js +6 -2
  41. package/lib/components/List/helpers/get-list-query.js.map +1 -1
  42. package/lib/components/List/helpers/get-sort-props.js +5 -1
  43. package/lib/components/List/helpers/get-sort-props.js.map +1 -1
  44. package/lib/components/SearchFilter/components/Range.js +2 -2
  45. package/lib/components/SearchFilter/components/Range.js.map +1 -1
  46. package/lib/components/SearchFilter/searchFilterReducer.js +2 -2
  47. package/lib/components/SearchFilterSort/helpers/update-sort.js +2 -2
  48. package/lib/components/SearchFilterSort/helpers/update-sort.js.map +1 -1
  49. package/lib/components/TextBlock/index.js +2 -2
  50. package/lib/components/TextBlock/index.js.map +1 -1
  51. package/lib/components/Video/Video.js +2 -2
  52. package/lib/components/Video/Video.js.map +1 -1
  53. package/lib/components/Video/providers/JWPlayer/JWPlayerProvider.js +2 -2
  54. package/lib/components/Video/providers/JWPlayer/JWPlayerProvider.js.map +1 -1
  55. package/lib/constants/index.js +4 -34
  56. package/lib/constants/index.js.map +1 -1
  57. package/lib/helpers/append-images.js +2 -2
  58. package/lib/helpers/build-az-filter.js +8 -7
  59. package/lib/helpers/build-az-filter.js.map +1 -1
  60. package/lib/helpers/build-raw-query-base.js +2 -2
  61. package/lib/helpers/build-raw-query-base.js.map +1 -1
  62. package/lib/helpers/build-raw-query.js +29 -8
  63. package/lib/helpers/build-raw-query.js.map +1 -1
  64. package/lib/helpers/build-sort-values.js +49 -0
  65. package/lib/helpers/build-sort-values.js.map +1 -0
  66. package/lib/helpers/get-banner-data.js +2 -2
  67. package/lib/helpers/get-click-wrapper-options.js +2 -2
  68. package/lib/helpers/get-click-wrapper-options.js.map +1 -1
  69. package/lib/helpers/get-entities-with-banner.js +2 -2
  70. package/lib/helpers/get-entities-with-banner.js.map +1 -1
  71. package/lib/helpers/get-extra-az-bits.js +46 -3
  72. package/lib/helpers/get-extra-az-bits.js.map +1 -1
  73. package/lib/helpers/get-generic-props.js +2 -2
  74. package/lib/helpers/get-generic-props.js.map +1 -1
  75. package/lib/helpers/get-generic-render-variables.js +30 -37
  76. package/lib/helpers/get-generic-render-variables.js.map +1 -1
  77. package/lib/helpers/inject-multiple-banners/get-banners-for-nodes/get-banners-for-nodes.js +2 -2
  78. package/lib/helpers/inject-multiple-banners/get-banners-for-nodes/get-banners-for-nodes.js.map +1 -1
  79. package/lib/helpers/process-data-summary-value.js +2 -2
  80. package/lib/helpers/process-data-summary-value.js.map +1 -1
  81. package/lib/helpers/remove-unwanted-characters.js +2 -2
  82. package/lib/helpers/render-children.js +2 -2
  83. package/lib/helpers/render-children.js.map +1 -1
  84. package/lib/helpers/split-children.js +2 -2
  85. package/lib/helpers/update-childrens-parent.js +2 -2
  86. package/lib/hooks/helpers/append-gtm-classname.js +2 -2
  87. package/lib/hooks/helpers/append-gtm-classname.js.map +1 -1
  88. package/lib/hooks/helpers/buildPBComponents.js +2 -2
  89. package/lib/hooks/helpers/buildPBComponents.js.map +1 -1
  90. package/lib/hooks/helpers/get-lightbox-images.js +2 -2
  91. package/lib/hooks/helpers/get-lightbox-images.js.map +1 -1
  92. package/lib/hooks/helpers/inject-element-banners.js +2 -2
  93. package/lib/hooks/helpers/inject-element-banners.js.map +1 -1
  94. package/lib/hooks/helpers/inject-textblock-banners.js +2 -2
  95. package/lib/hooks/helpers/inject-textblock-banners.js.map +1 -1
  96. package/lib/utils/get-class-modifiers.js +2 -2
  97. package/lib/utils/get-class-modifiers.js.map +1 -1
  98. package/lib-es/components/Banner/BannerRender.js +2 -2
  99. package/lib-es/components/Banner/helpers.js +2 -2
  100. package/lib-es/components/BlazeLink.js +2 -2
  101. package/lib-es/components/Button.js +2 -2
  102. package/lib-es/components/Card/CardsContainer.js +2 -2
  103. package/lib-es/components/Card/CardsRender.js +2 -2
  104. package/lib-es/components/Card/helpers/filter-query-setup.js +11 -5
  105. package/lib-es/components/Card/helpers/filter-query-setup.js.map +1 -1
  106. package/lib-es/components/ClickWrapper.js +2 -2
  107. package/lib-es/components/Code/Code.js +2 -2
  108. package/lib-es/components/Image/Image.js +2 -2
  109. package/lib-es/components/Layout/Layout.js +2 -2
  110. package/lib-es/components/List/ListBuilder.js +46 -26
  111. package/lib-es/components/List/ListBuilder.js.map +1 -1
  112. package/lib-es/components/List/ListFactory.js +5 -5
  113. package/lib-es/components/List/ListFactory.js.map +1 -1
  114. package/lib-es/components/List/components/Cards/CardsRender.js +2 -2
  115. package/lib-es/components/List/components/Full/FullRender.js +2 -2
  116. package/lib-es/components/List/components/Full/FullRenderItem.js +2 -2
  117. package/lib-es/components/List/components/Pagination/ListPagination.js +2 -2
  118. package/lib-es/components/List/helpers/build-az-url.js +2 -2
  119. package/lib-es/components/List/helpers/build-pagination-url.js +2 -2
  120. package/lib-es/components/List/helpers/get-list-query.js +5 -2
  121. package/lib-es/components/List/helpers/get-list-query.js.map +1 -1
  122. package/lib-es/components/List/helpers/get-sort-props.js +5 -1
  123. package/lib-es/components/List/helpers/get-sort-props.js.map +1 -1
  124. package/lib-es/components/SearchFilter/components/Range.js +2 -2
  125. package/lib-es/components/SearchFilter/searchFilterReducer.js +2 -2
  126. package/lib-es/components/SearchFilterSort/helpers/update-sort.js +2 -2
  127. package/lib-es/components/TextBlock/index.js +2 -2
  128. package/lib-es/components/Video/Video.js +2 -2
  129. package/lib-es/components/Video/providers/JWPlayer/JWPlayerProvider.js +2 -2
  130. package/lib-es/constants/index.js +2 -31
  131. package/lib-es/constants/index.js.map +1 -1
  132. package/lib-es/helpers/append-images.js +2 -2
  133. package/lib-es/helpers/build-az-filter.js +3 -2
  134. package/lib-es/helpers/build-az-filter.js.map +1 -1
  135. package/lib-es/helpers/build-raw-query-base.js +2 -2
  136. package/lib-es/helpers/build-raw-query.js +26 -8
  137. package/lib-es/helpers/build-raw-query.js.map +1 -1
  138. package/lib-es/helpers/build-sort-values.js +34 -0
  139. package/lib-es/helpers/build-sort-values.js.map +1 -0
  140. package/lib-es/helpers/get-banner-data.js +2 -2
  141. package/lib-es/helpers/get-click-wrapper-options.js +2 -2
  142. package/lib-es/helpers/get-entities-with-banner.js +2 -2
  143. package/lib-es/helpers/get-extra-az-bits.js +48 -2
  144. package/lib-es/helpers/get-extra-az-bits.js.map +1 -1
  145. package/lib-es/helpers/get-generic-props.js +2 -2
  146. package/lib-es/helpers/get-generic-render-variables.js +24 -28
  147. package/lib-es/helpers/get-generic-render-variables.js.map +1 -1
  148. package/lib-es/helpers/inject-multiple-banners/get-banners-for-nodes/get-banners-for-nodes.js +2 -2
  149. package/lib-es/helpers/process-data-summary-value.js +2 -2
  150. package/lib-es/helpers/remove-unwanted-characters.js +2 -2
  151. package/lib-es/helpers/render-children.js +2 -2
  152. package/lib-es/helpers/split-children.js +2 -2
  153. package/lib-es/helpers/update-childrens-parent.js +2 -2
  154. package/lib-es/hooks/helpers/append-gtm-classname.js +2 -2
  155. package/lib-es/hooks/helpers/buildPBComponents.js +2 -2
  156. package/lib-es/hooks/helpers/get-lightbox-images.js +2 -2
  157. package/lib-es/hooks/helpers/inject-element-banners.js +2 -2
  158. package/lib-es/hooks/helpers/inject-textblock-banners.js +2 -2
  159. package/lib-es/utils/get-class-modifiers.js +2 -2
  160. package/package.json +2 -2
  161. package/src/components/Card/helpers/filter-query-setup.js +4 -5
  162. package/src/components/List/ListBuilder.js +46 -55
  163. package/src/components/List/ListFactory.js +9 -7
  164. package/src/components/List/helpers/get-list-query.js +5 -2
  165. package/src/components/List/helpers/get-sort-props.js +9 -1
  166. package/src/constants/index.js +2 -32
  167. package/src/helpers/build-az-filter.js +3 -2
  168. package/src/helpers/build-raw-query.js +9 -7
  169. package/src/helpers/build-sort-values.js +32 -0
  170. package/src/helpers/get-extra-az-bits.js +40 -2
  171. package/src/helpers/get-generic-render-variables.js +20 -27
  172. package/tests/unit/src/components/List/helpers/get-list-query.test.js +55 -0
  173. package/tests/unit/src/components/List/helpers/get-sort-props.test.js +18 -0
  174. package/tests/unit/src/constants/__snapshots__/index.test.js.snap +3 -0
  175. package/tests/unit/src/constants/index.test.js +7 -0
  176. package/tests/unit/src/helpers/__snapshots__/get-extra-az-bits.test.js.snap +137 -0
  177. package/tests/unit/src/helpers/build-az-query.test.js +4 -3
  178. package/tests/unit/src/helpers/build-raw-query.test.js +82 -58
  179. package/tests/unit/src/helpers/build-sort-values.test.js +34 -0
  180. package/tests/unit/src/helpers/get-extra-az-bits.test.js +36 -6
  181. package/tests/unit/src/helpers/get-generic-render-variables.test.js +50 -53
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import { ON_CLICK } from '../constants';
5
5
  const getClickWrapperOptions = (children = {}, componentProps = {}, id = null) => {
6
6
  let shouldUseClickWrapper = false;
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import injectBannersToEntities from './inject-banners-to-entities';
5
5
  export default function getEntitiesWithBanner(entities, options, hasNewBannerSettings) {
6
6
  const {
@@ -1,6 +1,52 @@
1
- import { AZ_AGGS, ALL_AZ_SORT } from '../constants';
2
- const getExtraAzBits = (shouldReturnAggs, isAZ, azFilter) => {
1
+ import { AZ, AZ_DEFAULT_PROP } from '../constants';
2
+ function getAzArgs(azSortProperty) {
3
+ const azProp = `${azSortProperty}.keyword`;
4
+ const AZ_AGGS = {
5
+ aggs: {
6
+ azCount: {
7
+ terms: {
8
+ script: `doc['${azProp}'].getValue().substring(0,1).toUpperCase()`,
9
+ size: 500
10
+ }
11
+ }
12
+ },
13
+ sort: [{
14
+ [azProp]: 'asc'
15
+ }]
16
+ };
17
+ const ALL_AZ_SORT = {
18
+ sort: [{
19
+ _script: {
20
+ type: 'number',
21
+ script: {
22
+ lang: 'painless',
23
+ source: `int charPos = params.letters.indexOf(doc['${azProp}'].value.substring(0,1).toUpperCase()); charPos > -1 ? charPos : 100`,
24
+ params: {
25
+ letters: AZ
26
+ }
27
+ },
28
+ order: 'asc'
29
+ }
30
+ }, {
31
+ [azProp]: 'asc'
32
+ }]
33
+ };
34
+ return {
35
+ ALL_AZ_SORT,
36
+ AZ_AGGS
37
+ };
38
+ }
39
+ const getExtraAzBits = ({
40
+ shouldReturnAggs,
41
+ isAZ,
42
+ azSortProperty = AZ_DEFAULT_PROP,
43
+ azFilter
44
+ }) => {
3
45
  if (!isAZ || isAZ && azFilter) return {};
46
+ const {
47
+ AZ_AGGS,
48
+ ALL_AZ_SORT
49
+ } = getAzArgs(azSortProperty);
4
50
  if (shouldReturnAggs) return AZ_AGGS;
5
51
  return ALL_AZ_SORT;
6
52
  };
@@ -1 +1 @@
1
- {"version":3,"file":"get-extra-az-bits.js","names":["AZ_AGGS","ALL_AZ_SORT","getExtraAzBits","shouldReturnAggs","isAZ","azFilter"],"sources":["../../src/helpers/get-extra-az-bits.js"],"sourcesContent":["import { AZ_AGGS, ALL_AZ_SORT } from '../constants';\n\nconst getExtraAzBits = (shouldReturnAggs, isAZ, azFilter) => {\n if (!isAZ || (isAZ && azFilter)) return {};\n if (shouldReturnAggs) return AZ_AGGS;\n\n return ALL_AZ_SORT;\n};\n\nexport default getExtraAzBits;\n"],"mappings":"AAAA,SAASA,OAAO,EAAEC,WAAW,QAAQ,cAAc;AAEnD,MAAMC,cAAc,GAAGA,CAACC,gBAAgB,EAAEC,IAAI,EAAEC,QAAQ,KAAK;EAC3D,IAAI,CAACD,IAAI,IAAKA,IAAI,IAAIC,QAAS,EAAE,OAAO,CAAC,CAAC;EAC1C,IAAIF,gBAAgB,EAAE,OAAOH,OAAO;EAEpC,OAAOC,WAAW;AACpB,CAAC;AAED,eAAeC,cAAc"}
1
+ {"version":3,"file":"get-extra-az-bits.js","names":["AZ","AZ_DEFAULT_PROP","getAzArgs","azSortProperty","azProp","AZ_AGGS","aggs","azCount","terms","script","size","sort","ALL_AZ_SORT","_script","type","lang","source","params","letters","order","getExtraAzBits","shouldReturnAggs","isAZ","azFilter"],"sources":["../../src/helpers/get-extra-az-bits.js"],"sourcesContent":["import { AZ, AZ_DEFAULT_PROP } from '../constants';\n\nfunction getAzArgs(azSortProperty) {\n const azProp = `${azSortProperty}.keyword`;\n\n const AZ_AGGS = {\n aggs: {\n azCount: {\n terms: {\n script: `doc['${azProp}'].getValue().substring(0,1).toUpperCase()`,\n size: 500\n }\n }\n },\n sort: [{ [azProp]: 'asc' }]\n };\n const ALL_AZ_SORT = {\n sort: [\n {\n _script: {\n type: 'number',\n script: {\n lang: 'painless',\n source: `int charPos = params.letters.indexOf(doc['${azProp}'].value.substring(0,1).toUpperCase()); charPos > -1 ? charPos : 100`,\n params: {\n letters: AZ\n }\n },\n order: 'asc'\n }\n },\n { [azProp]: 'asc' }\n ]\n };\n\n return { ALL_AZ_SORT, AZ_AGGS };\n}\n\nconst getExtraAzBits = ({ shouldReturnAggs, isAZ, azSortProperty = AZ_DEFAULT_PROP, azFilter }) => {\n if (!isAZ || (isAZ && azFilter)) return {};\n\n const { AZ_AGGS, ALL_AZ_SORT } = getAzArgs(azSortProperty);\n if (shouldReturnAggs) return AZ_AGGS;\n\n return ALL_AZ_SORT;\n};\n\nexport default getExtraAzBits;\n"],"mappings":"AAAA,SAASA,EAAE,EAAEC,eAAe,QAAQ,cAAc;AAElD,SAASC,SAASA,CAACC,cAAc,EAAE;EACjC,MAAMC,MAAM,GAAI,GAAED,cAAe,UAAS;EAE1C,MAAME,OAAO,GAAG;IACdC,IAAI,EAAE;MACJC,OAAO,EAAE;QACPC,KAAK,EAAE;UACLC,MAAM,EAAG,QAAOL,MAAO,4CAA2C;UAClEM,IAAI,EAAE;QACR;MACF;IACF,CAAC;IACDC,IAAI,EAAE,CAAC;MAAE,CAACP,MAAM,GAAG;IAAM,CAAC;EAC5B,CAAC;EACD,MAAMQ,WAAW,GAAG;IAClBD,IAAI,EAAE,CACJ;MACEE,OAAO,EAAE;QACPC,IAAI,EAAE,QAAQ;QACdL,MAAM,EAAE;UACNM,IAAI,EAAE,UAAU;UAChBC,MAAM,EAAG,6CAA4CZ,MAAO,sEAAqE;UACjIa,MAAM,EAAE;YACNC,OAAO,EAAElB;UACX;QACF,CAAC;QACDmB,KAAK,EAAE;MACT;IACF,CAAC,EACD;MAAE,CAACf,MAAM,GAAG;IAAM,CAAC;EAEvB,CAAC;EAED,OAAO;IAAEQ,WAAW;IAAEP;EAAQ,CAAC;AACjC;AAEA,MAAMe,cAAc,GAAGA,CAAC;EAAEC,gBAAgB;EAAEC,IAAI;EAAEnB,cAAc,GAAGF,eAAe;EAAEsB;AAAS,CAAC,KAAK;EACjG,IAAI,CAACD,IAAI,IAAKA,IAAI,IAAIC,QAAS,EAAE,OAAO,CAAC,CAAC;EAE1C,MAAM;IAAElB,OAAO;IAAEO;EAAY,CAAC,GAAGV,SAAS,CAACC,cAAc,CAAC;EAC1D,IAAIkB,gBAAgB,EAAE,OAAOhB,OAAO;EAEpC,OAAOO,WAAW;AACpB,CAAC;AAED,eAAeQ,cAAc"}
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import getDictionaryMatch from './get-dictionary-match';
5
5
  import { propsSchema } from './entities/constants';
6
6
  function getGenericProps(props = propsSchema) {
@@ -1,28 +1,9 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
4
- import getSortbyFieldName from './get-sort-by-field-name';
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
5
4
  import { DEFAULT_LIMIT, DEFAULT_OFFSET } from '../constants';
6
- const buildSortValues = (sortFilters, relations, stringProps) => {
7
- if (!sortFilters || !sortFilters.length) return {
8
- sort: []
9
- };
10
- const sortValues = sortFilters.map(({
11
- sort,
12
- propsToDisplay
13
- }) => {
14
- if (!sort) return null;
15
- const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
16
- return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;
17
- }).filter(Boolean).join(',');
18
- return {
19
- sort: sortValues
20
- };
21
- };
22
- const getCorrectSort = (relations, filterProps, stringProps, isTextSearchApplied) => {
23
- if (isTextSearchApplied) {
24
- return {};
25
- }
5
+ import buildSortValues from './build-sort-values';
6
+ const getCorrectSort = (relations, filterProps, stringProps, useSortObject) => {
26
7
  const {
27
8
  sort,
28
9
  sortby,
@@ -31,9 +12,16 @@ const getCorrectSort = (relations, filterProps, stringProps, isTextSearchApplied
31
12
  return buildSortValues([{
32
13
  sort,
33
14
  propsToDisplay: sortby
34
- }, ...sortProperties], relations, stringProps);
15
+ }, ...sortProperties], relations, stringProps, useSortObject);
35
16
  };
36
- const getGenericRenderVariables = (relations, filterProps = {}, stringProps = [], rawQuery = {}, isTextSearchFilterApplied = false, useRandomSort = false) => {
17
+ const getGenericRenderVariables = ({
18
+ relations,
19
+ filterProps = {},
20
+ stringProps = [],
21
+ rawQuery = {},
22
+ useRandomSort = false
23
+ }) => {
24
+ const rawQueryCopy = _objectSpread({}, rawQuery);
37
25
  const {
38
26
  limit = DEFAULT_LIMIT,
39
27
  offset
@@ -44,7 +32,7 @@ const getGenericRenderVariables = (relations, filterProps = {}, stringProps = []
44
32
  const rawQueryStringified = JSON.stringify({
45
33
  query: {
46
34
  function_score: {
47
- query: rawQuery && rawQuery.query ? rawQuery.query : rawQuery,
35
+ query: rawQueryCopy && rawQueryCopy.query ? rawQueryCopy.query : rawQueryCopy,
48
36
  random_score: {},
49
37
  boost_mode: 'replace'
50
38
  }
@@ -56,12 +44,20 @@ const getGenericRenderVariables = (relations, filterProps = {}, stringProps = []
56
44
  rawQueryStringified
57
45
  };
58
46
  }
59
- const sort = getCorrectSort(relations, filterProps, stringProps, isTextSearchFilterApplied);
47
+ const sort = getCorrectSort(relations, filterProps, stringProps, !!rawQueryCopy.sort);
48
+ if (rawQueryCopy.sort && sort) {
49
+ rawQueryCopy.sort = [...rawQueryCopy.sort, sort];
50
+ return {
51
+ limit: limitToUse,
52
+ offset: offsetToUse,
53
+ rawQueryStringified: JSON.stringify(rawQueryCopy)
54
+ };
55
+ }
60
56
  return _objectSpread(_objectSpread({
61
57
  limit: limitToUse,
62
58
  offset: offsetToUse
63
59
  }, sort), {}, {
64
- rawQueryStringified: JSON.stringify(rawQuery)
60
+ rawQueryStringified: JSON.stringify(rawQueryCopy)
65
61
  });
66
62
  };
67
63
  export default getGenericRenderVariables;
@@ -1 +1 @@
1
- {"version":3,"file":"get-generic-render-variables.js","names":["getSortbyFieldName","DEFAULT_LIMIT","DEFAULT_OFFSET","buildSortValues","sortFilters","relations","stringProps","length","sort","sortValues","map","propsToDisplay","sortFieldName","toLowerCase","filter","Boolean","join","getCorrectSort","filterProps","isTextSearchApplied","sortby","sortProperties","getGenericRenderVariables","rawQuery","isTextSearchFilterApplied","useRandomSort","limit","offset","limitToUse","Number","offsetToUse","rawQueryStringified","JSON","stringify","query","function_score","random_score","boost_mode","_objectSpread"],"sources":["../../src/helpers/get-generic-render-variables.js"],"sourcesContent":["import getSortbyFieldName from './get-sort-by-field-name';\nimport { DEFAULT_LIMIT, DEFAULT_OFFSET } from '../constants';\n\nconst buildSortValues = (sortFilters, relations, stringProps) => {\n if (!sortFilters || !sortFilters.length) return { sort: [] };\n\n const sortValues = sortFilters\n .map(({ sort, propsToDisplay }) => {\n if (!sort) return null;\n\n const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);\n return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;\n })\n .filter(Boolean)\n .join(',');\n\n return { sort: sortValues };\n};\nconst getCorrectSort = (relations, filterProps, stringProps, isTextSearchApplied) => {\n if (isTextSearchApplied) {\n return {};\n }\n const { sort, sortby, sortProperties = [] } = filterProps;\n\n return buildSortValues(\n [{ sort, propsToDisplay: sortby }, ...sortProperties],\n relations,\n stringProps\n );\n};\n\nconst getGenericRenderVariables = (\n relations,\n filterProps = {},\n stringProps = [],\n rawQuery = {},\n isTextSearchFilterApplied = false,\n useRandomSort = false\n) => {\n const { limit = DEFAULT_LIMIT, offset } = filterProps;\n const limitToUse = Number(limit || DEFAULT_LIMIT);\n const offsetToUse = Number(offset || DEFAULT_OFFSET);\n\n if (useRandomSort) {\n const rawQueryStringified = JSON.stringify({\n query: {\n function_score: {\n query: rawQuery && rawQuery.query ? rawQuery.query : rawQuery,\n random_score: {},\n boost_mode: 'replace'\n }\n }\n });\n\n return {\n limit: limitToUse,\n offset: offsetToUse,\n rawQueryStringified\n };\n }\n\n const sort = getCorrectSort(relations, filterProps, stringProps, isTextSearchFilterApplied);\n\n return {\n limit: limitToUse,\n offset: offsetToUse,\n ...sort,\n rawQueryStringified: JSON.stringify(rawQuery)\n };\n};\n\nexport default getGenericRenderVariables;\n"],"mappings":";;;AAAA,OAAOA,kBAAkB,MAAM,0BAA0B;AACzD,SAASC,aAAa,EAAEC,cAAc,QAAQ,cAAc;AAE5D,MAAMC,eAAe,GAAGA,CAACC,WAAW,EAAEC,SAAS,EAAEC,WAAW,KAAK;EAC/D,IAAI,CAACF,WAAW,IAAI,CAACA,WAAW,CAACG,MAAM,EAAE,OAAO;IAAEC,IAAI,EAAE;EAAG,CAAC;EAE5D,MAAMC,UAAU,GAAGL,WAAW,CAC3BM,GAAG,CAAC,CAAC;IAAEF,IAAI;IAAEG;EAAe,CAAC,KAAK;IACjC,IAAI,CAACH,IAAI,EAAE,OAAO,IAAI;IAEtB,MAAMI,aAAa,GAAGZ,kBAAkB,CAACK,SAAS,EAAEM,cAAc,EAAEL,WAAW,CAAC;IAChF,OAAOM,aAAa,GAAI,GAAEA,aAAc,IAAGJ,IAAI,CAACK,WAAW,CAAC,CAAE,EAAC,GAAG,IAAI;EACxE,CAAC,CAAC,CACDC,MAAM,CAACC,OAAO,CAAC,CACfC,IAAI,CAAC,GAAG,CAAC;EAEZ,OAAO;IAAER,IAAI,EAAEC;EAAW,CAAC;AAC7B,CAAC;AACD,MAAMQ,cAAc,GAAGA,CAACZ,SAAS,EAAEa,WAAW,EAAEZ,WAAW,EAAEa,mBAAmB,KAAK;EACnF,IAAIA,mBAAmB,EAAE;IACvB,OAAO,CAAC,CAAC;EACX;EACA,MAAM;IAAEX,IAAI;IAAEY,MAAM;IAAEC,cAAc,GAAG;EAAG,CAAC,GAAGH,WAAW;EAEzD,OAAOf,eAAe,CACpB,CAAC;IAAEK,IAAI;IAAEG,cAAc,EAAES;EAAO,CAAC,EAAE,GAAGC,cAAc,CAAC,EACrDhB,SAAS,EACTC,WACF,CAAC;AACH,CAAC;AAED,MAAMgB,yBAAyB,GAAGA,CAChCjB,SAAS,EACTa,WAAW,GAAG,CAAC,CAAC,EAChBZ,WAAW,GAAG,EAAE,EAChBiB,QAAQ,GAAG,CAAC,CAAC,EACbC,yBAAyB,GAAG,KAAK,EACjCC,aAAa,GAAG,KAAK,KAClB;EACH,MAAM;IAAEC,KAAK,GAAGzB,aAAa;IAAE0B;EAAO,CAAC,GAAGT,WAAW;EACrD,MAAMU,UAAU,GAAGC,MAAM,CAACH,KAAK,IAAIzB,aAAa,CAAC;EACjD,MAAM6B,WAAW,GAAGD,MAAM,CAACF,MAAM,IAAIzB,cAAc,CAAC;EAEpD,IAAIuB,aAAa,EAAE;IACjB,MAAMM,mBAAmB,GAAGC,IAAI,CAACC,SAAS,CAAC;MACzCC,KAAK,EAAE;QACLC,cAAc,EAAE;UACdD,KAAK,EAAEX,QAAQ,IAAIA,QAAQ,CAACW,KAAK,GAAGX,QAAQ,CAACW,KAAK,GAAGX,QAAQ;UAC7Da,YAAY,EAAE,CAAC,CAAC;UAChBC,UAAU,EAAE;QACd;MACF;IACF,CAAC,CAAC;IAEF,OAAO;MACLX,KAAK,EAAEE,UAAU;MACjBD,MAAM,EAAEG,WAAW;MACnBC;IACF,CAAC;EACH;EAEA,MAAMvB,IAAI,GAAGS,cAAc,CAACZ,SAAS,EAAEa,WAAW,EAAEZ,WAAW,EAAEkB,yBAAyB,CAAC;EAE3F,OAAAc,aAAA,CAAAA,aAAA;IACEZ,KAAK,EAAEE,UAAU;IACjBD,MAAM,EAAEG;EAAW,GAChBtB,IAAI;IACPuB,mBAAmB,EAAEC,IAAI,CAACC,SAAS,CAACV,QAAQ;EAAC;AAEjD,CAAC;AAED,eAAeD,yBAAyB"}
1
+ {"version":3,"file":"get-generic-render-variables.js","names":["DEFAULT_LIMIT","DEFAULT_OFFSET","buildSortValues","getCorrectSort","relations","filterProps","stringProps","useSortObject","sort","sortby","sortProperties","propsToDisplay","getGenericRenderVariables","rawQuery","useRandomSort","rawQueryCopy","_objectSpread","limit","offset","limitToUse","Number","offsetToUse","rawQueryStringified","JSON","stringify","query","function_score","random_score","boost_mode"],"sources":["../../src/helpers/get-generic-render-variables.js"],"sourcesContent":["import { DEFAULT_LIMIT, DEFAULT_OFFSET } from '../constants';\nimport buildSortValues from './build-sort-values';\n\nconst getCorrectSort = (relations, filterProps, stringProps, useSortObject) => {\n const { sort, sortby, sortProperties = [] } = filterProps;\n\n return buildSortValues(\n [{ sort, propsToDisplay: sortby }, ...sortProperties],\n relations,\n stringProps,\n useSortObject\n );\n};\n\nconst getGenericRenderVariables = ({\n relations,\n filterProps = {},\n stringProps = [],\n rawQuery = {},\n useRandomSort = false\n}) => {\n const rawQueryCopy = { ...rawQuery };\n const { limit = DEFAULT_LIMIT, offset } = filterProps;\n const limitToUse = Number(limit || DEFAULT_LIMIT);\n const offsetToUse = Number(offset || DEFAULT_OFFSET);\n\n if (useRandomSort) {\n const rawQueryStringified = JSON.stringify({\n query: {\n function_score: {\n query: rawQueryCopy && rawQueryCopy.query ? rawQueryCopy.query : rawQueryCopy,\n random_score: {},\n boost_mode: 'replace'\n }\n }\n });\n\n return {\n limit: limitToUse,\n offset: offsetToUse,\n rawQueryStringified\n };\n }\n\n const sort = getCorrectSort(relations, filterProps, stringProps, !!rawQueryCopy.sort);\n\n if (rawQueryCopy.sort && sort) {\n rawQueryCopy.sort = [...rawQueryCopy.sort, sort];\n\n return {\n limit: limitToUse,\n offset: offsetToUse,\n rawQueryStringified: JSON.stringify(rawQueryCopy)\n };\n }\n\n return {\n limit: limitToUse,\n offset: offsetToUse,\n ...sort,\n rawQueryStringified: JSON.stringify(rawQueryCopy)\n };\n};\n\nexport default getGenericRenderVariables;\n"],"mappings":";;;AAAA,SAASA,aAAa,EAAEC,cAAc,QAAQ,cAAc;AAC5D,OAAOC,eAAe,MAAM,qBAAqB;AAEjD,MAAMC,cAAc,GAAGA,CAACC,SAAS,EAAEC,WAAW,EAAEC,WAAW,EAAEC,aAAa,KAAK;EAC7E,MAAM;IAAEC,IAAI;IAAEC,MAAM;IAAEC,cAAc,GAAG;EAAG,CAAC,GAAGL,WAAW;EAEzD,OAAOH,eAAe,CACpB,CAAC;IAAEM,IAAI;IAAEG,cAAc,EAAEF;EAAO,CAAC,EAAE,GAAGC,cAAc,CAAC,EACrDN,SAAS,EACTE,WAAW,EACXC,aACF,CAAC;AACH,CAAC;AAED,MAAMK,yBAAyB,GAAGA,CAAC;EACjCR,SAAS;EACTC,WAAW,GAAG,CAAC,CAAC;EAChBC,WAAW,GAAG,EAAE;EAChBO,QAAQ,GAAG,CAAC,CAAC;EACbC,aAAa,GAAG;AAClB,CAAC,KAAK;EACJ,MAAMC,YAAY,GAAAC,aAAA,KAAQH,QAAQ,CAAE;EACpC,MAAM;IAAEI,KAAK,GAAGjB,aAAa;IAAEkB;EAAO,CAAC,GAAGb,WAAW;EACrD,MAAMc,UAAU,GAAGC,MAAM,CAACH,KAAK,IAAIjB,aAAa,CAAC;EACjD,MAAMqB,WAAW,GAAGD,MAAM,CAACF,MAAM,IAAIjB,cAAc,CAAC;EAEpD,IAAIa,aAAa,EAAE;IACjB,MAAMQ,mBAAmB,GAAGC,IAAI,CAACC,SAAS,CAAC;MACzCC,KAAK,EAAE;QACLC,cAAc,EAAE;UACdD,KAAK,EAAEV,YAAY,IAAIA,YAAY,CAACU,KAAK,GAAGV,YAAY,CAACU,KAAK,GAAGV,YAAY;UAC7EY,YAAY,EAAE,CAAC,CAAC;UAChBC,UAAU,EAAE;QACd;MACF;IACF,CAAC,CAAC;IAEF,OAAO;MACLX,KAAK,EAAEE,UAAU;MACjBD,MAAM,EAAEG,WAAW;MACnBC;IACF,CAAC;EACH;EAEA,MAAMd,IAAI,GAAGL,cAAc,CAACC,SAAS,EAAEC,WAAW,EAAEC,WAAW,EAAE,CAAC,CAACS,YAAY,CAACP,IAAI,CAAC;EAErF,IAAIO,YAAY,CAACP,IAAI,IAAIA,IAAI,EAAE;IAC7BO,YAAY,CAACP,IAAI,GAAG,CAAC,GAAGO,YAAY,CAACP,IAAI,EAAEA,IAAI,CAAC;IAEhD,OAAO;MACLS,KAAK,EAAEE,UAAU;MACjBD,MAAM,EAAEG,WAAW;MACnBC,mBAAmB,EAAEC,IAAI,CAACC,SAAS,CAACT,YAAY;IAClD,CAAC;EACH;EAEA,OAAAC,aAAA,CAAAA,aAAA;IACEC,KAAK,EAAEE,UAAU;IACjBD,MAAM,EAAEG;EAAW,GAChBb,IAAI;IACPc,mBAAmB,EAAEC,IAAI,CAACC,SAAS,CAACT,YAAY;EAAC;AAErD,CAAC;AAED,eAAeH,yBAAyB"}
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import flatten from 'lodash.flatten';
5
5
  import { groupNodeEntities } from './helpers';
6
6
  import injectBanner from '../../inject-banner';
@@ -1,7 +1,7 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
3
- 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; }
4
- 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) { _defineProperty(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; }
3
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
4
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
5
5
  function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
6
6
  function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
7
7
  import React from 'react';
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  function removeUnwantedCharacters(value) {
5
5
  const args = value !== null && value !== void 0 ? value : '';
6
6
  return Array.isArray(args) ? value.map(removeUnwantedCharacters) : removeCharacters(args);
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import React from 'react';
5
5
  import { CHILD_PROPS_TO_USE } from '../constants';
6
6
  const buildChildProps = (childProps, parentProps) => {
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  /* eslint-disable no-param-reassign */
5
5
  const filterChildren = (children, parentComponent) => {
6
6
  const withGTMChildren = [];
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  const updateChildrensParent = (cardChildren, id, entity) => {
5
5
  const hasCardChildren = !!cardChildren && Object.keys(cardChildren).length && cardChildren.props;
6
6
  if (hasCardChildren && cardChildren.props.children) {
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import { GTM } from '../../constants';
5
5
  const appendGtmClassName = (settings, childComponents) => {
6
6
  if (!childComponents || Array.isArray(childComponents)) return settings;
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import React from 'react';
5
5
  import cloneDeep from 'lodash.clonedeep';
6
6
  import GlobalLightbox from '../../components/Image/GlobalLightbox';
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import { PB_TYPE_IMAGE, PB_TYPE_CAROUSEL, PB_TYPE_BANNER } from './constants';
5
5
  function checkIfHasLightboxAndImages(component) {
6
6
  const isImage = [PB_TYPE_IMAGE, PB_TYPE_CAROUSEL].includes(component.type);
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import updateTargetings from './update-targetings';
5
5
  import { IMAGE } from '../../constants';
6
6
  import { PB_TYPE_BANNER } from './constants';
@@ -1,7 +1,7 @@
1
1
  import _extends from "@babel/runtime/helpers/extends";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
- 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; }
4
- 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) { _defineProperty(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; }
3
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
4
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
5
5
  import React from 'react';
6
6
  import Banner from '../../components/Banner';
7
7
  import { getCollisions, checkIfHasCollided } from './check-collisions';
@@ -1,6 +1,6 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
- 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; }
3
- 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) { _defineProperty(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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
4
  import { BUTTON, BUTTON_ICON, CLASS_MODIFIERS, ICON_BUTTON, LINK, CODE } from '../constants';
5
5
  import COMPONENTS_DEFAULT_VALUES from '../constants/componentsDefaultValues';
6
6
  const {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@blaze-cms/react-page-builder",
3
- "version": "0.132.0",
3
+ "version": "0.133.0-alpha.0",
4
4
  "description": "Blaze react page builder",
5
5
  "main": "lib/index.js",
6
6
  "module": "lib-es/index.js",
@@ -89,5 +89,5 @@
89
89
  "lib/*",
90
90
  "lib-es/*"
91
91
  ],
92
- "gitHead": "d1a616228de279b4945be221c6175e297ac8ce94"
92
+ "gitHead": "b3594d05d55654eb41f8d13b6b3674b360a36e8a"
93
93
  }
@@ -39,14 +39,13 @@ const filterQuerySetup = ({
39
39
  const { limit: settingsLimit } = variableProps;
40
40
  const limit = settingsLimit || DEFAULT_LIMIT; // all falsey should use default
41
41
  const requestLimit = entitySameAsCurrentItemEntity ? Number(limit) + 1 : limit;
42
- const variables = getGenericRenderVariables(
43
- filterEntityRelations,
44
- { ...variableProps, limit: requestLimit },
42
+ const variables = getGenericRenderVariables({
43
+ relations: filterEntityRelations,
44
+ filterProps: { ...variableProps, limit: requestLimit },
45
45
  stringProps,
46
46
  rawQuery,
47
- false,
48
47
  useRandomSort
49
- );
48
+ });
50
49
 
51
50
  return { variables, limit };
52
51
  };
@@ -27,7 +27,6 @@ const ListBuilder = props => {
27
27
  inheritedFilters,
28
28
  paginationType,
29
29
  entities,
30
- isTextSearchFilterApplied,
31
30
  parent: { itemId },
32
31
  itemsPerPage,
33
32
  itemsToDisplay,
@@ -86,37 +85,42 @@ const ListBuilder = props => {
86
85
 
87
86
  const { relations = [] } = filterEntitySchema;
88
87
  const stringProps = getStringTypeProps(entity, relations, Object.values(requiredSchema));
89
-
90
- const azRawQuery = buildRawQuery(
91
- docTypes,
88
+ const filterData = {
89
+ filterValues,
90
+ filterOperator,
91
+ relations,
92
+ stringProps
93
+ };
94
+ const azRawQuery = buildRawQuery({
95
+ docType: docTypes,
92
96
  operator,
93
97
  searchValues,
94
- {
95
- filterValues,
96
- filterOperator,
97
- relations,
98
- stringProps
99
- },
100
- itemId,
101
- itemsToDisplayToUse,
102
- shouldApplyDefaultSort,
103
- { shouldReturnAggs: true, isAZ }
104
- );
98
+ filterData,
99
+ id: itemId,
100
+ itemsToDisplay: itemsToDisplayToUse,
101
+ shouldApplySort: shouldApplyDefaultSort,
102
+ azOptions: { shouldReturnAggs: true, isAZ, sortProperties }
103
+ });
105
104
 
106
- const azVariables = getGenericRenderVariables(
105
+ const filterProps = {
106
+ ...props,
107
+ limit: itemsPerPageToUse,
108
+ offset: initialOffset,
109
+ sort,
110
+ sortby,
111
+ sortProperties
112
+ };
113
+
114
+ const propsForVariables = {
107
115
  relations,
108
- {
109
- ...props,
110
- limit: itemsPerPageToUse,
111
- offset: initialOffset,
112
- sort,
113
- sortby,
114
- sortProperties
115
- },
116
- stringProps,
117
- azRawQuery,
118
- isTextSearchFilterApplied
119
- );
116
+ filterProps,
117
+ stringProps
118
+ };
119
+
120
+ const azVariables = getGenericRenderVariables({
121
+ ...propsForVariables,
122
+ rawQuery: azRawQuery
123
+ });
120
124
 
121
125
  const azAction = getSearchPublishedContent(RAW_RESULTS);
122
126
  const { data, error, loading } = useQuery(azAction, {
@@ -129,37 +133,25 @@ const ListBuilder = props => {
129
133
  const listAggregations = isAZ ? sortAggs(data) : [];
130
134
  const updatedAggregations = buildAzAggregations(listAggregations);
131
135
 
132
- const rawQuery = buildRawQuery(
133
- docTypes,
136
+ const rawQuery = buildRawQuery({
137
+ docType: docTypes,
134
138
  operator,
135
139
  searchValues,
136
- {
137
- filterValues,
138
- filterOperator,
139
- relations,
140
- stringProps,
140
+ filterData: {
141
+ ...filterData,
141
142
  azFilter
142
143
  },
143
- itemId,
144
- itemsToDisplayToUse,
145
- shouldApplyDefaultSort,
146
- { shouldReturnAggs: false, isAZ }
147
- );
144
+ id: itemId,
145
+ itemsToDisplay: itemsToDisplayToUse,
146
+ shouldApplySort: shouldApplyDefaultSort,
147
+ azOptions: { shouldReturnAggs: false, isAZ, sortProperties },
148
+ sortProperties
149
+ });
148
150
 
149
- const variables = getGenericRenderVariables(
150
- relations,
151
- {
152
- ...props,
153
- limit: itemsPerPageToUse,
154
- offset: initialOffset,
155
- sort,
156
- sortby,
157
- sortProperties
158
- },
159
- stringProps,
160
- rawQuery,
161
- isTextSearchFilterApplied
162
- );
151
+ const variables = getGenericRenderVariables({
152
+ ...propsForVariables,
153
+ rawQuery
154
+ });
163
155
 
164
156
  return (
165
157
  <ListRender
@@ -187,7 +179,6 @@ ListBuilder.propTypes = {
187
179
  mainSchemas: PropTypes.object.isRequired,
188
180
  isCard: PropTypes.bool.isRequired,
189
181
  isAZ: PropTypes.bool.isRequired,
190
- isTextSearchFilterApplied: PropTypes.bool.isRequired,
191
182
  parent: PropTypes.object.isRequired,
192
183
  itemsPerPage: PropTypes.number.isRequired,
193
184
  paginationIndex: PropTypes.number.isRequired,
@@ -58,13 +58,21 @@ const ListFactory = props => {
58
58
  );
59
59
  const { query, url, query: { itemListId: queryItemListId } = {} } = parseUrl(parsedQuery);
60
60
  const updatedQuery = getListQuery(query, hasListSpecificFilters, name);
61
+ const isTextSearchFilterApplied = !!(
62
+ updatedQuery.search_term &&
63
+ searchFilter &&
64
+ getSearchFilterType(searchFilter, TEXT_SEARCH).length
65
+ );
66
+
61
67
  const { sort: querySort, sortby: querySortBy } = updatedQuery;
68
+
62
69
  const { sortbyFilters, updatedSortProperties } = getSortProps({
63
70
  querySort,
64
71
  sortProperties,
65
72
  defaultSort,
66
73
  querySortBy,
67
- defaultSortBy
74
+ defaultSortBy,
75
+ isTextSearchFilterApplied
68
76
  });
69
77
 
70
78
  const itemListId = getItemListId(itemListName, queryItemListId);
@@ -135,11 +143,6 @@ const ListFactory = props => {
135
143
  ? buildSearchValuesText(textFilter, updatedQuery, name)
136
144
  : [];
137
145
  const { valuesAnd, valuesOr } = getQueryFilters(searchFilter, updatedQuery, name);
138
- const isTextSearchFilterApplied = !!(
139
- updatedQuery.search_term &&
140
- searchFilter &&
141
- getSearchFilterType(searchFilter, TEXT_SEARCH).length
142
- );
143
146
 
144
147
  const searchValues = {
145
148
  searchValuesText: valuesText,
@@ -164,7 +167,6 @@ const ListFactory = props => {
164
167
  currentSchema,
165
168
  omitWrappers,
166
169
  operator,
167
- isTextSearchFilterApplied,
168
170
  paginationIndex,
169
171
  entityData,
170
172
  inheritedFilters,