@contrail/data-grouping 1.0.48 → 1.0.50-alpha.0

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

@@ -7,8 +7,8 @@ export declare class DataGroupGenerator {
     }, propertyTypeOptions?: {
         isDate: boolean;
         isNumber: boolean;
-    }, displayItemsWithEmptyGroupingValues?: boolean): any[];
-    static buildChildDataGroups(data: any, parentGroup: DataGroup, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: any, currentDepth: any, groupMultiSelectInSeparateFrame?: boolean, displayItemsWithEmptyGroupingValues?: boolean): void;
-    static buildDataGroupStructure(data: Array<any>, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: number, groupMultiSelectInSeparateFrame?: boolean, displayItemsWithEmptyGroupingValues?: boolean): DataGroupStructure;
+    }, displayItemsWithEmptyGroupingValues?: boolean, displayOptionFrameWithNoData?: boolean): any[];
+    static buildChildDataGroups(data: any, parentGroup: DataGroup, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: any, currentDepth: any, groupMultiSelectInSeparateFrame?: boolean, displayItemsWithEmptyGroupingValues?: boolean, displayOptionFrameWithNoData?: boolean): void;
+    static buildDataGroupStructure(data: Array<any>, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: number, groupMultiSelectInSeparateFrame?: boolean, displayItemsWithEmptyGroupingValues?: boolean, displayOptionFrameWithNoData?: 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, sortOptions = { sortOrder: types_1.TypePropertySortOrder.ASCENDING, options: null }, propertyTypeOptions = { isDate: false, isNumber: false }, displayItemsWithEmptyGroupingValues = false) {
+    static getDistinctValues(data, rootIndex, slugIndex = null, rootAltIndex = null, slugAltIndex = null, groupMultiSelectInSeparateFrame = false, sortOptions = { sortOrder: types_1.TypePropertySortOrder.ASCENDING, options: null }, propertyTypeOptions = { isDate: false, isNumber: false }, displayItemsWithEmptyGroupingValues = false, displayOptionFrameWithNoData = false) {
         const sortOrder = (sortOptions === null || sortOptions === void 0 ? void 0 : sortOptions.sortOrder) || types_1.TypePropertySortOrder.ASCENDING;
         const options = (sortOptions === null || sortOptions === void 0 ? void 0 : sortOptions.options) || null;
         const map = new Map();
@@ -64,6 +64,14 @@ class DataGroupGenerator {
             }
         });
         const distinctValues = [...Object.values(map)];
+        if (options && Array.isArray(options) && displayOptionFrameWithNoData) {
+            const distinctValuesSet = new Set(distinctValues);
+            options.forEach((option) => {
+                if (!distinctValuesSet.has(option)) {
+                    distinctValues.push(option);
+                }
+            });
+        }
         const sortingArrayMap = new Map(sortingArray.map((value, index) => [value, index]));
         const optionsMap = options
             ? new Map(options.map((val, index) => [val, index]))
@@ -103,7 +111,7 @@ class DataGroupGenerator {
         }
         return distinctValues;
     }
