@blaze-cms/react-page-builder 0.144.0 → 0.145.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.
- package/CHANGELOG.md +11 -0
- package/lib/helpers/build-inherited-filters.js +3 -3
- package/lib/helpers/build-inherited-filters.js.map +1 -1
- package/lib/helpers/get-filter-props.js +10 -0
- package/lib/helpers/get-filter-props.js.map +1 -1
- package/lib-es/helpers/build-inherited-filters.js +3 -3
- package/lib-es/helpers/build-inherited-filters.js.map +1 -1
- package/lib-es/helpers/get-filter-props.js +10 -1
- package/lib-es/helpers/get-filter-props.js.map +1 -1
- package/package.json +2 -2
- package/src/helpers/build-inherited-filters.js +4 -4
- package/src/helpers/get-filter-props.js +12 -1
- package/tests/helpers/mocks.js +13 -0
- package/tests/unit/src/helpers/build-inherited-filters.test.js +5 -1
- package/tests/unit/src/helpers/get-filter-props.test.js +9 -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.145.0-alpha.0](https://github.com/thebyte9/blaze/compare/v0.144.0...v0.145.0-alpha.0) (2024-07-26)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* list component handle id filters ([#4445](https://github.com/thebyte9/blaze/issues/4445)) ([789ae4d](https://github.com/thebyte9/blaze/commit/789ae4d99000656e7d0fea44d129705b6dba11e2))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
# [0.144.0](https://github.com/thebyte9/blaze/compare/v0.144.0-alpha.2...v0.144.0) (2024-07-11)
|
|
7
18
|
|
|
8
19
|
**Note:** Version bump only for package @blaze-cms/react-page-builder
|
|
@@ -58,7 +58,6 @@ var buildInheritedFilters = function buildInheritedFilters(entityData, inherited
|
|
|
58
58
|
relationEntityName = _getFilterProps.relationEntityName,
|
|
59
59
|
relationForeignKeys = _getFilterProps.relationForeignKeys,
|
|
60
60
|
shouldIgnoreFilter = _getFilterProps.shouldIgnoreFilter;
|
|
61
|
-
if (filterName === _constants.ID) return;
|
|
62
61
|
var relationData = getRelationData(entityData, relationName, relationForeignKeys);
|
|
63
62
|
if (currentEntityId === entityName && (0, _isFilterEntitysId["default"])(filterName, currentEntityId) || shouldIgnoreFilter) {
|
|
64
63
|
relationFilters.push("".concat(filterName, "/").concat(itemId));
|
|
@@ -67,12 +66,13 @@ var buildInheritedFilters = function buildInheritedFilters(entityData, inherited
|
|
|
67
66
|
var isDataArray = Array.isArray(relationData);
|
|
68
67
|
var arrayHasData = checkIfArrayHasData(isDataArray, relationData);
|
|
69
68
|
if (!relationEntityName) {
|
|
70
|
-
var filtersNoRelation = setFiltersNoRelation(isDataArray, arrayHasData, relationData, relationName);
|
|
69
|
+
var filtersNoRelation = setFiltersNoRelation(isDataArray, arrayHasData, relationData, filterName === _constants.ID ? filterName : relationName);
|
|
71
70
|
relationFilters.push.apply(relationFilters, (0, _toConsumableArray2["default"])(filtersNoRelation));
|
|
72
71
|
}
|
|
73
72
|
if (arrayHasData) {
|
|
74
73
|
var filterValues = relationData.reduce(function (acc, relationValue) {
|
|
75
|
-
|
|
74
|
+
var filterNameToUse = filterName === _constants.ID ? 'ids' : filterName;
|
|
75
|
+
if (relationValue[relationProp]) acc.push("".concat(filterNameToUse, "/").concat(relationValue[relationProp]));
|
|
76
76
|
return acc;
|
|
77
77
|
}, []);
|
|
78
78
|
relationFilters.push.apply(relationFilters, (0, _toConsumableArray2["default"])(filterValues));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-inherited-filters.js","names":["_lodash","_interopRequireDefault","require","_isFilterEntitysId","_getFilterProps2","_constants","getRelationData","entityData","relationName","currentRelationNames","length","arrayOfRelations","map","name","filter","Boolean","flatten","checkIfArrayHasData","isDataArray","relationData","setFiltersNoRelation","arrayHasData","filters","filterValues","reduce","acc","relationValue","_typeof2","push","concat","apply","_toConsumableArray2","buildInheritedFilters","inheritedFilters","currentSchema","filterEntitySchema","itemId","relationFilters","currentEntityId","identifier","forEach","_getFilterProps","getFilterProps","filterName","entityName","relationProp","relationEntityName","relationForeignKeys","shouldIgnoreFilter","
|
|
1
|
+
{"version":3,"file":"build-inherited-filters.js","names":["_lodash","_interopRequireDefault","require","_isFilterEntitysId","_getFilterProps2","_constants","getRelationData","entityData","relationName","currentRelationNames","length","arrayOfRelations","map","name","filter","Boolean","flatten","checkIfArrayHasData","isDataArray","relationData","setFiltersNoRelation","arrayHasData","filters","filterValues","reduce","acc","relationValue","_typeof2","push","concat","apply","_toConsumableArray2","buildInheritedFilters","inheritedFilters","currentSchema","filterEntitySchema","itemId","relationFilters","currentEntityId","identifier","forEach","_getFilterProps","getFilterProps","filterName","entityName","relationProp","relationEntityName","relationForeignKeys","shouldIgnoreFilter","isFilterEntitysId","Array","isArray","filtersNoRelation","ID","filterNameToUse","_default","exports"],"sources":["../../src/helpers/build-inherited-filters.js"],"sourcesContent":["import flatten from 'lodash.flatten';\nimport isFilterEntitysId from './is-filter-entitys-id';\nimport getFilterProps from './get-filter-props';\nimport { ID } from '../constants';\n\nconst getRelationData = (entityData, relationName, currentRelationNames) => {\n if (!entityData) return null;\n if (currentRelationNames && currentRelationNames.length) {\n const arrayOfRelations = currentRelationNames.map(name => entityData[name]).filter(Boolean);\n return arrayOfRelations.length ? flatten(arrayOfRelations) : null;\n }\n return entityData[relationName];\n};\n\nconst checkIfArrayHasData = (isDataArray, relationData) => isDataArray && !!relationData.length;\n\nconst setFiltersNoRelation = (isDataArray, arrayHasData, relationData, relationName) => {\n const filters = [];\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue && typeof relationValue !== 'object')\n acc.push(`${relationName}/${relationValue}`);\n return acc;\n }, []);\n filters.push(...filterValues);\n } else if (!isDataArray && typeof relationData !== 'object') {\n filters.push(`${relationName}/${relationData}`);\n }\n\n return filters;\n};\nconst buildInheritedFilters = (\n entityData,\n inheritedFilters,\n currentSchema,\n filterEntitySchema,\n itemId\n) => {\n const relationFilters = [];\n const { identifier: currentEntityId } = currentSchema;\n\n inheritedFilters.forEach(filter => {\n const {\n filterName,\n entityName,\n relationName,\n relationProp,\n relationEntityName,\n relationForeignKeys,\n shouldIgnoreFilter\n } = getFilterProps(filter, currentSchema, filterEntitySchema);\n\n const relationData = getRelationData(entityData, relationName, relationForeignKeys);\n if (\n (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId)) ||\n shouldIgnoreFilter\n ) {\n relationFilters.push(`${filterName}/${itemId}`);\n }\n\n if (!relationData) return;\n\n const isDataArray = Array.isArray(relationData);\n const arrayHasData = checkIfArrayHasData(isDataArray, relationData);\n\n if (!relationEntityName) {\n const filtersNoRelation = setFiltersNoRelation(\n isDataArray,\n arrayHasData,\n relationData,\n filterName === ID ? filterName : relationName\n );\n relationFilters.push(...filtersNoRelation);\n }\n\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n const filterNameToUse = filterName === ID ? 'ids' : filterName;\n if (relationValue[relationProp])\n acc.push(`${filterNameToUse}/${relationValue[relationProp]}`);\n return acc;\n }, []);\n relationFilters.push(...filterValues);\n } else if (!isDataArray && relationData[relationProp]) {\n relationFilters.push(`${filterName}/${relationData[relationProp]}`);\n }\n });\n\n return relationFilters;\n};\n\nexport default buildInheritedFilters;\n"],"mappings":";;;;;;;;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,kBAAA,GAAAF,sBAAA,CAAAC,OAAA;AACA,IAAAE,gBAAA,GAAAH,sBAAA,CAAAC,OAAA;AACA,IAAAG,UAAA,GAAAH,OAAA;AAEA,IAAMI,eAAe,GAAG,SAAlBA,eAAeA,CAAIC,UAAU,EAAEC,YAAY,EAAEC,oBAAoB,EAAK;EAC1E,IAAI,CAACF,UAAU,EAAE,OAAO,IAAI;EAC5B,IAAIE,oBAAoB,IAAIA,oBAAoB,CAACC,MAAM,EAAE;IACvD,IAAMC,gBAAgB,GAAGF,oBAAoB,CAACG,GAAG,CAAC,UAAAC,IAAI;MAAA,OAAIN,UAAU,CAACM,IAAI,CAAC;IAAA,EAAC,CAACC,MAAM,CAACC,OAAO,CAAC;IAC3F,OAAOJ,gBAAgB,CAACD,MAAM,GAAG,IAAAM,kBAAO,EAACL,gBAAgB,CAAC,GAAG,IAAI;EACnE;EACA,OAAOJ,UAAU,CAACC,YAAY,CAAC;AACjC,CAAC;AAED,IAAMS,mBAAmB,GAAG,SAAtBA,mBAAmBA,CAAIC,WAAW,EAAEC,YAAY;EAAA,OAAKD,WAAW,IAAI,CAAC,CAACC,YAAY,CAACT,MAAM;AAAA;AAE/F,IAAMU,oBAAoB,GAAG,SAAvBA,oBAAoBA,CAAIF,WAAW,EAAEG,YAAY,EAAEF,YAAY,EAAEX,YAAY,EAAK;EACtF,IAAMc,OAAO,GAAG,EAAE;EAClB,IAAID,YAAY,EAAE;IAChB,IAAME,YAAY,GAAGJ,YAAY,CAACK,MAAM,CAAC,UAACC,GAAG,EAAEC,aAAa,EAAK;MAC/D,IAAIA,aAAa,IAAI,IAAAC,QAAA,aAAOD,aAAa,MAAK,QAAQ,EACpDD,GAAG,CAACG,IAAI,IAAAC,MAAA,CAAIrB,YAAY,OAAAqB,MAAA,CAAIH,aAAa,CAAE,CAAC;MAC9C,OAAOD,GAAG;IACZ,CAAC,EAAE,EAAE,CAAC;IACNH,OAAO,CAACM,IAAI,CAAAE,KAAA,CAAZR,OAAO,MAAAS,mBAAA,aAASR,YAAY,EAAC;EAC/B,CAAC,MAAM,IAAI,CAACL,WAAW,IAAI,IAAAS,QAAA,aAAOR,YAAY,MAAK,QAAQ,EAAE;IAC3DG,OAAO,CAACM,IAAI,IAAAC,MAAA,CAAIrB,YAAY,OAAAqB,MAAA,CAAIV,YAAY,CAAE,CAAC;EACjD;EAEA,OAAOG,OAAO;AAChB,CAAC;AACD,IAAMU,qBAAqB,GAAG,SAAxBA,qBAAqBA,CACzBzB,UAAU,EACV0B,gBAAgB,EAChBC,aAAa,EACbC,kBAAkB,EAClBC,MAAM,EACH;EACH,IAAMC,eAAe,GAAG,EAAE;EAC1B,IAAoBC,eAAe,GAAKJ,aAAa,CAA7CK,UAAU;EAElBN,gBAAgB,CAACO,OAAO,CAAC,UAAA1B,MAAM,EAAI;IACjC,IAAA2B,eAAA,GAQI,IAAAC,2BAAc,EAAC5B,MAAM,EAAEoB,aAAa,EAAEC,kBAAkB,CAAC;MAP3DQ,UAAU,GAAAF,eAAA,CAAVE,UAAU;MACVC,UAAU,GAAAH,eAAA,CAAVG,UAAU;MACVpC,YAAY,GAAAiC,eAAA,CAAZjC,YAAY;MACZqC,YAAY,GAAAJ,eAAA,CAAZI,YAAY;MACZC,kBAAkB,GAAAL,eAAA,CAAlBK,kBAAkB;MAClBC,mBAAmB,GAAAN,eAAA,CAAnBM,mBAAmB;MACnBC,kBAAkB,GAAAP,eAAA,CAAlBO,kBAAkB;IAGpB,IAAM7B,YAAY,GAAGb,eAAe,CAACC,UAAU,EAAEC,YAAY,EAAEuC,mBAAmB,CAAC;IACnF,IACGT,eAAe,KAAKM,UAAU,IAAI,IAAAK,6BAAiB,EAACN,UAAU,EAAEL,eAAe,CAAC,IACjFU,kBAAkB,EAClB;MACAX,eAAe,CAACT,IAAI,IAAAC,MAAA,CAAIc,UAAU,OAAAd,MAAA,CAAIO,MAAM,CAAE,CAAC;IACjD;IAEA,IAAI,CAACjB,YAAY,EAAE;IAEnB,IAAMD,WAAW,GAAGgC,KAAK,CAACC,OAAO,CAAChC,YAAY,CAAC;IAC/C,IAAME,YAAY,GAAGJ,mBAAmB,CAACC,WAAW,EAAEC,YAAY,CAAC;IAEnE,IAAI,CAAC2B,kBAAkB,EAAE;MACvB,IAAMM,iBAAiB,GAAGhC,oBAAoB,CAC5CF,WAAW,EACXG,YAAY,EACZF,YAAY,EACZwB,UAAU,KAAKU,aAAE,GAAGV,UAAU,GAAGnC,YACnC,CAAC;MACD6B,eAAe,CAACT,IAAI,CAAAE,KAAA,CAApBO,eAAe,MAAAN,mBAAA,aAASqB,iBAAiB,EAAC;IAC5C;IAEA,IAAI/B,YAAY,EAAE;MAChB,IAAME,YAAY,GAAGJ,YAAY,CAACK,MAAM,CAAC,UAACC,GAAG,EAAEC,aAAa,EAAK;QAC/D,IAAM4B,eAAe,GAAGX,UAAU,KAAKU,aAAE,GAAG,KAAK,GAAGV,UAAU;QAC9D,IAAIjB,aAAa,CAACmB,YAAY,CAAC,EAC7BpB,GAAG,CAACG,IAAI,IAAAC,MAAA,CAAIyB,eAAe,OAAAzB,MAAA,CAAIH,aAAa,CAACmB,YAAY,CAAC,CAAE,CAAC;QAC/D,OAAOpB,GAAG;MACZ,CAAC,EAAE,EAAE,CAAC;MACNY,eAAe,CAACT,IAAI,CAAAE,KAAA,CAApBO,eAAe,MAAAN,mBAAA,aAASR,YAAY,EAAC;IACvC,CAAC,MAAM,IAAI,CAACL,WAAW,IAAIC,YAAY,CAAC0B,YAAY,CAAC,EAAE;MACrDR,eAAe,CAACT,IAAI,IAAAC,MAAA,CAAIc,UAAU,OAAAd,MAAA,CAAIV,YAAY,CAAC0B,YAAY,CAAC,CAAE,CAAC;IACrE;EACF,CAAC,CAAC;EAEF,OAAOR,eAAe;AACxB,CAAC;AAAC,IAAAkB,QAAA,GAAAC,OAAA,cAEaxB,qBAAqB"}
|
|
@@ -10,6 +10,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
|
|
|
10
10
|
require("core-js/modules/es.array.find.js");
|
|
11
11
|
require("core-js/modules/es.object.to-string.js");
|
|
12
12
|
var _getFilterRelationKeys = _interopRequireDefault(require("./get-filter-relation-keys"));
|
|
13
|
+
var _constants = require("../constants");
|
|
13
14
|
var getFilterLocalKeys = function getFilterLocalKeys(relationName, relations) {
|
|
14
15
|
var _ref = relations.find(function (_ref2) {
|
|
15
16
|
var localField = _ref2.localField;
|
|
@@ -46,6 +47,15 @@ var getFilterProps = function getFilterProps(filter) {
|
|
|
46
47
|
_filterName$split2 = (0, _slicedToArray2["default"])(_filterName$split, 2),
|
|
47
48
|
relationName = _filterName$split2[0],
|
|
48
49
|
relationProp = _filterName$split2[1];
|
|
50
|
+
if (filterName === _constants.ID) {
|
|
51
|
+
var idRelation = currentEntityRelations.find(function (_ref7) {
|
|
52
|
+
var entityIdentifier = _ref7.entityIdentifier;
|
|
53
|
+
return entityIdentifier === filteryEntityId;
|
|
54
|
+
});
|
|
55
|
+
if (idRelation) {
|
|
56
|
+
relationName = idRelation.foreignKey;
|
|
57
|
+
}
|
|
58
|
+
}
|
|
49
59
|
var hasProperty = !!(currentEntityProperties[filterName] || currentEntityDynamicProperties[filterName]);
|
|
50
60
|
var relationEntityName = relationProp ? getFilterLocalKeys(relationName, currentEntityRelations) : null;
|
|
51
61
|
var filterNameEntity = getRelationEntity(filterName, filterEntityRelations);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-filter-props.js","names":["_getFilterRelationKeys","_interopRequireDefault","require","getFilterLocalKeys","relationName","relations","_ref","find","_ref2","localField","entityIdentifier","getRelationEntity","filterName","filterEntityRelations","_ref3","_ref4","foreignKey","getFilterProps","filter","_ref5","arguments","length","undefined","_ref5$relations","currentEntityRelations","_ref5$properties","properties","currentEntityProperties","_ref5$dynamicProperti","dynamicProperties","currentEntityDynamicProperties","currentEntityId","identifier","_ref6","_ref6$relations","filteryEntityId","_filter$split","split","_filter$split2","_slicedToArray2","_filterName$split","_filterName$split2","relationProp","hasProperty","relationEntityName","filterNameEntity","propertyEntityName","entityName","isEntityItself","shouldCheckRelationNames","relationForeignKeys","getFilterRelationKeys","shouldIgnoreFilter","_default","exports"],"sources":["../../src/helpers/get-filter-props.js"],"sourcesContent":["import getFilterRelationKeys from './get-filter-relation-keys';\n\nconst getFilterLocalKeys = (relationName, relations) => {\n const { entityIdentifier } =\n relations.find(({ localField }) => localField === relationName) || {};\n return entityIdentifier;\n};\n\nconst getRelationEntity = (filterName, filterEntityRelations) => {\n const { entityIdentifier } =\n filterEntityRelations.find(({ foreignKey }) => foreignKey === filterName) || {};\n return entityIdentifier;\n};\n\nconst getFilterProps = (\n filter,\n {\n relations: currentEntityRelations = [],\n properties: currentEntityProperties = {},\n dynamicProperties: currentEntityDynamicProperties = {},\n identifier: currentEntityId\n } = {},\n { relations: filterEntityRelations = [], identifier: filteryEntityId } = {}\n) => {\n const [filterName] = filter.split('/');\n
|
|
1
|
+
{"version":3,"file":"get-filter-props.js","names":["_getFilterRelationKeys","_interopRequireDefault","require","_constants","getFilterLocalKeys","relationName","relations","_ref","find","_ref2","localField","entityIdentifier","getRelationEntity","filterName","filterEntityRelations","_ref3","_ref4","foreignKey","getFilterProps","filter","_ref5","arguments","length","undefined","_ref5$relations","currentEntityRelations","_ref5$properties","properties","currentEntityProperties","_ref5$dynamicProperti","dynamicProperties","currentEntityDynamicProperties","currentEntityId","identifier","_ref6","_ref6$relations","filteryEntityId","_filter$split","split","_filter$split2","_slicedToArray2","_filterName$split","_filterName$split2","relationProp","ID","idRelation","_ref7","hasProperty","relationEntityName","filterNameEntity","propertyEntityName","entityName","isEntityItself","shouldCheckRelationNames","relationForeignKeys","getFilterRelationKeys","shouldIgnoreFilter","_default","exports"],"sources":["../../src/helpers/get-filter-props.js"],"sourcesContent":["import getFilterRelationKeys from './get-filter-relation-keys';\nimport { ID } from '../constants';\n\nconst getFilterLocalKeys = (relationName, relations) => {\n const { entityIdentifier } =\n relations.find(({ localField }) => localField === relationName) || {};\n return entityIdentifier;\n};\n\nconst getRelationEntity = (filterName, filterEntityRelations) => {\n const { entityIdentifier } =\n filterEntityRelations.find(({ foreignKey }) => foreignKey === filterName) || {};\n return entityIdentifier;\n};\n\nconst getFilterProps = (\n filter,\n {\n relations: currentEntityRelations = [],\n properties: currentEntityProperties = {},\n dynamicProperties: currentEntityDynamicProperties = {},\n identifier: currentEntityId\n } = {},\n { relations: filterEntityRelations = [], identifier: filteryEntityId } = {}\n) => {\n const [filterName] = filter.split('/');\n let [relationName, relationProp] = filterName.split('.');\n\n if (filterName === ID) {\n const idRelation = currentEntityRelations.find(\n ({ entityIdentifier }) => entityIdentifier === filteryEntityId\n );\n if (idRelation) {\n relationName = idRelation.foreignKey;\n }\n }\n\n const hasProperty = !!(\n currentEntityProperties[filterName] || currentEntityDynamicProperties[filterName]\n );\n const relationEntityName = relationProp\n ? getFilterLocalKeys(relationName, currentEntityRelations)\n : null;\n const filterNameEntity = getRelationEntity(filterName, filterEntityRelations);\n\n const propertyEntityName = relationEntityName || filterNameEntity;\n const entityName = filterNameEntity ? filteryEntityId : relationEntityName;\n const isEntityItself = currentEntityId === propertyEntityName;\n const shouldCheckRelationNames = !hasProperty && !relationEntityName;\n const relationForeignKeys = shouldCheckRelationNames\n ? getFilterRelationKeys(propertyEntityName, currentEntityRelations, currentEntityProperties)\n : [];\n const shouldIgnoreFilter = shouldCheckRelationNames && !relationForeignKeys.length;\n\n return {\n filterName,\n entityName,\n relationName,\n relationProp,\n hasProperty,\n relationEntityName,\n isEntityItself,\n relationForeignKeys,\n shouldIgnoreFilter\n };\n};\n\nexport default getFilterProps;\n"],"mappings":"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"}
|
|
@@ -39,7 +39,6 @@ const buildInheritedFilters = (entityData, inheritedFilters, currentSchema, filt
|
|
|
39
39
|
relationForeignKeys,
|
|
40
40
|
shouldIgnoreFilter
|
|
41
41
|
} = getFilterProps(filter, currentSchema, filterEntitySchema);
|
|
42
|
-
if (filterName === ID) return;
|
|
43
42
|
const relationData = getRelationData(entityData, relationName, relationForeignKeys);
|
|
44
43
|
if (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId) || shouldIgnoreFilter) {
|
|
45
44
|
relationFilters.push(`${filterName}/${itemId}`);
|
|
@@ -48,12 +47,13 @@ const buildInheritedFilters = (entityData, inheritedFilters, currentSchema, filt
|
|
|
48
47
|
const isDataArray = Array.isArray(relationData);
|
|
49
48
|
const arrayHasData = checkIfArrayHasData(isDataArray, relationData);
|
|
50
49
|
if (!relationEntityName) {
|
|
51
|
-
const filtersNoRelation = setFiltersNoRelation(isDataArray, arrayHasData, relationData, relationName);
|
|
50
|
+
const filtersNoRelation = setFiltersNoRelation(isDataArray, arrayHasData, relationData, filterName === ID ? filterName : relationName);
|
|
52
51
|
relationFilters.push(...filtersNoRelation);
|
|
53
52
|
}
|
|
54
53
|
if (arrayHasData) {
|
|
55
54
|
const filterValues = relationData.reduce((acc, relationValue) => {
|
|
56
|
-
|
|
55
|
+
const filterNameToUse = filterName === ID ? 'ids' : filterName;
|
|
56
|
+
if (relationValue[relationProp]) acc.push(`${filterNameToUse}/${relationValue[relationProp]}`);
|
|
57
57
|
return acc;
|
|
58
58
|
}, []);
|
|
59
59
|
relationFilters.push(...filterValues);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-inherited-filters.js","names":["flatten","isFilterEntitysId","getFilterProps","ID","getRelationData","entityData","relationName","currentRelationNames","length","arrayOfRelations","map","name","filter","Boolean","checkIfArrayHasData","isDataArray","relationData","setFiltersNoRelation","arrayHasData","filters","filterValues","reduce","acc","relationValue","push","buildInheritedFilters","inheritedFilters","currentSchema","filterEntitySchema","itemId","relationFilters","identifier","currentEntityId","forEach","filterName","entityName","relationProp","relationEntityName","relationForeignKeys","shouldIgnoreFilter","Array","isArray","filtersNoRelation"],"sources":["../../src/helpers/build-inherited-filters.js"],"sourcesContent":["import flatten from 'lodash.flatten';\nimport isFilterEntitysId from './is-filter-entitys-id';\nimport getFilterProps from './get-filter-props';\nimport { ID } from '../constants';\n\nconst getRelationData = (entityData, relationName, currentRelationNames) => {\n if (!entityData) return null;\n if (currentRelationNames && currentRelationNames.length) {\n const arrayOfRelations = currentRelationNames.map(name => entityData[name]).filter(Boolean);\n return arrayOfRelations.length ? flatten(arrayOfRelations) : null;\n }\n return entityData[relationName];\n};\n\nconst checkIfArrayHasData = (isDataArray, relationData) => isDataArray && !!relationData.length;\n\nconst setFiltersNoRelation = (isDataArray, arrayHasData, relationData, relationName) => {\n const filters = [];\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue && typeof relationValue !== 'object')\n acc.push(`${relationName}/${relationValue}`);\n return acc;\n }, []);\n filters.push(...filterValues);\n } else if (!isDataArray && typeof relationData !== 'object') {\n filters.push(`${relationName}/${relationData}`);\n }\n\n return filters;\n};\nconst buildInheritedFilters = (\n entityData,\n inheritedFilters,\n currentSchema,\n filterEntitySchema,\n itemId\n) => {\n const relationFilters = [];\n const { identifier: currentEntityId } = currentSchema;\n\n inheritedFilters.forEach(filter => {\n const {\n filterName,\n entityName,\n relationName,\n relationProp,\n relationEntityName,\n relationForeignKeys,\n shouldIgnoreFilter\n } = getFilterProps(filter, currentSchema, filterEntitySchema);\n\n
|
|
1
|
+
{"version":3,"file":"build-inherited-filters.js","names":["flatten","isFilterEntitysId","getFilterProps","ID","getRelationData","entityData","relationName","currentRelationNames","length","arrayOfRelations","map","name","filter","Boolean","checkIfArrayHasData","isDataArray","relationData","setFiltersNoRelation","arrayHasData","filters","filterValues","reduce","acc","relationValue","push","buildInheritedFilters","inheritedFilters","currentSchema","filterEntitySchema","itemId","relationFilters","identifier","currentEntityId","forEach","filterName","entityName","relationProp","relationEntityName","relationForeignKeys","shouldIgnoreFilter","Array","isArray","filtersNoRelation","filterNameToUse"],"sources":["../../src/helpers/build-inherited-filters.js"],"sourcesContent":["import flatten from 'lodash.flatten';\nimport isFilterEntitysId from './is-filter-entitys-id';\nimport getFilterProps from './get-filter-props';\nimport { ID } from '../constants';\n\nconst getRelationData = (entityData, relationName, currentRelationNames) => {\n if (!entityData) return null;\n if (currentRelationNames && currentRelationNames.length) {\n const arrayOfRelations = currentRelationNames.map(name => entityData[name]).filter(Boolean);\n return arrayOfRelations.length ? flatten(arrayOfRelations) : null;\n }\n return entityData[relationName];\n};\n\nconst checkIfArrayHasData = (isDataArray, relationData) => isDataArray && !!relationData.length;\n\nconst setFiltersNoRelation = (isDataArray, arrayHasData, relationData, relationName) => {\n const filters = [];\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n if (relationValue && typeof relationValue !== 'object')\n acc.push(`${relationName}/${relationValue}`);\n return acc;\n }, []);\n filters.push(...filterValues);\n } else if (!isDataArray && typeof relationData !== 'object') {\n filters.push(`${relationName}/${relationData}`);\n }\n\n return filters;\n};\nconst buildInheritedFilters = (\n entityData,\n inheritedFilters,\n currentSchema,\n filterEntitySchema,\n itemId\n) => {\n const relationFilters = [];\n const { identifier: currentEntityId } = currentSchema;\n\n inheritedFilters.forEach(filter => {\n const {\n filterName,\n entityName,\n relationName,\n relationProp,\n relationEntityName,\n relationForeignKeys,\n shouldIgnoreFilter\n } = getFilterProps(filter, currentSchema, filterEntitySchema);\n\n const relationData = getRelationData(entityData, relationName, relationForeignKeys);\n if (\n (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId)) ||\n shouldIgnoreFilter\n ) {\n relationFilters.push(`${filterName}/${itemId}`);\n }\n\n if (!relationData) return;\n\n const isDataArray = Array.isArray(relationData);\n const arrayHasData = checkIfArrayHasData(isDataArray, relationData);\n\n if (!relationEntityName) {\n const filtersNoRelation = setFiltersNoRelation(\n isDataArray,\n arrayHasData,\n relationData,\n filterName === ID ? filterName : relationName\n );\n relationFilters.push(...filtersNoRelation);\n }\n\n if (arrayHasData) {\n const filterValues = relationData.reduce((acc, relationValue) => {\n const filterNameToUse = filterName === ID ? 'ids' : filterName;\n if (relationValue[relationProp])\n acc.push(`${filterNameToUse}/${relationValue[relationProp]}`);\n return acc;\n }, []);\n relationFilters.push(...filterValues);\n } else if (!isDataArray && relationData[relationProp]) {\n relationFilters.push(`${filterName}/${relationData[relationProp]}`);\n }\n });\n\n return relationFilters;\n};\n\nexport default buildInheritedFilters;\n"],"mappings":"AAAA,OAAOA,OAAO,MAAM,gBAAgB;AACpC,OAAOC,iBAAiB,MAAM,wBAAwB;AACtD,OAAOC,cAAc,MAAM,oBAAoB;AAC/C,SAASC,EAAE,QAAQ,cAAc;AAEjC,MAAMC,eAAe,GAAGA,CAACC,UAAU,EAAEC,YAAY,EAAEC,oBAAoB,KAAK;EAC1E,IAAI,CAACF,UAAU,EAAE,OAAO,IAAI;EAC5B,IAAIE,oBAAoB,IAAIA,oBAAoB,CAACC,MAAM,EAAE;IACvD,MAAMC,gBAAgB,GAAGF,oBAAoB,CAACG,GAAG,CAACC,IAAI,IAAIN,UAAU,CAACM,IAAI,CAAC,CAAC,CAACC,MAAM,CAACC,OAAO,CAAC;IAC3F,OAAOJ,gBAAgB,CAACD,MAAM,GAAGR,OAAO,CAACS,gBAAgB,CAAC,GAAG,IAAI;EACnE;EACA,OAAOJ,UAAU,CAACC,YAAY,CAAC;AACjC,CAAC;AAED,MAAMQ,mBAAmB,GAAGA,CAACC,WAAW,EAAEC,YAAY,KAAKD,WAAW,IAAI,CAAC,CAACC,YAAY,CAACR,MAAM;AAE/F,MAAMS,oBAAoB,GAAGA,CAACF,WAAW,EAAEG,YAAY,EAAEF,YAAY,EAAEV,YAAY,KAAK;EACtF,MAAMa,OAAO,GAAG,EAAE;EAClB,IAAID,YAAY,EAAE;IAChB,MAAME,YAAY,GAAGJ,YAAY,CAACK,MAAM,CAAC,CAACC,GAAG,EAAEC,aAAa,KAAK;MAC/D,IAAIA,aAAa,IAAI,OAAOA,aAAa,KAAK,QAAQ,EACpDD,GAAG,CAACE,IAAI,CAAE,GAAElB,YAAa,IAAGiB,aAAc,EAAC,CAAC;MAC9C,OAAOD,GAAG;IACZ,CAAC,EAAE,EAAE,CAAC;IACNH,OAAO,CAACK,IAAI,CAAC,GAAGJ,YAAY,CAAC;EAC/B,CAAC,MAAM,IAAI,CAACL,WAAW,IAAI,OAAOC,YAAY,KAAK,QAAQ,EAAE;IAC3DG,OAAO,CAACK,IAAI,CAAE,GAAElB,YAAa,IAAGU,YAAa,EAAC,CAAC;EACjD;EAEA,OAAOG,OAAO;AAChB,CAAC;AACD,MAAMM,qBAAqB,GAAGA,CAC5BpB,UAAU,EACVqB,gBAAgB,EAChBC,aAAa,EACbC,kBAAkB,EAClBC,MAAM,KACH;EACH,MAAMC,eAAe,GAAG,EAAE;EAC1B,MAAM;IAAEC,UAAU,EAAEC;EAAgB,CAAC,GAAGL,aAAa;EAErDD,gBAAgB,CAACO,OAAO,CAACrB,MAAM,IAAI;IACjC,MAAM;MACJsB,UAAU;MACVC,UAAU;MACV7B,YAAY;MACZ8B,YAAY;MACZC,kBAAkB;MAClBC,mBAAmB;MACnBC;IACF,CAAC,GAAGrC,cAAc,CAACU,MAAM,EAAEe,aAAa,EAAEC,kBAAkB,CAAC;IAE7D,MAAMZ,YAAY,GAAGZ,eAAe,CAACC,UAAU,EAAEC,YAAY,EAAEgC,mBAAmB,CAAC;IACnF,IACGN,eAAe,KAAKG,UAAU,IAAIlC,iBAAiB,CAACiC,UAAU,EAAEF,eAAe,CAAC,IACjFO,kBAAkB,EAClB;MACAT,eAAe,CAACN,IAAI,CAAE,GAAEU,UAAW,IAAGL,MAAO,EAAC,CAAC;IACjD;IAEA,IAAI,CAACb,YAAY,EAAE;IAEnB,MAAMD,WAAW,GAAGyB,KAAK,CAACC,OAAO,CAACzB,YAAY,CAAC;IAC/C,MAAME,YAAY,GAAGJ,mBAAmB,CAACC,WAAW,EAAEC,YAAY,CAAC;IAEnE,IAAI,CAACqB,kBAAkB,EAAE;MACvB,MAAMK,iBAAiB,GAAGzB,oBAAoB,CAC5CF,WAAW,EACXG,YAAY,EACZF,YAAY,EACZkB,UAAU,KAAK/B,EAAE,GAAG+B,UAAU,GAAG5B,YACnC,CAAC;MACDwB,eAAe,CAACN,IAAI,CAAC,GAAGkB,iBAAiB,CAAC;IAC5C;IAEA,IAAIxB,YAAY,EAAE;MAChB,MAAME,YAAY,GAAGJ,YAAY,CAACK,MAAM,CAAC,CAACC,GAAG,EAAEC,aAAa,KAAK;QAC/D,MAAMoB,eAAe,GAAGT,UAAU,KAAK/B,EAAE,GAAG,KAAK,GAAG+B,UAAU;QAC9D,IAAIX,aAAa,CAACa,YAAY,CAAC,EAC7Bd,GAAG,CAACE,IAAI,CAAE,GAAEmB,eAAgB,IAAGpB,aAAa,CAACa,YAAY,CAAE,EAAC,CAAC;QAC/D,OAAOd,GAAG;MACZ,CAAC,EAAE,EAAE,CAAC;MACNQ,eAAe,CAACN,IAAI,CAAC,GAAGJ,YAAY,CAAC;IACvC,CAAC,MAAM,IAAI,CAACL,WAAW,IAAIC,YAAY,CAACoB,YAAY,CAAC,EAAE;MACrDN,eAAe,CAACN,IAAI,CAAE,GAAEU,UAAW,IAAGlB,YAAY,CAACoB,YAAY,CAAE,EAAC,CAAC;IACrE;EACF,CAAC,CAAC;EAEF,OAAON,eAAe;AACxB,CAAC;AAED,eAAeL,qBAAqB"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import getFilterRelationKeys from './get-filter-relation-keys';
|
|
2
|
+
import { ID } from '../constants';
|
|
2
3
|
const getFilterLocalKeys = (relationName, relations) => {
|
|
3
4
|
const {
|
|
4
5
|
entityIdentifier
|
|
@@ -25,7 +26,15 @@ const getFilterProps = (filter, {
|
|
|
25
26
|
identifier: filteryEntityId
|
|
26
27
|
} = {}) => {
|
|
27
28
|
const [filterName] = filter.split('/');
|
|
28
|
-
|
|
29
|
+
let [relationName, relationProp] = filterName.split('.');
|
|
30
|
+
if (filterName === ID) {
|
|
31
|
+
const idRelation = currentEntityRelations.find(({
|
|
32
|
+
entityIdentifier
|
|
33
|
+
}) => entityIdentifier === filteryEntityId);
|
|
34
|
+
if (idRelation) {
|
|
35
|
+
relationName = idRelation.foreignKey;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
29
38
|
const hasProperty = !!(currentEntityProperties[filterName] || currentEntityDynamicProperties[filterName]);
|
|
30
39
|
const relationEntityName = relationProp ? getFilterLocalKeys(relationName, currentEntityRelations) : null;
|
|
31
40
|
const filterNameEntity = getRelationEntity(filterName, filterEntityRelations);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-filter-props.js","names":["getFilterRelationKeys","getFilterLocalKeys","relationName","relations","entityIdentifier","find","localField","getRelationEntity","filterName","filterEntityRelations","foreignKey","getFilterProps","filter","currentEntityRelations","properties","currentEntityProperties","dynamicProperties","currentEntityDynamicProperties","identifier","currentEntityId","filteryEntityId","split","relationProp","hasProperty","relationEntityName","filterNameEntity","propertyEntityName","entityName","isEntityItself","shouldCheckRelationNames","relationForeignKeys","shouldIgnoreFilter","length"],"sources":["../../src/helpers/get-filter-props.js"],"sourcesContent":["import getFilterRelationKeys from './get-filter-relation-keys';\n\nconst getFilterLocalKeys = (relationName, relations) => {\n const { entityIdentifier } =\n relations.find(({ localField }) => localField === relationName) || {};\n return entityIdentifier;\n};\n\nconst getRelationEntity = (filterName, filterEntityRelations) => {\n const { entityIdentifier } =\n filterEntityRelations.find(({ foreignKey }) => foreignKey === filterName) || {};\n return entityIdentifier;\n};\n\nconst getFilterProps = (\n filter,\n {\n relations: currentEntityRelations = [],\n properties: currentEntityProperties = {},\n dynamicProperties: currentEntityDynamicProperties = {},\n identifier: currentEntityId\n } = {},\n { relations: filterEntityRelations = [], identifier: filteryEntityId } = {}\n) => {\n const [filterName] = filter.split('/');\n
|
|
1
|
+
{"version":3,"file":"get-filter-props.js","names":["getFilterRelationKeys","ID","getFilterLocalKeys","relationName","relations","entityIdentifier","find","localField","getRelationEntity","filterName","filterEntityRelations","foreignKey","getFilterProps","filter","currentEntityRelations","properties","currentEntityProperties","dynamicProperties","currentEntityDynamicProperties","identifier","currentEntityId","filteryEntityId","split","relationProp","idRelation","hasProperty","relationEntityName","filterNameEntity","propertyEntityName","entityName","isEntityItself","shouldCheckRelationNames","relationForeignKeys","shouldIgnoreFilter","length"],"sources":["../../src/helpers/get-filter-props.js"],"sourcesContent":["import getFilterRelationKeys from './get-filter-relation-keys';\nimport { ID } from '../constants';\n\nconst getFilterLocalKeys = (relationName, relations) => {\n const { entityIdentifier } =\n relations.find(({ localField }) => localField === relationName) || {};\n return entityIdentifier;\n};\n\nconst getRelationEntity = (filterName, filterEntityRelations) => {\n const { entityIdentifier } =\n filterEntityRelations.find(({ foreignKey }) => foreignKey === filterName) || {};\n return entityIdentifier;\n};\n\nconst getFilterProps = (\n filter,\n {\n relations: currentEntityRelations = [],\n properties: currentEntityProperties = {},\n dynamicProperties: currentEntityDynamicProperties = {},\n identifier: currentEntityId\n } = {},\n { relations: filterEntityRelations = [], identifier: filteryEntityId } = {}\n) => {\n const [filterName] = filter.split('/');\n let [relationName, relationProp] = filterName.split('.');\n\n if (filterName === ID) {\n const idRelation = currentEntityRelations.find(\n ({ entityIdentifier }) => entityIdentifier === filteryEntityId\n );\n if (idRelation) {\n relationName = idRelation.foreignKey;\n }\n }\n\n const hasProperty = !!(\n currentEntityProperties[filterName] || currentEntityDynamicProperties[filterName]\n );\n const relationEntityName = relationProp\n ? getFilterLocalKeys(relationName, currentEntityRelations)\n : null;\n const filterNameEntity = getRelationEntity(filterName, filterEntityRelations);\n\n const propertyEntityName = relationEntityName || filterNameEntity;\n const entityName = filterNameEntity ? filteryEntityId : relationEntityName;\n const isEntityItself = currentEntityId === propertyEntityName;\n const shouldCheckRelationNames = !hasProperty && !relationEntityName;\n const relationForeignKeys = shouldCheckRelationNames\n ? getFilterRelationKeys(propertyEntityName, currentEntityRelations, currentEntityProperties)\n : [];\n const shouldIgnoreFilter = shouldCheckRelationNames && !relationForeignKeys.length;\n\n return {\n filterName,\n entityName,\n relationName,\n relationProp,\n hasProperty,\n relationEntityName,\n isEntityItself,\n relationForeignKeys,\n shouldIgnoreFilter\n };\n};\n\nexport default getFilterProps;\n"],"mappings":"AAAA,OAAOA,qBAAqB,MAAM,4BAA4B;AAC9D,SAASC,EAAE,QAAQ,cAAc;AAEjC,MAAMC,kBAAkB,GAAGA,CAACC,YAAY,EAAEC,SAAS,KAAK;EACtD,MAAM;IAAEC;EAAiB,CAAC,GACxBD,SAAS,CAACE,IAAI,CAAC,CAAC;IAAEC;EAAW,CAAC,KAAKA,UAAU,KAAKJ,YAAY,CAAC,IAAI,CAAC,CAAC;EACvE,OAAOE,gBAAgB;AACzB,CAAC;AAED,MAAMG,iBAAiB,GAAGA,CAACC,UAAU,EAAEC,qBAAqB,KAAK;EAC/D,MAAM;IAAEL;EAAiB,CAAC,GACxBK,qBAAqB,CAACJ,IAAI,CAAC,CAAC;IAAEK;EAAW,CAAC,KAAKA,UAAU,KAAKF,UAAU,CAAC,IAAI,CAAC,CAAC;EACjF,OAAOJ,gBAAgB;AACzB,CAAC;AAED,MAAMO,cAAc,GAAGA,CACrBC,MAAM,EACN;EACET,SAAS,EAAEU,sBAAsB,GAAG,EAAE;EACtCC,UAAU,EAAEC,uBAAuB,GAAG,CAAC,CAAC;EACxCC,iBAAiB,EAAEC,8BAA8B,GAAG,CAAC,CAAC;EACtDC,UAAU,EAAEC;AACd,CAAC,GAAG,CAAC,CAAC,EACN;EAAEhB,SAAS,EAAEM,qBAAqB,GAAG,EAAE;EAAES,UAAU,EAAEE;AAAgB,CAAC,GAAG,CAAC,CAAC,KACxE;EACH,MAAM,CAACZ,UAAU,CAAC,GAAGI,MAAM,CAACS,KAAK,CAAC,GAAG,CAAC;EACtC,IAAI,CAACnB,YAAY,EAAEoB,YAAY,CAAC,GAAGd,UAAU,CAACa,KAAK,CAAC,GAAG,CAAC;EAExD,IAAIb,UAAU,KAAKR,EAAE,EAAE;IACrB,MAAMuB,UAAU,GAAGV,sBAAsB,CAACR,IAAI,CAC5C,CAAC;MAAED;IAAiB,CAAC,KAAKA,gBAAgB,KAAKgB,eACjD,CAAC;IACD,IAAIG,UAAU,EAAE;MACdrB,YAAY,GAAGqB,UAAU,CAACb,UAAU;IACtC;EACF;EAEA,MAAMc,WAAW,GAAG,CAAC,EACnBT,uBAAuB,CAACP,UAAU,CAAC,IAAIS,8BAA8B,CAACT,UAAU,CAAC,CAClF;EACD,MAAMiB,kBAAkB,GAAGH,YAAY,GACnCrB,kBAAkB,CAACC,YAAY,EAAEW,sBAAsB,CAAC,GACxD,IAAI;EACR,MAAMa,gBAAgB,GAAGnB,iBAAiB,CAACC,UAAU,EAAEC,qBAAqB,CAAC;EAE7E,MAAMkB,kBAAkB,GAAGF,kBAAkB,IAAIC,gBAAgB;EACjE,MAAME,UAAU,GAAGF,gBAAgB,GAAGN,eAAe,GAAGK,kBAAkB;EAC1E,MAAMI,cAAc,GAAGV,eAAe,KAAKQ,kBAAkB;EAC7D,MAAMG,wBAAwB,GAAG,CAACN,WAAW,IAAI,CAACC,kBAAkB;EACpE,MAAMM,mBAAmB,GAAGD,wBAAwB,GAChD/B,qBAAqB,CAAC4B,kBAAkB,EAAEd,sBAAsB,EAAEE,uBAAuB,CAAC,GAC1F,EAAE;EACN,MAAMiB,kBAAkB,GAAGF,wBAAwB,IAAI,CAACC,mBAAmB,CAACE,MAAM;EAElF,OAAO;IACLzB,UAAU;IACVoB,UAAU;IACV1B,YAAY;IACZoB,YAAY;IACZE,WAAW;IACXC,kBAAkB;IAClBI,cAAc;IACdE,mBAAmB;IACnBC;EACF,CAAC;AACH,CAAC;AAED,eAAerB,cAAc"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/react-page-builder",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.145.0-alpha.0",
|
|
4
4
|
"description": "Blaze react page builder",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -90,5 +90,5 @@
|
|
|
90
90
|
"lib/*",
|
|
91
91
|
"lib-es/*"
|
|
92
92
|
],
|
|
93
|
-
"gitHead": "
|
|
93
|
+
"gitHead": "3a7ae260bafa6417c642d254d5e5a43ee629df3f"
|
|
94
94
|
}
|
|
@@ -50,8 +50,6 @@ const buildInheritedFilters = (
|
|
|
50
50
|
shouldIgnoreFilter
|
|
51
51
|
} = getFilterProps(filter, currentSchema, filterEntitySchema);
|
|
52
52
|
|
|
53
|
-
if (filterName === ID) return;
|
|
54
|
-
|
|
55
53
|
const relationData = getRelationData(entityData, relationName, relationForeignKeys);
|
|
56
54
|
if (
|
|
57
55
|
(currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId)) ||
|
|
@@ -70,14 +68,16 @@ const buildInheritedFilters = (
|
|
|
70
68
|
isDataArray,
|
|
71
69
|
arrayHasData,
|
|
72
70
|
relationData,
|
|
73
|
-
relationName
|
|
71
|
+
filterName === ID ? filterName : relationName
|
|
74
72
|
);
|
|
75
73
|
relationFilters.push(...filtersNoRelation);
|
|
76
74
|
}
|
|
77
75
|
|
|
78
76
|
if (arrayHasData) {
|
|
79
77
|
const filterValues = relationData.reduce((acc, relationValue) => {
|
|
80
|
-
|
|
78
|
+
const filterNameToUse = filterName === ID ? 'ids' : filterName;
|
|
79
|
+
if (relationValue[relationProp])
|
|
80
|
+
acc.push(`${filterNameToUse}/${relationValue[relationProp]}`);
|
|
81
81
|
return acc;
|
|
82
82
|
}, []);
|
|
83
83
|
relationFilters.push(...filterValues);
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import getFilterRelationKeys from './get-filter-relation-keys';
|
|
2
|
+
import { ID } from '../constants';
|
|
2
3
|
|
|
3
4
|
const getFilterLocalKeys = (relationName, relations) => {
|
|
4
5
|
const { entityIdentifier } =
|
|
@@ -23,7 +24,17 @@ const getFilterProps = (
|
|
|
23
24
|
{ relations: filterEntityRelations = [], identifier: filteryEntityId } = {}
|
|
24
25
|
) => {
|
|
25
26
|
const [filterName] = filter.split('/');
|
|
26
|
-
|
|
27
|
+
let [relationName, relationProp] = filterName.split('.');
|
|
28
|
+
|
|
29
|
+
if (filterName === ID) {
|
|
30
|
+
const idRelation = currentEntityRelations.find(
|
|
31
|
+
({ entityIdentifier }) => entityIdentifier === filteryEntityId
|
|
32
|
+
);
|
|
33
|
+
if (idRelation) {
|
|
34
|
+
relationName = idRelation.foreignKey;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
27
38
|
const hasProperty = !!(
|
|
28
39
|
currentEntityProperties[filterName] || currentEntityDynamicProperties[filterName]
|
|
29
40
|
);
|
package/tests/helpers/mocks.js
CHANGED
|
@@ -78,6 +78,19 @@ const MOCKED_SCHEMA_FOR_FILTERS = {
|
|
|
78
78
|
searchable: true,
|
|
79
79
|
onDeleteAction: 'unset'
|
|
80
80
|
},
|
|
81
|
+
{
|
|
82
|
+
relationType: 'hasMany',
|
|
83
|
+
entityIdentifier: 'page',
|
|
84
|
+
foreignKey: 'relatedPageIds',
|
|
85
|
+
localField: 'relatedPages',
|
|
86
|
+
description: 'Related pages',
|
|
87
|
+
label: 'Related Profiles',
|
|
88
|
+
showInForm: true,
|
|
89
|
+
displayFormName: 'Related Profiles',
|
|
90
|
+
formPriority: 3.11,
|
|
91
|
+
formFieldType: 'relationStandard',
|
|
92
|
+
searchable: false
|
|
93
|
+
},
|
|
81
94
|
{
|
|
82
95
|
relationType: 'hasMany',
|
|
83
96
|
entityIdentifier: 'profile',
|
|
@@ -13,11 +13,13 @@ const entityData = {
|
|
|
13
13
|
yachts: [{ id: 'some' }],
|
|
14
14
|
image: { name: 'image name' },
|
|
15
15
|
tags: [{ name: 'tag1' }, { name: 'tag2' }],
|
|
16
|
-
brokers: [{ price: 1 }]
|
|
16
|
+
brokers: [{ price: 1 }],
|
|
17
|
+
relatedPageIds: ['related-page-id']
|
|
17
18
|
};
|
|
18
19
|
|
|
19
20
|
const filterByProperty = ['category.name/category'];
|
|
20
21
|
const filterByPropertyMoreData = [
|
|
22
|
+
'id/page',
|
|
21
23
|
'category.name/category',
|
|
22
24
|
'image.name/image',
|
|
23
25
|
'tags.name/tags',
|
|
@@ -84,6 +86,8 @@ describe('build inherited filters', () => {
|
|
|
84
86
|
|
|
85
87
|
it('should return an array with filter set for more relations', () => {
|
|
86
88
|
expect(relationFiltersMoreData).toEqual([
|
|
89
|
+
'id/page-id',
|
|
90
|
+
'id/related-page-id',
|
|
87
91
|
'category.name/cat',
|
|
88
92
|
'image.name/page-id',
|
|
89
93
|
'image.name/image name',
|
|
@@ -65,6 +65,15 @@ describe('getFilterProps function', () => {
|
|
|
65
65
|
expect(dyanmicPropFilter).toHaveProperty('shouldIgnoreFilter', false);
|
|
66
66
|
});
|
|
67
67
|
|
|
68
|
+
it('should return relation foriegnKey for matching relaiton entity for id propery', () => {
|
|
69
|
+
const dyanmicPropFilter = getFilterProps(
|
|
70
|
+
'id',
|
|
71
|
+
MOCKED_SCHEMA_FOR_FILTERS,
|
|
72
|
+
MOCKED_SCHEMA_FOR_FILTERS
|
|
73
|
+
);
|
|
74
|
+
expect(dyanmicPropFilter).toHaveProperty('relationName', 'relatedPageIds');
|
|
75
|
+
});
|
|
76
|
+
|
|
68
77
|
// todo: add test case
|
|
69
78
|
// it('should return relationForeignKeys array with values if it isnt a schema or relation prop', () => {
|
|
70
79
|
// expect(withRelationKeys.relationForeignKeys).toBeDefined();
|