fix(table): table column sorting fix

torkelo · torkelo · commit 5d652dcaef49 · 2016-04-28T15:48:49.000+02:00
diff --git a/public/app/core/table_model.ts b/public/app/core/table_model.ts
@@ -32,6 +32,8 @@ export default class TableModel {
     if (options.desc) {
       this.rows.reverse();
       this.columns[options.col].desc = true;
+    } else {
+      this.columns[options.col].desc = false;
     }
   }
 }
diff --git a/public/app/plugins/panel/table/module.ts b/public/app/plugins/panel/table/module.ts
@@ -120,6 +120,11 @@ class TablePanelCtrl extends MetricsPanelCtrl {
   }
 
   toggleColumnSort(col, colIndex) {
+    // remove sort flag from current column
+    if (this.table.columns[this.panel.sort.col]) {
+      this.table.columns[this.panel.sort.col].sort = false;
+    }
+
     if (this.panel.sort.col === colIndex) {
       if (this.panel.sort.desc) {
         this.panel.sort.desc = false;

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ export default class TableModel {`
`32`	`32`	`if (options.desc) {`
`33`	`33`	`this.rows.reverse();`
`34`	`34`	`this.columns[options.col].desc = true;`
	`35`	`+ } else {`
	`36`	`+ this.columns[options.col].desc = false;`
`35`	`37`	`}`
`36`	`38`	`}`
`37`	`39`	`}`