From c6a78456b8a6f7e6c0ec329634791bfb3abfcf0e Mon Sep 17 00:00:00 2001 From: BranislavGrbicMDCS <55592643+BranislavGrbicMDCS@users.noreply.github.com> Date: Fri, 25 Oct 2019 17:33:17 +0200 Subject: [PATCH] Adjusting context menu for SqlOnDemand (#8018) --- .../parts/scripting/browser/scripting.contribution.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts b/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts index bd88d00903..d6cbc09728 100644 --- a/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts +++ b/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts @@ -15,6 +15,7 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ItemContextKey } from 'sql/workbench/parts/dashboard/browser/widgets/explorer/explorerTreeContext'; import { EditDataAction } from 'sql/workbench/browser/scriptingActions'; +import { DatabaseEngineEdition } from 'sql/workbench/api/common/sqlExtHostTypes'; //#region -- Data Explorer // Script as Create @@ -80,7 +81,7 @@ MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, { id: commands.EDIT_DATA_COMMAND_ID, title: localize('editData', "Edit Data") }, - when: MssqlNodeContext.CanEditData + when: ContextKeyExpr.and(MssqlNodeContext.CanEditData, MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())) }); //#endregion @@ -103,7 +104,7 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, { id: commands.OE_EDIT_DATA_COMMAND_ID, title: localize('editData', "Edit Data") }, - when: TreeNodeContextKey.NodeType.isEqualTo('Table') + when: ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo('Table'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())) }); MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, { @@ -114,8 +115,8 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, { title: localize('scriptCreate', "Script as Create") }, when: ContextKeyExpr.or( - TreeNodeContextKey.NodeType.isEqualTo('Table'), - TreeNodeContextKey.NodeType.isEqualTo('View'), + ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo('Table'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())), + ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo('View'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())), TreeNodeContextKey.NodeType.isEqualTo('Schema'), TreeNodeContextKey.NodeType.isEqualTo('User'), TreeNodeContextKey.NodeType.isEqualTo('UserDefinedTableType'),