@contrail/data-grouping 1.0.10 → 1.0.12

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

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

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

@@ -4,14 +4,30 @@ exports.DataGroupGenerator = void 0;
 const util_1 = require("@contrail/util");
 const types_1 = require("@contrail/types");
 class DataGroupGenerator {
+    static getDistinctValues(data, index) {
+        const map = new Map();
+        data.forEach(obj => {
+            if (!obj) {
+                return;
+            }
+            let key = obj[index];
+            let value = key;
+            if (typeof key === 'object') {
+                key = value.id || value.name || value;
+            }
+            map[key] = value;
+        });
+        const distinctValues = [...(Object.values(map))].sort((v1, v2) => {
+            let val1 = (typeof v1 === 'object') ? v1.name : v1;
+            let val2 = (typeof v2 === 'object') ? v2.name : v2;
+            return val1 > val2 ? 1 : -1;
+        });
+        return distinctValues;
+    }
     static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth) {
         const groupingProperty = groupingProperties[currentDepth];
         const index = groupingProperty.scope + "." + groupingProperty.property.slug;
-        const distinctValues = [...new Set(data.filter(obj => util_1.ObjectUtil.getByPath(obj, index))
-                .map(obj => util_1.ObjectUtil.getByPath(obj, index)))
-        ].sort((v1, v2) => {
-            return v1 > v2 ? 1 : -1;
-        });
+        const distinctValues = this.getDistinctValues(data, index);
         for (let val of distinctValues) {
             const groupData = data.filter(obj => util_1.ObjectUtil.getByPath(obj, index) === val);
             const group = {
@@ -21,7 +37,7 @@ class DataGroupGenerator {
                 name: ''
             };
             group.properties[groupingProperty.property.slug] = val;
-            const label = new types_1.PropertyValueFormatter().formatValueForProperty(val, groupingProperty);
+            const label = new types_1.PropertyValueFormatter().formatValueForProperty(val, groupingProperty.property);
             group.name = label;
             if (currentDepth === groupingProperties.length - 1) {
                 group.subGroups = this.createPartitionedGroupsFromData(group, groupData, leafNodeDataCount);

package/package.json

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