ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix query history view actions (#15949)

Browse Source 
* Fix query history view actions

* Update order

* update order values

* Use codicon
This commit is contained in:
Charles Gagnon
2021-06-29 19:56:44 -07:00
committed by GitHub
parent aa3b4f0806
commit 8ddb6ca7e8
2 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts
View File

@@ -20,7 +20,6 @@ import { IExpandableTree } from 'sql/workbench/services/objectExplorer/browser/t
import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService';
import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode';
import { QueryHistoryInfo } from 'sql/workbench/services/queryHistory/common/queryHistoryInfo';
import { IAction } from 'vs/base/common/actions';
import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPane';
import { IViewDescriptorService } from 'vs/workbench/common/views';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
@@ -151,9 +150,4 @@ export class QueryHistoryView extends ViewPane {
this._tree.onHidden();
}
}
public getActions(): IAction[] {
return this._actionProvider.getActions(undefined);
}
}

54
src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.ts
View File

@@ -7,7 +7,7 @@ import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService';
import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import { localize } from 'vs/nls';
import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions';
import { SyncActionDescriptor, MenuRegistry, MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions';
import { Registry } from 'vs/platform/registry/common/platform';
import { ToggleQueryHistoryAction } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryActions';
@@ -18,6 +18,9 @@ import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
import { QUERY_HISTORY_CONTAINER_ID, QUERY_HISTORY_VIEW_ID } from 'sql/workbench/contrib/queryHistory/common/constants';
import { QueryHistoryView } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryView';
import { ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { Codicon } from 'vs/base/common/codicons';
export class QueryHistoryWorkbenchContribution implements IWorkbenchContribution {
@@ -57,17 +60,53 @@ export class QueryHistoryWorkbenchContribution implements IWorkbenchContribution
// on some events
_queryHistoryService.start();
CommandsRegistry.registerCommand({
id: 'queryHistory.clear',
handler: (accessor) => {
registerAction2(class extends Action2 {
constructor() {
super({
id: `queryHistory.clear`,
title: { value: localize('queryHistory.clearLabel', "Clear All History"), original: 'Clear All History' },
icon: Codicon.clearAll,
menu: {
id: MenuId.ViewTitle,
group: 'navigation',
when: ContextKeyEqualsExpr.create('view', QUERY_HISTORY_VIEW_ID),
order: 10
}
});
}
run(accessor: ServicesAccessor) {
const queryHistoryService = accessor.get(IQueryHistoryService);
queryHistoryService.clearQueryHistory();
}
});
CommandsRegistry.registerCommand({
id: 'queryHistory.toggleCapture',
handler: (accessor) => {
const PAUSE_QUERY_HISTORY_CAPTURE = localize('queryHistory.disableCapture', "Pause Query History Capture");
const START_QUERY_HISTORY_CAPTURE = localize('queryHistory.enableCapture', "Start Query History Capture");
registerAction2(class extends Action2 {
constructor() {
super({
id: `queryHistory.toggleCapture`,
title: { value: START_QUERY_HISTORY_CAPTURE, original: 'Start Query History Capture' },
tooltip: START_QUERY_HISTORY_CAPTURE,
icon: Codicon.play,
menu: {
id: MenuId.ViewTitle,
group: 'navigation',
when: ContextKeyEqualsExpr.create('view', QUERY_HISTORY_VIEW_ID),
order: 20
},
toggled: {
condition: ContextKeyEqualsExpr.create('config.queryHistory.captureEnabled', true),
title: { value: PAUSE_QUERY_HISTORY_CAPTURE, original: 'Pause Query History Capture' },
tooltip: PAUSE_QUERY_HISTORY_CAPTURE,
icon: { id: 'debug-pause' }
}
});
}
run(accessor: ServicesAccessor) {
const queryHistoryService = accessor.get(IQueryHistoryService);
queryHistoryService.toggleCaptureEnabled();
}
@@ -93,7 +132,6 @@ export class QueryHistoryWorkbenchContribution implements IWorkbenchContribution
order: 2
});
// markers view container
const VIEW_CONTAINER: ViewContainer = Registry.as<IViewContainersRegistry>(ViewContainerExtensions.ViewContainersRegistry).registerViewContainer({
id: QUERY_HISTORY_CONTAINER_ID,
title: localize('queryHistory', "Query History"),