From 975e45061b073ecce2398d00c12f525d90e07b02 Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Thu, 8 Aug 2019 11:26:44 -0700
Subject: [PATCH] Change logic to not show results until there are results to
 show (#6310)

* change logic to not show results until there are results to show

* wip

* simplify code

* address feedback
---
 .../parts/query/browser/queryResultsView.ts   | 44 ++++++++++---------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/sql/workbench/parts/query/browser/queryResultsView.ts b/src/sql/workbench/parts/query/browser/queryResultsView.ts
index a2b7b2075f..8dbb792043 100644
--- a/src/sql/workbench/parts/query/browser/queryResultsView.ts
+++ b/src/sql/workbench/parts/query/browser/queryResultsView.ts
@@ -13,15 +13,16 @@ import { ChartTab } from 'sql/workbench/parts/charts/browser/chartTab';
 import { QueryPlanTab } from 'sql/workbench/parts/queryPlan/browser/queryPlan';
 import { TopOperationsTab } from 'sql/workbench/parts/queryPlan/browser/topOperations';
 import { QueryModelViewTab } from 'sql/workbench/parts/query/browser/modelViewTab/queryModelViewTab';
+import { MessagePanelState } from 'sql/workbench/parts/query/common/messagePanelState';
+import { GridPanelState } from 'sql/workbench/parts/query/common/gridPanelState';
 
 import * as nls from 'vs/nls';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import * as DOM from 'vs/base/browser/dom';
-import { IDisposable, dispose, Disposable } from 'vs/base/common/lifecycle';
+import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
 import { attachTabbedPanelStyler } from 'sql/platform/theme/common/styler';
 import { IThemeService } from 'vs/platform/theme/common/themeService';
-import { MessagePanelState } from 'sql/workbench/parts/query/common/messagePanelState';
-import { GridPanelState } from 'sql/workbench/parts/query/common/gridPanelState';
+import { Event } from 'vs/base/common/event';
 
 class MessagesView extends Disposable implements IPanelView {
 	private messagePanel: MessagePanel;
@@ -173,7 +174,7 @@ export class QueryResultsView extends Disposable {
 	private topOperationsTab: TopOperationsTab;
 	private dynamicModelViewTabs: QueryModelViewTab[] = [];
 
-	private runnerDisposables: IDisposable[];
+	private runnerDisposables = new DisposableStore();
 
 	constructor(
 		container: HTMLElement,
@@ -212,26 +213,27 @@ export class QueryResultsView extends Disposable {
 
 	private setQueryRunner(runner: QueryRunner) {
 		const activeTab = this._input.state.activeTab;
-		if (runner.hasCompleted && !this.hasResults(runner)) {
-			this.hideResults();
-		} else {
+		if (this.hasResults(runner)) {
 			this.showResults();
+		} else {
+			if (runner.isExecuting) { // in case we don't have results yet, but we also have already started executing
+				this.runnerDisposables.add(Event.once(runner.onResultSet)(() => this.showResults()));
+			}
+			this.hideResults();
 		}
 		this.resultsTab.queryRunner = runner;
 		this.messagesTab.queryRunner = runner;
 		this.chartTab.queryRunner = runner;
-		this.runnerDisposables.push(runner.onQueryStart(e => {
-			this.showResults();
+		this.runnerDisposables.add(runner.onQueryStart(e => {
+			this.runnerDisposables.add(Event.once(runner.onResultSet)(() => this.showResults()));
+			this.hideResults();
 			this.hideChart();
 			this.hidePlan();
 			this.hideDynamicViewModelTabs();
 			this.input.state.visibleTabs = new Set();
 			this.input.state.activeTab = this.resultsTab.identifier;
 		}));
-		this.runnerDisposables.push(runner.onQueryEnd(() => {
-			if (!this.hasResults(runner)) {
-				this.hideResults();
-			}
+		this.runnerDisposables.add(runner.onQueryEnd(() => {
 			if (runner.messages.find(v => v.isError)) {
 				this._panelView.showTab(this.messagesTab.identifier);
 			}
@@ -278,7 +280,7 @@ export class QueryResultsView extends Disposable {
 			}
 		});
 
-		this.runnerDisposables.push(runner.onQueryEnd(() => {
+		this.runnerDisposables.add(runner.onQueryEnd(() => {
 			if (runner.isQueryPlan) {
 				runner.planXml.then(e => {
 					this.showPlan(e);
@@ -294,8 +296,8 @@ export class QueryResultsView extends Disposable {
 
 	public set input(input: QueryResultsInput) {
 		this._input = input;
-		dispose(this.runnerDisposables);
-		this.runnerDisposables = [];
+		this.runnerDisposables.dispose();
+		this.runnerDisposables = new DisposableStore();
 
 		[this.resultsTab, this.messagesTab, this.qpTab, this.topOperationsTab, this.chartTab].forEach(t => t.clear());
 		this.dynamicModelViewTabs.forEach(t => t.clear());
@@ -320,14 +322,14 @@ export class QueryResultsView extends Disposable {
 					disposable.dispose();
 				}
 			});
-			this.runnerDisposables.push(disposable);
+			this.runnerDisposables.add(disposable);
 		}
 	}
 
 	clearInput() {
 		this._input = undefined;
-		dispose(this.runnerDisposables);
-		this.runnerDisposables = [];
+		this.runnerDisposables.dispose();
+		this.runnerDisposables = new DisposableStore();
 		this.resultsTab.clear();
 		this.messagesTab.clear();
 		this.qpTab.clear();
@@ -409,8 +411,8 @@ export class QueryResultsView extends Disposable {
 	}
 
 	public dispose() {
-		dispose(this.runnerDisposables);
-		this.runnerDisposables = [];
+		this.runnerDisposables.dispose();
+		this.runnerDisposables = new DisposableStore();
 		super.dispose();
 	}