@contrail/data-grouping 1.0.22 → 1.0.24

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

@@ -6,6 +6,7 @@ const types_1 = require("@contrail/types");
 class DataGroupGenerator {
     static getDistinctValues(data, index, altIndex = null, groupMultiSelectInSeparateFrame = false) {
         const map = new Map();
+        const sortingArray = [];
         data.forEach(obj => {
             if (!obj) {
                 return;
@@ -28,16 +29,22 @@ class DataGroupGenerator {
             if (Array.isArray(value) && !groupMultiSelectInSeparateFrame) {
                 value.forEach(arrayValue => {
                     map[arrayValue] = arrayValue;
+                    if (!sortingArray.includes(arrayValue)) {
+                        sortingArray.push(arrayValue);
+                    }
                 });
             }
             else {
                 map[key] = value;
+                if (!sortingArray.includes(value)) {
+                    sortingArray.push(value);
+                }
             }
         });
         const distinctValues = [...(Object.values(map))].sort((v1, v2) => {
             let val1 = (v1 && typeof v1 === 'object') ? v1.name : v1;
             let val2 = (v2 && typeof v2 === 'object') ? v2.name : v2;
-            return val1 > val2 ? 1 : -1;
+            return sortingArray.indexOf(val1) - sortingArray.indexOf(val2);
         });
         return distinctValues;
     }
@@ -68,6 +75,9 @@ class DataGroupGenerator {
                 propertyValues: {},
                 name: ''
             };
+            if (groupingProperty.isSecondaryGroup) {
+                group.isSecondaryGroup = true;
+            }
             if (groupData.length > 0) {
                 const details = groupData[0];
                 group.propertyValues = Object.assign({}, details);

package/lib/interfaces.d.ts

@@ -9,6 +9,7 @@ export interface DataGroup {
         [key: string]: any;
     };
     data: Array<any>;
+    isSecondaryGroup?: boolean;
 }
 export interface DataGroupStructure {
     rootGroup: DataGroup;
@@ -26,4 +27,5 @@ export interface DataGroupingProperty {
     values?: Array<string>;
     typeRootSlug: string;
     sort: string;
+    isSecondaryGroup?: boolean;
 }

package/package.json

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