More work around isolating node imports (#6512)

* more work around isolating node imports * rewrite query plan input * fix hygiene errors * fix tests * address feedback * remove welcome page changes
2026-01-30 17:23:29 -05:00 · 2019-07-30 14:01:37 -07:00
parent c99ce4de07
commit c1acf6ae93
89 changed files with 1430 additions and 1097 deletions
--- a/src/sql/workbench/parts/dataExplorer/common/mssqlNodeContext.ts
+++ b/src/sql/workbench/parts/dataExplorer/common/mssqlNodeContext.ts
@@ -3,7 +3,6 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import * as os from 'os';
 import { INodeContextValue } from 'sql/workbench/parts/dataExplorer/common/nodeContext';
 import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Disposable } from 'vs/base/common/lifecycle';
@@ -13,6 +12,7 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
 import { ExtensionNodeType } from 'sql/workbench/api/common/sqlExtHostTypes';
+import { isWindows } from 'vs/base/common/platform';

 export class MssqlNodeContext extends Disposable {

@@ -28,7 +28,7 @@ export class MssqlNodeContext extends Disposable {
 	// General node context keys
 	static NodeProvider = new RawContextKey<string>('nodeProvider', undefined);
 	static IsDatabaseOrServer = new RawContextKey<boolean>('isDatabaseOrServer', false);
-	static IsWindows = new RawContextKey<boolean>('isWindows', os.platform() === 'win32');
+	static IsWindows = new RawContextKey<boolean>('isWindows', isWindows);
 	static IsCloud = new RawContextKey<boolean>('isCloud', false);
 	static NodeType = new RawContextKey<string>('nodeType', undefined);
 	static NodeLabel = new RawContextKey<string>('nodeLabel', undefined);
--- a/src/sql/workbench/parts/dataExplorer/common/nodeActions.common.contribution.ts
+++ b/src/sql/workbench/parts/dataExplorer/common/nodeActions.common.contribution.ts
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { localize } from 'vs/nls';
+import { mssqlProviderName } from 'sql/platform/connection/common/constants';
+import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
+import {
+	DISCONNECT_COMMAND_ID, MANAGE_COMMAND_ID, NEW_QUERY_COMMAND_ID, REFRESH_COMMAND_ID,
+	NEW_NOTEBOOK_COMMAND_ID, SCHEMA_COMPARE_COMMAND_ID, DATA_TIER_WIZARD_COMMAND_ID,
+	IMPORT_COMMAND_ID, BACKUP_COMMAND_ID, RESTORE_COMMAND_ID, PROFILER_COMMAND_ID, GENERATE_SCRIPTS_COMMAND_ID, PROPERTIES_COMMAND_ID
+} from './nodeCommands.common';
+import { ContextKeyExpr, ContextKeyRegexExpr, ContextKeyNotEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
+import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/common/nodeContext';
+import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext';
+import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
+
+
+// Disconnect
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'connection',
+	order: 4,
+	command: {
+		id: DISCONNECT_COMMAND_ID,
+		title: localize('disconnect', "Disconnect")
+	},
+	when: ContextKeyExpr.and(NodeContextKey.IsConnected,
+		ContextKeyNotEqualsExpr.create('nodeType', NodeType.Folder))
+});
+
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'connection',
+	order: 3,
+	command: {
+		id: DISCONNECT_COMMAND_ID,
+		title: localize('disconnect', "Disconnect")
+	},
+	when: ContextKeyExpr.and(NodeContextKey.IsConnected,
+		MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.IsDatabaseOrServer)
+});
+
+// New Query
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'connection',
+	order: 2,
+	command: {
+		id: NEW_QUERY_COMMAND_ID,
+		title: localize('newQuery', "New Query")
+	},
+	when: MssqlNodeContext.IsDatabaseOrServer
+});
+
+// Manage
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'connection',
+	order: 1,
+	command: {
+		id: MANAGE_COMMAND_ID,
+		title: localize('manage', "Manage")
+	},
+	when: MssqlNodeContext.IsDatabaseOrServer
+});
+
+
+// Refresh
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'connection',
+	order: 6,
+	command: {
+		id: REFRESH_COMMAND_ID,
+		title: localize('refresh', "Refresh")
+	},
+	when: NodeContextKey.IsConnectable
+});
+
+
+// New Notebook
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'connection',
+	order: 3,
+	command: {
+		id: NEW_NOTEBOOK_COMMAND_ID,
+		title: localize('newNotebook', "New Notebook")
+	},
+	when: ContextKeyExpr.and(NodeContextKey.IsConnectable,
+		MssqlNodeContext.IsDatabaseOrServer,
+		MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName))
+});
+
+// Data-Tier Application Wizard
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'export',
+	order: 7,
+	command: {
+		id: DATA_TIER_WIZARD_COMMAND_ID,
+		title: localize('dacFx', "Data-tier Application Wizard")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.IsDatabaseOrServer)
+});
+
+
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'export',
+	order: 7,
+	command: {
+		id: DATA_TIER_WIZARD_COMMAND_ID,
+		title: localize('dacFx', "Data-tier Application Wizard")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.NodeType.isEqualTo(NodeType.Folder),
+		MssqlNodeContext.NodeLabel.isEqualTo('Databases'))
+});
+
+// Profiler
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'profiler',
+	order: 8,
+	command: {
+		id: PROFILER_COMMAND_ID,
+		title: localize('profiler', "Launch Profiler")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.NodeType.isEqualTo(NodeType.Server))
+});
+
+// Flat File Import
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'import',
+	order: 10,
+	command: {
+		id: IMPORT_COMMAND_ID,
+		title: localize('flatFileImport', "Import Wizard")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database))
+});
+
+// Schema Compare
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'export',
+	order: 9,
+	command: {
+		id: SCHEMA_COMPARE_COMMAND_ID,
+		title: localize('schemaCompare', "Schema Compare")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database))
+});
+
+// Backup Action
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'connection',
+	order: 4,
+	command: {
+		id: BACKUP_COMMAND_ID,
+		title: localize('backup', "Backup")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database))
+});
+
+// Restore Action
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'connection',
+	order: 5,
+	command: {
+		id: RESTORE_COMMAND_ID,
+		title: localize('restore', "Restore")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database))
+});
+
+// Generate Scripts Action
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'z-AdminToolExt@1',
+	order: 11,
+	command: {
+		id: GENERATE_SCRIPTS_COMMAND_ID,
+		title: localize('generateScripts', "Generate Scripts...")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database),
+		MssqlNodeContext.IsWindows)
+});
+
+// Properties Action
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'z-AdminToolExt@2',
+	order: 12,
+	command: {
+		id: PROPERTIES_COMMAND_ID,
+		title: localize('properties', "Properties")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.NodeType.isEqualTo(NodeType.Server), ContextKeyExpr.not('isCloud'),
+		MssqlNodeContext.IsWindows)
+});
+
+MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
+	group: 'z-AdminToolExt@2',
+	order: 12,
+	command: {
+		id: PROPERTIES_COMMAND_ID,
+		title: localize('properties', "Properties")
+	},
+	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
+		MssqlNodeContext.IsWindows,
+		ContextKeyRegexExpr.create('nodeType', /^(Database|Table|Column|Index|Statistic|View|ServerLevelLogin|ServerLevelServerRole|ServerLevelCredential|ServerLevelServerAudit|ServerLevelServerAuditSpecification|StoredProcedure|ScalarValuedFunction|TableValuedFunction|AggregateFunction|Synonym|Assembly|UserDefinedDataType|UserDefinedType|UserDefinedTableType|Sequence|User|DatabaseRole|ApplicationRole|Schema|SecurityPolicy|ServerLevelLinkedServer)$/))
+});
--- a/src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommands.ts
+++ b/src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommands.ts
@@ -175,3 +175,52 @@ CommandsRegistry.registerCommand({
 		return commandService.executeCommand(RestoreAction.ID, connectedContext);
 	}
 });
