Fix: visualization wasn't loading on first page load

washort · Dec 27, 2016 · b3d0f70 · b3d0f70
1 parent 894da61
commit b3d0f70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/client/app/services/query-result.js b/client/app/services/query-result.js
@@ -312,6 +312,10 @@ function QueryResultService($resource, $timeout, $q) {
     }
 
     prepareFilters() {
+      if (!this.getColumns()) {
+        return;
+      }
+
       const filters = [];
       const filterTypes = ['filter', 'multi-filter', 'multiFilter'];
 

diff --git a/client/app/visualizations/chart/index.js b/client/app/visualizations/chart/index.js
@@ -23,7 +23,7 @@ function ChartRenderer() {
       }
 
       function reloadData() {
-        if (!isUndefined($scope.queryResult)) {
+        if (!isUndefined($scope.queryResult) && $scope.queryResult.getData()) {
           const data = $scope.queryResult.getChartData($scope.options.columnMapping);
           $scope.chartSeries = sortBy(data, zIndexCompare);
         }