@contrail/data-grouping 1.0.26 → 1.0.28

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

@@ -1,6 +1,6 @@
 import { DataGroup, DataGroupStructure, DataGroupingProperty } from '../interfaces';
 export declare class DataGroupGenerator {
-    static getDistinctValues(data: any, index: any, altIndex?: any, groupMultiSelectInSeparateFrame?: boolean): any[];
+    static getDistinctValues(data: any, rootIndex: any, slugIndex?: any, rootAltIndex?: any, slugAltIndex?: any, groupMultiSelectInSeparateFrame?: boolean, sortKey?: string): 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,17 +4,17 @@ exports.DataGroupGenerator = void 0;
 const util_1 = require("@contrail/util");
 const types_1 = require("@contrail/types");
 class DataGroupGenerator {
-    static getDistinctValues(data, index, altIndex = null, groupMultiSelectInSeparateFrame = false) {
+    static getDistinctValues(data, rootIndex, slugIndex = null, rootAltIndex = null, slugAltIndex = null, groupMultiSelectInSeparateFrame = false, sortKey = 'asc') {
         const map = new Map();
         const sortingArray = [];
-        data.forEach(obj => {
+        data.forEach((obj) => {
             if (!obj) {
                 return;
             }
-            let key = util_1.ObjectUtil.getByPath(obj, index);
+            let key = util_1.ObjectUtil.getBySlugs(obj, rootIndex, slugIndex);
             let altKey = null;
-            if (altIndex) {
-                altKey = util_1.ObjectUtil.getByPath(obj, altIndex);
+            if (rootAltIndex) {
+                altKey = util_1.ObjectUtil.getBySlugs(obj, rootAltIndex, slugAltIndex);
                 if (!key) {
                     key = altKey;
                 }
@@ -27,7 +27,7 @@ class DataGroupGenerator {
                 key = value.id || value.name || value;
             }
             if (Array.isArray(value) && !groupMultiSelectInSeparateFrame) {
-                value.forEach(arrayValue => {
+                value.forEach((arrayValue) => {
                     map[arrayValue] = arrayValue;
                     if (!sortingArray.includes(arrayValue)) {
                         sortingArray.push(arrayValue);
@@ -41,21 +41,33 @@ class DataGroupGenerator {
                 }
             }
         });
-        const distinctValues = [...Object.values(map)].sort((v1, v2) => {
+        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;
-            return sortingArray.indexOf(val1) - sortingArray.indexOf(val2);
+            if (sortKey === 'asc') {
+                return val1 > val2 ? 1 : -1;
+            }
+            else if (sortKey === 'desc') {
+                return val1 < val2 ? 1 : -1;
+            }
+            else {
+                return sortingArray.indexOf(val1) - sortingArray.indexOf(val2);
+            }
         });
         return distinctValues;
     }
     static buildChildDataGroups(data, parentGroup, groupingProperties, leafNodeDataCount, currentDepth, groupMultiSelectInSeparateFrame = false) {
         const groupingProperty = groupingProperties[currentDepth];
-        const index = groupingProperty.typeRootSlug + '.' + groupingProperty.propertyDefinition.slug;
-        const altIndex = util_1.StringUtil.convertToCamelCase(groupingProperty.typeRootSlug) + '.' + groupingProperty.propertyDefinition.slug;
-        let distinctValues = this.getDistinctValues(data, index, altIndex, groupMultiSelectInSeparateFrame);
+        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';
+        let distinctValues = this.getDistinctValues(data, rootIndex, slugIndex, rootAltIndex, slugAltIndex, groupMultiSelectInSeparateFrame, sort);
         for (let val of distinctValues) {
-            const groupData = data.filter(obj => {
-                const objVal = util_1.ObjectUtil.getByPath(obj, index) || util_1.ObjectUtil.getByPath(obj, altIndex);
+            const groupData = data.filter((obj) => {
+                const objVal = util_1.ObjectUtil.getBySlugs(obj, rootIndex, slugIndex) || util_1.ObjectUtil.getBySlugs(obj, rootAltIndex, slugAltIndex);
                 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.26",
+  "version": "1.0.28",
   "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.63",
+    "@contrail/util": "^1.0.64",
     "@types/jest": "^29.5.2",
     "jest": "^29.5.0",
     "prettier": "^1.19.1",