@contrail/data-grouping 1.0.34 → 1.0.35

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

@@ -3,7 +3,7 @@ export declare class DataGroupGenerator {
     static getDistinctValues(data: any, rootIndex: any, slugIndex?: any, rootAltIndex?: any, slugAltIndex?: any, groupMultiSelectInSeparateFrame?: boolean, sort?: {
         sortKey: string;
         options: any;
-    }): any[];
+    }, isDateProperty?: boolean): any[];
     static buildChildDataGroups(data: any, parentGroup: DataGroup, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: any, currentDepth: any, groupMultiSelectInSeparateFrame?: boolean): void;
     static buildDataGroupStructure(data: Array<any>, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: number, groupMultiSelectInSeparateFrame?: boolean): DataGroupStructure;
     static createPartitionedGroupsFromData(parentGroup: DataGroup, data: Array<any>, leafNodeDataCount: number): Array<DataGroup>;

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

@@ -4,7 +4,7 @@ exports.DataGroupGenerator = void 0;
 const util_1 = require("@contrail/util");
 const types_1 = require("@contrail/types");
 class DataGroupGenerator {
-    static getDistinctValues(data, rootIndex, slugIndex = null, rootAltIndex = null, slugAltIndex = null, groupMultiSelectInSeparateFrame = false, sort = { sortKey: 'asc', options: null }) {
+    static getDistinctValues(data, rootIndex, slugIndex = null, rootAltIndex = null, slugAltIndex = null, groupMultiSelectInSeparateFrame = false, sort = { sortKey: 'asc', options: null }, isDateProperty = false) {
         const sortKey = (sort === null || sort === void 0 ? void 0 : sort.sortKey) || 'asc';
         const options = (sort === null || sort === void 0 ? void 0 : sort.options) || null;
         const map = new Map();
@@ -25,6 +25,11 @@ class DataGroupGenerator {
             if (!value) {
                 return;
             }
+            if (isDateProperty && value) {
+                const date = new Date(value);
+                value = date.toISOString().split('T')[0];
+                key = value;
+            }
             if (key && value && typeof key === 'object') {
                 key = value.id || value.name || value;
             }
@@ -65,16 +70,22 @@ class DataGroupGenerator {
     static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth, groupMultiSelectInSeparateFrame = false) {
         var _a, _b;
         const groupingProperty = groupingProperties[currentDepth];
+        const isDateProperty = groupingProperty.propertyDefinition.propertyType === 'date';
         const rootIndex = groupingProperty.typeRootSlug;
         const slugIndex = groupingProperty.propertyDefinition.slug;
         const rootAltIndex = util_1.StringUtil.convertToCamelCase(groupingProperty.typeRootSlug);
         const slugAltIndex = groupingProperty.propertyDefinition.slug;
         const sort = groupingProperty.sort || 'asc';
         const options = ((_b = (_a = groupingProperty.propertyDefinition) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b.map(x => x.value)) || null;
-        let distinctValues = this.getDistinctValues(data, rootIndex, slugIndex, rootAltIndex, slugAltIndex, groupMultiSelectInSeparateFrame, { sortKey: sort, options });
+        let distinctValues = this.getDistinctValues(data, rootIndex, slugIndex, rootAltIndex, slugAltIndex, groupMultiSelectInSeparateFrame, { sortKey: sort, options }, isDateProperty);
         for (let val of distinctValues) {
             const groupData = data.filter(obj => {
                 const objVal = util_1.ObjectUtil.getBySlugs(obj, rootIndex, slugIndex) || util_1.ObjectUtil.getBySlugs(obj, rootAltIndex, slugAltIndex);
+                if (isDateProperty) {
+                    const objDate = new Date(objVal).toISOString().split('T')[0];
+                    const valDate = new Date(val).toISOString().split('T')[0];
+                    return objDate === valDate;
+                }
                 if (Array.isArray(val) && Array.isArray(objVal)) {
                     return val.sort().join() === objVal.sort().join();
                 }

package/package.json

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