@contrail/data-grouping 1.0.25 → 1.0.26

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, indexRootSlug: any, indexSlug?: any, altIndexRootSlug?: any, altIndexSlug?: any, groupMultiSelectInSeparateFrame?: boolean): any[];
+    static getDistinctValues(data: any, index: any, altIndex?: any, groupMultiSelectInSeparateFrame?: boolean): any[];
     static buildChildDataGroups(data: any, parentGroup: DataGroup, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: any, currentDepth: any, groupMultiSelectInSeparateFrame?: boolean): void;
     static buildDataGroupStructure(data: Array<any>, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: number, groupMultiSelectInSeparateFrame?: boolean): DataGroupStructure;
     static createPartitionedGroupsFromData(parentGroup: DataGroup, data: Array<any>, leafNodeDataCount: number): Array<DataGroup>;

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

@@ -4,17 +4,17 @@ exports.DataGroupGenerator = void 0;
 const util_1 = require("@contrail/util");
 const types_1 = require("@contrail/types");
 class DataGroupGenerator {
-    static getDistinctValues(data, indexRootSlug, indexSlug = null, altIndexRootSlug = null, altIndexSlug = null, groupMultiSelectInSeparateFrame = false) {
+    static getDistinctValues(data, index, altIndex = null, groupMultiSelectInSeparateFrame = false) {
         const map = new Map();
         const sortingArray = [];
         data.forEach(obj => {
             if (!obj) {
                 return;
             }
-            let key = util_1.ObjectUtil.getBySlugs(obj, indexRootSlug, indexSlug);
+            let key = util_1.ObjectUtil.getByPath(obj, index);
             let altKey = null;
-            if (altIndexRootSlug) {
-                altKey = util_1.ObjectUtil.getBySlugs(obj, altIndexRootSlug, altIndexSlug);
+            if (altIndex) {
+                altKey = util_1.ObjectUtil.getByPath(obj, altIndex);
                 if (!key) {
                     key = altKey;
                 }
@@ -50,15 +50,12 @@ class DataGroupGenerator {
     }
     static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth, groupMultiSelectInSeparateFrame = false) {
         const groupingProperty = groupingProperties[currentDepth];
-        const indexRootSlug = groupingProperty.typeRootSlug;
-        const indexSlug = groupingProperty.propertyDefinition.slug;
-        const altIndexRootSlug = util_1.StringUtil.convertToCamelCase(groupingProperty.typeRootSlug);
-        const altIndexSlug = groupingProperty.propertyDefinition.slug;
-        let distinctValues = this.getDistinctValues(data, indexRootSlug, indexSlug, altIndexRootSlug, altIndexSlug, groupMultiSelectInSeparateFrame);
+        const index = groupingProperty.typeRootSlug + '.' + groupingProperty.propertyDefinition.slug;
+        const altIndex = util_1.StringUtil.convertToCamelCase(groupingProperty.typeRootSlug) + '.' + groupingProperty.propertyDefinition.slug;
+        let distinctValues = this.getDistinctValues(data, index, altIndex, groupMultiSelectInSeparateFrame);
         for (let val of distinctValues) {
             const groupData = data.filter(obj => {
-                const objVal = util_1.ObjectUtil.getBySlugs(obj, indexRootSlug, indexSlug) ||
-                    util_1.ObjectUtil.getBySlugs(obj, altIndexRootSlug, altIndexSlug);
+                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();
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/data-grouping",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "Utilities and interfaces for grouping data into hierarchial data structures based on properties.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -14,7 +14,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@contrail/util": "^1.0.62",
+    "@contrail/util": "^1.0.63",
     "@types/jest": "^29.5.2",
     "jest": "^29.5.0",
     "prettier": "^1.19.1",