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

Bug/extension contribution (#2560)

Browse Source 
* revert 4ab5d84b94

* fixed extensions
This commit is contained in:
Aditya Bist
2018-09-12 23:04:59 -07:00
committed by Karl Burtram
parent 10875f26dc
commit c92b88bfaf
4 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.ts
View File

@@ -86,7 +86,7 @@ export class TasksWidget extends DashboardWidget implements IDashboardWidget, On
}).filter(i => !!i); }).filter(i => !!i);
} }
this._tasks = tasks.map(i => TaskRegistry.getCommandActionById(i)).filter(v => !!v); this._tasks = tasks.map(i => MenuRegistry.getCommand(i)).filter(v => !!v);
} }
ngOnInit() { ngOnInit() {

28
src/sql/platform/tasks/common/tasks.ts
View File

@@ -48,9 +48,7 @@ export abstract class Task {
id: this.id, id: this.id,
handler: (accessor, profile, args) => this.runTask(accessor, profile, args), handler: (accessor, profile, args) => this.runTask(accessor, profile, args),
description: this._description, description: this._description,
iconClass: this._iconClass, iconClass: this._iconClass
iconPath: this.opts.iconPath,
title: this.title
}; };
} }
@@ -62,10 +60,8 @@ export abstract class Task {
}; };
} }
public registerTask(showInCommandPalette: boolean = true): IDisposable { public registerTask(): IDisposable {
if (showInCommandPalette) { MenuRegistry.addCommand(this.toCommandAction());
MenuRegistry.addCommand(this.toCommandAction());
}
return TaskRegistry.registerTask(this.toITask()); return TaskRegistry.registerTask(this.toITask());
} }
@@ -100,8 +96,6 @@ export interface ITask {
precondition?: ContextKeyExpr; precondition?: ContextKeyExpr;
description?: ITaskHandlerDescription; description?: ITaskHandlerDescription;
iconClass?: string; iconClass?: string;
iconPath?: { dark: string; light?: string; };
title?: string;
} }
export interface ITaskRegistry { export interface ITaskRegistry {
@@ -110,7 +104,6 @@ export interface ITaskRegistry {
getTasks(): string[]; getTasks(): string[];
getOrCreateTaskIconClassName(item: ICommandAction): string; getOrCreateTaskIconClassName(item: ICommandAction): string;
onTaskRegistered: Event<string>; onTaskRegistered: Event<string>;
getCommandActionById(id: string): ICommandAction;
} }
const ids = new IdGenerator('task-icon-'); const ids = new IdGenerator('task-icon-');
@@ -121,7 +114,6 @@ export const TaskRegistry: ITaskRegistry = new class implements ITaskRegistry {
private _onTaskRegistered = new Emitter<string>(); private _onTaskRegistered = new Emitter<string>();
public readonly onTaskRegistered: Event<string> = this._onTaskRegistered.event; public readonly onTaskRegistered: Event<string> = this._onTaskRegistered.event;
private taskIdToIconClassNameMap: Map<string /* task id */, string /* CSS rule */> = new Map<string, string>(); private taskIdToIconClassNameMap: Map<string /* task id */, string /* CSS rule */> = new Map<string, string>();
private taskIdToCommandActionMap: Map<string, ICommandAction> = new Map<string, ICommandAction>();
registerTask(idOrTask: string | ITask, handler?: ITaskHandler): IDisposable { registerTask(idOrTask: string | ITask, handler?: ITaskHandler): IDisposable {
let disposable: IDisposable; let disposable: IDisposable;
@@ -133,16 +125,6 @@ export const TaskRegistry: ITaskRegistry = new class implements ITaskRegistry {
if (idOrTask.iconClass) { if (idOrTask.iconClass) {
this.taskIdToIconClassNameMap.set(idOrTask.id, idOrTask.iconClass); this.taskIdToIconClassNameMap.set(idOrTask.id, idOrTask.iconClass);
} }
if (idOrTask.iconPath && idOrTask.title) {
this.taskIdToCommandActionMap.set(idOrTask.id, {
iconLocation: {
dark: URI.parse(idOrTask.iconPath.dark),
light: URI.parse(idOrTask.iconPath.light),
},
id: idOrTask.id,
title: idOrTask.title
});
}
disposable = CommandsRegistry.registerCommand(idOrTask); disposable = CommandsRegistry.registerCommand(idOrTask);
id = idOrTask.id; id = idOrTask.id;
} }
@@ -177,8 +159,4 @@ export const TaskRegistry: ITaskRegistry = new class implements ITaskRegistry {
getTasks(): string[] { getTasks(): string[] {
return this._tasks.slice(0); return this._tasks.slice(0);
} }
getCommandActionById(taskId: string): ICommandAction {
return this.taskIdToCommandActionMap.get(taskId);
}
}; };

4
src/sql/workbench/common/actions.contribution.ts
View File

@@ -16,8 +16,8 @@ import { ShowCurrentReleaseNotesAction } from 'sql/workbench/update/releaseNotes
import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle';
import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry'; import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry';
new Actions.BackupAction().registerTask(false); new Actions.BackupAction().registerTask();
new Actions.RestoreAction().registerTask(false); new Actions.RestoreAction().registerTask();
new Actions.NewQueryAction().registerTask(); new Actions.NewQueryAction().registerTask();
new Actions.ConfigureDashboardAction().registerTask(); new Actions.ConfigureDashboardAction().registerTask();

6
src/sql/workbench/common/actions.ts
View File

@@ -302,6 +302,12 @@ export class BackupAction extends Task {
} }
runTask(accessor: ServicesAccessor, profile: IConnectionProfile): TPromise<void> { runTask(accessor: ServicesAccessor, profile: IConnectionProfile): TPromise<void> {
if (!profile) {
let objectExplorerService = accessor.get<IObjectExplorerService>(IObjectExplorerService);
let connectionManagementService = accessor.get<IConnectionManagementService>(IConnectionManagementService);
let workbenchEditorService = accessor.get<IEditorService>(IEditorService);
profile = TaskUtilities.getCurrentGlobalConnection(objectExplorerService, connectionManagementService, workbenchEditorService);
}
let configurationService = accessor.get<IWorkspaceConfigurationService>(IWorkspaceConfigurationService); let configurationService = accessor.get<IWorkspaceConfigurationService>(IWorkspaceConfigurationService);
let previewFeaturesEnabled: boolean = configurationService.getValue('workbench')['enablePreviewFeatures']; let previewFeaturesEnabled: boolean = configurationService.getValue('workbench')['enablePreviewFeatures'];
if (!previewFeaturesEnabled) { if (!previewFeaturesEnabled) {