From 9f342ec9d5ed3827ecd86d7e165044e1b73e77ea Mon Sep 17 00:00:00 2001
From: Maddy <12754347+MaddyDev@users.noreply.github.com>
Date: Thu, 25 Jul 2019 11:50:55 -0700
Subject: [PATCH] folderUrl pointing to the contribution file that's created
 inside the picked folder (#6495)

---
 extensions/mssql/src/dashboard/bookWidget.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/extensions/mssql/src/dashboard/bookWidget.ts b/extensions/mssql/src/dashboard/bookWidget.ts
index 209519f413..45c66542dd 100644
--- a/extensions/mssql/src/dashboard/bookWidget.ts
+++ b/extensions/mssql/src/dashboard/bookWidget.ts
@@ -87,8 +87,9 @@ async function promptForFolder(bookContribution: BookContribution): Promise<void
 		});
 		if (uris && uris.length > 0) {
 			let pickedFolder = uris[0];
-			await saveBooksToFolder(pickedFolder, bookContribution);
-			await promptToReloadWindow(pickedFolder);
+			let destinationUri: vscode.Uri = vscode.Uri.file(path.join(pickedFolder.fsPath, bookContribution.name));
+			await saveBooksToFolder(destinationUri, bookContribution);
+			await promptToReloadWindow(destinationUri);
 		}
 		return;
 	} catch (error) {
@@ -100,12 +101,10 @@ async function saveBooksToFolder(folderUri: vscode.Uri, bookContribution: BookCo
 	// Get book contributions
 	if (bookContribution && folderUri) {
 		//remove folder if exists
-		await fs.removeSync(path.join(folderUri.fsPath, bookContribution.name));
-		//copy them from the books extension:
-		const destinationFolder = path.join(folderUri.fsPath, bookContribution.name);
+		await fs.removeSync(folderUri.fsPath);
 		//make directory for each contribution book.
-		fs.mkdirSync(destinationFolder);
-		await fs.copy(bookContribution.path, destinationFolder);
+		await fs.mkdirSync(folderUri.fsPath);
+		await fs.copy(bookContribution.path, folderUri.fsPath);
 	}
 }
 function promptToReloadWindow(folderUri: vscode.Uri): void {