Add "Import New Database Project" to dashboard toolbar (#11229)

* add import database project to database and server dashboard home toolbar

* connection profile is getting passed to the extension

* use MenuItemAction instead of creating a new one

* move database picking

* add comment

* add helper function

extensions/sql-database-projects/package.json

@@ -118,7 +118,11 @@
       {
         "command": "sqlDatabaseProjects.importDatabase",
         "title": "%sqlDatabaseProjects.importDatabase%",
-        "category": "%sqlDatabaseProjects.displayName%"
+        "category": "%sqlDatabaseProjects.displayName%",
+          "icon": {
+            "dark": "images/extension.png",
+            "light": "images/extension.png"
+          }
       },
       {
         "command": "sqlDatabaseProjects.addDatabaseReference",
@@ -277,6 +281,12 @@
           "when": "connectionProvider == MSSQL && nodeType && nodeType == Database && mssql:engineedition != 11",
           "group": "export"
         }
+      ],
+      "dashboard/toolbar": [
+        {
+            "command": "sqlDatabaseProjects.importDatabase",
+            "when": "connectionProvider == 'MSSQL' && mssql:engineedition != 11"
+        }
       ]
     },
     "views": {

extensions/sql-database-projects/src/common/constants.ts

@@ -39,6 +39,7 @@ export const sqlDatabaseProject = localize('sqlDatabaseProject', "SQL database p
 export const yesString = localize('yesString', "Yes");
 export const noString = localize('noString', "No");
 export const extractTargetInput = localize('extractTargetInput', "Select folder structure for SQL files");
+export const extractDatabaseSelection = localize('extractDatabaseSelection', "Select database to import");
 export const selectString = localize('selectString', "Select");
 export const addDatabaseReferenceInput = localize('addDatabaseReferenceInput', "Add database reference for:");
 export const systemDatabaseReferenceInput = localize('systemDatabaseReferenceInput', "System Database:");

extensions/sql-database-projects/src/controllers/projectController.ts

@@ -632,16 +632,18 @@ export class ProjectsController {
 	 * Imports a new SQL database project from the existing database,
 	 * prompting the user for a name, file path location and extract target
 	 */
-	public async importNewDatabaseProject(context: any): Promise<void> {
+	public async importNewDatabaseProject(context: IConnectionProfile | any): Promise<void> {
 		let model = <ImportDataModel>{};
 
 		// TODO: Refactor code
 		try {
-			let profile = context ? <IConnectionProfile>context.connectionProfile : undefined;
+			let profile = this.getConnectionProfileFromContext(context);
 			//TODO: Prompt for new connection addition and get database information if context information isn't provided.
+
+			let connectionId;
 			if (profile) {
-				model.serverId = profile.id;
 				model.database = profile.databaseName;
+				connectionId = profile.id;
 			}
 			else {
 				const connection = await this.apiWrapper.openConnectionDialog();
@@ -649,23 +651,29 @@ export class ProjectsController {
 					return;
 				}
 
-				const connectionId = connection.connectionId;
+				connectionId = connection.connectionId;
-				let database;
 
-				// use database that was connected to if it isn't master
+				// use database that was connected to
-				if (connection.options['database'] && connection.options['database'] !== constants.master) {
+				if (connection.options['database']) {
-					database = connection.options['database'];
+					model.database = connection.options['database'];
-				} else {
+				}
+			}
+
+			// choose database if connection was to a server or master
+			if (!model.database || model.database === constants.master) {
 				const databaseList = await this.apiWrapper.listDatabases(connectionId);
-					database = (await this.apiWrapper.showQuickPick(databaseList.map(dbName => { return { label: dbName }; })))?.label;
+				let database = (await this.apiWrapper.showQuickPick(databaseList.map(dbName => { return { label: dbName }; }),
+					{
+						canPickMany: false,
+						placeHolder: constants.extractDatabaseSelection
+					}))?.label;
 
 				if (!database) {
 					throw new Error(constants.databaseSelectionRequired);
 				}
-				}
 
-				model.serverId = connectionId;
 				model.database = database;
+				model.serverId = connectionId;
 			}
 
 			// Get project name
@@ -727,6 +735,16 @@ export class ProjectsController {
 		}
 	}
 
+	private getConnectionProfileFromContext(context: IConnectionProfile | any): IConnectionProfile | undefined {
+		if (!context) {
+			return undefined;
+		}
+
+		// depending on where import new project is launched from, the connection profile could be passed as just
+		// the profile or it could be wrapped in another object
+		return (<any>context).connectionProfile ? (<any>context).connectionProfile : context;
+	}
+
 	private async getProjectName(dbName: string): Promise<string | undefined> {
 		let projName = await this.apiWrapper.showInputBox({
 			prompt: constants.newDatabaseProjectName,