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

Secondary actions (#16122) (#16132)

Browse Source 
* data menu shows up

* clean up code

* remove dead code

* string literal

* add menu item instead

* remove unused code

(cherry picked from commit 5524a3659c)
This commit is contained in:
Aditya Bist
2021-07-14 13:28:22 -07:00
committed by GitHub
parent 7c34261fd2
commit c1fede2c75
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet.ts
View File

@@ -5,7 +5,6 @@
import { localize } from 'vs/nls'; import { localize } from 'vs/nls';
import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions';
import { IAction } from 'vs/base/common/actions';
import { toggleClass, Dimension } from 'vs/base/browser/dom'; import { toggleClass, Dimension } from 'vs/base/browser/dom';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -20,8 +19,6 @@ import { Extensions as ViewContainerExtensions, IViewDescriptor, IViewsRegistry,
import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { Registry } from 'vs/platform/registry/common/platform'; import { Registry } from 'vs/platform/registry/common/platform';
import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane'; import { ViewPane } from 'vs/workbench/browser/parts/views/viewPane';
import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer'; import { ViewPaneContainer } from 'vs/workbench/browser/parts/views/viewPaneContainer';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
@@ -67,8 +64,6 @@ export class DataExplorerViewPaneContainer extends ViewPaneContainer {
@IContextMenuService contextMenuService: IContextMenuService, @IContextMenuService contextMenuService: IContextMenuService,
@IExtensionService extensionService: IExtensionService, @IExtensionService extensionService: IExtensionService,
@IConfigurationService configurationService: IConfigurationService, @IConfigurationService configurationService: IConfigurationService,
@IMenuService private menuService: IMenuService,
@IContextKeyService private contextKeyService: IContextKeyService,
@IViewDescriptorService viewDescriptorService: IViewDescriptorService @IViewDescriptorService viewDescriptorService: IViewDescriptorService
) { ) {
super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService); super(VIEWLET_ID, { mergeViewWithContainerWhenSingleView: true }, instantiationService, configurationService, layoutService, contextMenuService, telemetryService, extensionService, themeService, storageService, contextService, viewDescriptorService);
@@ -93,18 +88,6 @@ export class DataExplorerViewPaneContainer extends ViewPaneContainer {
return 400; return 400;
} }
getSecondaryActions(): IAction[] {
let menu = this.menuService.createMenu(MenuId.DataExplorerAction, this.contextKeyService);
let actions: IAction[] = [];
menu.getActions({}).forEach(group => {
if (group[0] === 'secondary') {
actions.push(...group[1]);
}
});
menu.dispose();
return actions;
}
protected override createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewPane { protected override createView(viewDescriptor: IViewDescriptor, options: IViewletViewOptions): ViewPane {
let viewletPanel = this.instantiationService.createInstance(viewDescriptor.ctorDescriptor.ctor, options) as ViewPane; let viewletPanel = this.instantiationService.createInstance(viewDescriptor.ctorDescriptor.ctor, options) as ViewPane;
this._register(viewletPanel); this._register(viewletPanel);

14
src/sql/workbench/contrib/resourceDeployment/browser/resourceDeployment.contribution.ts
View File

@@ -3,7 +3,11 @@
* Licensed under the Source EULA. See License.txt in the project root for license information. * Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
import { VIEWLET_ID } from 'sql/workbench/contrib/dataExplorer/browser/dataExplorerViewlet';
import { localize } from 'vs/nls';
import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands'; import { CommandsRegistry, ICommandService } from 'vs/platform/commands/common/commands';
import { ContextKeyEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
// New Resource Deployment // New Resource Deployment
@@ -15,3 +19,13 @@ CommandsRegistry.registerCommand({
return commandService.executeCommand('azdata.resource.deploy'); return commandService.executeCommand('azdata.resource.deploy');
} }
}); });
MenuRegistry.appendMenuItem(MenuId.ViewContainerTitle, {
group: 'deployment',
order: 4,
command: {
id: 'azdata.resource.deploy',
title: localize('deployment.title', "New Deployment...")
},
when: ContextKeyEqualsExpr.create('viewContainer', VIEWLET_ID)
});