+
+// Profiler
+CommandsRegistry.registerCommand({
+	id: PROFILER_COMMAND_ID,
+	handler: (accessor, args: TreeViewItemHandleArg) => {
+		const commandService = accessor.get(ICommandService);
+		const oeShimService = accessor.get(IOEShimService);
+		const objectExplorerContext: azdata.ObjectExplorerContext = {
+			connectionProfile: args.$treeItem.payload,
+			isConnectionNode: true,
+			nodeInfo: oeShimService.getNodeInfoForTreeItem(args.$treeItem)
+		};
+		return commandService.executeCommand('profiler.newProfiler', objectExplorerContext);
+	}
+});
+
+// Generate Scripts
+CommandsRegistry.registerCommand({
+	id: GENERATE_SCRIPTS_COMMAND_ID,
+	handler: (accessor, args: TreeViewItemHandleArg) => {
+		const commandService = accessor.get(ICommandService);
+		const oeShimService = accessor.get(IOEShimService);
+		const objectExplorerContext: azdata.ObjectExplorerContext = {
+			connectionProfile: args.$treeItem.payload,
+			isConnectionNode: true,
+			nodeInfo: oeShimService.getNodeInfoForTreeItem(args.$treeItem)
+		};
+		return commandService.executeCommand('adminToolExtWin.launchSsmsMinGswDialog', objectExplorerContext);
+	}
+});
+
+// Properties
+CommandsRegistry.registerCommand({
+	id: PROPERTIES_COMMAND_ID,
+	handler: async (accessor, args: TreeViewItemHandleArg) => {
+		const commandService = accessor.get(ICommandService);
+		const capabilitiesService = accessor.get(ICapabilitiesService);
+		const connectionManagementService = accessor.get(IConnectionManagementService);
+		const oeShimService = accessor.get(IOEShimService);
+		const profile = new ConnectionProfile(capabilitiesService, args.$treeItem.payload);
+		await connectionManagementService.connectIfNotConnected(profile);
+		const objectExplorerContext: azdata.ObjectExplorerContext = {
+			connectionProfile: args.$treeItem.payload,
+			isConnectionNode: true,
+			nodeInfo: oeShimService.getNodeInfoForTreeItem(args.$treeItem)
+		};
+		return commandService.executeCommand('adminToolExtWin.launchSsmsMinPropertiesDialog', objectExplorerContext);
+	}
+});
--- a/src/sql/workbench/parts/dataExplorer/common/nodeContextUtils.ts
+++ b/src/sql/workbench/parts/dataExplorer/common/nodeContextUtils.ts
@@ -3,7 +3,6 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import * as os from 'os';
 import { INodeContextValue } from 'sql/workbench/parts/dataExplorer/common/nodeContext';
 import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey';
 import { Disposable } from 'vs/base/common/lifecycle';
