From 9fcd85e64085e9c4d682a3abc9bc811a25911450 Mon Sep 17 00:00:00 2001
From: BranislavGrbicMDCS
 <55592643+BranislavGrbicMDCS@users.noreply.github.com>
Date: Thu, 29 Oct 2020 01:37:42 +0100
Subject: [PATCH] Adjusting ADS to support new changes for CloudServerType for
 SQLOD (#12824)

* Add CodeQL Analysis workflow (#10195)

* Add CodeQL Analysis workflow

* Fix path

* Adjusting ADS to support new changes for CloudServerType for SQLOD

* Using existing constants instead of hardcoded values

* Updating STS version

Co-authored-by: Justin Hutchings <jhutchings1@users.noreply.github.com>
---
 extensions/kusto/src/contextProvider.ts            |  5 +++--
 extensions/mssql/config.json                       |  2 +-
 extensions/mssql/package.json                      | 14 +++++---------
 extensions/mssql/src/contextProvider.ts            |  6 +++---
 .../browser/widgets/properties/propertiesJson.ts   | 14 +++++---------
 .../scripting/browser/scripting.contribution.ts    |  2 +-
 6 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/extensions/kusto/src/contextProvider.ts b/extensions/kusto/src/contextProvider.ts
index b0ec4f6a3b..763703e2a1 100644
--- a/extensions/kusto/src/contextProvider.ts
+++ b/extensions/kusto/src/contextProvider.ts
@@ -19,8 +19,9 @@ export enum ContextKeys {
 }
 
 const isCloudEditions = [
-	5,
-	6
+	azdata.DatabaseEngineEdition.SqlDatabase,
+	azdata.DatabaseEngineEdition.SqlDataWarehouse,
+	azdata.DatabaseEngineEdition.SqlOnDemand
 ];
 
 export function setCommandContext(key: ContextKeys | string, value: any) {
diff --git a/extensions/mssql/config.json b/extensions/mssql/config.json
index b452b0077c..fbea010331 100644
--- a/extensions/mssql/config.json
+++ b/extensions/mssql/config.json
@@ -1,6 +1,6 @@
 {
 	"downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}",
-	"version": "3.0.0-release.45",
+	"version": "3.0.0-release.46",
 	"downloadFileNames": {
 		"Windows_86": "win-x86-netcoreapp3.1.zip",
 		"Windows_64": "win-x64-netcoreapp3.1.zip",
diff --git a/extensions/mssql/package.json b/extensions/mssql/package.json
index f8d32e55dc..926cc44e2b 100644
--- a/extensions/mssql/package.json
+++ b/extensions/mssql/package.json
@@ -488,11 +488,6 @@
               "field": "isCloud",
               "operator": "!=",
               "value": true
-            },
-            {
-              "field": "engineEditionId",
-              "operator": "!=",
-              "value": "11"
             }
           ],
           "databaseProperties": [
@@ -571,6 +566,11 @@
               "field": "isCloud",
               "operator": "==",
               "value": true
+            },
+            {
+              "field": "engineEditionId",
+              "operator": "!=",
+              "value": "11"
             }
           ],
           "databaseProperties": [
@@ -632,10 +632,6 @@
             {
               "displayName": "%cloud.databaseProperties.compatibilityLevel%",
               "value": "compatibilityLevel"
-            },
-            {
-              "displayName": "%cloud.databaseProperties.owner%",
-              "value": "owner"
             }
           ],
           "serverProperties": [
diff --git a/extensions/mssql/src/contextProvider.ts b/extensions/mssql/src/contextProvider.ts
index d2ba9c6969..9d3c75cd3f 100644
--- a/extensions/mssql/src/contextProvider.ts
+++ b/extensions/mssql/src/contextProvider.ts
@@ -21,9 +21,9 @@ enum ContextKeys {
 }
 
 const isCloudEditions = [
-	5,
-	6,
-	11
+	azdata.DatabaseEngineEdition.SqlDatabase,
+	azdata.DatabaseEngineEdition.SqlDataWarehouse,
+	azdata.DatabaseEngineEdition.SqlOnDemand
 ];
 
 function setCommandContext(key: ContextKeys | string, value: any) {
diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesJson.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesJson.ts
index 4b99bdde0f..8cb931cb78 100644
--- a/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesJson.ts
+++ b/src/sql/workbench/contrib/dashboard/browser/widgets/properties/propertiesJson.ts
@@ -21,11 +21,6 @@ export const properties: Array<ProviderProperties> = [
 						field: 'isCloud',
 						operator: '!=',
 						value: true
-					},
-					{
-						field: 'engineEditionId',
-						operator: '!=',
-						value: '11'
 					}
 				],
 				databaseProperties: [
@@ -82,6 +77,11 @@ export const properties: Array<ProviderProperties> = [
 						field: 'isCloud',
 						operator: '==',
 						value: true
+					},
+					{
+						field: 'engineEditionId',
+						operator: '!=',
+						value: '11'
 					}
 				],
 				databaseProperties: [
@@ -126,10 +126,6 @@ export const properties: Array<ProviderProperties> = [
 					{
 						displayName: nls.localize('compatibilityLevel', "Compatibility Level"),
 						value: 'compatibilityLevel'
-					},
-					{
-						displayName: nls.localize('owner', "Owner"),
-						value: 'owner'
 					}
 				],
 				serverProperties: [
diff --git a/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts b/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts
index b753009e84..2a6453bae2 100644
--- a/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts
+++ b/src/sql/workbench/contrib/scripting/browser/scripting.contribution.ts
@@ -140,7 +140,7 @@ MenuRegistry.appendMenuItem(MenuId.ObjectExplorerItemContext, {
 				TreeNodeContextKey.NodeType.isEqualTo('Table'),
 				TreeNodeContextKey.NodeType.isEqualTo('View'),
 				TreeNodeContextKey.NodeType.isEqualTo('Schema'),
-				TreeNodeContextKey.NodeType.isEqualTo('User'),
+				ContextKeyExpr.and(TreeNodeContextKey.NodeType.isEqualTo('User'), MssqlNodeContext.EngineEdition.notEqualsTo(DatabaseEngineEdition.SqlOnDemand.toString())),
 				TreeNodeContextKey.NodeType.isEqualTo('UserDefinedTableType'),
 				TreeNodeContextKey.NodeType.isEqualTo('StoredProcedure'),
 				TreeNodeContextKey.NodeType.isEqualTo('AggregateFunction'),