Don't execute query when changing data sources (fixes getredash#29)

Also: show query results for execution after changing data sources (fixes getredash#774)
mnoorenberghe · Jan 16, 2020 · 6cbad1e · 6cbad1e
1 parent ab70991
commit 6cbad1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
@@ -229,7 +229,7 @@ <h3>
               <!-- End of Query Execution Status -->
 
               <!-- tabs and data -->
-              <div ng-if="showDataset" class="flex-fill p-relative">
+              <div ng-if="showDataset && !dataSourceChanged" class="flex-fill p-relative">
                 <div class="d-flex flex-column p-absolute static-position__mobile" style="left: 0; top: 0; right: 0; bottom: 0;">
                   <div class="p-10" ng-show="showLog">
                     <p>Log Information:</p>

diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js
@@ -130,6 +130,7 @@ function QueryViewCtrl(
       return;
     }
 
+    $scope.dataSourceChanged = false;
     getQueryResult(0, $scope.selectedQueryText);
     $scope.lockButton(true);
     $scope.cancelling = false;
@@ -138,6 +139,7 @@ function QueryViewCtrl(
     Notifications.getPermissions();
   };
 
+  $scope.dataSourceChanged = false;
   $scope.selectedVisualization = DEFAULT_VISUALIZATION;
   $scope.currentUser = currentUser;
   $scope.dataSource = {};
@@ -381,7 +383,7 @@ function QueryViewCtrl(
 
     $scope.dataSource = find($scope.dataSources, ds => ds.id === $scope.query.data_source_id);
     getSchema();
-    $scope.executeQuery();
+    $scope.dataSourceChanged = true;
   };
 
   $scope.setVisualizationTab = visualization => {