Merge pull request #1484 from getredash/v1fixes

Fix #1457: sort was using the string value
getredash · Dec 23, 2016 · e0a010f · e0a010f
2 parents 3bc98fb + 40b8200
commit e0a010f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 24 deletions.
diff --git a/client/app/components/dynamic-table/dynamic-table.html b/client/app/components/dynamic-table/dynamic-table.html
@@ -3,15 +3,15 @@
     <thead>
     <tr>
       <th ng-repeat="column in $ctrl.columns" ng-click="$ctrl.orderBy(column)" class="sortable-column">
-        {{column}} <span ng-if="$ctrl.sortIcon(column)"><i class="fa fa-sort-{{$ctrl.sortIcon(column)}}"></i></span>
+        {{column.title}} <span ng-if="$ctrl.sortIcon(column)"><i class="fa fa-sort-{{$ctrl.sortIcon(column)}}"></i></span>
       </th>
     </tr>
 
     </thead>
     <tbody>
     <tr ng-repeat="row in $ctrl.rows">
       <td ng-repeat="column in $ctrl.columns">
-        {{row[column]}}
+        {{column.formatFunction(row[column.name])}}
       </td>
     </tr>
     </tbody>

diff --git a/client/app/components/dynamic-table/index.js b/client/app/components/dynamic-table/index.js
@@ -33,7 +33,7 @@ function DynamicTable() {
     }
 
     if (this.orderByField) {
-      this.allRows = sortBy(this.allRows, this.orderByField);
+      this.allRows = sortBy(this.allRows, this.orderByField.name);
       if (this.orderByReverse) {
         this.allRows = this.allRows.reverse();
       }

diff --git a/client/app/visualizations/table/index.js b/client/app/visualizations/table/index.js
@@ -1,5 +1,5 @@
 import moment from 'moment';
-import { each, isString, object, pluck } from 'underscore';
+import { _, partial, isString } from 'underscore';
 import { getColumnCleanName } from '../../services/query-result';
 import template from './table.html';
 
@@ -62,23 +62,13 @@ function GridRenderer(clientConfig) {
           $scope.filters = $scope.queryResult.getFilters();
 
           const columns = $scope.queryResult.getColumns();
-          const columnsMap = object(pluck(columns, 'name'), pluck(columns, 'type'));
+          columns.forEach((col) => {
+            col.title = getColumnCleanName(col.name);
+            col.formatFunction = partial(formatValue, $filter, clientConfig, _, col.type);
+          });
 
-          const prepareGridData = (data) => {
-            const gridData = data.map((row) => {
-              const newRow = {};
-              each(row, (val, key) => {
-                const formattedValue = formatValue($filter, clientConfig, val, columnsMap[key]);
-                newRow[getColumnCleanName(key)] = formattedValue;
-              });
-              return newRow;
-            });
-
-            return gridData;
-          };
-
-          $scope.gridRows = prepareGridData($scope.queryResult.getData());
-          $scope.gridColumns = $scope.queryResult.getColumnCleanNames();
+          $scope.gridRows = $scope.queryResult.getData();
+          $scope.gridColumns = columns;
         }
       });
     },

diff --git a/redash/handlers/queries.py b/redash/handlers/queries.py
@@ -58,10 +58,6 @@ def post(self):
         for field in ['id', 'created_at', 'api_key', 'visualizations', 'latest_query_data', 'last_modified_by']:
             query_def.pop(field, None)
 
-        # If we already executed this query, save the query result reference
-        if 'latest_query_data_id' in query_def:
-            query_def['latest_query_data'] = query_def.pop('latest_query_data_id')
-
         query_def['query_text'] = query_def.pop('query')
         query_def['user'] = self.current_user
         query_def['data_source'] = data_source