Focus database projects view after open/import (#10760)

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

@@ -47,6 +47,10 @@ export class ApiWrapper {
 		return vscode.window.registerTreeDataProvider(viewId, treeDataProvider);
 	}
 
+	public createTreeView<T>(viewId: string, options: vscode.TreeViewOptions<T>): vscode.TreeView<T> {
+		return vscode.window.createTreeView(viewId, options);
+	}
+
 	public getUriForConnection(connectionId: string): Thenable<string> {
 		return azdata.connection.getUriForConnection(connectionId);
 	}

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

@@ -15,6 +15,7 @@ import { Project } from '../models/project';
  */
 export class SqlDatabaseProjectTreeViewProvider implements vscode.TreeDataProvider<BaseProjectTreeItem> {
 	private _onDidChangeTreeData: vscode.EventEmitter<BaseProjectTreeItem | undefined> = new vscode.EventEmitter<BaseProjectTreeItem | undefined>();
+	private treeView: vscode.TreeView<BaseProjectTreeItem> | undefined;
 	readonly onDidChangeTreeData: vscode.Event<BaseProjectTreeItem | undefined> = this._onDidChangeTreeData.event;
 
 	private roots: BaseProjectTreeItem[] = [];
@@ -58,4 +59,20 @@ export class SqlDatabaseProjectTreeViewProvider implements vscode.TreeDataProvid
 		this.roots = newRoots;
 		this._onDidChangeTreeData.fire(undefined);
 	}
+
+	public setTreeView(value: vscode.TreeView<BaseProjectTreeItem>) {
+		if (this.treeView) {
+			throw new Error('TreeView should not be set multiple times.');
+		}
+
+		this.treeView = value;
+	}
+
+	public async focus(project: Project) {
+		const projNode = this.roots.find(x => x instanceof ProjectRootTreeItem ? (<ProjectRootTreeItem>x).project === project : false);
+
+		if (projNode) {
+			this.treeView?.reveal(projNode, { focus: true, expand: true });
+		}
+	}
 }

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

@@ -53,7 +53,7 @@ export default class MainController implements Disposable {
 		this.apiWrapper.registerCommand('sqlDatabaseProjects.build', async (node: BaseProjectTreeItem) => { await this.projectsController.buildProject(node); });
 		this.apiWrapper.registerCommand('sqlDatabaseProjects.deploy', async (node: BaseProjectTreeItem) => { await this.projectsController.deployProject(node); });
 		this.apiWrapper.registerCommand('sqlDatabaseProjects.schemaCompare', async (node: BaseProjectTreeItem) => { await this.projectsController.schemaCompare(node); });
-		this.apiWrapper.registerCommand('sqlDatabaseProjects.import', async (node: BaseProjectTreeItem) => { await this.projectsController.import(node); });
+		this.apiWrapper.registerCommand('sqlDatabaseProjects.importDatabase', async (profile: azdata.IConnectionProfile) => { await this.projectsController.importNewDatabaseProject(profile); });
 
 		this.apiWrapper.registerCommand('sqlDatabaseProjects.newScript', async (node: BaseProjectTreeItem) => { await this.projectsController.addItemPromptFromNode(node, templates.script); });
 		this.apiWrapper.registerCommand('sqlDatabaseProjects.newTable', async (node: BaseProjectTreeItem) => { await this.projectsController.addItemPromptFromNode(node, templates.table); });
@@ -62,12 +62,14 @@ export default class MainController implements Disposable {
 		this.apiWrapper.registerCommand('sqlDatabaseProjects.newItem', async (node: BaseProjectTreeItem) => { await this.projectsController.addItemPromptFromNode(node); });
 		this.apiWrapper.registerCommand('sqlDatabaseProjects.newFolder', async (node: BaseProjectTreeItem) => { await this.projectsController.addFolderPrompt(node); });
 
-		this.apiWrapper.registerCommand('sqlDatabaseProjects.importDatabase', async (profile: azdata.IConnectionProfile) => { await this.projectsController.importNewDatabaseProject(profile); });
 
 		this.apiWrapper.registerCommand('sqlDatabaseProjects.addDatabaseReference', async (node: BaseProjectTreeItem) => { await this.projectsController.addDatabaseReference(node); });
 
 		// init view
-		this.extensionContext.subscriptions.push(this.apiWrapper.registerTreeDataProvider(SQL_DATABASE_PROJECTS_VIEW_ID, this.dbProjectTreeViewProvider));
+		const treeView = this.apiWrapper.createTreeView(SQL_DATABASE_PROJECTS_VIEW_ID, { treeDataProvider: this.dbProjectTreeViewProvider });
+		this.dbProjectTreeViewProvider.setTreeView(treeView);
+
+		this.extensionContext.subscriptions.push(treeView);
 
 		await templates.loadTemplates(path.join(this.context.extensionPath, 'resources', 'templates'));
 
@@ -86,11 +88,14 @@ export default class MainController implements Disposable {
 			filter[constants.sqlDatabaseProject] = ['sqlproj'];
 
 			let files: Uri[] | undefined = await this.apiWrapper.showOpenDialog({ filters: filter });
+			const prevCount = this.projectsController.projects.length;
 
 			if (files) {
 				for (const file of files) {
 					await this.projectsController.openProject(file);
 				}
+
+				this.projectsController.focusProject(this.projectsController.projects[prevCount]); // focus the first of the newly-opened projects
 			}
 		}
 		catch (err) {

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

@@ -93,6 +93,13 @@ export class ProjectsController {
 		return newProject;
 	}
 
+	public async focusProject(project?: Project) {
+		if (project && this.projects.includes(project)) {
+			await this.apiWrapper.executeCommand('sqlDatabaseProjectsView.focus');
+			this.projectTreeViewProvider.focus(project);
+		}
+	}
+
 	public async createNewProject(newProjName: string, folderUri: Uri, projectGuid?: string): Promise<string> {
 		if (projectGuid && !UUID.isUUID(projectGuid)) {
 			throw new Error(`Specified GUID is invalid: '${projectGuid}'`);
@@ -230,11 +237,6 @@ export class ProjectsController {
 		}
 	}
 
-	public async import(treeNode: BaseProjectTreeItem) {
-		const project = ProjectsController.getProjectFromContext(treeNode);
-		await this.apiWrapper.showErrorMessage(`Import not yet implemented: ${project.projectFilePath}`); // TODO
-	}
-
 	public async addFolderPrompt(treeNode: BaseProjectTreeItem) {
 		const project = ProjectsController.getProjectFromContext(treeNode);
 		const newFolderName = await this.promptForNewObjectName(new templates.ProjectScriptType(templates.folder, constants.folderFriendlyName, ''), project);
@@ -542,6 +544,8 @@ export class ProjectsController {
 
 			//Refresh project to show the added files
 			this.refreshProjectsTree();
+
+			this.focusProject(project);
 		}
 		catch (err) {
 			this.apiWrapper.showErrorMessage(utils.getErrorMessage(err));