-    static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth, groupMultiSelectInSeparateFrame = false, displayItemsWithEmptyGroupingValues = false) {
+    static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth, groupMultiSelectInSeparateFrame = false, displayItemsWithEmptyGroupingValues = false, displayOptionFrameWithNoData = false) {
         var _a, _b, _c, _d, _e;
         const groupingProperty = groupingProperties[currentDepth];
         const propertyTypeOptions = {
@@ -117,7 +125,7 @@ class DataGroupGenerator {
         const slugAltIndex = groupingProperty.propertyDefinition.slug;
         const sort = groupingProperty.sort || types_1.TypePropertySortOrder.ASCENDING;
         const options = ((_e = (_d = groupingProperty.propertyDefinition) === null || _d === void 0 ? void 0 : _d.options) === null || _e === void 0 ? void 0 : _e.map((x) => x.value)) || null;
-        let distinctValues = this.getDistinctValues(data, rootIndex, slugIndex, rootAltIndex, slugAltIndex, groupMultiSelectInSeparateFrame, { sortOrder: sort, options }, propertyTypeOptions, displayItemsWithEmptyGroupingValues);
+        let distinctValues = this.getDistinctValues(data, rootIndex, slugIndex, rootAltIndex, slugAltIndex, groupMultiSelectInSeparateFrame, { sortOrder: sort, options }, propertyTypeOptions, displayItemsWithEmptyGroupingValues, displayOptionFrameWithNoData);
         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);
@@ -164,12 +172,12 @@ class DataGroupGenerator {
                 group.subGroups = this.createPartitionedGroupsFromData(group, groupData, leafNodeDataCount);
             }
             else if (currentDepth < groupingProperties.length - 1) {
-                this.buildChildDataGroups(groupData, group, groupingProperties, leafNodeDataCount, currentDepth + 1, groupMultiSelectInSeparateFrame, displayItemsWithEmptyGroupingValues);
+                this.buildChildDataGroups(groupData, group, groupingProperties, leafNodeDataCount, currentDepth + 1, groupMultiSelectInSeparateFrame, displayItemsWithEmptyGroupingValues, displayOptionFrameWithNoData);
             }
             parentGroup.subGroups.push(group);
         }
     }
-    static buildDataGroupStructure(data, groupingProperties, leafNodeDataCount, groupMultiSelectInSeparateFrame = false, displayItemsWithEmptyGroupingValues = false) {
+    static buildDataGroupStructure(data, groupingProperties, leafNodeDataCount, groupMultiSelectInSeparateFrame = false, displayItemsWithEmptyGroupingValues = false, displayOptionFrameWithNoData = false) {
         const structure = {
             rootGroup: {
                 subGroups: [],
@@ -180,25 +188,36 @@ class DataGroupGenerator {
             groupingProperties,
             depth: groupingProperties ? groupingProperties.length : 0,
         };
-        this.buildChildDataGroups(data, structure.rootGroup, groupingProperties, leafNodeDataCount, 0, groupMultiSelectInSeparateFrame, displayItemsWithEmptyGroupingValues);
+        this.buildChildDataGroups(data, structure.rootGroup, groupingProperties, leafNodeDataCount, 0, groupMultiSelectInSeparateFrame, displayItemsWithEmptyGroupingValues, displayOptionFrameWithNoData);
         return structure;
     }
     static createPartitionedGroupsFromData(parentGroup, data, leafNodeDataCount) {
         const dataLength = data.length;
         const frameCount = Math.ceil(dataLength / leafNodeDataCount);
         const groups = [];
-        for (let i = 1; i <= frameCount; i++) {
-            const startIndex = (i - 1) * leafNodeDataCount;
-            const endIndex = startIndex + leafNodeDataCount;
-            let groupData = data.slice(startIndex, endIndex);
+        if (data.length === 0) {
             const group = {
-                data: groupData,
+                data: [],
                 subGroups: [],
                 name: parentGroup.name,
                 propertyValues: parentGroup.propertyValues,
             };
             groups.push(group);
         }
+        else {
+            for (let i = 1; i <= frameCount; i++) {
+                const startIndex = (i - 1) * leafNodeDataCount;
+                const endIndex = startIndex + leafNodeDataCount;
+                let groupData = data.slice(startIndex, endIndex);
+                const group = {
+                    data: groupData,
+                    subGroups: [],
+                    name: parentGroup.name,
+                    propertyValues: parentGroup.propertyValues,
+                };
+                groups.push(group);
+            }
+        }
         return groups;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/data-grouping",
-  "version": "1.0.48",
+  "version": "1.0.50-alpha.0",
   "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.64",
+    "@contrail/util": "^1.1.17-alpha.0",
     "@types/jest": "^29.5.2",
     "jest": "^29.5.0",
     "prettier": "^1.19.1",
@@ -38,7 +38,7 @@
     "testEnvironment": "node"
   },
   "dependencies": {
-    "@contrail/documents": "^1.0.38",
-    "@contrail/types": "^3.0.95"
+    "@contrail/documents": "^1.2.9-alpha.0",
+    "@contrail/types": "^3.1.2-alpha.0"
   }
 }