@contrail/data-grouping 1.0.14 → 1.0.16

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

@@ -12,14 +12,17 @@ class DataGroupGenerator {
             }
             let key = util_1.ObjectUtil.getByPath(obj, index);
             let value = key;
+            if (!value) {
+                return;
+            }
             if (key && value && 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;
+            let val1 = (v1 && typeof v1 === 'object') ? v1.name : v1;
+            let val2 = (v2 && typeof v2 === 'object') ? v2.name : v2;
             return val1 > val2 ? 1 : -1;
         });
         return distinctValues;
@@ -33,10 +36,10 @@ class DataGroupGenerator {
             const group = {
                 data: [],
                 subGroups: [],
-                properties: {},
+                propertyValues: {},
                 name: ''
             };
-            group.properties[groupingProperty.property.slug] = val;
+            group.propertyValues[groupingProperty.property.slug] = val;
             const label = new types_1.PropertyValueFormatter().formatValueForProperty(val, groupingProperty.property);
             group.name = label;
             if (currentDepth === groupingProperties.length - 1) {
@@ -53,7 +56,7 @@ class DataGroupGenerator {
             rootGroup: {
                 subGroups: [],
                 name: "root",
-                properties: {},
+                propertyValues: {},
                 data: [],
             },
             groupingProperties,
@@ -74,7 +77,7 @@ class DataGroupGenerator {
                 data: groupData,
                 subGroups: [],
                 name: parentGroup.name,
-                properties: parentGroup.properties,
+                propertyValues: parentGroup.propertyValues,
             };
             groups.push(group);
         }

package/lib/interfaces.d.ts

@@ -2,7 +2,10 @@ import { TypeProperty } from "@contrail/types";
 export interface DataGroup {
     subGroups: Array<DataGroup>;
     name: string;
-    properties: {
+    propertyValues: {
+        [key: string]: any;
+    };
+    aggregateValues?: {
         [key: string]: any;
     };
     data: Array<any>;
@@ -11,6 +14,12 @@ export interface DataGroupStructure {
     rootGroup: DataGroup;
     depth: number;
     groupingProperties: Array<DataGroupingProperty>;
+    aggregationProperties?: Array<DataGroupingProperty>;
+    sourceDataDefinition?: {
+        sourceDataReference: string;
+        filterDefinition?: any;
+        sortDefinition?: any;
+    };
 }
 export interface DataGroupingProperty {
     property: TypeProperty;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/data-grouping",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "description": "Utilities and interfaces for grouping data into hierarchial data structures based on properties.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",