@@ -13,6 +12,7 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit
 import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
 import { ExtensionNodeType } from 'sql/workbench/api/common/sqlExtHostTypes';
+import { isWindows } from 'vs/base/common/platform';

 export class NodeContextUtils extends Disposable {

@@ -28,7 +28,7 @@ export class NodeContextUtils extends Disposable {
 	// General node context keys
 	static NodeProvider = new RawContextKey<string>('nodeProvider', undefined);
 	static IsDatabaseOrServer = new RawContextKey<boolean>('isDatabaseOrServer', false);
-	static IsWindows = new RawContextKey<boolean>('isWindows', os.platform() === 'win32');
+	static IsWindows = new RawContextKey<boolean>('isWindows', isWindows);
 	static IsCloud = new RawContextKey<boolean>('isCloud', false);
 	static NodeType = new RawContextKey<string>('nodeType', undefined);
 	static NodeLabel = new RawContextKey<string>('nodeLabel', undefined);
--- a/src/sql/workbench/parts/dataExplorer/electron-browser/nodeActions.contribution.ts
+++ b/src/sql/workbench/parts/dataExplorer/electron-browser/nodeActions.contribution.ts
@@ -3,221 +3,10 @@
 *  Licensed under the Source EULA. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/

-import { localize } from 'vs/nls';
-import { mssqlProviderName } from 'sql/platform/connection/common/constants';
 import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
-import {
-	DISCONNECT_COMMAND_ID, MANAGE_COMMAND_ID, NEW_QUERY_COMMAND_ID, REFRESH_COMMAND_ID,
-	NEW_NOTEBOOK_COMMAND_ID, SCHEMA_COMPARE_COMMAND_ID, DATA_TIER_WIZARD_COMMAND_ID,
-	IMPORT_COMMAND_ID, BACKUP_COMMAND_ID, RESTORE_COMMAND_ID
-} from './nodeCommands';
-import {
-	PROFILER_COMMAND_ID, GENERATE_SCRIPTS_COMMAND_ID, PROPERTIES_COMMAND_ID,
-	SCRIPT_AS_CREATE_COMMAND_ID, SCRIPT_AS_DELETE_COMMAND_ID, SCRIPT_AS_SELECT_COMMAND_ID,
-	SCRIPT_AS_EXECUTE_COMMAND_ID, SCRIPT_AS_ALTER_COMMAND_ID, EDIT_DATA_COMMAND_ID
-} from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShimActions';
-import { ContextKeyExpr, ContextKeyRegexExpr, ContextKeyNotEqualsExpr } from 'vs/platform/contextkey/common/contextkey';
-import { NodeContextKey } from 'sql/workbench/parts/dataExplorer/common/nodeContext';
+import { SCRIPT_AS_CREATE_COMMAND_ID, SCRIPT_AS_DELETE_COMMAND_ID, SCRIPT_AS_SELECT_COMMAND_ID, SCRIPT_AS_EXECUTE_COMMAND_ID, SCRIPT_AS_ALTER_COMMAND_ID, EDIT_DATA_COMMAND_ID } from 'sql/workbench/parts/dataExplorer/electron-browser/nodeCommand';
 import { MssqlNodeContext } from 'sql/workbench/parts/dataExplorer/common/mssqlNodeContext';
-import { NodeType } from 'sql/workbench/parts/objectExplorer/common/nodeType';
-
-
-// Disconnect
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'connection',
-	order: 4,
-	command: {
-		id: DISCONNECT_COMMAND_ID,
-		title: localize('disconnect', "Disconnect")
-	},
-	when: ContextKeyExpr.and(NodeContextKey.IsConnected,
-		ContextKeyNotEqualsExpr.create('nodeType', NodeType.Folder))
-});
-
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'connection',
-	order: 3,
-	command: {
-		id: DISCONNECT_COMMAND_ID,
-		title: localize('disconnect', "Disconnect")
-	},
-	when: ContextKeyExpr.and(NodeContextKey.IsConnected,
-		MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.IsDatabaseOrServer)
-});
-
-// New Query
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'connection',
-	order: 2,
-	command: {
-		id: NEW_QUERY_COMMAND_ID,
-		title: localize('newQuery', "New Query")
-	},
-	when: MssqlNodeContext.IsDatabaseOrServer
-});
-
-// Manage
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'connection',
-	order: 1,
-	command: {
-		id: MANAGE_COMMAND_ID,
-		title: localize('manage', "Manage")
-	},
-	when: MssqlNodeContext.IsDatabaseOrServer
-});
-
-
-// Refresh
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'connection',
-	order: 6,
-	command: {
-		id: REFRESH_COMMAND_ID,
-		title: localize('refresh', "Refresh")
-	},
-	when: NodeContextKey.IsConnectable
-});
-
-
-// New Notebook
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'connection',
-	order: 3,
-	command: {
-		id: NEW_NOTEBOOK_COMMAND_ID,
-		title: localize('newNotebook', "New Notebook")
-	},
-	when: ContextKeyExpr.and(NodeContextKey.IsConnectable,
-		MssqlNodeContext.IsDatabaseOrServer,
-		MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName))
-});
-
-// Data-Tier Application Wizard
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'export',
-	order: 7,
-	command: {
-		id: DATA_TIER_WIZARD_COMMAND_ID,
-		title: localize('dacFx', "Data-tier Application Wizard")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.IsDatabaseOrServer)
-});
-
-
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'export',
-	order: 7,
-	command: {
-		id: DATA_TIER_WIZARD_COMMAND_ID,
-		title: localize('dacFx', "Data-tier Application Wizard")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.NodeType.isEqualTo(NodeType.Folder),
-		MssqlNodeContext.NodeLabel.isEqualTo('Databases'))
-});
-
-// Profiler
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'profiler',
-	order: 8,
-	command: {
-		id: PROFILER_COMMAND_ID,
-		title: localize('profiler', "Launch Profiler")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.NodeType.isEqualTo(NodeType.Server))
-});
-
-// Flat File Import
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'import',
-	order: 10,
-	command: {
-		id: IMPORT_COMMAND_ID,
-		title: localize('flatFileImport', "Import Wizard")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database))
-});
-
-// Schema Compare
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'export',
-	order: 9,
-	command: {
-		id: SCHEMA_COMPARE_COMMAND_ID,
-		title: localize('schemaCompare', "Schema Compare")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database))
-});
-
-// Backup Action
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'connection',
-	order: 4,
-	command: {
-		id: BACKUP_COMMAND_ID,
-		title: localize('backup', "Backup")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database))
-});
-
-// Restore Action
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'connection',
-	order: 5,
-	command: {
-		id: RESTORE_COMMAND_ID,
-		title: localize('restore', "Restore")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database))
-});
-
-// Generate Scripts Action
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'z-AdminToolExt@1',
-	order: 11,
-	command: {
-		id: GENERATE_SCRIPTS_COMMAND_ID,
-		title: localize('generateScripts', "Generate Scripts...")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.NodeType.isEqualTo(NodeType.Database),
-		MssqlNodeContext.IsWindows)
-});
-
-// Properties Action
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'z-AdminToolExt@2',
-	order: 12,
-	command: {
-		id: PROPERTIES_COMMAND_ID,
-		title: localize('properties', "Properties")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.NodeType.isEqualTo(NodeType.Server), ContextKeyExpr.not('isCloud'),
-		MssqlNodeContext.IsWindows)
-});
-
-MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
-	group: 'z-AdminToolExt@2',
-	order: 12,
-	command: {
-		id: PROPERTIES_COMMAND_ID,
-		title: localize('properties', "Properties")
-	},
-	when: ContextKeyExpr.and(MssqlNodeContext.NodeProvider.isEqualTo(mssqlProviderName),
-		MssqlNodeContext.IsWindows,
-		ContextKeyRegexExpr.create('nodeType', /^(Database|Table|Column|Index|Statistic|View|ServerLevelLogin|ServerLevelServerRole|ServerLevelCredential|ServerLevelServerAudit|ServerLevelServerAuditSpecification|StoredProcedure|ScalarValuedFunction|TableValuedFunction|AggregateFunction|Synonym|Assembly|UserDefinedDataType|UserDefinedType|UserDefinedTableType|Sequence|User|DatabaseRole|ApplicationRole|Schema|SecurityPolicy|ServerLevelLinkedServer)$/))
-});
-
-//////////////// Scripting Actions /////////////////
+import { localize } from 'vs/nls';

 // Script as Create
 MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, {
--- a/src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommand.ts
+++ b/src/sql/workbench/parts/dataExplorer/electron-browser/nodeCommand.ts
@@ -0,0 +1,155 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { VIEWLET_ID } from 'sql/workbench/parts/dataExplorer/browser/dataExplorerExtensionPoint';
+import { IScriptingService } from 'sql/platform/scripting/common/scriptingService';
+import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
+import { CommandsRegistry } from 'vs/platform/commands/common/commands';
+import { TreeViewItemHandleArg } from 'sql/workbench/common/views';
+import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
+import { IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim';
+import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService';
+import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
+import { IProgressService } from 'vs/platform/progress/common/progress';
+import { BaseActionContext } from 'sql/workbench/common/actions';
+import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
+import { ScriptCreateAction, ScriptDeleteAction, ScriptSelectAction, ScriptExecuteAction, ScriptAlterAction, EditDataAction } from 'sql/workbench/electron-browser/scriptingActions';
+
+export const SCRIPT_AS_CREATE_COMMAND_ID = 'dataExplorer.scriptAsCreate';
+export const SCRIPT_AS_DELETE_COMMAND_ID = 'dataExplorer.scriptAsDelete';
+export const SCRIPT_AS_SELECT_COMMAND_ID = 'dataExplorer.scriptAsSelect';
+export const SCRIPT_AS_EXECUTE_COMMAND_ID = 'dataExplorer.scriptAsExecute';
+export const SCRIPT_AS_ALTER_COMMAND_ID = 'dataExplorer.scriptAsAlter';
+export const EDIT_DATA_COMMAND_ID = 'dataExplorer.scriptAsAlter';
+
+// Script as Create
+CommandsRegistry.registerCommand({
+	id: SCRIPT_AS_CREATE_COMMAND_ID,
+	handler: async (accessor, args: TreeViewItemHandleArg) => {
+		const capabilitiesService = accessor.get(ICapabilitiesService);
+		const oeShimService = accessor.get(IOEShimService);
+		const queryEditorService = accessor.get(IQueryEditorService);
+		const connectionManagementService = accessor.get(IConnectionManagementService);
+		const scriptingService = accessor.get(IScriptingService);
+		const errorMessageService = accessor.get(IErrorMessageService);
+		const progressService = accessor.get(IProgressService);
+		const profile = new ConnectionProfile(capabilitiesService, args.$treeItem.payload);
+		const baseContext: BaseActionContext = {
+			profile: profile,
+			object: oeShimService.getNodeInfoForTreeItem(args.$treeItem).metadata
+		};
+		const scriptCreateAction = new ScriptCreateAction(ScriptCreateAction.ID, ScriptCreateAction.LABEL,
+			queryEditorService, connectionManagementService, scriptingService, errorMessageService);
+		return progressService.withProgress({ location: VIEWLET_ID }, () => scriptCreateAction.run(baseContext));
+	}
+});
+
+// Script as Delete
+CommandsRegistry.registerCommand({
+	id: SCRIPT_AS_DELETE_COMMAND_ID,
+	handler: async (accessor, args: TreeViewItemHandleArg) => {
+		const capabilitiesService = accessor.get(ICapabilitiesService);
+		const oeShimService = accessor.get(IOEShimService);
+		const queryEditorService = accessor.get(IQueryEditorService);
+		const connectionManagementService = accessor.get(IConnectionManagementService);
+		const scriptingService = accessor.get(IScriptingService);
+		const errorMessageService = accessor.get(IErrorMessageService);
+		const progressService = accessor.get(IProgressService);
+		const profile = new ConnectionProfile(capabilitiesService, args.$treeItem.payload);
+		const baseContext: BaseActionContext = {
+			profile: profile,
+			object: oeShimService.getNodeInfoForTreeItem(args.$treeItem).metadata
+		};
+		const scriptDeleteAction = new ScriptDeleteAction(ScriptDeleteAction.ID, ScriptDeleteAction.LABEL,
+			queryEditorService, connectionManagementService, scriptingService, errorMessageService);
+		return progressService.withProgress({ location: VIEWLET_ID }, () => scriptDeleteAction.run(baseContext));
+	}
+});
+
+// Script as Select
+CommandsRegistry.registerCommand({
+	id: SCRIPT_AS_SELECT_COMMAND_ID,
+	handler: async (accessor, args: TreeViewItemHandleArg) => {
+		const capabilitiesService = accessor.get(ICapabilitiesService);
+		const oeShimService = accessor.get(IOEShimService);
+		const queryEditorService = accessor.get(IQueryEditorService);
+		const connectionManagementService = accessor.get(IConnectionManagementService);
+		const scriptingService = accessor.get(IScriptingService);
+		const progressService = accessor.get(IProgressService);
+		const profile = new ConnectionProfile(capabilitiesService, args.$treeItem.payload);
+		const baseContext: BaseActionContext = {
+			profile: profile,
+			object: oeShimService.getNodeInfoForTreeItem(args.$treeItem).metadata
+		};
+		const scriptSelectAction = new ScriptSelectAction(ScriptSelectAction.ID, ScriptSelectAction.LABEL,
+			queryEditorService, connectionManagementService, scriptingService);
+		return progressService.withProgress({ location: VIEWLET_ID }, () => scriptSelectAction.run(baseContext));
+	}
+});
+
+// Script as Execute
+CommandsRegistry.registerCommand({
+	id: SCRIPT_AS_EXECUTE_COMMAND_ID,
+	handler: async (accessor, args: TreeViewItemHandleArg) => {
+		const capabilitiesService = accessor.get(ICapabilitiesService);
+		const oeShimService = accessor.get(IOEShimService);
+		const queryEditorService = accessor.get(IQueryEditorService);
+		const connectionManagementService = accessor.get(IConnectionManagementService);
+		const scriptingService = accessor.get(IScriptingService);
+		const progressService = accessor.get(IProgressService);
+		const errorMessageService = accessor.get(IErrorMessageService);
+		const profile = new ConnectionProfile(capabilitiesService, args.$treeItem.payload);
+		const baseContext: BaseActionContext = {
+			profile: profile,
+			object: oeShimService.getNodeInfoForTreeItem(args.$treeItem).metadata
+		};
+		const scriptExecuteAction = new ScriptExecuteAction(ScriptExecuteAction.ID, ScriptExecuteAction.LABEL,
+			queryEditorService, connectionManagementService, scriptingService, errorMessageService);
+		return progressService.withProgress({ location: VIEWLET_ID }, () => scriptExecuteAction.run(baseContext));
+	}
+});
+
+// Script as Alter
+CommandsRegistry.registerCommand({
+	id: SCRIPT_AS_ALTER_COMMAND_ID,
+	handler: async (accessor, args: TreeViewItemHandleArg) => {
+		const capabilitiesService = accessor.get(ICapabilitiesService);
+		const oeShimService = accessor.get(IOEShimService);
+		const queryEditorService = accessor.get(IQueryEditorService);
+		const connectionManagementService = accessor.get(IConnectionManagementService);
+		const scriptingService = accessor.get(IScriptingService);
+		const progressService = accessor.get(IProgressService);
+		const errorMessageService = accessor.get(IErrorMessageService);
+		const profile = new ConnectionProfile(capabilitiesService, args.$treeItem.payload);
+		const baseContext: BaseActionContext = {
+			profile: profile,
+			object: oeShimService.getNodeInfoForTreeItem(args.$treeItem).metadata
+		};
+		const scriptAlterAction = new ScriptAlterAction(ScriptAlterAction.ID, ScriptAlterAction.LABEL,
+			queryEditorService, connectionManagementService, scriptingService, errorMessageService);
+		return progressService.withProgress({ location: VIEWLET_ID }, () => scriptAlterAction.run(baseContext));
+	}
+});
+
+// Edit Data
+CommandsRegistry.registerCommand({
+	id: EDIT_DATA_COMMAND_ID,
+	handler: async (accessor, args: TreeViewItemHandleArg) => {
+		const capabilitiesService = accessor.get(ICapabilitiesService);
+		const oeShimService = accessor.get(IOEShimService);
+		const queryEditorService = accessor.get(IQueryEditorService);
+		const connectionManagementService = accessor.get(IConnectionManagementService);
+		const scriptingService = accessor.get(IScriptingService);
+		const progressService = accessor.get(IProgressService);
+		const profile = new ConnectionProfile(capabilitiesService, args.$treeItem.payload);
+		const baseContext: BaseActionContext = {
+			profile: profile,
+			object: oeShimService.getNodeInfoForTreeItem(args.$treeItem).metadata
+		};
+		const editDataAction = new EditDataAction(EditDataAction.ID, EditDataAction.LABEL,
+			queryEditorService, connectionManagementService, scriptingService);
+		return progressService.withProgress({ location: VIEWLET_ID }, () => editDataAction.run(baseContext));
+	}
+});