@blaze-cms/react-page-builder 0.114.0-alpha.4 → 0.114.0-alpha.5
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/get-generic-render-variables.js +4 -2
- package/lib/helpers/get-generic-render-variables.js.map +1 -1
- package/lib/helpers/get-sort-by-field-name.js +5 -1
- package/lib/helpers/get-sort-by-field-name.js.map +1 -1
- package/lib-es/helpers/get-generic-render-variables.js +6 -2
- package/lib-es/helpers/get-generic-render-variables.js.map +1 -1
- package/lib-es/helpers/get-sort-by-field-name.js +3 -1
- package/lib-es/helpers/get-sort-by-field-name.js.map +1 -1
- package/package.json +2 -2
- package/src/helpers/get-generic-render-variables.js +7 -7
- package/src/helpers/get-sort-by-field-name.js +4 -1
- package/tests/unit/src/helpers/get-generic-render-variables.test.js +12 -0
- package/tests/unit/src/helpers/get-sort-by-field-name.test.js +16 -0
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.114.0-alpha.5](https://github.com/thebyte9/blaze/compare/v0.114.0-alpha.4...v0.114.0-alpha.5) (2021-11-30)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* handle legacy sortby property as a string ([#3235](https://github.com/thebyte9/blaze/issues/3235)) ([2d25fc3](https://github.com/thebyte9/blaze/commit/2d25fc3e55125fec711d4a06f78d35a6b26d443a))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
# [0.114.0-alpha.4](https://github.com/thebyte9/blaze/compare/v0.114.0-alpha.3...v0.114.0-alpha.4) (2021-11-29)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @blaze-cms/react-page-builder
|
|
@@ -54,7 +54,9 @@ var buildSortValues = function buildSortValues(sortFilters, relations, stringPro
|
|
|
54
54
|
var sortValues = sortFilters.map(function (_ref) {
|
|
55
55
|
var sort = _ref.sort,
|
|
56
56
|
propsToDisplay = _ref.propsToDisplay;
|
|
57
|
-
|
|
57
|
+
if (!sort) return null;
|
|
58
|
+
var sortFieldName = (0, _getSortByFieldName["default"])(relations, propsToDisplay, stringProps);
|
|
59
|
+
return sortFieldName ? "".concat(sortFieldName, ":").concat(sort.toLowerCase()) : null;
|
|
58
60
|
}).filter(Boolean).join(',');
|
|
59
61
|
return {
|
|
60
62
|
sort: sortValues
|
|
@@ -72,7 +74,7 @@ var getCorrectSort = function getCorrectSort(relations, filterProps, stringProps
|
|
|
72
74
|
sortProperties = _filterProps$sortProp === void 0 ? [] : _filterProps$sortProp;
|
|
73
75
|
return buildSortValues([{
|
|
74
76
|
sort: sort,
|
|
75
|
-
propsToDisplay:
|
|
77
|
+
propsToDisplay: sortby
|
|
76
78
|
}].concat((0, _toConsumableArray2["default"])(sortProperties)), relations, stringProps);
|
|
77
79
|
};
|
|
78
80
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/helpers/get-generic-render-variables.js"],"names":["buildSortValues","sortFilters","relations","stringProps","length","sort","sortValues","map","propsToDisplay","toLowerCase","filter","Boolean","join","getCorrectSort","filterProps","isTextSearchApplied","sortby","sortProperties","getGenericRenderVariables","rawQueryStringified","isTextSearchFilterApplied","limit","DEFAULT_LIMIT","offset","raw","Number","DEFAULT_OFFSET"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;;;;;AAEA,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAACC,WAAD,EAAcC,SAAd,EAAyBC,WAAzB,EAAyC;AAC/D,MAAI,CAACF,WAAD,IAAgB,CAACA,WAAW,CAACG,MAAjC,EAAyC,OAAO;AAAEC,IAAAA,IAAI,EAAE;AAAR,GAAP;AACzC,MAAMC,UAAU,GAAGL,WAAW,CAC3BM,GADgB,
|
|
1
|
+
{"version":3,"sources":["../../src/helpers/get-generic-render-variables.js"],"names":["buildSortValues","sortFilters","relations","stringProps","length","sort","sortValues","map","propsToDisplay","sortFieldName","toLowerCase","filter","Boolean","join","getCorrectSort","filterProps","isTextSearchApplied","sortby","sortProperties","getGenericRenderVariables","rawQueryStringified","isTextSearchFilterApplied","limit","DEFAULT_LIMIT","offset","raw","Number","DEFAULT_OFFSET"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;;;;;AAEA,IAAMA,eAAe,GAAG,SAAlBA,eAAkB,CAACC,WAAD,EAAcC,SAAd,EAAyBC,WAAzB,EAAyC;AAC/D,MAAI,CAACF,WAAD,IAAgB,CAACA,WAAW,CAACG,MAAjC,EAAyC,OAAO;AAAEC,IAAAA,IAAI,EAAE;AAAR,GAAP;AACzC,MAAMC,UAAU,GAAGL,WAAW,CAC3BM,GADgB,CACZ,gBAA8B;AAAA,QAA3BF,IAA2B,QAA3BA,IAA2B;AAAA,QAArBG,cAAqB,QAArBA,cAAqB;AACjC,QAAI,CAACH,IAAL,EAAW,OAAO,IAAP;AAEX,QAAMI,aAAa,GAAG,oCAAmBP,SAAnB,EAA8BM,cAA9B,EAA8CL,WAA9C,CAAtB;AACA,WAAOM,aAAa,aAAMA,aAAN,cAAuBJ,IAAI,CAACK,WAAL,EAAvB,IAA8C,IAAlE;AACD,GANgB,EAOhBC,MAPgB,CAOTC,OAPS,EAQhBC,IARgB,CAQX,GARW,CAAnB;AAUA,SAAO;AAAER,IAAAA,IAAI,EAAEC;AAAR,GAAP;AACD,CAbD;;AAcA,IAAMQ,cAAc,GAAG,SAAjBA,cAAiB,CAACZ,SAAD,EAAYa,WAAZ,EAAyBZ,WAAzB,EAAsCa,mBAAtC,EAA8D;AACnF,MAAIA,mBAAJ,EAAyB;AACvB,WAAO,EAAP;AACD;;AACD,MAAQX,IAAR,GAA8CU,WAA9C,CAAQV,IAAR;AAAA,MAAcY,MAAd,GAA8CF,WAA9C,CAAcE,MAAd;AAAA,8BAA8CF,WAA9C,CAAsBG,cAAtB;AAAA,MAAsBA,cAAtB,sCAAuC,EAAvC;AAEA,SAAOlB,eAAe,EACnB;AAAEK,IAAAA,IAAI,EAAJA,IAAF;AAAQG,IAAAA,cAAc,EAAES;AAAxB,GADmB,6CACkBC,cADlB,IAEpBhB,SAFoB,EAGpBC,WAHoB,CAAtB;AAKD,CAXD;;AAaA,IAAMgB,yBAAyB,GAAG,SAA5BA,yBAA4B,CAChCjB,SADgC,EAM7B;AAAA,MAJHa,WAIG,uEAJW,EAIX;AAAA,MAHHZ,WAGG,uEAHW,EAGX;AAAA,MAFHiB,mBAEG,uEAFmB,EAEnB;AAAA,MADHC,yBACG,uEADyB,KACzB;AACH,2BAA0CN,WAA1C,CAAQO,KAAR;AAAA,MAAQA,KAAR,mCAAgBC,wBAAhB;AAAA,MAA+BC,MAA/B,GAA0CT,WAA1C,CAA+BS,MAA/B;AACA,MAAMnB,IAAI,GAAGS,cAAc,CAACZ,SAAD,EAAYa,WAAZ,EAAyBZ,WAAzB,EAAsCkB,yBAAtC,CAA3B;AACA,MAAMI,GAAG,GAAGL,mBAAmB,GAAG;AAAEA,IAAAA,mBAAmB,EAAnBA;AAAF,GAAH,GAA6B,EAA5D;AAEA;AACEE,IAAAA,KAAK,EAAEI,MAAM,CAACJ,KAAK,IAAIC,wBAAV,CADf;AAEEC,IAAAA,MAAM,EAAEE,MAAM,CAACF,MAAM,IAAIG,yBAAX;AAFhB,KAGKtB,IAHL,GAIKoB,GAJL;AAMD,CAjBD;;eAmBeN,yB","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 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 rawQueryStringified = '',\n isTextSearchFilterApplied = false\n) => {\n const { limit = DEFAULT_LIMIT, offset } = filterProps;\n const sort = getCorrectSort(relations, filterProps, stringProps, isTextSearchFilterApplied);\n const raw = rawQueryStringified ? { rawQueryStringified } : {};\n\n return {\n limit: Number(limit || DEFAULT_LIMIT),\n offset: Number(offset || DEFAULT_OFFSET),\n ...sort,\n ...raw\n };\n};\n\nexport default getGenericRenderVariables;\n"],"file":"get-generic-render-variables.js"}
|
|
@@ -11,6 +11,8 @@ exports["default"] = void 0;
|
|
|
11
11
|
|
|
12
12
|
var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
|
|
13
13
|
|
|
14
|
+
require("core-js/modules/es.array.is-array.js");
|
|
15
|
+
|
|
14
16
|
require("core-js/modules/es.array.includes.js");
|
|
15
17
|
|
|
16
18
|
require("core-js/modules/es.string.includes.js");
|
|
@@ -25,7 +27,9 @@ require("core-js/modules/es.array.concat.js");
|
|
|
25
27
|
|
|
26
28
|
var _constants = require("../constants");
|
|
27
29
|
|
|
28
|
-
var buildFieldName = function buildFieldName(relations,
|
|
30
|
+
var buildFieldName = function buildFieldName(relations, fieldValue, stringProps) {
|
|
31
|
+
var field = Array.isArray(fieldValue) ? fieldValue[0] : fieldValue;
|
|
32
|
+
if (!field) return null;
|
|
29
33
|
var updatedField = field;
|
|
30
34
|
|
|
31
35
|
if (field.includes('.')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/helpers/get-sort-by-field-name.js"],"names":["buildFieldName","relations","
|
|
1
|
+
{"version":3,"sources":["../../src/helpers/get-sort-by-field-name.js"],"names":["buildFieldName","relations","fieldValue","stringProps","field","Array","isArray","updatedField","includes","split","relationName","relationProp","filter","localField","relation","entityIdentifier","KEYWORD","getSortbyFieldName","sortby","isSortbyArray"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AAEA,IAAMA,cAAc,GAAG,SAAjBA,cAAiB,CAACC,SAAD,EAAYC,UAAZ,EAAwBC,WAAxB,EAAwC;AAC7D,MAAMC,KAAK,GAAGC,KAAK,CAACC,OAAN,CAAcJ,UAAd,IAA4BA,UAAU,CAAC,CAAD,CAAtC,GAA4CA,UAA1D;AACA,MAAI,CAACE,KAAL,EAAY,OAAO,IAAP;AAEZ,MAAIG,YAAY,GAAGH,KAAnB;;AAEA,MAAIA,KAAK,CAACI,QAAN,CAAe,GAAf,CAAJ,EAAyB;AACvB,uBAAqCJ,KAAK,CAACK,KAAN,CAAY,GAAZ,CAArC;AAAA;AAAA,QAAOC,YAAP;AAAA,QAAqBC,YAArB;;AAEA,4BAAmBV,SAAS,CAACW,MAAV,CAAiB;AAAA,UAAGC,UAAH,QAAGA,UAAH;AAAA,aAAoBA,UAAU,KAAKH,YAAnC;AAAA,KAAjB,CAAnB;AAAA;AAAA,QAAOI,QAAP;;AACA,gBAAkCA,QAAQ,IAAI,EAA9C;AAAA,sCAAQC,gBAAR;AAAA,QAAQA,gBAAR,sCAA2B,EAA3B;;AACA,QAAIA,gBAAgB,IAAIA,gBAAgB,KAAKL,YAA7C,EACEH,YAAY,aAAMQ,gBAAN,cAA0BJ,YAA1B,CAAZ;AACH;;AACD,SAAOR,WAAW,CAACK,QAAZ,CAAqBD,YAArB,cAAwCH,KAAxC,cAAiDY,kBAAjD,IAA6DZ,KAApE;AACD,CAfD;;AAiBA,IAAMa,kBAAkB,GAAG,SAArBA,kBAAqB,CAAChB,SAAD,EAAYiB,MAAZ,EAAoBf,WAApB,EAAiCgB,aAAjC;AAAA,SACzBA,aAAa,GACTnB,cAAc,CAACC,SAAD,EAAYiB,MAAM,CAAC,CAAD,CAAlB,EAAuBf,WAAvB,CADL,GAETH,cAAc,CAACC,SAAD,EAAYiB,MAAZ,EAAoBf,WAApB,CAHO;AAAA,CAA3B;;eAKec,kB","sourcesContent":["import { KEYWORD } from '../constants';\n\nconst buildFieldName = (relations, fieldValue, stringProps) => {\n const field = Array.isArray(fieldValue) ? fieldValue[0] : fieldValue;\n if (!field) return null;\n\n let updatedField = field;\n\n if (field.includes('.')) {\n const [relationName, relationProp] = field.split('.');\n\n const [relation] = relations.filter(({ localField }) => localField === relationName);\n const { entityIdentifier = '' } = relation || {};\n if (entityIdentifier && entityIdentifier !== relationName)\n updatedField = `${entityIdentifier}.${relationProp}`;\n }\n return stringProps.includes(updatedField) ? `${field}.${KEYWORD}` : field;\n};\n\nconst getSortbyFieldName = (relations, sortby, stringProps, isSortbyArray) =>\n isSortbyArray\n ? buildFieldName(relations, sortby[0], stringProps)\n : buildFieldName(relations, sortby, stringProps);\n\nexport default getSortbyFieldName;\n"],"file":"get-sort-by-field-name.js"}
|
|
@@ -14,7 +14,11 @@ const buildSortValues = (sortFilters, relations, stringProps) => {
|
|
|
14
14
|
const sortValues = sortFilters.map(({
|
|
15
15
|
sort,
|
|
16
16
|
propsToDisplay
|
|
17
|
-
}) =>
|
|
17
|
+
}) => {
|
|
18
|
+
if (!sort) return null;
|
|
19
|
+
const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
|
|
20
|
+
return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;
|
|
21
|
+
}).filter(Boolean).join(',');
|
|
18
22
|
return {
|
|
19
23
|
sort: sortValues
|
|
20
24
|
};
|
|
@@ -32,7 +36,7 @@ const getCorrectSort = (relations, filterProps, stringProps, isTextSearchApplied
|
|
|
32
36
|
} = filterProps;
|
|
33
37
|
return buildSortValues([{
|
|
34
38
|
sort,
|
|
35
|
-
propsToDisplay:
|
|
39
|
+
propsToDisplay: sortby
|
|
36
40
|
}, ...sortProperties], relations, stringProps);
|
|
37
41
|
};
|
|
38
42
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/helpers/get-generic-render-variables.js"],"names":["getSortbyFieldName","DEFAULT_LIMIT","DEFAULT_OFFSET","buildSortValues","sortFilters","relations","stringProps","length","sort","sortValues","map","propsToDisplay","toLowerCase","filter","Boolean","join","getCorrectSort","filterProps","isTextSearchApplied","sortby","sortProperties","getGenericRenderVariables","rawQueryStringified","isTextSearchFilterApplied","limit","offset","raw","Number"],"mappings":";;;;;;AAAA,OAAOA,kBAAP,MAA+B,0BAA/B;AACA,SAASC,aAAT,EAAwBC,cAAxB,QAA8C,cAA9C;;AAEA,MAAMC,eAAe,GAAG,CAACC,WAAD,EAAcC,SAAd,EAAyBC,WAAzB,KAAyC;AAC/D,MAAI,CAACF,WAAD,IAAgB,CAACA,WAAW,CAACG,MAAjC,EAAyC,OAAO;AAAEC,IAAAA,IAAI,EAAE;AAAR,GAAP;AACzC,QAAMC,UAAU,GAAGL,WAAW,CAC3BM,GADgB,
|
|
1
|
+
{"version":3,"sources":["../../src/helpers/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","rawQueryStringified","isTextSearchFilterApplied","limit","offset","raw","Number"],"mappings":";;;;;;AAAA,OAAOA,kBAAP,MAA+B,0BAA/B;AACA,SAASC,aAAT,EAAwBC,cAAxB,QAA8C,cAA9C;;AAEA,MAAMC,eAAe,GAAG,CAACC,WAAD,EAAcC,SAAd,EAAyBC,WAAzB,KAAyC;AAC/D,MAAI,CAACF,WAAD,IAAgB,CAACA,WAAW,CAACG,MAAjC,EAAyC,OAAO;AAAEC,IAAAA,IAAI,EAAE;AAAR,GAAP;AACzC,QAAMC,UAAU,GAAGL,WAAW,CAC3BM,GADgB,CACZ,CAAC;AAAEF,IAAAA,IAAF;AAAQG,IAAAA;AAAR,GAAD,KAA8B;AACjC,QAAI,CAACH,IAAL,EAAW,OAAO,IAAP;AAEX,UAAMI,aAAa,GAAGZ,kBAAkB,CAACK,SAAD,EAAYM,cAAZ,EAA4BL,WAA5B,CAAxC;AACA,WAAOM,aAAa,GAAI,GAAEA,aAAc,IAAGJ,IAAI,CAACK,WAAL,EAAmB,EAA1C,GAA8C,IAAlE;AACD,GANgB,EAOhBC,MAPgB,CAOTC,OAPS,EAQhBC,IARgB,CAQX,GARW,CAAnB;AAUA,SAAO;AAAER,IAAAA,IAAI,EAAEC;AAAR,GAAP;AACD,CAbD;;AAcA,MAAMQ,cAAc,GAAG,CAACZ,SAAD,EAAYa,WAAZ,EAAyBZ,WAAzB,EAAsCa,mBAAtC,KAA8D;AACnF,MAAIA,mBAAJ,EAAyB;AACvB,WAAO,EAAP;AACD;;AACD,QAAM;AAAEX,IAAAA,IAAF;AAAQY,IAAAA,MAAR;AAAgBC,IAAAA,cAAc,GAAG;AAAjC,MAAwCH,WAA9C;AAEA,SAAOf,eAAe,CACpB,CAAC;AAAEK,IAAAA,IAAF;AAAQG,IAAAA,cAAc,EAAES;AAAxB,GAAD,EAAmC,GAAGC,cAAtC,CADoB,EAEpBhB,SAFoB,EAGpBC,WAHoB,CAAtB;AAKD,CAXD;;AAaA,MAAMgB,yBAAyB,GAAG,CAChCjB,SADgC,EAEhCa,WAAW,GAAG,EAFkB,EAGhCZ,WAAW,GAAG,EAHkB,EAIhCiB,mBAAmB,GAAG,EAJU,EAKhCC,yBAAyB,GAAG,KALI,KAM7B;AACH,QAAM;AAAEC,IAAAA,KAAK,GAAGxB,aAAV;AAAyByB,IAAAA;AAAzB,MAAoCR,WAA1C;AACA,QAAMV,IAAI,GAAGS,cAAc,CAACZ,SAAD,EAAYa,WAAZ,EAAyBZ,WAAzB,EAAsCkB,yBAAtC,CAA3B;AACA,QAAMG,GAAG,GAAGJ,mBAAmB,GAAG;AAAEA,IAAAA;AAAF,GAAH,GAA6B,EAA5D;AAEA;AACEE,IAAAA,KAAK,EAAEG,MAAM,CAACH,KAAK,IAAIxB,aAAV,CADf;AAEEyB,IAAAA,MAAM,EAAEE,MAAM,CAACF,MAAM,IAAIxB,cAAX;AAFhB,KAGKM,IAHL,GAIKmB,GAJL;AAMD,CAjBD;;AAmBA,eAAeL,yBAAf","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 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 rawQueryStringified = '',\n isTextSearchFilterApplied = false\n) => {\n const { limit = DEFAULT_LIMIT, offset } = filterProps;\n const sort = getCorrectSort(relations, filterProps, stringProps, isTextSearchFilterApplied);\n const raw = rawQueryStringified ? { rawQueryStringified } : {};\n\n return {\n limit: Number(limit || DEFAULT_LIMIT),\n offset: Number(offset || DEFAULT_OFFSET),\n ...sort,\n ...raw\n };\n};\n\nexport default getGenericRenderVariables;\n"],"file":"get-generic-render-variables.js"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { KEYWORD } from '../constants';
|
|
2
2
|
|
|
3
|
-
const buildFieldName = (relations,
|
|
3
|
+
const buildFieldName = (relations, fieldValue, stringProps) => {
|
|
4
|
+
const field = Array.isArray(fieldValue) ? fieldValue[0] : fieldValue;
|
|
5
|
+
if (!field) return null;
|
|
4
6
|
let updatedField = field;
|
|
5
7
|
|
|
6
8
|
if (field.includes('.')) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/helpers/get-sort-by-field-name.js"],"names":["KEYWORD","buildFieldName","relations","
|
|
1
|
+
{"version":3,"sources":["../../src/helpers/get-sort-by-field-name.js"],"names":["KEYWORD","buildFieldName","relations","fieldValue","stringProps","field","Array","isArray","updatedField","includes","relationName","relationProp","split","relation","filter","localField","entityIdentifier","getSortbyFieldName","sortby","isSortbyArray"],"mappings":"AAAA,SAASA,OAAT,QAAwB,cAAxB;;AAEA,MAAMC,cAAc,GAAG,CAACC,SAAD,EAAYC,UAAZ,EAAwBC,WAAxB,KAAwC;AAC7D,QAAMC,KAAK,GAAGC,KAAK,CAACC,OAAN,CAAcJ,UAAd,IAA4BA,UAAU,CAAC,CAAD,CAAtC,GAA4CA,UAA1D;AACA,MAAI,CAACE,KAAL,EAAY,OAAO,IAAP;AAEZ,MAAIG,YAAY,GAAGH,KAAnB;;AAEA,MAAIA,KAAK,CAACI,QAAN,CAAe,GAAf,CAAJ,EAAyB;AACvB,UAAM,CAACC,YAAD,EAAeC,YAAf,IAA+BN,KAAK,CAACO,KAAN,CAAY,GAAZ,CAArC;AAEA,UAAM,CAACC,QAAD,IAAaX,SAAS,CAACY,MAAV,CAAiB,CAAC;AAAEC,MAAAA;AAAF,KAAD,KAAoBA,UAAU,KAAKL,YAApD,CAAnB;AACA,UAAM;AAAEM,MAAAA,gBAAgB,GAAG;AAArB,QAA4BH,QAAQ,IAAI,EAA9C;AACA,QAAIG,gBAAgB,IAAIA,gBAAgB,KAAKN,YAA7C,EACEF,YAAY,GAAI,GAAEQ,gBAAiB,IAAGL,YAAa,EAAnD;AACH;;AACD,SAAOP,WAAW,CAACK,QAAZ,CAAqBD,YAArB,IAAsC,GAAEH,KAAM,IAAGL,OAAQ,EAAzD,GAA6DK,KAApE;AACD,CAfD;;AAiBA,MAAMY,kBAAkB,GAAG,CAACf,SAAD,EAAYgB,MAAZ,EAAoBd,WAApB,EAAiCe,aAAjC,KACzBA,aAAa,GACTlB,cAAc,CAACC,SAAD,EAAYgB,MAAM,CAAC,CAAD,CAAlB,EAAuBd,WAAvB,CADL,GAETH,cAAc,CAACC,SAAD,EAAYgB,MAAZ,EAAoBd,WAApB,CAHpB;;AAKA,eAAea,kBAAf","sourcesContent":["import { KEYWORD } from '../constants';\n\nconst buildFieldName = (relations, fieldValue, stringProps) => {\n const field = Array.isArray(fieldValue) ? fieldValue[0] : fieldValue;\n if (!field) return null;\n\n let updatedField = field;\n\n if (field.includes('.')) {\n const [relationName, relationProp] = field.split('.');\n\n const [relation] = relations.filter(({ localField }) => localField === relationName);\n const { entityIdentifier = '' } = relation || {};\n if (entityIdentifier && entityIdentifier !== relationName)\n updatedField = `${entityIdentifier}.${relationProp}`;\n }\n return stringProps.includes(updatedField) ? `${field}.${KEYWORD}` : field;\n};\n\nconst getSortbyFieldName = (relations, sortby, stringProps, isSortbyArray) =>\n isSortbyArray\n ? buildFieldName(relations, sortby[0], stringProps)\n : buildFieldName(relations, sortby, stringProps);\n\nexport default getSortbyFieldName;\n"],"file":"get-sort-by-field-name.js"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/react-page-builder",
|
|
3
|
-
"version": "0.114.0-alpha.
|
|
3
|
+
"version": "0.114.0-alpha.5",
|
|
4
4
|
"description": "Blaze react page builder",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -88,5 +88,5 @@
|
|
|
88
88
|
"lib/*",
|
|
89
89
|
"lib-es/*"
|
|
90
90
|
],
|
|
91
|
-
"gitHead": "
|
|
91
|
+
"gitHead": "0be6611c7eec3b27764b130f19bdd8d5e7d7d41a"
|
|
92
92
|
}
|
|
@@ -4,12 +4,12 @@ import { DEFAULT_LIMIT, DEFAULT_OFFSET } from '../constants';
|
|
|
4
4
|
const buildSortValues = (sortFilters, relations, stringProps) => {
|
|
5
5
|
if (!sortFilters || !sortFilters.length) return { sort: [] };
|
|
6
6
|
const sortValues = sortFilters
|
|
7
|
-
.map(
|
|
8
|
-
(
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
)
|
|
7
|
+
.map(({ sort, propsToDisplay }) => {
|
|
8
|
+
if (!sort) return null;
|
|
9
|
+
|
|
10
|
+
const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
|
|
11
|
+
return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;
|
|
12
|
+
})
|
|
13
13
|
.filter(Boolean)
|
|
14
14
|
.join(',');
|
|
15
15
|
|
|
@@ -22,7 +22,7 @@ const getCorrectSort = (relations, filterProps, stringProps, isTextSearchApplied
|
|
|
22
22
|
const { sort, sortby, sortProperties = [] } = filterProps;
|
|
23
23
|
|
|
24
24
|
return buildSortValues(
|
|
25
|
-
[{ sort, propsToDisplay:
|
|
25
|
+
[{ sort, propsToDisplay: sortby }, ...sortProperties],
|
|
26
26
|
relations,
|
|
27
27
|
stringProps
|
|
28
28
|
);
|
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
import { KEYWORD } from '../constants';
|
|
2
2
|
|
|
3
|
-
const buildFieldName = (relations,
|
|
3
|
+
const buildFieldName = (relations, fieldValue, stringProps) => {
|
|
4
|
+
const field = Array.isArray(fieldValue) ? fieldValue[0] : fieldValue;
|
|
5
|
+
if (!field) return null;
|
|
6
|
+
|
|
4
7
|
let updatedField = field;
|
|
5
8
|
|
|
6
9
|
if (field.includes('.')) {
|
|
@@ -68,6 +68,13 @@ describe('get card/list render variables', () => {
|
|
|
68
68
|
expect(offset).toEqual(0);
|
|
69
69
|
});
|
|
70
70
|
|
|
71
|
+
it('should return an object with correct data when no sortby is passed', () => {
|
|
72
|
+
const { sort, offset } = getGenericRenderVariables(mockedProps({ sortby: [] }));
|
|
73
|
+
|
|
74
|
+
expect(sort).toBeFalsy();
|
|
75
|
+
expect(offset).toEqual(0);
|
|
76
|
+
});
|
|
77
|
+
|
|
71
78
|
it('should return correct sort data when we pass an array', () => {
|
|
72
79
|
const { sort } = getGenericRenderVariables(
|
|
73
80
|
[],
|
|
@@ -82,6 +89,11 @@ describe('get card/list render variables', () => {
|
|
|
82
89
|
expect(sort).toEqual('name.keyword:desc');
|
|
83
90
|
});
|
|
84
91
|
|
|
92
|
+
it('should return correct sort data sortby is an array', () => {
|
|
93
|
+
const { sort } = getGenericRenderVariables([], mockedProps({ sortby: ['name'] }), STRING_PROPS);
|
|
94
|
+
expect(sort).toEqual('name.keyword:desc');
|
|
95
|
+
});
|
|
96
|
+
|
|
85
97
|
it("should return correct sort data when when there is a prop that is of type string and it's also a relation prop", () => {
|
|
86
98
|
const { sort } = getGenericRenderVariables(
|
|
87
99
|
[{ localField: 'entity', entityIdentifier: 'entity' }],
|
|
@@ -38,4 +38,20 @@ describe('get sortb by field name', () => {
|
|
|
38
38
|
expect(sortByNoArray).toEqual(PRICE_FIELD);
|
|
39
39
|
expect(sortByNoArrayStringProp).toEqual(CATEGORY_SORT_FIELD);
|
|
40
40
|
});
|
|
41
|
+
|
|
42
|
+
it('should automatically handle when is an array but isSortbyArray is not set', () => {
|
|
43
|
+
const sort = getSortbyFieldName([], [PRICE_FIELD], []);
|
|
44
|
+
expect(typeof sort).toEqual('string');
|
|
45
|
+
expect(sort).toEqual(PRICE_FIELD);
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
it('should handle empty array', () => {
|
|
49
|
+
const sort = getSortbyFieldName([], [], []);
|
|
50
|
+
expect(sort).toBeNull();
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
it('should handle empty string', () => {
|
|
54
|
+
const sort = getSortbyFieldName([], '', []);
|
|
55
|
+
expect(sort).toBeNull();
|
|
56
|
+
});
|
|
41
57
|
});
|