@contrail/data-grouping 1.0.19 → 1.0.21

package/lib/data-group-generator/data-group-generator.d.ts

@@ -1,6 +1,6 @@
 import { DataGroup, DataGroupStructure, DataGroupingProperty } from "../interfaces";
 export declare class DataGroupGenerator {
-    static getDistinctValues(data: any, index: any): any[];
+    static getDistinctValues(data: any, index: any, altIndex?: any): any[];
     static buildChildDataGroups(data: any, parentGroup: DataGroup, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: any, currentDepth: any): void;
     static buildDataGroupStructure(data: Array<any>, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: number): DataGroupStructure;
     static createPartitionedGroupsFromData(parentGroup: DataGroup, data: Array<any>, leafNodeDataCount: number): Array<DataGroup>;

package/lib/data-group-generator/data-group-generator.js

@@ -4,13 +4,20 @@ exports.DataGroupGenerator = void 0;
 const util_1 = require("@contrail/util");
 const types_1 = require("@contrail/types");
 class DataGroupGenerator {
-    static getDistinctValues(data, index) {
+    static getDistinctValues(data, index, altIndex = null) {
         const map = new Map();
         data.forEach(obj => {
             if (!obj) {
                 return;
             }
             let key = util_1.ObjectUtil.getByPath(obj, index);
+            let altKey = null;
+            if (altIndex) {
+                altKey = util_1.ObjectUtil.getByPath(obj, altIndex);
+                if (!key) {
+                    key = altKey;
+                }
+            }
             let value = key;
             if (!value) {
                 return;
@@ -30,9 +37,21 @@ class DataGroupGenerator {
     static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth) {
         const groupingProperty = groupingProperties[currentDepth];
         const index = groupingProperty.typeRootSlug + "." + groupingProperty.propertyDefinition.slug;
-        const distinctValues = this.getDistinctValues(data, index);
+        const altIndex = util_1.StringUtil.convertToCamelCase(groupingProperty.typeRootSlug) + "." + groupingProperty.propertyDefinition.slug;
+        let distinctValues = this.getDistinctValues(data, index, altIndex);
         for (let val of distinctValues) {
-            const groupData = data.filter(obj => util_1.ObjectUtil.getByPath(obj, index) === val);
+            const groupData = data.filter(obj => {
+                const objVal = util_1.ObjectUtil.getByPath(obj, index) || util_1.ObjectUtil.getByPath(obj, altIndex);
+                if (Array.isArray(val) && Array.isArray(objVal)) {
+                    return val.sort().join() === objVal.sort().join();
+                }
+                else if (val.id && (objVal === null || objVal === void 0 ? void 0 : objVal.id)) {
+                    return val.id === objVal.id;
+                }
+                else {
+                    return (objVal === val);
+                }
+            });
             const group = {
                 data: [],
                 subGroups: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/data-grouping",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Utilities and interfaces for grouping data into hierarchial data structures based on properties.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -14,11 +14,11 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@contrail/util": "^1.0.26",
-    "@types/jest": "^23.3.14",
-    "jest": "^23.6.0",
+    "@contrail/util": "^1.0.34",
+    "@types/jest": "^29.5.2",
+    "jest": "^29.5.0",
     "prettier": "^1.19.1",
-    "ts-jest": "^23.10.5",
+    "ts-jest": "^29.1.1",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.18.0",
     "typescript": "^4.0.0"