From 3d1d20a472e57223083cb988e08f4c2bccf87146 Mon Sep 17 00:00:00 2001 From: BranislavGrbicMDCS <55592643+BranislavGrbicMDCS@users.noreply.github.com> Date: Wed, 30 Oct 2019 18:02:12 +0100 Subject: [PATCH] Adjusting OE and hiding nodes for sql on demand (#8087) --- .../scripting/browser/scripting.contribution.ts | 13 +++++++------ 1 file changed, 7 insertions(+), 6 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..7f053bf3ed 100644 --- a/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts +++ b/src/sql/workbench/parts/scripting/browser/scripting.contribution.ts @@ -25,7 +25,7 @@ MenuRegistry.appendMenuItem(MenuId.DataExplorerContext, { id: commands.SCRIPT_AS_CREATE_COMMAND_ID, title: localize('scriptAsCreate', "Script as Create") }, - when: MssqlNodeContext.CanScriptAsCreateOrDelete + when: ContextKeyExpr.and(MssqlNodeContext.CanScriptAsCreateOrDelete, MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())) }); // Script as Delete @@ -114,10 +114,10 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, { title: localize('scriptCreate', "Script as Create") }, when: ContextKeyExpr.or( - TreeNodeContextKey.NodeType.isEqualTo('Table'), - TreeNodeContextKey.NodeType.isEqualTo('View'), - TreeNodeContextKey.NodeType.isEqualTo('Schema'), - TreeNodeContextKey.NodeType.isEqualTo('User'), + ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo('Table'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())), + ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo('View'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())), + ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo('Schema'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())), + ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo('User'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())), TreeNodeContextKey.NodeType.isEqualTo('UserDefinedTableType'), TreeNodeContextKey.NodeType.isEqualTo('StoredProcedure'), TreeNodeContextKey.NodeType.isEqualTo('AggregateFunction'), @@ -235,7 +235,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerWidgetContext, { id: ExplorerEditDataActionID, title: EditDataAction.LABEL }, - when: ItemContextKey.ItemType.isEqualTo('table'), + when: ContextKeyExpr.and(ItemContextKey.ItemType.isEqualTo('table'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())), order: 2 }); @@ -295,6 +295,7 @@ MenuRegistry.appendMenuItem(MenuId.ExplorerWidgetContext, { id: commands.ExplorerScriptCreateAction.ID, title: commands.ExplorerScriptCreateAction.LABEL }, + when: MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString()), order: 2 }); //#endregion