@contrail/data-grouping 1.0.20 → 1.0.21

Sign up to get free protection for your applications and to get access to all the features.
@@ -41,7 +41,16 @@ class DataGroupGenerator {
41
41
  let distinctValues = this.getDistinctValues(data, index, altIndex);
42
42
  for (let val of distinctValues) {
43
43
  const groupData = data.filter(obj => {
44
- return (util_1.ObjectUtil.getByPath(obj, index) === val || util_1.ObjectUtil.getByPath(obj, altIndex) === val);
44
+ const objVal = util_1.ObjectUtil.getByPath(obj, index) || util_1.ObjectUtil.getByPath(obj, altIndex);
45
+ if (Array.isArray(val) && Array.isArray(objVal)) {
46
+ return val.sort().join() === objVal.sort().join();
47
+ }
48
+ else if (val.id && (objVal === null || objVal === void 0 ? void 0 : objVal.id)) {
49
+ return val.id === objVal.id;
50
+ }
51
+ else {
52
+ return (objVal === val);
53
+ }
45
54
  });
46
55
  const group = {
47
56
  data: [],
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@contrail/data-grouping",
3
- "version": "1.0.20",
3
+ "version": "1.0.21",
4
4
  "description": "Utilities and interfaces for grouping data into hierarchial data structures based on properties.",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -14,11 +14,11 @@
14
14
  "author": "",
15
15
  "license": "ISC",
16
16
  "devDependencies": {
17
- "@contrail/util": "^1.0.28",
18
- "@types/jest": "^23.3.14",
19
- "jest": "^23.6.0",
17
+ "@contrail/util": "^1.0.34",
18
+ "@types/jest": "^29.5.2",
19
+ "jest": "^29.5.0",
20
20
  "prettier": "^1.19.1",
21
- "ts-jest": "^23.10.5",
21
+ "ts-jest": "^29.1.1",
22
22
  "tslint": "^5.11.0",
23
23
  "tslint-config-prettier": "^1.18.0",
24
24
  "typescript": "^4.0.0"