mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-17 02:51:36 -05:00
add contrib/tasks to strict compile (#12034)
This commit is contained in:
@@ -24,7 +24,7 @@ import { TaskHistoryView } from 'sql/workbench/contrib/tasks/browser/tasksView';
|
|||||||
export class StatusUpdater extends lifecycle.Disposable implements ext.IWorkbenchContribution {
|
export class StatusUpdater extends lifecycle.Disposable implements ext.IWorkbenchContribution {
|
||||||
static ID = 'data.taskhistory.statusUpdater';
|
static ID = 'data.taskhistory.statusUpdater';
|
||||||
|
|
||||||
private badgeHandle: lifecycle.IDisposable;
|
private badgeHandle?: lifecycle.IDisposable;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
@IActivityService private readonly activityBarService: IActivityService,
|
@IActivityService private readonly activityBarService: IActivityService,
|
||||||
|
|||||||
@@ -16,11 +16,7 @@ export class TaskHistoryDataSource implements IDataSource {
|
|||||||
* No more than one element may use a given identifier.
|
* No more than one element may use a given identifier.
|
||||||
*/
|
*/
|
||||||
public getId(tree: ITree, element: any): string {
|
public getId(tree: ITree, element: any): string {
|
||||||
if (element instanceof TaskNode) {
|
|
||||||
return (<TaskNode>element).id;
|
return (<TaskNode>element).id;
|
||||||
} else {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -67,10 +67,11 @@ export class TaskHistoryRenderer implements IRenderer {
|
|||||||
* Render a element, given an object bag returned by the template
|
* Render a element, given an object bag returned by the template
|
||||||
*/
|
*/
|
||||||
public renderElement(tree: ITree, element: TaskNode, templateId: string, templateData: ITaskHistoryTemplateData): void {
|
public renderElement(tree: ITree, element: TaskNode, templateId: string, templateData: ITaskHistoryTemplateData): void {
|
||||||
let taskStatus;
|
let taskStatus: string;
|
||||||
if (element) {
|
if (element) {
|
||||||
templateData.icon.className = 'task-icon';
|
templateData.icon.className = 'task-icon';
|
||||||
switch (element.status) {
|
switch (element.status) {
|
||||||
|
case TaskStatus.SucceededWithWarning:
|
||||||
case TaskStatus.Succeeded:
|
case TaskStatus.Succeeded:
|
||||||
dom.addClass(templateData.icon, TaskHistoryRenderer.SUCCESS_CLASS);
|
dom.addClass(templateData.icon, TaskHistoryRenderer.SUCCESS_CLASS);
|
||||||
taskStatus = localize('succeeded', "succeeded");
|
taskStatus = localize('succeeded', "succeeded");
|
||||||
@@ -103,7 +104,7 @@ export class TaskHistoryRenderer implements IRenderer {
|
|||||||
templateData.label.textContent = element.taskName + ' ' + taskStatus;
|
templateData.label.textContent = element.taskName + ' ' + taskStatus;
|
||||||
templateData.label.title = templateData.label.textContent;
|
templateData.label.title = templateData.label.textContent;
|
||||||
|
|
||||||
let description: string;
|
let description: string | undefined;
|
||||||
// Determine the target name and set hover text equal to that
|
// Determine the target name and set hover text equal to that
|
||||||
// show target location if there is one, otherwise show server and database name
|
// show target location if there is one, otherwise show server and database name
|
||||||
if (element.targetLocation) {
|
if (element.targetLocation) {
|
||||||
@@ -115,7 +116,7 @@ export class TaskHistoryRenderer implements IRenderer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
templateData.description.textContent = description;
|
templateData.description.textContent = description ?? '';
|
||||||
templateData.description.title = templateData.description.textContent;
|
templateData.description.title = templateData.description.textContent;
|
||||||
|
|
||||||
this.timer(element, templateData.time);
|
this.timer(element, templateData.time);
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ import { IExpandableTree } from 'sql/workbench/services/objectExplorer/browser/t
|
|||||||
* TaskHistoryView implements the dynamic tree view.
|
* TaskHistoryView implements the dynamic tree view.
|
||||||
*/
|
*/
|
||||||
export class TaskHistoryView extends ViewPane {
|
export class TaskHistoryView extends ViewPane {
|
||||||
private _messages: HTMLElement;
|
private _messages?: HTMLElement;
|
||||||
private _tree: ITree;
|
private _tree?: ITree;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
options: IViewPaneOptions,
|
options: IViewPaneOptions,
|
||||||
@@ -80,7 +80,7 @@ export class TaskHistoryView extends ViewPane {
|
|||||||
this._register(attachListStyler(this._tree, this.themeService));
|
this._register(attachListStyler(this._tree, this.themeService));
|
||||||
|
|
||||||
this._register(this.taskService.onAddNewTask(args => {
|
this._register(this.taskService.onAddNewTask(args => {
|
||||||
hide(this._messages);
|
hide(this._messages!);
|
||||||
this.refreshTree();
|
this.refreshTree();
|
||||||
}));
|
}));
|
||||||
this._register(this.taskService.onTaskComplete(task => {
|
this._register(this.taskService.onTaskComplete(task => {
|
||||||
@@ -101,11 +101,10 @@ export class TaskHistoryView extends ViewPane {
|
|||||||
const controller = instantiationService.createInstance(TaskHistoryController, actionProvider);
|
const controller = instantiationService.createInstance(TaskHistoryController, actionProvider);
|
||||||
const dnd = new DefaultDragAndDrop();
|
const dnd = new DefaultDragAndDrop();
|
||||||
const filter = new DefaultFilter();
|
const filter = new DefaultFilter();
|
||||||
const sorter = null;
|
|
||||||
const accessibilityProvider = new DefaultAccessibilityProvider();
|
const accessibilityProvider = new DefaultAccessibilityProvider();
|
||||||
|
|
||||||
return new Tree(treeContainer, {
|
return new Tree(treeContainer, {
|
||||||
dataSource, renderer, controller, dnd, filter, sorter, accessibilityProvider
|
dataSource, renderer, controller, dnd, filter, accessibilityProvider
|
||||||
}, {
|
}, {
|
||||||
indentPixels: 10,
|
indentPixels: 10,
|
||||||
twistiePixels: 20,
|
twistiePixels: 20,
|
||||||
@@ -114,7 +113,7 @@ export class TaskHistoryView extends ViewPane {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private updateTask(task: TaskNode): void {
|
private updateTask(task: TaskNode): void {
|
||||||
this._tree.refresh(task).catch(err => errors.onUnexpectedError(err));
|
this._tree!.refresh(task).catch(err => errors.onUnexpectedError(err));
|
||||||
}
|
}
|
||||||
|
|
||||||
public refreshTree(): void {
|
public refreshTree(): void {
|
||||||
@@ -122,9 +121,9 @@ export class TaskHistoryView extends ViewPane {
|
|||||||
let targetsToExpand: any[];
|
let targetsToExpand: any[];
|
||||||
|
|
||||||
// Focus
|
// Focus
|
||||||
this._tree.domFocus();
|
|
||||||
|
|
||||||
if (this._tree) {
|
if (this._tree) {
|
||||||
|
this._tree.domFocus();
|
||||||
let selection = this._tree.getSelection();
|
let selection = this._tree.getSelection();
|
||||||
if (selection && selection.length === 1) {
|
if (selection && selection.length === 1) {
|
||||||
selectedElement = <any>selection[0];
|
selectedElement = <any>selection[0];
|
||||||
@@ -132,7 +131,6 @@ export class TaskHistoryView extends ViewPane {
|
|||||||
// convert to old VS Code tree interface with expandable methods
|
// convert to old VS Code tree interface with expandable methods
|
||||||
let expandableTree: IExpandableTree = <IExpandableTree>this._tree;
|
let expandableTree: IExpandableTree = <IExpandableTree>this._tree;
|
||||||
targetsToExpand = expandableTree.getExpandedElements();
|
targetsToExpand = expandableTree.getExpandedElements();
|
||||||
}
|
|
||||||
|
|
||||||
//Get the tree Input
|
//Get the tree Input
|
||||||
let treeInput = this.taskService.getAllTasks();
|
let treeInput = this.taskService.getAllTasks();
|
||||||
@@ -140,18 +138,20 @@ export class TaskHistoryView extends ViewPane {
|
|||||||
this._tree.setInput(treeInput).then(async () => {
|
this._tree.setInput(treeInput).then(async () => {
|
||||||
// Make sure to expand all folders that where expanded in the previous session
|
// Make sure to expand all folders that where expanded in the previous session
|
||||||
if (targetsToExpand) {
|
if (targetsToExpand) {
|
||||||
await this._tree.expandAll(targetsToExpand);
|
await this._tree!.expandAll(targetsToExpand);
|
||||||
}
|
}
|
||||||
if (selectedElement) {
|
if (selectedElement) {
|
||||||
this._tree.select(selectedElement);
|
this._tree!.select(selectedElement);
|
||||||
}
|
}
|
||||||
this._tree.getFocus();
|
this._tree!.getFocus();
|
||||||
}, errors.onUnexpectedError);
|
}, errors.onUnexpectedError);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private onSelected(event: any) {
|
private onSelected(event: any) {
|
||||||
let selection = this._tree.getSelection();
|
let selection = this._tree!.getSelection();
|
||||||
|
|
||||||
if (selection && selection.length > 0 && (selection[0] instanceof TaskNode)) {
|
if (selection && selection.length > 0 && (selection[0] instanceof TaskNode)) {
|
||||||
let task = <TaskNode>selection[0];
|
let task = <TaskNode>selection[0];
|
||||||
@@ -171,6 +171,8 @@ export class TaskHistoryView extends ViewPane {
|
|||||||
*/
|
*/
|
||||||
public layoutBody(height: number, width: number): void {
|
public layoutBody(height: number, width: number): void {
|
||||||
super.layoutBody(height, width);
|
super.layoutBody(height, width);
|
||||||
|
if (this._tree) {
|
||||||
this._tree.layout(height);
|
this._tree.layout(height);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ export class CancelAction extends Action {
|
|||||||
super(id, label);
|
super(id, label);
|
||||||
}
|
}
|
||||||
public run(element: TaskNode): Promise<boolean> {
|
public run(element: TaskNode): Promise<boolean> {
|
||||||
if (element instanceof TaskNode) {
|
if (element instanceof TaskNode && element.providerName) {
|
||||||
this._taskService.cancelTask(element.providerName, element.id).then((result) => {
|
this._taskService.cancelTask(element.providerName, element.id).then((result) => {
|
||||||
if (!result) {
|
if (!result) {
|
||||||
let error = localize('errorMsgFromCancelTask', "The task is failed to cancel.");
|
let error = localize('errorMsgFromCancelTask', "The task is failed to cancel.");
|
||||||
|
|||||||
@@ -75,7 +75,6 @@
|
|||||||
"./sql/workbench/contrib/queryHistory/**/*.ts", // 305 errors
|
"./sql/workbench/contrib/queryHistory/**/*.ts", // 305 errors
|
||||||
"./sql/workbench/contrib/restore/**/*.ts", // 28 errors
|
"./sql/workbench/contrib/restore/**/*.ts", // 28 errors
|
||||||
"./sql/workbench/contrib/scripting/**/*.ts", // 195 errors
|
"./sql/workbench/contrib/scripting/**/*.ts", // 195 errors
|
||||||
"./sql/workbench/contrib/tasks/**/*.ts", // 8 errors
|
|
||||||
"./sql/workbench/contrib/views/**/*.ts", // 19 errors
|
"./sql/workbench/contrib/views/**/*.ts", // 19 errors
|
||||||
"./sql/workbench/contrib/welcome/**/*.ts", // 66 errors
|
"./sql/workbench/contrib/welcome/**/*.ts", // 66 errors
|
||||||
"./sql/workbench/services/connection/**/*.ts", // 3244 errors
|
"./sql/workbench/services/connection/**/*.ts", // 3244 errors
|
||||||
|
|||||||
Reference in New Issue
Block a user