@contrail/data-grouping 1.0.18 → 1.0.20

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;
@@ -29,10 +36,13 @@ class DataGroupGenerator {
     }
     static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth) {
         const groupingProperty = groupingProperties[currentDepth];
-        const index = groupingProperty.scope + "." + groupingProperty.property.slug;
-        const distinctValues = this.getDistinctValues(data, index);
+        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);
         for (let val of distinctValues) {
-            const groupData = data.filter(obj => util_1.ObjectUtil.getByPath(obj, index) === val);
+            const groupData = data.filter(obj => {
+                return (util_1.ObjectUtil.getByPath(obj, index) === val || util_1.ObjectUtil.getByPath(obj, altIndex) === val);
+            });
             const group = {
                 data: [],
                 subGroups: [],
@@ -43,8 +53,8 @@ class DataGroupGenerator {
                 const details = groupData[0];
                 group.propertyValues = Object.assign({}, details);
             }
-            group.propertyValues[groupingProperty.property.slug] = val;
-            const label = new types_1.PropertyValueFormatter().formatValueForProperty(val, groupingProperty.property);
+            group.propertyValues[groupingProperty.propertyDefinition.slug] = val;
+            const label = new types_1.PropertyValueFormatter().formatValueForProperty(val, groupingProperty.propertyDefinition);
             group.name = label;
             if (currentDepth === groupingProperties.length - 1) {
                 group.subGroups = this.createPartitionedGroupsFromData(group, groupData, leafNodeDataCount);

package/lib/interfaces.d.ts

@@ -22,8 +22,8 @@ export interface DataGroupStructure {
     };
 }
 export interface DataGroupingProperty {
-    property: TypeProperty;
+    propertyDefinition: TypeProperty;
     values?: Array<string>;
-    scope: string;
+    typeRootSlug: string;
     sort: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/data-grouping",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "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.26",
+    "@contrail/util": "^1.0.28",
     "@types/jest": "^23.3.14",
     "jest": "^23.6.0",
     "prettier": "^1.19.1",