From ccbf72d17f3555592f19e236502c605ea46691d7 Mon Sep 17 00:00:00 2001
From: vargburz <vargburz@corpglory.com>
Date: Wed, 3 May 2023 14:56:38 +0300
Subject: [PATCH] fix ordering

---
 src/services/exporter.ts | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/services/exporter.ts b/src/services/exporter.ts
index 3333280..0778385 100644
--- a/src/services/exporter.ts
+++ b/src/services/exporter.ts
@@ -98,7 +98,7 @@ export class Exporter {
   }
 
   private _updateColumns(columnsToUpdate: string[], queriedColumns: string[]): string[] {
-    // slice(1) to avoid time fields
+    // slice(1) to avoid key fields
     return _.concat(columnsToUpdate, queriedColumns.slice(1));
   }
 
@@ -116,10 +116,11 @@ export class Exporter {
   }
 
   private _getRowsFromDict(dict: any, columns: string[]): (number | null)[][] {
-    let keyList = _.orderBy(_.keys(dict));
+    const keyList = _.map(_.keys(dict), value => _.toNumber(value));
+    const orderedKeyList = _.orderBy(keyList);
     let rows = [];
-    for(const keyIdx in keyList) {
-      const key = _.toNumber(keyList[keyIdx]);
+    for(const keyIdx in orderedKeyList) {
+      const key = orderedKeyList[keyIdx];
       rows[keyIdx] = [key];
       for(const column of columns) {
         const value = dict[key][column] || null;