@blaze-cms/react-page-builder 0.136.0 → 0.136.2-core-styles.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.
- package/CHANGELOG.md +19 -0
- package/lib/helpers/build-raw-query.js +11 -6
- package/lib/helpers/build-raw-query.js.map +1 -1
- package/lib/helpers/build-search-values-text.js +6 -3
- package/lib/helpers/build-search-values-text.js.map +1 -1
- package/lib-es/helpers/build-raw-query.js +5 -5
- package/lib-es/helpers/build-raw-query.js.map +1 -1
- package/lib-es/helpers/build-search-values-text.js +3 -3
- package/lib-es/helpers/build-search-values-text.js.map +1 -1
- package/package.json +10 -10
- package/src/helpers/build-raw-query.js +4 -4
- package/src/helpers/build-search-values-text.js +1 -1
- package/tests/unit/src/helpers/build-raw-query.test.js +15 -0
- package/tests/unit/src/helpers/build-search-values-text.test.js +11 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,25 @@
|
|
|
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.136.2-core-styles.0](https://github.com/thebyte9/blaze/compare/v0.136.1...v0.136.2-core-styles.0) (2023-11-29)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @blaze-cms/react-page-builder
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
## [0.136.1](https://github.com/thebyte9/blaze/compare/v0.136.0...v0.136.1) (2023-11-22)
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
### Bug Fixes
|
|
18
|
+
|
|
19
|
+
* handle when props to display not set on list component ([#4139](https://github.com/thebyte9/blaze/issues/4139)) ([6725fb2](https://github.com/thebyte9/blaze/commit/6725fb252a9e3e4add66422ff5337297718fee09))
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
6
25
|
# [0.136.0](https://github.com/thebyte9/blaze/compare/v0.136.0-alpha.1...v0.136.0) (2023-11-22)
|
|
7
26
|
|
|
8
27
|
**Note:** Version bump only for package @blaze-cms/react-page-builder
|
|
@@ -31,18 +31,23 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
|
|
|
31
31
|
var buildRawQuery = function buildRawQuery(_ref) {
|
|
32
32
|
var docType = _ref.docType,
|
|
33
33
|
operator = _ref.operator,
|
|
34
|
-
searchValues = _ref.searchValues,
|
|
34
|
+
_ref$searchValues = _ref.searchValues,
|
|
35
|
+
searchValues = _ref$searchValues === void 0 ? {} : _ref$searchValues,
|
|
35
36
|
filterData = _ref.filterData,
|
|
36
37
|
id = _ref.id,
|
|
37
38
|
itemsToDisplay = _ref.itemsToDisplay,
|
|
38
39
|
shouldApplySort = _ref.shouldApplySort,
|
|
39
40
|
azOptions = _ref.azOptions;
|
|
40
41
|
var _searchValues$searchV = searchValues.searchValuesText,
|
|
41
|
-
|
|
42
|
-
_searchValues$
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
42
|
+
_searchValues$searchV2 = _searchValues$searchV === void 0 ? {} : _searchValues$searchV,
|
|
43
|
+
_searchValues$searchV3 = _searchValues$searchV2.must,
|
|
44
|
+
searchValuesText = _searchValues$searchV3 === void 0 ? [] : _searchValues$searchV3,
|
|
45
|
+
_searchValues$searchV4 = _searchValues$searchV2.should,
|
|
46
|
+
shouldValuesText = _searchValues$searchV4 === void 0 ? [] : _searchValues$searchV4,
|
|
47
|
+
_searchValues$searchV5 = searchValues.searchValuesCheckboxSelectRange,
|
|
48
|
+
searchValuesCheckboxSelectRange = _searchValues$searchV5 === void 0 ? [] : _searchValues$searchV5,
|
|
49
|
+
_searchValues$searchV6 = searchValues.searchValuesCheckboxOr,
|
|
50
|
+
searchValuesCheckboxOr = _searchValues$searchV6 === void 0 ? [] : _searchValues$searchV6;
|
|
46
51
|
var filterValues = filterData.filterValues,
|
|
47
52
|
filterOperator = filterData.filterOperator,
|
|
48
53
|
relations = filterData.relations,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-raw-query.js","names":["_buildRawQueryBase2","_interopRequireDefault","require","_getItemsToDisplayIds","_getExtraAzBits","_buildAzFilter","_constants","_excluded","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","buildRawQuery","_ref","docType","operator","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","_searchValues$searchV","searchValuesText","must","_searchValues$searchV2","should","shouldValuesText","searchValuesCheckboxSelectRange","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","_ref2","isAZ","_ref2$sortProperties","sortProperties","sortPropertyToUse","isScore","_ref3","propsToDisplay","_ref3$propsToDisplay","_ref3$propsToDisplay2","_ref3$propsToDisplay3","_slicedToArray2","azSortProp","azSortProperty","AZ_DEFAULT_PROP","searchValuesTextCheckboxSelectJoined","AND_OPERATOR","concat","_toConsumableArray2","searchValuesTextCheckboxOr","finalValue","finalValueWithCheckboxOrValues","bool","finalValueIfNoCheckboxOrValues","mustValues","buildAzFilter","_buildRawQueryBase","buildRawQueryBase","_buildRawQueryBase$sh","baseShould","baseQuery","_objectWithoutProperties2","shouldValue","query","undefined","azQueryBits","getExtraAzBits","itemsToDisplayIds","getItemsToDisplayIds","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order","_default","exports"],"sources":["../../src/helpers/build-raw-query.js"],"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, AZ_DEFAULT_PROP } 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: { must: searchValuesText, should: shouldValuesText = [] },\n searchValuesCheckboxSelectRange,\n searchValuesCheckboxOr\n } = searchValues;\n const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;\n\n const { isAZ, sortProperties = [] } = azOptions || {};\n const sortPropertyToUse = isAZ && sortProperties[0] && sortProperties[0].isScore ? 1 : 0;\n const { propsToDisplay: [azSortProp] = [] } = sortProperties[sortPropertyToUse] || {\n propsToDisplay: []\n };\n const azSortProperty = azSortProp || AZ_DEFAULT_PROP;\n\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: [\n ...searchValuesCheckboxSelectRange,\n { bool: { should: [...searchValuesTextCheckboxOr, ...shouldValuesText] } }\n ]\n };\n }\n const mustValues = [\n {\n bool: finalValue\n }\n ];\n\n buildAzFilter(azFilter, mustValues, azSortProperty);\n\n const { should: baseShould = [], ...baseQuery } = buildRawQueryBase({\n docType,\n id,\n filterValues,\n filterOperator,\n relations,\n stringProps\n });\n const shouldValue = [...baseShould, ...shouldValuesText];\n const query = {\n bool: {\n must: mustValues,\n should: shouldValue.length ? shouldValue : undefined,\n ...baseQuery\n }\n };\n const azQueryBits = getExtraAzBits({ ...azOptions, azSortProperty, azFilter });\n\n if (itemsToDisplay && itemsToDisplay.length) {\n const itemsToDisplayIds = getItemsToDisplayIds(itemsToDisplay);\n\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"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"build-raw-query.js","names":["_buildRawQueryBase2","_interopRequireDefault","require","_getItemsToDisplayIds","_getExtraAzBits","_buildAzFilter","_constants","_excluded","ownKeys","e","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty2","getOwnPropertyDescriptors","defineProperties","defineProperty","buildRawQuery","_ref","docType","operator","_ref$searchValues","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","_searchValues$searchV","searchValuesText","_searchValues$searchV2","_searchValues$searchV3","must","_searchValues$searchV4","should","shouldValuesText","_searchValues$searchV5","searchValuesCheckboxSelectRange","_searchValues$searchV6","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","_ref2","isAZ","_ref2$sortProperties","sortProperties","sortPropertyToUse","isScore","_ref3","propsToDisplay","_ref3$propsToDisplay","_ref3$propsToDisplay2","_ref3$propsToDisplay3","_slicedToArray2","azSortProp","azSortProperty","AZ_DEFAULT_PROP","searchValuesTextCheckboxSelectJoined","AND_OPERATOR","concat","_toConsumableArray2","searchValuesTextCheckboxOr","finalValue","finalValueWithCheckboxOrValues","bool","finalValueIfNoCheckboxOrValues","mustValues","buildAzFilter","_buildRawQueryBase","buildRawQueryBase","_buildRawQueryBase$sh","baseShould","baseQuery","_objectWithoutProperties2","shouldValue","query","undefined","azQueryBits","getExtraAzBits","itemsToDisplayIds","getItemsToDisplayIds","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order","_default","exports"],"sources":["../../src/helpers/build-raw-query.js"],"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, AZ_DEFAULT_PROP } 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: { must: searchValuesText = [], should: shouldValuesText = [] } = {},\n searchValuesCheckboxSelectRange = [],\n searchValuesCheckboxOr = []\n } = searchValues;\n const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;\n\n const { isAZ, sortProperties = [] } = azOptions || {};\n const sortPropertyToUse = isAZ && sortProperties[0] && sortProperties[0].isScore ? 1 : 0;\n const { propsToDisplay: [azSortProp] = [] } = sortProperties[sortPropertyToUse] || {\n propsToDisplay: []\n };\n const azSortProperty = azSortProp || AZ_DEFAULT_PROP;\n\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: [\n ...searchValuesCheckboxSelectRange,\n { bool: { should: [...searchValuesTextCheckboxOr, ...shouldValuesText] } }\n ]\n };\n }\n const mustValues = [\n {\n bool: finalValue\n }\n ];\n\n buildAzFilter(azFilter, mustValues, azSortProperty);\n\n const { should: baseShould = [], ...baseQuery } = buildRawQueryBase({\n docType,\n id,\n filterValues,\n filterOperator,\n relations,\n stringProps\n });\n const shouldValue = [...baseShould, ...shouldValuesText];\n const query = {\n bool: {\n must: mustValues,\n should: shouldValue.length ? shouldValue : undefined,\n ...baseQuery\n }\n };\n const azQueryBits = getExtraAzBits({ ...azOptions, azSortProperty, azFilter });\n\n if (itemsToDisplay && itemsToDisplay.length) {\n const itemsToDisplayIds = getItemsToDisplayIds(itemsToDisplay);\n\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"],"mappings":"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"}
|
|
@@ -9,9 +9,12 @@ exports["default"] = void 0;
|
|
|
9
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
10
|
require("core-js/modules/es.array.reduce.js");
|
|
11
11
|
require("core-js/modules/es.object.to-string.js");
|
|
12
|
-
var buildSearchValuesText = function buildSearchValuesText(
|
|
13
|
-
var
|
|
14
|
-
|
|
12
|
+
var buildSearchValuesText = function buildSearchValuesText() {
|
|
13
|
+
var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
14
|
+
_ref$propsToDisplay = _ref.propsToDisplay,
|
|
15
|
+
propsToDisplay = _ref$propsToDisplay === void 0 ? [] : _ref$propsToDisplay;
|
|
16
|
+
var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
|
|
17
|
+
searchTerm = _ref2.search_term;
|
|
15
18
|
return propsToDisplay.reduce(function (acc, field, index) {
|
|
16
19
|
if (field && searchTerm) {
|
|
17
20
|
if (index === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-search-values-text.js","names":["buildSearchValuesText","_ref","
|
|
1
|
+
{"version":3,"file":"build-search-values-text.js","names":["buildSearchValuesText","_ref","arguments","length","undefined","_ref$propsToDisplay","propsToDisplay","_ref2","searchTerm","search_term","reduce","acc","field","index","should","push","match","pageBuilderIndexed","query","fuzziness","must","_defineProperty2","_default","exports"],"sources":["../../src/helpers/build-search-values-text.js"],"sourcesContent":["const buildSearchValuesText = ({ propsToDisplay = [] } = {}, { search_term: searchTerm } = {}) =>\n propsToDisplay.reduce(\n (acc, field, index) => {\n if (field && searchTerm) {\n if (index === 0) {\n acc.should.push({\n match: {\n pageBuilderIndexed: {\n query: searchTerm,\n fuzziness: 'AUTO'\n }\n }\n });\n }\n acc.must.push({\n match: {\n [field]: {\n query: searchTerm,\n fuzziness: 'AUTO'\n }\n }\n });\n }\n return acc;\n },\n { should: [], must: [] }\n );\n\nexport default buildSearchValuesText;\n"],"mappings":";;;;;;;;;;;AAAA,IAAMA,qBAAqB,GAAG,SAAxBA,qBAAqBA,CAAA;EAAA,IAAAC,IAAA,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAA8B,CAAC,CAAC;IAAAG,mBAAA,GAAAJ,IAAA,CAA1BK,cAAc;IAAdA,cAAc,GAAAD,mBAAA,cAAG,EAAE,GAAAA,mBAAA;EAAA,IAAAE,KAAA,GAAAL,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAuC,CAAC,CAAC;IAAjBM,UAAU,GAAAD,KAAA,CAAvBE,WAAW;EAAA,OACxEH,cAAc,CAACI,MAAM,CACnB,UAACC,GAAG,EAAEC,KAAK,EAAEC,KAAK,EAAK;IACrB,IAAID,KAAK,IAAIJ,UAAU,EAAE;MACvB,IAAIK,KAAK,KAAK,CAAC,EAAE;QACfF,GAAG,CAACG,MAAM,CAACC,IAAI,CAAC;UACdC,KAAK,EAAE;YACLC,kBAAkB,EAAE;cAClBC,KAAK,EAAEV,UAAU;cACjBW,SAAS,EAAE;YACb;UACF;QACF,CAAC,CAAC;MACJ;MACAR,GAAG,CAACS,IAAI,CAACL,IAAI,CAAC;QACZC,KAAK,MAAAK,gBAAA,iBACFT,KAAK,EAAG;UACPM,KAAK,EAAEV,UAAU;UACjBW,SAAS,EAAE;QACb,CAAC;MAEL,CAAC,CAAC;IACJ;IACA,OAAOR,GAAG;EACZ,CAAC,EACD;IAAEG,MAAM,EAAE,EAAE;IAAEM,IAAI,EAAE;EAAG,CACzB,CAAC;AAAA;AAAC,IAAAE,QAAA,GAEWtB,qBAAqB;AAAAuB,OAAA,cAAAD,QAAA"}
|
|
@@ -11,7 +11,7 @@ import { AND_OPERATOR, AZ_DEFAULT_PROP } from '../constants';
|
|
|
11
11
|
const buildRawQuery = ({
|
|
12
12
|
docType,
|
|
13
13
|
operator,
|
|
14
|
-
searchValues,
|
|
14
|
+
searchValues = {},
|
|
15
15
|
filterData,
|
|
16
16
|
id,
|
|
17
17
|
itemsToDisplay,
|
|
@@ -20,11 +20,11 @@ const buildRawQuery = ({
|
|
|
20
20
|
}) => {
|
|
21
21
|
const {
|
|
22
22
|
searchValuesText: {
|
|
23
|
-
must: searchValuesText,
|
|
23
|
+
must: searchValuesText = [],
|
|
24
24
|
should: shouldValuesText = []
|
|
25
|
-
},
|
|
26
|
-
searchValuesCheckboxSelectRange,
|
|
27
|
-
searchValuesCheckboxOr
|
|
25
|
+
} = {},
|
|
26
|
+
searchValuesCheckboxSelectRange = [],
|
|
27
|
+
searchValuesCheckboxOr = []
|
|
28
28
|
} = searchValues;
|
|
29
29
|
const {
|
|
30
30
|
filterValues,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-raw-query.js","names":["buildRawQueryBase","getItemsToDisplayIds","getExtraAzBits","buildAzFilter","AND_OPERATOR","AZ_DEFAULT_PROP","buildRawQuery","docType","operator","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","searchValuesText","must","should","shouldValuesText","searchValuesCheckboxSelectRange","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","isAZ","sortProperties","sortPropertyToUse","isScore","propsToDisplay","azSortProp","azSortProperty","searchValuesTextCheckboxSelectJoined","searchValuesTextCheckboxOr","length","finalValue","finalValueWithCheckboxOrValues","bool","finalValueIfNoCheckboxOrValues","mustValues","_buildRawQueryBase","baseShould","baseQuery","_objectWithoutProperties","_excluded","shouldValue","query","_objectSpread","undefined","azQueryBits","itemsToDisplayIds","push","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order"],"sources":["../../src/helpers/build-raw-query.js"],"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, AZ_DEFAULT_PROP } 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: { must: searchValuesText, should: shouldValuesText = [] },\n searchValuesCheckboxSelectRange,\n searchValuesCheckboxOr\n } = searchValues;\n const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;\n\n const { isAZ, sortProperties = [] } = azOptions || {};\n const sortPropertyToUse = isAZ && sortProperties[0] && sortProperties[0].isScore ? 1 : 0;\n const { propsToDisplay: [azSortProp] = [] } = sortProperties[sortPropertyToUse] || {\n propsToDisplay: []\n };\n const azSortProperty = azSortProp || AZ_DEFAULT_PROP;\n\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: [\n ...searchValuesCheckboxSelectRange,\n { bool: { should: [...searchValuesTextCheckboxOr, ...shouldValuesText] } }\n ]\n };\n }\n const mustValues = [\n {\n bool: finalValue\n }\n ];\n\n buildAzFilter(azFilter, mustValues, azSortProperty);\n\n const { should: baseShould = [], ...baseQuery } = buildRawQueryBase({\n docType,\n id,\n filterValues,\n filterOperator,\n relations,\n stringProps\n });\n const shouldValue = [...baseShould, ...shouldValuesText];\n const query = {\n bool: {\n must: mustValues,\n should: shouldValue.length ? shouldValue : undefined,\n ...baseQuery\n }\n };\n const azQueryBits = getExtraAzBits({ ...azOptions, azSortProperty, azFilter });\n\n if (itemsToDisplay && itemsToDisplay.length) {\n const itemsToDisplayIds = getItemsToDisplayIds(itemsToDisplay);\n\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"],"mappings":";;;;;AAAA,OAAOA,iBAAiB,MAAM,wBAAwB;AACtD,OAAOC,oBAAoB,MAAM,4BAA4B;AAC7D,OAAOC,cAAc,MAAM,qBAAqB;AAChD,OAAOC,aAAa,MAAM,mBAAmB;AAC7C,SAASC,YAAY,EAAEC,eAAe,QAAQ,cAAc;AAE5D,MAAMC,aAAa,GAAGA,CAAC;EACrBC,OAAO;EACPC,QAAQ;EACRC,YAAY;
|
|
1
|
+
{"version":3,"file":"build-raw-query.js","names":["buildRawQueryBase","getItemsToDisplayIds","getExtraAzBits","buildAzFilter","AND_OPERATOR","AZ_DEFAULT_PROP","buildRawQuery","docType","operator","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","searchValuesText","must","should","shouldValuesText","searchValuesCheckboxSelectRange","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","isAZ","sortProperties","sortPropertyToUse","isScore","propsToDisplay","azSortProp","azSortProperty","searchValuesTextCheckboxSelectJoined","searchValuesTextCheckboxOr","length","finalValue","finalValueWithCheckboxOrValues","bool","finalValueIfNoCheckboxOrValues","mustValues","_buildRawQueryBase","baseShould","baseQuery","_objectWithoutProperties","_excluded","shouldValue","query","_objectSpread","undefined","azQueryBits","itemsToDisplayIds","push","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order"],"sources":["../../src/helpers/build-raw-query.js"],"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, AZ_DEFAULT_PROP } 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: { must: searchValuesText = [], should: shouldValuesText = [] } = {},\n searchValuesCheckboxSelectRange = [],\n searchValuesCheckboxOr = []\n } = searchValues;\n const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;\n\n const { isAZ, sortProperties = [] } = azOptions || {};\n const sortPropertyToUse = isAZ && sortProperties[0] && sortProperties[0].isScore ? 1 : 0;\n const { propsToDisplay: [azSortProp] = [] } = sortProperties[sortPropertyToUse] || {\n propsToDisplay: []\n };\n const azSortProperty = azSortProp || AZ_DEFAULT_PROP;\n\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: [\n ...searchValuesCheckboxSelectRange,\n { bool: { should: [...searchValuesTextCheckboxOr, ...shouldValuesText] } }\n ]\n };\n }\n const mustValues = [\n {\n bool: finalValue\n }\n ];\n\n buildAzFilter(azFilter, mustValues, azSortProperty);\n\n const { should: baseShould = [], ...baseQuery } = buildRawQueryBase({\n docType,\n id,\n filterValues,\n filterOperator,\n relations,\n stringProps\n });\n const shouldValue = [...baseShould, ...shouldValuesText];\n const query = {\n bool: {\n must: mustValues,\n should: shouldValue.length ? shouldValue : undefined,\n ...baseQuery\n }\n };\n const azQueryBits = getExtraAzBits({ ...azOptions, azSortProperty, azFilter });\n\n if (itemsToDisplay && itemsToDisplay.length) {\n const itemsToDisplayIds = getItemsToDisplayIds(itemsToDisplay);\n\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"],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
const buildSearchValuesText = ({
|
|
2
|
-
propsToDisplay
|
|
3
|
-
}, {
|
|
2
|
+
propsToDisplay = []
|
|
3
|
+
} = {}, {
|
|
4
4
|
search_term: searchTerm
|
|
5
|
-
}) => propsToDisplay.reduce((acc, field, index) => {
|
|
5
|
+
} = {}) => propsToDisplay.reduce((acc, field, index) => {
|
|
6
6
|
if (field && searchTerm) {
|
|
7
7
|
if (index === 0) {
|
|
8
8
|
acc.should.push({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-search-values-text.js","names":["buildSearchValuesText","propsToDisplay","search_term","searchTerm","reduce","acc","field","index","should","push","match","pageBuilderIndexed","query","fuzziness","must"],"sources":["../../src/helpers/build-search-values-text.js"],"sourcesContent":["const buildSearchValuesText = ({ propsToDisplay }, { search_term: searchTerm }) =>\n propsToDisplay.reduce(\n (acc, field, index) => {\n if (field && searchTerm) {\n if (index === 0) {\n acc.should.push({\n match: {\n pageBuilderIndexed: {\n query: searchTerm,\n fuzziness: 'AUTO'\n }\n }\n });\n }\n acc.must.push({\n match: {\n [field]: {\n query: searchTerm,\n fuzziness: 'AUTO'\n }\n }\n });\n }\n return acc;\n },\n { should: [], must: [] }\n );\n\nexport default buildSearchValuesText;\n"],"mappings":"AAAA,MAAMA,qBAAqB,GAAGA,CAAC;EAAEC;
|
|
1
|
+
{"version":3,"file":"build-search-values-text.js","names":["buildSearchValuesText","propsToDisplay","search_term","searchTerm","reduce","acc","field","index","should","push","match","pageBuilderIndexed","query","fuzziness","must"],"sources":["../../src/helpers/build-search-values-text.js"],"sourcesContent":["const buildSearchValuesText = ({ propsToDisplay = [] } = {}, { search_term: searchTerm } = {}) =>\n propsToDisplay.reduce(\n (acc, field, index) => {\n if (field && searchTerm) {\n if (index === 0) {\n acc.should.push({\n match: {\n pageBuilderIndexed: {\n query: searchTerm,\n fuzziness: 'AUTO'\n }\n }\n });\n }\n acc.must.push({\n match: {\n [field]: {\n query: searchTerm,\n fuzziness: 'AUTO'\n }\n }\n });\n }\n return acc;\n },\n { should: [], must: [] }\n );\n\nexport default buildSearchValuesText;\n"],"mappings":"AAAA,MAAMA,qBAAqB,GAAGA,CAAC;EAAEC,cAAc,GAAG;AAAG,CAAC,GAAG,CAAC,CAAC,EAAE;EAAEC,WAAW,EAAEC;AAAW,CAAC,GAAG,CAAC,CAAC,KAC3FF,cAAc,CAACG,MAAM,CACnB,CAACC,GAAG,EAAEC,KAAK,EAAEC,KAAK,KAAK;EACrB,IAAID,KAAK,IAAIH,UAAU,EAAE;IACvB,IAAII,KAAK,KAAK,CAAC,EAAE;MACfF,GAAG,CAACG,MAAM,CAACC,IAAI,CAAC;QACdC,KAAK,EAAE;UACLC,kBAAkB,EAAE;YAClBC,KAAK,EAAET,UAAU;YACjBU,SAAS,EAAE;UACb;QACF;MACF,CAAC,CAAC;IACJ;IACAR,GAAG,CAACS,IAAI,CAACL,IAAI,CAAC;MACZC,KAAK,EAAE;QACL,CAACJ,KAAK,GAAG;UACPM,KAAK,EAAET,UAAU;UACjBU,SAAS,EAAE;QACb;MACF;IACF,CAAC,CAAC;EACJ;EACA,OAAOR,GAAG;AACZ,CAAC,EACD;EAAEG,MAAM,EAAE,EAAE;EAAEM,IAAI,EAAE;AAAG,CACzB,CAAC;AAEH,eAAed,qBAAqB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/react-page-builder",
|
|
3
|
-
"version": "0.136.0",
|
|
3
|
+
"version": "0.136.2-core-styles.0",
|
|
4
4
|
"description": "Blaze react page builder",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -27,15 +27,15 @@
|
|
|
27
27
|
},
|
|
28
28
|
"license": "GPL-3.0",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@blaze-cms/core-auth-ui": "
|
|
31
|
-
"@blaze-cms/core-errors": "
|
|
32
|
-
"@blaze-cms/core-errors-ui": "
|
|
30
|
+
"@blaze-cms/core-auth-ui": "0.136.2-core-styles.0",
|
|
31
|
+
"@blaze-cms/core-errors": "0.136.2-core-styles.0",
|
|
32
|
+
"@blaze-cms/core-errors-ui": "0.136.2-core-styles.0",
|
|
33
33
|
"@blaze-cms/image-cdn-react": "0.3.0-alpha.6",
|
|
34
|
-
"@blaze-cms/nextjs-components": "
|
|
35
|
-
"@blaze-cms/plugin-search-ui": "
|
|
36
|
-
"@blaze-cms/setup-ui": "
|
|
37
|
-
"@blaze-cms/utils": "
|
|
38
|
-
"@blaze-cms/utils-handlebars": "
|
|
34
|
+
"@blaze-cms/nextjs-components": "0.136.2-core-styles.0",
|
|
35
|
+
"@blaze-cms/plugin-search-ui": "0.136.2-core-styles.0",
|
|
36
|
+
"@blaze-cms/setup-ui": "0.136.2-core-styles.0",
|
|
37
|
+
"@blaze-cms/utils": "0.136.2-core-styles.0",
|
|
38
|
+
"@blaze-cms/utils-handlebars": "0.136.2-core-styles.0",
|
|
39
39
|
"@blaze-react/breadcrumb": "0.8.0-alpha.60",
|
|
40
40
|
"@blaze-react/button": "0.5.19",
|
|
41
41
|
"@blaze-react/checkboxes": "0.5.31",
|
|
@@ -89,5 +89,5 @@
|
|
|
89
89
|
"lib/*",
|
|
90
90
|
"lib-es/*"
|
|
91
91
|
],
|
|
92
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "b97683792b7146cd371f6c418716788a8138ae1d"
|
|
93
93
|
}
|
|
@@ -7,7 +7,7 @@ import { AND_OPERATOR, AZ_DEFAULT_PROP } from '../constants';
|
|
|
7
7
|
const buildRawQuery = ({
|
|
8
8
|
docType,
|
|
9
9
|
operator,
|
|
10
|
-
searchValues,
|
|
10
|
+
searchValues = {},
|
|
11
11
|
filterData,
|
|
12
12
|
id,
|
|
13
13
|
itemsToDisplay,
|
|
@@ -15,9 +15,9 @@ const buildRawQuery = ({
|
|
|
15
15
|
azOptions
|
|
16
16
|
}) => {
|
|
17
17
|
const {
|
|
18
|
-
searchValuesText: { must: searchValuesText, should: shouldValuesText = [] },
|
|
19
|
-
searchValuesCheckboxSelectRange,
|
|
20
|
-
searchValuesCheckboxOr
|
|
18
|
+
searchValuesText: { must: searchValuesText = [], should: shouldValuesText = [] } = {},
|
|
19
|
+
searchValuesCheckboxSelectRange = [],
|
|
20
|
+
searchValuesCheckboxOr = []
|
|
21
21
|
} = searchValues;
|
|
22
22
|
const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;
|
|
23
23
|
|
|
@@ -80,6 +80,21 @@ describe('build raw query', () => {
|
|
|
80
80
|
expect(rawQueryCheckboxSelect).toEqual(RAW_QUERY_CHECKBOX_SELECT);
|
|
81
81
|
});
|
|
82
82
|
|
|
83
|
+
it('should hande empty searchValuesText', () => {
|
|
84
|
+
const rawQueryCheckboxSelect = buildRawQuery({
|
|
85
|
+
docType,
|
|
86
|
+
operator,
|
|
87
|
+
searchValues: {
|
|
88
|
+
searchValuesCheckboxSelectRange: SEARCH_VALUES_CHECKBOX_SELECT,
|
|
89
|
+
searchValuesCheckboxOr: searchValuesCheckboxOrEmpty
|
|
90
|
+
},
|
|
91
|
+
filterData,
|
|
92
|
+
id
|
|
93
|
+
});
|
|
94
|
+
|
|
95
|
+
expect(rawQueryCheckboxSelect).toEqual(RAW_QUERY_CHECKBOX_SELECT);
|
|
96
|
+
});
|
|
97
|
+
|
|
83
98
|
it('should return an object with only checkbox & select search values when checkbox has OR operator', () => {
|
|
84
99
|
const rawQueryCheckboxSelect = buildRawQuery({
|
|
85
100
|
docType,
|
|
@@ -15,11 +15,19 @@ describe('build search values for text input', () => {
|
|
|
15
15
|
const searchValues = buildSearchValuesText(textFilter, query);
|
|
16
16
|
const searchValuesEmpty = buildSearchValuesText({ propsToDisplay: [] }, query);
|
|
17
17
|
const searchValuesNoQueryParams = buildSearchValuesText(textFilter, {});
|
|
18
|
+
const searchValuesEmptyArgs = buildSearchValuesText();
|
|
18
19
|
|
|
19
20
|
it('should always return an array', () => {
|
|
20
|
-
[searchValues, searchValuesEmpty].forEach(searchValue => {
|
|
21
|
-
expect(Array.isArray(
|
|
22
|
-
expect(Array.isArray(
|
|
21
|
+
[searchValues, searchValuesEmpty, searchValuesEmptyArgs].forEach(searchValue => {
|
|
22
|
+
expect(Array.isArray(searchValue.should)).toEqual(true);
|
|
23
|
+
expect(Array.isArray(searchValue.must)).toEqual(true);
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it('should handle empty values', () => {
|
|
28
|
+
[searchValues, searchValuesEmpty, searchValuesEmptyArgs].forEach(searchValue => {
|
|
29
|
+
expect(Array.isArray(searchValue.should)).toEqual(true);
|
|
30
|
+
expect(Array.isArray(searchValue.must)).toEqual(true);
|
|
23
31
|
});
|
|
24
32
|
});
|
|
25
33
|
|