@blaze-cms/react-page-builder 0.122.2 → 0.122.3
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.
- package/CHANGELOG.md +11 -0
- package/lib/helpers/build-raw-query.js +1 -1
- package/lib/helpers/build-raw-query.js.map +1 -1
- package/lib-es/helpers/build-raw-query.js +1 -1
- package/lib-es/helpers/build-raw-query.js.map +1 -1
- package/package.json +2 -2
- package/src/helpers/build-raw-query.js +2 -1
- package/tests/helpers/mocks.js +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [0.122.3](https://github.com/thebyte9/blaze/compare/v0.122.2...v0.122.3) (2022-04-06)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* add id to elasticsearch index data and update frontend item to display sort to use ([#3426](https://github.com/thebyte9/blaze/issues/3426)) ([0e3572c](https://github.com/thebyte9/blaze/commit/0e3572cdc69a8a59f9a500c1ae452a940c0f97cd))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [0.122.2](https://github.com/thebyte9/blaze/compare/v0.122.1...v0.122.2) (2022-04-04)
|
|
7
18
|
|
|
8
19
|
|
|
@@ -126,7 +126,7 @@ var buildRawQuery = function buildRawQuery(docType, operator, searchValues, filt
|
|
|
126
126
|
type: 'number',
|
|
127
127
|
script: {
|
|
128
128
|
lang: 'painless',
|
|
129
|
-
source: "doc['
|
|
129
|
+
source: "!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0",
|
|
130
130
|
params: {
|
|
131
131
|
sortOrder: itemsToDisplayIds
|
|
132
132
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/helpers/build-raw-query.js"],"names":["buildRawQuery","docType","operator","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","searchValuesText","searchValuesCheckboxSelectRange","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","shouldReturnAggs","isAZ","searchValuesTextCheckboxSelectJoined","AND_OPERATOR","searchValuesTextCheckboxOr","length","finalValue","finalValueWithCheckboxOrValues","must","bool","should","finalValueIfNoCheckboxOrValues","mustValues","query","azQueryBits","itemsToDisplayIds","push","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../src/helpers/build-raw-query.js"],"names":["buildRawQuery","docType","operator","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","searchValuesText","searchValuesCheckboxSelectRange","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","shouldReturnAggs","isAZ","searchValuesTextCheckboxSelectJoined","AND_OPERATOR","searchValuesTextCheckboxOr","length","finalValue","finalValueWithCheckboxOrValues","must","bool","should","finalValueIfNoCheckboxOrValues","mustValues","query","azQueryBits","itemsToDisplayIds","push","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order"],"mappings":"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","sourcesContent":["import buildRawQueryBase from './build-raw-query-base';\nimport getItemsToDisplayIds from './get-items-to-display-ids';\nimport getExtraAzBits from './get-extra-az-bits';\nimport buildAzFilter from './build-az-filter';\nimport { AND_OPERATOR } from '../constants';\n\nconst buildRawQuery = (\n docType,\n operator,\n searchValues,\n filterData,\n id,\n itemsToDisplay,\n shouldApplySort,\n azOptions\n) => {\n const {\n searchValuesText,\n searchValuesCheckboxSelectRange,\n searchValuesCheckboxOr\n } = searchValues;\n\n const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;\n const { shouldReturnAggs, isAZ } = azOptions || {};\n const searchValuesTextCheckboxSelectJoined =\n operator === AND_OPERATOR ? [...searchValuesText, ...searchValuesCheckboxSelectRange] : [];\n let searchValuesTextCheckboxOr = searchValuesText;\n if (searchValuesCheckboxOr.length) {\n searchValuesTextCheckboxOr = [...searchValuesText, ...searchValuesCheckboxOr];\n }\n\n let finalValue;\n\n if (searchValuesTextCheckboxSelectJoined.length) {\n const finalValueWithCheckboxOrValues = {\n must: [...searchValuesTextCheckboxSelectJoined, { bool: { should: searchValuesCheckboxOr } }]\n };\n const finalValueIfNoCheckboxOrValues = { must: searchValuesTextCheckboxSelectJoined };\n finalValue = searchValuesCheckboxOr.length\n ? finalValueWithCheckboxOrValues\n : finalValueIfNoCheckboxOrValues;\n } else {\n finalValue = {\n must: [...searchValuesCheckboxSelectRange, { bool: { should: searchValuesTextCheckboxOr } }]\n };\n }\n const mustValues = [\n {\n bool: finalValue\n }\n ];\n\n buildAzFilter(azFilter, mustValues);\n\n const query = {\n bool: {\n must: mustValues,\n ...buildRawQueryBase({ docType, id, filterValues, filterOperator, relations, stringProps })\n }\n };\n const azQueryBits = getExtraAzBits(shouldReturnAggs, isAZ, azFilter);\n\n if (itemsToDisplay && itemsToDisplay.length) {\n const itemsToDisplayIds = getItemsToDisplayIds(itemsToDisplay);\n query.bool.must.push({ ids: { values: itemsToDisplayIds } });\n if (shouldApplySort) {\n return {\n query,\n sort: {\n _script: {\n type: 'number',\n script: {\n lang: 'painless',\n source:\n \"!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0\",\n params: {\n sortOrder: itemsToDisplayIds\n }\n },\n order: 'asc'\n }\n },\n ...azQueryBits\n };\n }\n }\n\n return isAZ\n ? {\n query,\n ...azQueryBits\n }\n : query;\n};\n\nexport default buildRawQuery;\n"],"file":"build-raw-query.js"}
|
|
@@ -92,7 +92,7 @@ const buildRawQuery = (docType, operator, searchValues, filterData, id, itemsToD
|
|
|
92
92
|
type: 'number',
|
|
93
93
|
script: {
|
|
94
94
|
lang: 'painless',
|
|
95
|
-
source: "doc['
|
|
95
|
+
source: "!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0",
|
|
96
96
|
params: {
|
|
97
97
|
sortOrder: itemsToDisplayIds
|
|
98
98
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/helpers/build-raw-query.js"],"names":["buildRawQueryBase","getItemsToDisplayIds","getExtraAzBits","buildAzFilter","AND_OPERATOR","buildRawQuery","docType","operator","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","searchValuesText","searchValuesCheckboxSelectRange","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","shouldReturnAggs","isAZ","searchValuesTextCheckboxSelectJoined","searchValuesTextCheckboxOr","length","finalValue","finalValueWithCheckboxOrValues","must","bool","should","finalValueIfNoCheckboxOrValues","mustValues","query","azQueryBits","itemsToDisplayIds","push","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order"],"mappings":"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
|
|
1
|
+
{"version":3,"sources":["../../src/helpers/build-raw-query.js"],"names":["buildRawQueryBase","getItemsToDisplayIds","getExtraAzBits","buildAzFilter","AND_OPERATOR","buildRawQuery","docType","operator","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","searchValuesText","searchValuesCheckboxSelectRange","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","shouldReturnAggs","isAZ","searchValuesTextCheckboxSelectJoined","searchValuesTextCheckboxOr","length","finalValue","finalValueWithCheckboxOrValues","must","bool","should","finalValueIfNoCheckboxOrValues","mustValues","query","azQueryBits","itemsToDisplayIds","push","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order"],"mappings":"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","sourcesContent":["import buildRawQueryBase from './build-raw-query-base';\nimport getItemsToDisplayIds from './get-items-to-display-ids';\nimport getExtraAzBits from './get-extra-az-bits';\nimport buildAzFilter from './build-az-filter';\nimport { AND_OPERATOR } from '../constants';\n\nconst buildRawQuery = (\n docType,\n operator,\n searchValues,\n filterData,\n id,\n itemsToDisplay,\n shouldApplySort,\n azOptions\n) => {\n const {\n searchValuesText,\n searchValuesCheckboxSelectRange,\n searchValuesCheckboxOr\n } = searchValues;\n\n const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;\n const { shouldReturnAggs, isAZ } = azOptions || {};\n const searchValuesTextCheckboxSelectJoined =\n operator === AND_OPERATOR ? [...searchValuesText, ...searchValuesCheckboxSelectRange] : [];\n let searchValuesTextCheckboxOr = searchValuesText;\n if (searchValuesCheckboxOr.length) {\n searchValuesTextCheckboxOr = [...searchValuesText, ...searchValuesCheckboxOr];\n }\n\n let finalValue;\n\n if (searchValuesTextCheckboxSelectJoined.length) {\n const finalValueWithCheckboxOrValues = {\n must: [...searchValuesTextCheckboxSelectJoined, { bool: { should: searchValuesCheckboxOr } }]\n };\n const finalValueIfNoCheckboxOrValues = { must: searchValuesTextCheckboxSelectJoined };\n finalValue = searchValuesCheckboxOr.length\n ? finalValueWithCheckboxOrValues\n : finalValueIfNoCheckboxOrValues;\n } else {\n finalValue = {\n must: [...searchValuesCheckboxSelectRange, { bool: { should: searchValuesTextCheckboxOr } }]\n };\n }\n const mustValues = [\n {\n bool: finalValue\n }\n ];\n\n buildAzFilter(azFilter, mustValues);\n\n const query = {\n bool: {\n must: mustValues,\n ...buildRawQueryBase({ docType, id, filterValues, filterOperator, relations, stringProps })\n }\n };\n const azQueryBits = getExtraAzBits(shouldReturnAggs, isAZ, azFilter);\n\n if (itemsToDisplay && itemsToDisplay.length) {\n const itemsToDisplayIds = getItemsToDisplayIds(itemsToDisplay);\n query.bool.must.push({ ids: { values: itemsToDisplayIds } });\n if (shouldApplySort) {\n return {\n query,\n sort: {\n _script: {\n type: 'number',\n script: {\n lang: 'painless',\n source:\n \"!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0\",\n params: {\n sortOrder: itemsToDisplayIds\n }\n },\n order: 'asc'\n }\n },\n ...azQueryBits\n };\n }\n }\n\n return isAZ\n ? {\n query,\n ...azQueryBits\n }\n : query;\n};\n\nexport default buildRawQuery;\n"],"file":"build-raw-query.js"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/react-page-builder",
|
|
3
|
-
"version": "0.122.
|
|
3
|
+
"version": "0.122.3",
|
|
4
4
|
"description": "Blaze react page builder",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -84,5 +84,5 @@
|
|
|
84
84
|
"lib/*",
|
|
85
85
|
"lib-es/*"
|
|
86
86
|
],
|
|
87
|
-
"gitHead": "
|
|
87
|
+
"gitHead": "36a1302b243ffe46c704a9591e6d61d6ca3878ef"
|
|
88
88
|
}
|
|
@@ -71,7 +71,8 @@ const buildRawQuery = (
|
|
|
71
71
|
type: 'number',
|
|
72
72
|
script: {
|
|
73
73
|
lang: 'painless',
|
|
74
|
-
source:
|
|
74
|
+
source:
|
|
75
|
+
"!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0",
|
|
75
76
|
params: {
|
|
76
77
|
sortOrder: itemsToDisplayIds
|
|
77
78
|
}
|
package/tests/helpers/mocks.js
CHANGED
|
@@ -2074,7 +2074,7 @@ const RAW_QUERY_WITH_SHOULD_APPLY_SORT = {
|
|
|
2074
2074
|
type: 'number',
|
|
2075
2075
|
script: {
|
|
2076
2076
|
lang: 'painless',
|
|
2077
|
-
source: "doc['
|
|
2077
|
+
source: "!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0",
|
|
2078
2078
|
params: {
|
|
2079
2079
|
sortOrder: ITEMS_TO_DISPLAY
|
|
2080
2080
|
}
|