ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix error if close insight before laoded (#1557)

Browse Source
This commit is contained in:
Anthony Dresser
2018-06-07 09:23:52 -07:00
committed by GitHub
parent 43c3bf4d24
commit e9747a61ac
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts
View File

@@ -30,6 +30,9 @@ import { WorkbenchState, IWorkspaceContextService } from 'vs/platform/workspace/
import { IntervalTimer } from 'vs/base/common/async'; import { IntervalTimer } from 'vs/base/common/async';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IStorageService } from 'vs/platform/storage/common/storage'; import { IStorageService } from 'vs/platform/storage/common/storage';
import { TPromise } from 'vs/base/common/winjs.base';
import { toDisposable } from 'vs/base/common/lifecycle';
import { isPromiseCanceledError } from 'vs/base/common/errors';
const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution); const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution);
@@ -80,23 +83,27 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget,
if (!this._checkStorage()) { if (!this._checkStorage()) {
let promise = this._runQuery(); let promise = this._runQuery();
this.queryObv = Observable.fromPromise(promise); this.queryObv = Observable.fromPromise(promise);
promise.then( let tpromise = promise.then(
result => { result => {
if (this._init) { if (this._init) {
this._updateChild(result); this._updateChild(result);
this.setupInterval(); this.setupInterval();
} else { } else {
this.queryObv = Observable.fromPromise(Promise.resolve<SimpleExecuteResult>(result)); this.queryObv = Observable.fromPromise(TPromise.as<SimpleExecuteResult>(result));
} }
}, },
error => { error => {
if (isPromiseCanceledError(error)) {
return;
}
if (this._init) { if (this._init) {
this.showError(error); this.showError(error);
} else { } else {
this.queryObv = Observable.fromPromise(Promise.reject<SimpleExecuteResult>(error)); this.queryObv = Observable.fromPromise(TPromise.as<SimpleExecuteResult>(error));
} }
} }
); );
this._register(toDisposable(() => tpromise.cancel()));
} }
}, error => { }, error => {
this.showError(error); this.showError(error);
@@ -195,15 +202,15 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget,
return `insights.${this.insightConfig.cacheId}.${this.dashboardService.connectionManagementService.connectionInfo.connectionProfile.getOptionsKey()}`; return `insights.${this.insightConfig.cacheId}.${this.dashboardService.connectionManagementService.connectionInfo.connectionProfile.getOptionsKey()}`;
} }
private _runQuery(): Thenable<SimpleExecuteResult> { private _runQuery(): TPromise<SimpleExecuteResult> {
return this.dashboardService.queryManagementService.runQueryAndReturn(this.insightConfig.query as string).then( return TPromise.wrap(this.dashboardService.queryManagementService.runQueryAndReturn(this.insightConfig.query as string).then(
result => { result => {
return this._storeResult(result); return this._storeResult(result);
}, },
error => { error => {
throw error; throw error;
} }
); ));
} }
private _updateChild(result: SimpleExecuteResult): void { private _updateChild(result: SimpleExecuteResult): void {