@contrail/data-grouping 1.0.17 → 1.0.19

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

@@ -29,9 +29,8 @@ class DataGroupGenerator {
     }
     static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth) {
         const groupingProperty = groupingProperties[currentDepth];
-        const index = groupingProperty.scope + "." + groupingProperty.property.slug;
+        const index = groupingProperty.typeRootSlug + "." + groupingProperty.propertyDefinition.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 = {
@@ -40,14 +39,12 @@ class DataGroupGenerator {
                 propertyValues: {},
                 name: ''
             };
-            if (groupingProperty.scopeIdentityProperty === true && groupData.length) {
-                const details = groupData[0][groupingProperty.scope];
+            if (groupData.length > 0) {
+                const details = groupData[0];
                 group.propertyValues = Object.assign({}, details);
             }
-            else {
-                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,9 +22,8 @@ export interface DataGroupStructure {
     };
 }
 export interface DataGroupingProperty {
-    property: TypeProperty;
+    propertyDefinition: TypeProperty;
     values?: Array<string>;
-    scope: string;
+    typeRootSlug: string;
     sort: string;
-    scopeIdentityProperty?: boolean;
 }

package/package.json

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