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

Fix context menu positioning. (#6992)

Browse Source 
* hack in default actions into menu

* fix tests
This commit is contained in:
Anthony Dresser
2019-08-29 12:12:14 -07:00
committed by GitHub
parent faf6eae535
commit 947ac1fbf2
4 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/parts/dashboard/browser/dashboard.contribution.ts
View File

@@ -39,7 +39,7 @@ configurationRegistry.registerConfiguration(dashboardConfig);
// // Manage
MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
group: '0_query',
order: 1,
order: 0,
command: {
id: DE_MANAGE_COMMAND_ID,
title: localize('manage', "Manage")
@@ -49,7 +49,7 @@ MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, {
group: '0_query',
order: 1,
order: 0,
command: {
id: OE_MANAGE_COMMAND_ID,
title: localize('manage', "Manage")

29
src/sql/workbench/parts/objectExplorer/browser/serverTreeActionProvider.ts
View File

@@ -19,12 +19,14 @@ import { ConnectionProfileGroup } from 'sql/platform/connection/common/connectio
import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
import { TreeUpdateUtils } from 'sql/workbench/parts/objectExplorer/browser/treeUpdateUtils';
import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
import { MenuId, IMenuService } from 'vs/platform/actions/common/actions';
import { MenuId, IMenuService, MenuItemAction } from 'vs/platform/actions/common/actions';
import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey';
import { TreeNodeContextKey } from 'sql/workbench/parts/objectExplorer/common/treeNodeContextKey';
import { IQueryManagementService } from 'sql/platform/query/common/queryManagement';
import { ServerInfoContextKey } from 'sql/workbench/parts/connection/common/serverInfoContextKey';
import { fillInActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
import { Separator } from 'vs/base/browser/ui/actionbar/actionbar';
import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration';
/**
* Provides actions for the server tree elements
@@ -88,11 +90,32 @@ export class ServerTreeActionProvider extends ContributableActionProvider {
let menu = this.menuService.createMenu(MenuId.ObjectExplorerItemContext, scopedContextService);
// Fill in all actions
let actions = getDefaultActions(context);
let options = { arg: undefined, shouldForwardArgs: true };
const builtIn = getDefaultActions(context);
const actions = [];
const options = { arg: undefined, shouldForwardArgs: true };
const groups = menu.getActions(options);
let insertIndex: number | undefined = 0;
const queryIndex = groups.findIndex(v => {
if (v[0] === '0_query') {
return true;
} else {
insertIndex += v[1].length;
return false;
}
});
insertIndex = queryIndex > -1 ? insertIndex + groups[queryIndex][1].length : undefined;
fillInActions(groups, actions, false);
if (insertIndex) {
builtIn.unshift(new Separator());
actions.splice(insertIndex, 0, ...builtIn);
} else {
if (actions.length > 0) {
builtIn.push(new Separator());
}
actions.unshift(...builtIn);
}
// Cleanup
scopedContextService.dispose();
menu.dispose();

4
src/sql/workbench/parts/query/browser/query.contribution.ts
View File

@@ -72,7 +72,7 @@ new NewQueryTask().registerTask();
MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, {
group: '0_query',
order: 0,
order: 1,
command: {
id: OE_NEW_QUERY_ACTION_ID,
title: localize('newQuery', "New Query")
@@ -83,7 +83,7 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, {
// New Query
MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
group: '0_query',
order: 0,
order: 1,
command: {
id: DE_NEW_QUERY_COMMAND_ID,
title: localize('newQuery', "New Query")