ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

strict compile for queryResultsView (#12581)

Browse Source
This commit is contained in:
Charles Gagnon
2020-09-23 13:17:23 -07:00
committed by GitHub
parent 4e07685588
commit 8bc7079d78
2 changed files with 54 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/common/editor/query/queryResultsInput.ts
View File

@@ -40,9 +40,9 @@ export class ResultsViewState {
*/ */
export class QueryResultsInput extends EditorInput { export class QueryResultsInput extends EditorInput {
private _state?= new ResultsViewState(); private _state = new ResultsViewState();
public get state(): ResultsViewState | undefined { public get state(): ResultsViewState {
return this._state; return this._state;
} }

68
src/sql/workbench/contrib/query/browser/queryResultsView.ts
View File

@@ -21,7 +21,6 @@ import * as DOM from 'vs/base/browser/dom';
import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle'; import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle';
import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IThemeService } from 'vs/platform/theme/common/themeService';
import { Event } from 'vs/base/common/event'; import { Event } from 'vs/base/common/event';
import { startsWith } from 'vs/base/common/strings';
import { URI } from 'vs/base/common/uri'; import { URI } from 'vs/base/common/uri';
import { attachTabbedPanelStyler } from 'sql/workbench/common/styler'; import { attachTabbedPanelStyler } from 'sql/workbench/common/styler';
@@ -65,8 +64,8 @@ class MessagesView extends Disposable implements IPanelView {
class ResultsView extends Disposable implements IPanelView { class ResultsView extends Disposable implements IPanelView {
private gridPanel: GridPanel; private gridPanel: GridPanel;
private container = document.createElement('div'); private container = document.createElement('div');
private _state: GridPanelState; private _state: GridPanelState | undefined;
private _runner: QueryRunner; private _runner: QueryRunner | undefined;
constructor(private instantiationService: IInstantiationService) { constructor(private instantiationService: IInstantiationService) {
super(); super();
@@ -104,9 +103,11 @@ class ResultsView extends Disposable implements IPanelView {
onShow(): void { onShow(): void {
if (this._state) { if (this._state) {
this.state = this._state; this.state = this._state;
if (this._runner) {
this.queryRunner = this._runner; this.queryRunner = this._runner;
} }
} }
}
public set queryRunner(runner: QueryRunner) { public set queryRunner(runner: QueryRunner) {
this._runner = runner; this._runner = runner;
@@ -163,7 +164,7 @@ class MessagesTab implements IPanelTab {
export class QueryResultsView extends Disposable { export class QueryResultsView extends Disposable {
private _panelView: TabbedPanel; private _panelView: TabbedPanel;
private _input: QueryResultsInput; private _input: QueryResultsInput | undefined;
private resultsTab: ResultsTab; private resultsTab: ResultsTab;
private messagesTab: MessagesTab; private messagesTab: MessagesTab;
private chartTab: ChartTab; private chartTab: ChartTab;
@@ -209,7 +210,7 @@ export class QueryResultsView extends Disposable {
} }
private setQueryRunner(runner: QueryRunner) { private setQueryRunner(runner: QueryRunner) {
const activeTab = this._input.state.activeTab; const activeTab = this._input?.state.activeTab;
if (this.hasResults(runner)) { if (this.hasResults(runner)) {
this.showResults(); this.showResults();
} else { } else {
@@ -227,8 +228,10 @@ export class QueryResultsView extends Disposable {
this.hideChart(); this.hideChart();
this.hidePlan(); this.hidePlan();
this.hideDynamicViewModelTabs(); this.hideDynamicViewModelTabs();
this.input.state.visibleTabs.clear(); this.input?.state.visibleTabs.clear();
if (this.input) {
this.input.state.activeTab = this.resultsTab.identifier; this.input.state.activeTab = this.resultsTab.identifier;
}
})); }));
this.runnerDisposables.add(runner.onQueryEnd(() => { this.runnerDisposables.add(runner.onQueryEnd(() => {
if (runner.messages.some(v => v.isError)) { if (runner.messages.some(v => v.isError)) {
@@ -236,21 +239,21 @@ export class QueryResultsView extends Disposable {
} }
})); }));
if (this.input.state.visibleTabs.has(this.chartTab.identifier) && !this._panelView.contains(this.chartTab)) { if (this.input?.state.visibleTabs.has(this.chartTab.identifier) && !this._panelView.contains(this.chartTab)) {
this._panelView.pushTab(this.chartTab); this._panelView.pushTab(this.chartTab);
} else if (!this.input.state.visibleTabs.has(this.chartTab.identifier) && this._panelView.contains(this.chartTab)) { } else if (!this.input?.state.visibleTabs.has(this.chartTab.identifier) && this._panelView.contains(this.chartTab)) {
this._panelView.removeTab(this.chartTab.identifier); this._panelView.removeTab(this.chartTab.identifier);
} }
if (this.input.state.visibleTabs.has(this.qpTab.identifier) && !this._panelView.contains(this.qpTab)) { if (this.input?.state.visibleTabs.has(this.qpTab.identifier) && !this._panelView.contains(this.qpTab)) {
this._panelView.pushTab(this.qpTab); this._panelView.pushTab(this.qpTab);
} else if (!this.input.state.visibleTabs.has(this.qpTab.identifier) && this._panelView.contains(this.qpTab)) { } else if (!this.input?.state.visibleTabs.has(this.qpTab.identifier) && this._panelView.contains(this.qpTab)) {
this._panelView.removeTab(this.qpTab.identifier); this._panelView.removeTab(this.qpTab.identifier);
} }
if (this.input.state.visibleTabs.has(this.topOperationsTab.identifier) && !this._panelView.contains(this.topOperationsTab)) { if (this.input?.state.visibleTabs.has(this.topOperationsTab.identifier) && !this._panelView.contains(this.topOperationsTab)) {
this._panelView.pushTab(this.topOperationsTab); this._panelView.pushTab(this.topOperationsTab);
} else if (!this.input.state.visibleTabs.has(this.topOperationsTab.identifier) && this._panelView.contains(this.topOperationsTab)) { } else if (!this.input?.state.visibleTabs.has(this.topOperationsTab.identifier) && this._panelView.contains(this.topOperationsTab)) {
this._panelView.removeTab(this.topOperationsTab.identifier); this._panelView.removeTab(this.topOperationsTab.identifier);
} }
@@ -262,8 +265,8 @@ export class QueryResultsView extends Disposable {
}); });
this.dynamicModelViewTabs = []; this.dynamicModelViewTabs = [];
this.input.state.visibleTabs.forEach(tabId => { this.input?.state.visibleTabs.forEach(tabId => {
if (startsWith(tabId, 'querymodelview;')) { if (tabId.startsWith('querymodelview;')) {
// tab id format is 'tab type;title;model view id' // tab id format is 'tab type;title;model view id'
let parts = tabId.split(';'); let parts = tabId.split(';');
if (parts.length === 3) { if (parts.length === 3) {
@@ -291,41 +294,42 @@ export class QueryResultsView extends Disposable {
} }
} }
public set input(input: QueryResultsInput) { public set input(input: QueryResultsInput | undefined) {
this._input = input; this._input = input;
this.runnerDisposables.dispose(); this.runnerDisposables.clear();
this.runnerDisposables = new DisposableStore();
[this.resultsTab, this.messagesTab, this.qpTab, this.topOperationsTab, this.chartTab].forEach(t => t.clear()); [this.resultsTab, this.messagesTab, this.qpTab, this.topOperationsTab, this.chartTab].forEach(t => t.clear());
this.dynamicModelViewTabs.forEach(t => t.clear()); this.dynamicModelViewTabs.forEach(t => t.clear());
this.resultsTab.view.state = this.input.state.gridPanelState; if (input) {
this.qpTab.view.setState(this.input.state.queryPlanState); this.resultsTab.view.state = input.state.gridPanelState;
this.topOperationsTab.view.setState(this.input.state.topOperationsState); this.qpTab.view.setState(input.state.queryPlanState);
this.chartTab.view.state = this.input.state.chartState; this.topOperationsTab.view.setState(input.state.topOperationsState);
this.chartTab.view.state = input.state.chartState;
this.dynamicModelViewTabs.forEach((dynamicTab: QueryModelViewTab) => { this.dynamicModelViewTabs.forEach((dynamicTab: QueryModelViewTab) => {
dynamicTab.captureState(this.input.state.dynamicModelViewTabsState); dynamicTab.captureState(input.state.dynamicModelViewTabsState);
}); });
let info = this.queryModelService._getQueryInfo(input.uri) || this.queryModelService._getQueryInfo(URI.parse(input.uri).toString(true)); let info = this.queryModelService._getQueryInfo(input.uri) || this.queryModelService._getQueryInfo(URI.parse(input.uri).toString(true));
if (info) { if (info?.queryRunner) {
this.setQueryRunner(info.queryRunner); this.setQueryRunner(info.queryRunner);
} else { } else {
let disposable = this.queryModelService.onRunQueryStart(c => { let disposable = this.queryModelService.onRunQueryStart(c => {
if (URI.parse(c).toString() === URI.parse(input.uri).toString()) { if (URI.parse(c).toString() === URI.parse(input.uri).toString()) {
let info = this.queryModelService._getQueryInfo(c); let info = this.queryModelService._getQueryInfo(c);
if (info?.queryRunner) {
this.setQueryRunner(info.queryRunner); this.setQueryRunner(info.queryRunner);
}
disposable.dispose(); disposable.dispose();
} }
}); });
this.runnerDisposables.add(disposable); this.runnerDisposables.add(disposable);
} }
} }
}
clearInput() { clearInput() {
this._input = undefined; this._input = undefined;
this.runnerDisposables.dispose(); this.runnerDisposables.clear();
this.runnerDisposables = new DisposableStore();
this.resultsTab.clear(); this.resultsTab.clear();
this.messagesTab.clear(); this.messagesTab.clear();
this.qpTab.clear(); this.qpTab.clear();
@@ -334,7 +338,7 @@ export class QueryResultsView extends Disposable {
this.dynamicModelViewTabs.forEach(t => t.clear()); this.dynamicModelViewTabs.forEach(t => t.clear());
} }
public get input(): QueryResultsInput { public get input(): QueryResultsInput | undefined {
return this._input; return this._input;
} }
@@ -343,7 +347,7 @@ export class QueryResultsView extends Disposable {
} }
public chartData(dataId: { resultId: number, batchId: number }): void { public chartData(dataId: { resultId: number, batchId: number }): void {
this.input.state.visibleTabs.add(this.chartTab.identifier); this.input?.state.visibleTabs.add(this.chartTab.identifier);
if (!this._panelView.contains(this.chartTab)) { if (!this._panelView.contains(this.chartTab)) {
this._panelView.pushTab(this.chartTab); this._panelView.pushTab(this.chartTab);
} }
@@ -372,11 +376,11 @@ export class QueryResultsView extends Disposable {
} }
public showPlan(xml: string) { public showPlan(xml: string) {
this.input.state.visibleTabs.add(this.qpTab.identifier); this.input?.state.visibleTabs.add(this.qpTab.identifier);
if (!this._panelView.contains(this.qpTab)) { if (!this._panelView.contains(this.qpTab)) {
this._panelView.pushTab(this.qpTab); this._panelView.pushTab(this.qpTab);
} }
this.input.state.visibleTabs.add(this.topOperationsTab.identifier); this.input?.state.visibleTabs.add(this.topOperationsTab.identifier);
if (!this._panelView.contains(this.topOperationsTab)) { if (!this._panelView.contains(this.topOperationsTab)) {
this._panelView.pushTab(this.topOperationsTab); this._panelView.pushTab(this.topOperationsTab);
} }
@@ -417,11 +421,13 @@ export class QueryResultsView extends Disposable {
tab.view.componentId = componentId; tab.view.componentId = componentId;
this.dynamicModelViewTabs.push(tab); this.dynamicModelViewTabs.push(tab);
this.input.state.visibleTabs.add('querymodelview;' + title + ';' + componentId); this.input?.state.visibleTabs.add('querymodelview;' + title + ';' + componentId);
if (!this._panelView.contains(tab)) { if (!this._panelView.contains(tab)) {
this._panelView.pushTab(tab, undefined, true); this._panelView.pushTab(tab, undefined, true);
} }
if (this.input) {
tab.putState(this.input.state.dynamicModelViewTabsState); tab.putState(this.input.state.dynamicModelViewTabsState);
} }
}
} }