@contrail/data-grouping 1.0.36 → 1.0.37

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

@@ -1,7 +1,8 @@
 import { DataGroup, DataGroupStructure, DataGroupingProperty } from '../interfaces';
+import { TypePropertySortOrder } from '@contrail/types';
 export declare class DataGroupGenerator {
-    static getDistinctValues(data: any, rootIndex: any, slugIndex?: any, rootAltIndex?: any, slugAltIndex?: any, groupMultiSelectInSeparateFrame?: boolean, sort?: {
-        sortKey: string;
+    static getDistinctValues(data: any, rootIndex: any, slugIndex?: any, rootAltIndex?: any, slugAltIndex?: any, groupMultiSelectInSeparateFrame?: boolean, sortOptions?: {
+        sortOrder: TypePropertySortOrder;
         options: any;
     }, isDateProperty?: boolean): any[];
     static buildChildDataGroups(data: any, parentGroup: DataGroup, groupingProperties: Array<DataGroupingProperty>, leafNodeDataCount: any, currentDepth: any, groupMultiSelectInSeparateFrame?: boolean): void;

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

@@ -4,12 +4,12 @@ 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 }, 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;
+    static getDistinctValues(data, rootIndex, slugIndex = null, rootAltIndex = null, slugAltIndex = null, groupMultiSelectInSeparateFrame = false, sortOptions = { sortOrder: types_1.TypePropertySortOrder.ASCENDING, options: null }, isDateProperty = 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();
         const sortingArray = [];
-        data.forEach((obj) => {
+        data.forEach(obj => {
             if (!obj) {
                 return;
             }
@@ -34,7 +34,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);
@@ -49,18 +49,22 @@ class DataGroupGenerator {
             }
         });
         const distinctValues = [...Object.values(map)];
+        const optionsMap = options
+            ? new Map(options.map((val, index) => [val, index]))
+            : null;
         distinctValues.sort((v1, v2) => {
-            const val1 = v1 && typeof v1 === 'object' ? v1.name.toLowerCase() : String(v1).toLowerCase();
-            const val2 = v2 && typeof v2 === 'object' ? v2.name.toLowerCase() : String(v2).toLowerCase();
-            switch (sortKey) {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            const val1 = v1 && typeof v1 === 'object' ? (_a = v1 === null || v1 === void 0 ? void 0 : v1.name) === null || _a === void 0 ? void 0 : _a.toLowerCase() : (_b = String(v1)) === null || _b === void 0 ? void 0 : _b.toLowerCase();
+            const val2 = v2 && typeof v2 === 'object' ? (_c = v2 === null || v2 === void 0 ? void 0 : v2.name) === null || _c === void 0 ? void 0 : _c.toLowerCase() : (_d = String(v2)) === null || _d === void 0 ? void 0 : _d.toLowerCase();
+            switch (sortOrder) {
                 case 'asc':
                     return val1 > val2 ? 1 : val1 < val2 ? -1 : 0;
                 case 'desc':
                     return val1 < val2 ? 1 : val1 > val2 ? -1 : 0;
                 case 'list_order_asc':
-                    return options.indexOf(val1) - options.indexOf(val2);
+                    return ((_e = optionsMap.get(val1)) !== null && _e !== void 0 ? _e : 0) - ((_f = optionsMap.get(val2)) !== null && _f !== void 0 ? _f : 0);
                 case 'list_order_desc':
-                    return options.indexOf(val2) - options.indexOf(val1);
+                    return ((_g = optionsMap.get(val2)) !== null && _g !== void 0 ? _g : 0) - ((_h = optionsMap.get(val1)) !== null && _h !== void 0 ? _h : 0);
                 default:
                     return sortingArray.indexOf(val1) - sortingArray.indexOf(val2);
             }
@@ -75,11 +79,11 @@ class DataGroupGenerator {
         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 = ((_c = (_b = groupingProperty.propertyDefinition) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.map((x) => x.value)) || null;
-        let distinctValues = this.getDistinctValues(data, rootIndex, slugIndex, rootAltIndex, slugAltIndex, groupMultiSelectInSeparateFrame, { sortKey: sort, options }, isDateProperty);
+        const sort = groupingProperty.sort || types_1.TypePropertySortOrder.ASCENDING;
+        const options = ((_c = (_b = groupingProperty.propertyDefinition) === null || _b === void 0 ? void 0 : _b.options) === null || _c === void 0 ? void 0 : _c.map(x => x.value)) || null;
+        let distinctValues = this.getDistinctValues(data, rootIndex, slugIndex, rootAltIndex, slugAltIndex, groupMultiSelectInSeparateFrame, { sortOrder: sort, options }, isDateProperty);
         for (let val of distinctValues) {
-            const groupData = data.filter((obj) => {
+            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];

package/lib/interfaces.d.ts

@@ -1,4 +1,4 @@
-import { TypeProperty } from '@contrail/types';
+import { TypeProperty, TypePropertySortOrder } from '@contrail/types';
 export interface DataGroup {
     subGroups: Array<DataGroup>;
     name: string;
@@ -26,6 +26,6 @@ export interface DataGroupingProperty {
     propertyDefinition: TypeProperty;
     values?: Array<string>;
     typeRootSlug: string;
-    sort: string;
+    sort: TypePropertySortOrder;
     isSecondaryGroup?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/data-grouping",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "description": "Utilities and interfaces for grouping data into hierarchial data structures based on properties.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -39,6 +39,6 @@
   },
   "dependencies": {
     "@contrail/documents": "^1.0.38",
-    "@contrail/types": "^3.0.27"
+    "@contrail/types": "^3.0.83"
   }
 }