ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-08 01:28:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update action run return type (#15568)

Browse Source 
* Update action run return type

* fix tests

* Update rest

* Add back null checks
This commit is contained in:
Charles Gagnon
2021-05-25 14:52:39 -07:00
committed by GitHub
parent 25352fa39c
commit 399406b732
29 changed files with 379 additions and 637 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/sql/workbench/contrib/tasks/common/tasksAction.ts
View File

@@ -23,19 +23,18 @@ export class CancelAction extends Action {
) {
super(id, label);
}
public run(element: TaskNode): Promise<boolean> {
public async run(element: TaskNode): Promise<void> {
if (element instanceof TaskNode && element.providerName) {
this._taskService.cancelTask(element.providerName, element.id).then((result) => {
try {
const result = await this._taskService.cancelTask(element.providerName, element.id);
if (!result) {
let error = localize('errorMsgFromCancelTask', "The task is failed to cancel.");
let error = localize('errorMsgFromCancelTask', "The task failed to cancel.");
this.showError(error);
}
}, error => {
} catch (error) {
this.showError(error);
return Promise.resolve(true);
});
}
}
return Promise.resolve(true);
}
private showError(errorMessage: string) {
@@ -57,12 +56,11 @@ export class ScriptAction extends Action {
super(id, label);
}
public async run(element: TaskNode): Promise<boolean> {
public async run(element: TaskNode): Promise<void> {
if (element instanceof TaskNode) {
if (element.script && element.script !== '') {
this._queryEditorService.newSqlEditor({ initalContent: element.script });
if (element.script) {
await this._queryEditorService.newSqlEditor({ initalContent: element.script });
}
}
return true;
}
}