@contrail/data-grouping 1.0.15 → 1.0.17

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

@@ -2,6 +2,6 @@ import { DataGroup, DataGroupStructure, DataGroupingProperty } from "../interfac
 export declare class DataGroupGenerator {
     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 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

@@ -31,15 +31,22 @@ class DataGroupGenerator {
         const groupingProperty = groupingProperties[currentDepth];
         const index = groupingProperty.scope + "." + groupingProperty.property.slug;
         const distinctValues = this.getDistinctValues(data, index);
+        console.log("distinctValues: ", distinctValues);
         for (let val of distinctValues) {
             const groupData = data.filter(obj => util_1.ObjectUtil.getByPath(obj, index) === val);
             const group = {
                 data: [],
                 subGroups: [],
-                properties: {},
+                propertyValues: {},
                 name: ''
             };
-            group.properties[groupingProperty.property.slug] = val;
+            if (groupingProperty.scopeIdentityProperty === true && groupData.length) {
+                const details = groupData[0][groupingProperty.scope];
+                group.propertyValues = Object.assign({}, details);
+            }
+            else {
+                group.propertyValues[groupingProperty.property.slug] = val;
+            }
             const label = new types_1.PropertyValueFormatter().formatValueForProperty(val, groupingProperty.property);
             group.name = label;
             if (currentDepth === groupingProperties.length - 1) {
@@ -51,12 +58,12 @@ class DataGroupGenerator {
             parentGroup.subGroups.push(group);
         }
     }
-    static buildDataGroupStructure(data, groupingProperties, leafNodeDataCount, currentDepth = 0) {
+    static buildDataGroupStructure(data, groupingProperties, leafNodeDataCount) {
         const structure = {
             rootGroup: {
                 subGroups: [],
                 name: "root",
-                properties: {},
+                propertyValues: {},
                 data: [],
             },
             groupingProperties,
@@ -77,7 +84,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,10 +14,17 @@ 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;
     values?: Array<string>;
     scope: string;
     sort: string;
+    scopeIdentityProperty?: boolean;
 }

package/package.json

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