@contrail/data-grouping 1.0.29 → 1.0.30

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

@@ -1,6 +1,9 @@
 import { DataGroup, DataGroupStructure, DataGroupingProperty } from '../interfaces';
 export declare class DataGroupGenerator {
-    static getDistinctValues(data: any, rootIndex: any, slugIndex?: any, rootAltIndex?: any, slugAltIndex?: any, groupMultiSelectInSeparateFrame?: boolean, sortKey?: string, options?: any): any[];
+    static getDistinctValues(data: any, rootIndex: any, slugIndex?: any, rootAltIndex?: any, slugAltIndex?: any, groupMultiSelectInSeparateFrame?: boolean, sort?: {
+        sortKey: string;
+        options: any;
+    }): 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,9 @@ 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, sortKey = 'asc', options = null) {
+    static getDistinctValues(data, rootIndex, slugIndex = null, rootAltIndex = null, slugAltIndex = null, groupMultiSelectInSeparateFrame = false, sort = { sortKey: 'asc', options: null }) {
+        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();
         const sortingArray = [];
         data.forEach((obj) => {
@@ -43,42 +45,33 @@ class DataGroupGenerator {
         });
         const distinctValues = [...Object.values(map)];
         distinctValues.sort((v1, v2) => {
-            let val1 = v1 && typeof v1 === 'object' ? v1.name : v1;
-            let val2 = v2 && typeof v2 === 'object' ? v2.name : v2;
-            console.log('OPTIONS', options);
-            if (sortKey === 'asc') {
-                if (options) {
-                    return options.indexOf(val1) - options.indexOf(val2);
-                }
-                else {
+            const val1 = v1 && typeof v1 === 'object' ? v1.name : v1;
+            const val2 = v2 && typeof v2 === 'object' ? v2.name : v2;
+            switch (sortKey) {
+                case 'asc':
                     return val1 > val2 ? 1 : -1;
-                }
-            }
-            else if (sortKey === 'desc') {
-                if (options) {
-                    return options.indexOf(val2) - options.indexOf(val1);
-                }
-                else {
+                case 'desc':
                     return val1 < val2 ? 1 : -1;
-                }
-            }
-            else {
-                return sortingArray.indexOf(val1) - sortingArray.indexOf(val2);
+                case 'list_order_asc':
+                    return options.indexOf(val1) - options.indexOf(val2);
+                case 'list_order_desc':
+                    return options.indexOf(val2) - options.indexOf(val1);
+                default:
+                    return sortingArray.indexOf(val1) - sortingArray.indexOf(val2);
             }
         });
         return distinctValues;
     }
     static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth, groupMultiSelectInSeparateFrame = false) {
-        var _a;
+        var _a, _b;
         const groupingProperty = groupingProperties[currentDepth];
         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 = ((_a = groupingProperty.propertyDefinition) === null || _a === void 0 ? void 0 : _a.options) || null;
-        console.log('GROUPING PROPERTIES', groupingProperty);
-        let distinctValues = this.getDistinctValues(data, rootIndex, slugIndex, rootAltIndex, slugAltIndex, groupMultiSelectInSeparateFrame, sort, options);
+        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 });
         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);

package/package.json

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