Added multiple location option to package management dialog (#9790)

* Added multiple location option to package management dialog

extensions/machine-learning-services/src/test/packageManagement/packageManager.test.ts

@@ -116,7 +116,7 @@ describe('Package Manager', () => {
 
 	it('installDependencies Should install packages that are not already installed', async function (): Promise<void> {
 		let testContext = createContext();
-		//let packagesInstalled = false;
+		let packagesInstalled = false;
 		let installedPackages = `[
 			{"name":"pymssql","version":"2.1.4"}
 		]`;
@@ -128,15 +128,67 @@ describe('Package Manager', () => {
 		});
 		testContext.processService.setup(x => x.executeBufferedCommand(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns((command) => {
 			if (command.indexOf('pip install') > 0) {
-				//packagesInstalled = true;
+				packagesInstalled = true;
 			}
 			return Promise.resolve(installedPackages);
 		});
 
 		let packageManager = createPackageManager(testContext);
 		await packageManager.installDependencies();
-		//should.equal(testContext.getOpStatus(), azdata.TaskStatus.Succeeded);
-		//should.equal(packagesInstalled, true);
+		should.equal(testContext.getOpStatus(), azdata.TaskStatus.Succeeded);
+		should.equal(packagesInstalled, true);
+	});
+
+	it('installDependencies Should not install packages if runtime is disabled in setting', async function (): Promise<void> {
+		let testContext = createContext();
+		testContext.config.setup(x => x.rEnabled).returns(() => false);
+		testContext.config.setup(x => x.pythonEnabled).returns(() => false);
+		let packagesInstalled = false;
+		let installedPackages = `[
+			{"name":"pymssql","version":"2.1.4"}
+		]`;
+		testContext.apiWrapper.setup(x => x.showQuickPick(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve({
+			label: 'Yes'
+		}));
+		testContext.apiWrapper.setup(x => x.startBackgroundOperation(TypeMoq.It.isAny())).returns((operationInfo: azdata.BackgroundOperationInfo) => {
+			operationInfo.operation(testContext.op);
+		});
+		testContext.processService.setup(x => x.executeBufferedCommand(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns((command) => {
+			if (command.indexOf('pip install') > 0 || command.indexOf('install.packages') > 0) {
+				packagesInstalled = true;
+			}
+			return Promise.resolve(installedPackages);
+		});
+
+		let packageManager = createPackageManager(testContext);
+		await packageManager.installDependencies();
+		should.equal(testContext.getOpStatus(), azdata.TaskStatus.Succeeded);
+		should.equal(packagesInstalled, false);
+	});
+
+	it('installDependencies Should install packages that have older version installed', async function (): Promise<void> {
+		let testContext = createContext();
+		let packagesInstalled = false;
+		let installedPackages = `[
+			{"name":"sqlmlutils","version":"0.1.1"}
+		]`;
+		testContext.apiWrapper.setup(x => x.showQuickPick(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve({
+			label: 'Yes'
+		}));
+		testContext.apiWrapper.setup(x => x.startBackgroundOperation(TypeMoq.It.isAny())).returns((operationInfo: azdata.BackgroundOperationInfo) => {
+			operationInfo.operation(testContext.op);
+		});
+		testContext.processService.setup(x => x.executeBufferedCommand(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns((command) => {
+			if (command.indexOf('pip install') > 0) {
+				packagesInstalled = true;
+			}
+			return Promise.resolve(installedPackages);
+		});
+
+		let packageManager = createPackageManager(testContext);
+		await packageManager.installDependencies();
+		should.equal(testContext.getOpStatus(), azdata.TaskStatus.Succeeded);
+		should.equal(packagesInstalled, true);
 	});
 
 	it('installDependencies Should install packages if list packages fails', async function (): Promise<void> {
@@ -197,7 +249,7 @@ describe('Package Manager', () => {
 			{ name: 'pymssql', version: '2.1.4' },
 			{ name: 'sqlmlutils', version: '' }
 		]);
-		testContext.config.setup(x => x.requiredSqlPythonPackages).returns( () => [
+		testContext.config.setup(x => x.requiredSqlRPackages).returns( () => [
 			{ name: 'RODBCext', repository: 'https://cran.microsoft.com' },
 			{ name: 'sqlmlutils', fileName: 'sqlmlutils_0.7.1.zip', downloadUrl: 'https://github.com/microsoft/sqlmlutils/blob/master/R/dist/sqlmlutils_0.7.1.zip?raw=true'}
 		]);

extensions/machine-learning-services/src/test/packageManagement/sqlPythonPackageManageProvider.test.ts

@@ -7,7 +7,6 @@ import * as azdata from 'azdata';
 import * as should from 'should';
 import 'mocha';
 import * as TypeMoq from 'typemoq';
-import * as constants from '../../common/constants';
 import { SqlPythonPackageManageProvider } from '../../packageManagement/sqlPythonPackageManageProvider';
 import { createContext, TestContext } from './utils';
 import * as nbExtensionApis from '../../typings/notebookServices';
@@ -40,10 +39,10 @@ describe('SQL Python Package Manager', () => {
 
 		let connection = new azdata.connection.ConnectionProfile();
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
-		testContext.serverConfigManager.setup(x => x.getPythonPackages(TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
+		testContext.serverConfigManager.setup(x => x.getPythonPackages(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
 
 		let provider = createProvider(testContext);
-		let actual = await provider.listPackages();
+		let actual = await provider.listPackages(connection.databaseName);
 		let expected = [
 			{
 				'name': 'a-name',
@@ -72,10 +71,10 @@ describe('SQL Python Package Manager', () => {
 
 		let connection = new azdata.connection.ConnectionProfile();
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
-		testContext.serverConfigManager.setup(x => x.getPythonPackages(TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
+		testContext.serverConfigManager.setup(x => x.getPythonPackages(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
 
 		let provider = createProvider(testContext);
-		let actual = await provider.listPackages();
+		let actual = await provider.listPackages(connection.databaseName);
 		let expected = [
 			{
 				'name': 'b-name',
@@ -95,10 +94,10 @@ describe('SQL Python Package Manager', () => {
 		let connection = new azdata.connection.ConnectionProfile();
 		let packages: nbExtensionApis.IPackageDetails[];
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
-		testContext.serverConfigManager.setup(x => x.getPythonPackages(TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
+		testContext.serverConfigManager.setup(x => x.getPythonPackages(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
 
 		let provider = createProvider(testContext);
-		let actual = await provider.listPackages();
+		let actual = await provider.listPackages(connection.databaseName);
 		let expected: nbExtensionApis.IPackageDetails[] = [];
 		should.deepEqual(actual, expected);
 	});
@@ -108,10 +107,10 @@ describe('SQL Python Package Manager', () => {
 
 		let connection = new azdata.connection.ConnectionProfile();
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
-		testContext.serverConfigManager.setup(x => x.getPythonPackages(TypeMoq.It.isAny())).returns(() => Promise.resolve([]));
+		testContext.serverConfigManager.setup(x => x.getPythonPackages(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve([]));
 
 		let provider = createProvider(testContext);
-		let actual = await provider.listPackages();
+		let actual = await provider.listPackages(connection.databaseName);
 		let expected: nbExtensionApis.IPackageDetails[] = [];
 		should.deepEqual(actual, expected);
 	});
@@ -152,7 +151,7 @@ describe('SQL Python Package Manager', () => {
 		});
 
 		let provider = createProvider(testContext);
-		await provider.installPackages(packages, false);
+		await provider.installPackages(packages, false, connection.databaseName);
 
 		should.deepEqual(packagesUpdated, true);
 	});
@@ -192,7 +191,7 @@ describe('SQL Python Package Manager', () => {
 		});
 
 		let provider = createProvider(testContext);
-		await provider.uninstallPackages(packages);
+		await provider.uninstallPackages(packages, connection.databaseName);
 
 		should.deepEqual(packagesUpdated, true);
 	});
@@ -233,7 +232,7 @@ describe('SQL Python Package Manager', () => {
 		});
 
 		let provider = createProvider(testContext);
-		await provider.installPackages(packages, false);
+		await provider.installPackages(packages, false, connection.databaseName);
 
 		should.deepEqual(packagesUpdated, true);
 	});
@@ -255,7 +254,7 @@ describe('SQL Python Package Manager', () => {
 
 
 		let provider = createProvider(testContext);
-		await provider.installPackages(packages, false);
+		await provider.installPackages(packages, false, connection.databaseName);
 
 		should.deepEqual(packagesUpdated, false);
 	});
@@ -277,7 +276,7 @@ describe('SQL Python Package Manager', () => {
 
 
 		let provider = createProvider(testContext);
-		await provider.uninstallPackages(packages);
+		await provider.uninstallPackages(packages, connection.databaseName);
 
 		should.deepEqual(packagesUpdated, false);
 	});
@@ -346,42 +345,44 @@ describe('SQL Python Package Manager', () => {
 		should.deepEqual(actual, packagePreview);
 	});
 
-	it('getLocationTitle Should default string for no connection', async function (): Promise<void> {
+	it('getLocations Should return empty array for no connection', async function (): Promise<void> {
 		let testContext = createContext();
 		let connection: azdata.connection.ConnectionProfile;
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
 
 		let provider = createProvider(testContext);
-		let actual = await provider.getLocationTitle();
+		let actual = await provider.getLocations();
 
-		should.deepEqual(actual, constants.noConnectionError);
+		should.deepEqual(actual, []);
 	});
 
-	it('getLocationTitle Should return connection title string for valid connection', async function (): Promise<void> {
+	it('getLocations Should return database names for valid connection', async function (): Promise<void> {
 		let testContext = createContext();
 
 		let connection = new azdata.connection.ConnectionProfile();
 		connection.serverName = 'serverName';
 		connection.databaseName = 'databaseName';
+		const databaseNames = [
+			'db1',
+			'db2'
+		];
+		const expected = [
+			{
+				displayName: 'db1',
+				name: 'db1'
+			},
+			{
+				displayName: 'db2',
+				name: 'db2'
+			}
+		];
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
+		testContext.apiWrapper.setup(x => x.listDatabases(connection.connectionId)).returns(() => { return Promise.resolve(databaseNames); });
 
 		let provider = createProvider(testContext);
-		let actual = await provider.getLocationTitle();
+		let actual = await provider.getLocations();
 
-		should.deepEqual(actual, `${connection.serverName} ${connection.databaseName}`);
-	});
-
-	it('getLocationTitle Should return server name as connection title if there is not database name', async function (): Promise<void> {
-		let testContext = createContext();
-
-		let connection = new azdata.connection.ConnectionProfile();
-		connection.serverName = 'serverName';
-		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
-
-		let provider = createProvider(testContext);
-		let actual = await provider.getLocationTitle();
-
-		should.deepEqual(actual, `${connection.serverName} `);
+		should.deepEqual(actual, expected);
 	});
 
 	function createProvider(testContext: TestContext): SqlPythonPackageManageProvider {

extensions/machine-learning-services/src/test/packageManagement/sqlRPackageManageProvider.test.ts

@@ -7,7 +7,6 @@ import * as azdata from 'azdata';
 import * as should from 'should';
 import 'mocha';
 import * as TypeMoq from 'typemoq';
-import * as constants from '../../common/constants';
 import { SqlRPackageManageProvider } from '../../packageManagement/sqlRPackageManageProvider';
 import { createContext, TestContext } from './utils';
 import * as nbExtensionApis from '../../typings/notebookServices';
@@ -40,10 +39,10 @@ describe('SQL R Package Manager', () => {
 
 		let connection = new azdata.connection.ConnectionProfile();
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
-		testContext.serverConfigManager.setup(x => x.getRPackages(TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
+		testContext.serverConfigManager.setup(x => x.getRPackages(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
 
 		let provider = createProvider(testContext);
-		let actual = await provider.listPackages();
+		let actual = await provider.listPackages(connection.databaseName);
 		let expected = [
 			{
 				'name': 'a-name',
@@ -63,10 +62,10 @@ describe('SQL R Package Manager', () => {
 		let connection = new azdata.connection.ConnectionProfile();
 		let packages: nbExtensionApis.IPackageDetails[];
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
-		testContext.serverConfigManager.setup(x => x.getRPackages(TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
+		testContext.serverConfigManager.setup(x => x.getRPackages(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve(packages));
 
 		let provider = createProvider(testContext);
-		let actual = await provider.listPackages();
+		let actual = await provider.listPackages(connection.databaseName);
 		let expected: nbExtensionApis.IPackageDetails[] = [];
 		should.deepEqual(actual, expected);
 	});
@@ -76,10 +75,10 @@ describe('SQL R Package Manager', () => {
 
 		let connection = new azdata.connection.ConnectionProfile();
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
-		testContext.serverConfigManager.setup(x => x.getRPackages(TypeMoq.It.isAny())).returns(() => Promise.resolve([]));
+		testContext.serverConfigManager.setup(x => x.getRPackages(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve([]));
 
 		let provider = createProvider(testContext);
-		let actual = await provider.listPackages();
+		let actual = await provider.listPackages(connection.databaseName);
 		let expected: nbExtensionApis.IPackageDetails[] = [];
 		should.deepEqual(actual, expected);
 	});
@@ -118,7 +117,7 @@ describe('SQL R Package Manager', () => {
 		});
 
 		let provider = createProvider(testContext);
-		await provider.installPackages(packages, false);
+		await provider.installPackages(packages, false, connection.databaseName);
 
 		should.deepEqual(packagesUpdated, true);
 	});
@@ -157,7 +156,7 @@ describe('SQL R Package Manager', () => {
 		});
 
 		let provider = createProvider(testContext);
-		await provider.uninstallPackages(packages);
+		await provider.uninstallPackages(packages, connection.databaseName);
 
 		should.deepEqual(packagesUpdated, true);
 	});
@@ -179,7 +178,7 @@ describe('SQL R Package Manager', () => {
 
 
 		let provider = createProvider(testContext);
-		await provider.installPackages(packages, false);
+		await provider.installPackages(packages, false, connection.databaseName);
 
 		should.deepEqual(packagesUpdated, false);
 	});
@@ -201,7 +200,7 @@ describe('SQL R Package Manager', () => {
 
 
 		let provider = createProvider(testContext);
-		await provider.uninstallPackages(packages);
+		await provider.uninstallPackages(packages, connection.databaseName);
 
 		should.deepEqual(packagesUpdated, false);
 	});
@@ -271,42 +270,44 @@ describe('SQL R Package Manager', () => {
 		should.deepEqual(actual, packagePreview);
 	});
 
-	it('getLocationTitle Should default string for no connection', async function (): Promise<void> {
+	it('getLocations Should return empty array for no connection', async function (): Promise<void> {
 		let testContext = createContext();
 		let connection: azdata.connection.ConnectionProfile;
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
 
 		let provider = createProvider(testContext);
-		let actual = await provider.getLocationTitle();
+		let actual = await provider.getLocations();
 
-		should.deepEqual(actual, constants.noConnectionError);
+		should.deepEqual(actual, []);
 	});
 
-	it('getLocationTitle Should return connection title string for valid connection', async function (): Promise<void> {
+	it('getLocations Should return database names for valid connection', async function (): Promise<void> {
 		let testContext = createContext();
 
 		let connection = new azdata.connection.ConnectionProfile();
 		connection.serverName = 'serverName';
 		connection.databaseName = 'databaseName';
+		const databaseNames = [
+			'db1',
+			'db2'
+		];
+		const expected = [
+			{
+				displayName: 'db1',
+				name: 'db1'
+			},
+			{
+				displayName: 'db2',
+				name: 'db2'
+			}
+		];
 		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
+		testContext.apiWrapper.setup(x => x.listDatabases(connection.connectionId)).returns(() => { return Promise.resolve(databaseNames); });
 
 		let provider = createProvider(testContext);
-		let actual = await provider.getLocationTitle();
+		let actual = await provider.getLocations();
 
-		should.deepEqual(actual, `${connection.serverName} ${connection.databaseName}`);
-	});
-
-	it('getLocationTitle Should return server name as connection title if there is not database name', async function (): Promise<void> {
-		let testContext = createContext();
-
-		let connection = new azdata.connection.ConnectionProfile();
-		connection.serverName = 'serverName';
-		testContext.apiWrapper.setup(x => x.getCurrentConnection()).returns(() => { return Promise.resolve(connection); });
-
-		let provider = createProvider(testContext);
-		let actual = await provider.getLocationTitle();
-
-		should.deepEqual(actual, `${connection.serverName} `);
+		should.deepEqual(actual, expected);
 	});
 
 	function createProvider(testContext: TestContext): SqlRPackageManageProvider {

extensions/machine-learning-services/src/test/queryRunner.test.ts

@@ -59,7 +59,7 @@ describe('Query Runner', () => {
 		let queryProvider: azdata.QueryProvider;
 		testContext.apiWrapper.setup(x => x.getProvider<azdata.QueryProvider>(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => queryProvider);
 
-		let actual = await queryRunner.getPythonPackages(connection);
+		let actual = await queryRunner.getPythonPackages(connection, connection.databaseName);
 		should.deepEqual(actual, []);
 	});
 
@@ -70,7 +70,7 @@ describe('Query Runner', () => {
 		testContext.queryProvider.runQueryAndReturn = () => { return Promise.reject(); };
 		testContext.apiWrapper.setup(x => x.getProvider<azdata.QueryProvider>(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => testContext.queryProvider);
 
-		let actual = await queryRunner.getPythonPackages(connection);
+		let actual = await queryRunner.getPythonPackages(connection, connection.databaseName);
 		should.deepEqual(actual, []);
 	});
 
@@ -117,7 +117,7 @@ describe('Query Runner', () => {
 		testContext.queryProvider.runQueryAndReturn = () => { return Promise.resolve(result); };
 		testContext.apiWrapper.setup(x => x.getProvider<azdata.QueryProvider>(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => testContext.queryProvider);
 
-		let actual = await queryRunner.getPythonPackages(connection);
+		let actual = await queryRunner.getPythonPackages(connection, connection.databaseName);
 
 		should.deepEqual(actual, expected);
 	});
@@ -138,7 +138,7 @@ describe('Query Runner', () => {
 		testContext.queryProvider.runQueryAndReturn = () => { return Promise.resolve(result); };
 		testContext.apiWrapper.setup(x => x.getProvider<azdata.QueryProvider>(TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => testContext.queryProvider);
 
-		let actual = await queryRunner.getPythonPackages(connection);
+		let actual = await queryRunner.getPythonPackages(connection, connection.databaseName);
 
 		should.deepEqual(actual, expected);
 	});