Enable visualizer recommendaton prompt in stable build (#6737)

* wait for all toc.yml to be found

* add event to signal all toc.yml files read

* add workspae folder parameter back

* remove toc filter

extensions/dacpac/src/wizard/api/basePage.ts

@@ -52,6 +52,9 @@ export abstract class BasePage {
 			return undefined;
 		}
 
+		// reverse list so that most recent connections are first
+		cons.reverse();
+
 		let count = -1;
 		let idx = -1;
 
@@ -99,9 +102,6 @@ export abstract class BasePage {
 			return uniqueValues;
 		}, []);
 
-		// reverse list so that most recent connections show first
-		values.reverse();
-
 		return values;
 	}
 

extensions/notebook/src/book/bookTreeView.ts

@@ -24,12 +24,17 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
 	private _extensionContext: vscode.ExtensionContext;
 	private _throttleTimer: any;
 	private _resource: string;
+	private _onReadAllTOCFiles: vscode.EventEmitter<void> = new vscode.EventEmitter<void>();
 
 	constructor(workspaceFolders: vscode.WorkspaceFolder[], extensionContext: vscode.ExtensionContext) {
 		this.getTableOfContentFiles(workspaceFolders).then(() => undefined, (err) => { console.log(err); });
 		this._extensionContext = extensionContext;
 	}
 
+	public get onReadAllTOCFiles(): vscode.Event<void> {
+		return this._onReadAllTOCFiles.event;
+	}
+
 	async getTableOfContentFiles(workspaceFolders: vscode.WorkspaceFolder[]): Promise<void> {
 		let notebookConfig = vscode.workspace.getConfiguration(notebookConfigKey);
 		let maxDepth = notebookConfig[maxBookSearchDepth];
@@ -46,6 +51,7 @@ export class BookTreeViewProvider implements vscode.TreeDataProvider<BookTreeIte
 		}
 		let bookOpened: boolean = this._tableOfContentPaths.length > 0;
 		vscode.commands.executeCommand('setContext', 'bookOpened', bookOpened);
+		this._onReadAllTOCFiles.fire();
 	}
 
 	async openNotebook(resource: string): Promise<void> {

extensions/notebook/src/test/book/book.test.ts

@@ -73,26 +73,30 @@ describe('BookTreeViewProvider.getChildren', function (): void {
 	});
 
 	it('should return all book nodes when element is undefined', async function (): Promise<void> {
-		const children = await bookTreeViewProvider.getChildren();
+		bookTreeViewProvider.onReadAllTOCFiles(async () => {
-		should(children).be.Array();
+			const children = await bookTreeViewProvider.getChildren();
-		should(children.length).equal(1);
+			should(children).be.Array();
-		book = children[0];
+			should(children.length).equal(1);
-		should(book.title).equal(expectedBook.title);
+			book = children[0];
+			should(book.title).equal(expectedBook.title);
+		});
 	});
 
 	it('should return all page nodes when element is a book', async function (): Promise<void> {
-		const children = await bookTreeViewProvider.getChildren(book);
+		bookTreeViewProvider.onReadAllTOCFiles(async () => {
-		should(children).be.Array();
+				const children = await bookTreeViewProvider.getChildren(book);
-		should(children.length).equal(3);
+				should(children).be.Array();
-		const notebook = children[0];
+				should(children.length).equal(3);
-		const markdown = children[1];
+				const notebook = children[0];
-		const externalLink = children[2];
+				const markdown = children[1];
-		should(notebook.title).equal(expectedNotebook.title);
+				const externalLink = children[2];
-		should(notebook.uri).equal(expectedNotebook.url);
+				should(notebook.title).equal(expectedNotebook.title);
-		should(markdown.title).equal(expectedMarkdown.title);
+				should(notebook.uri).equal(expectedNotebook.url);
-		should(markdown.uri).equal(expectedMarkdown.url);
+				should(markdown.title).equal(expectedMarkdown.title);
-		should(externalLink.title).equal(expectedExternalLink.title);
+				should(markdown.uri).equal(expectedMarkdown.url);
-		should(externalLink.uri).equal(expectedExternalLink.url);
+				should(externalLink.title).equal(expectedExternalLink.title);
+				should(externalLink.uri).equal(expectedExternalLink.url);
+		});
 	});
 
 	this.afterAll(async function () {

extensions/schema-compare/package.json

@@ -7,7 +7,7 @@
 	"preview": true,
 	"engines": {
 		"vscode": "^1.25.0",
-		"azdata": ">=1.9.0"
+		"azdata": ">=1.10.0"
 	},
 	"license": "https://raw.githubusercontent.com/Microsoft/azuredatastudio/master/extensions/import/Microsoft_SQL_Server_Import_Extension_and_Tools_Import_Flat_File_Preview.docx",
 	"icon": "images/sqlserver.png",

src/sql/media/icons/start.svg

@@ -1,3 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#388a34;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14.334,8,3.667,16H3V0h.667Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M4,1.5v13L12.667,8,4,1.5Z"/></g></svg>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2V14.4805L12.9146 8.24024L4 2ZM11.1809 8.24024L4.995 12.5684V3.91209L11.1809 8.24024Z" fill="#C5C5C5"/>
-</svg>

src/sql/media/icons/start_inverse.svg

@@ -1,3 +1 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#252526;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#89d185;}</style></defs><title>continue</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline" style="display: none;"><path class="icon-vs-out" d="M14.334,8,3.667,16H3V0h.667Z"/></g><g id="iconBg"><path class="icon-vs-action-green" d="M4,1.5v13L12.667,8,4,1.5Z"/></g></svg>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4 2V14.4805L12.9146 8.24024L4 2ZM11.1809 8.24024L4.995 12.5684V3.91209L11.1809 8.24024Z" fill="#424242"/>
-</svg>

src/sql/workbench/parts/notebook/browser/notebook.component.html

@@ -11,11 +11,11 @@
 		<loading-spinner [loading]="isLoading"></loading-spinner>
 		<div class="hoverButtonsContainer" *ngIf="(cells && cells.length > 0) && !isLoading">
 			<span class="containerBackground"></span>
-			<button class="hoverButton" (click)="addCell('code', 0)">
+			<button class="hoverButton" (click)="addCell('code', 0, $event)">
 				<div class="addCodeIcon"></div>
 				<span>{{addCodeLabel}}</span>
 			</button>
-			<button class="hoverButton" (click)="addCell('markdown', 0)">
+			<button class="hoverButton" (click)="addCell('markdown', 0, $event)">
 				<div class="addTextIcon"></div>
 				<span>{{addTextLabel}}</span>
 			</button>
@@ -29,11 +29,11 @@
 			</div>
 			<div class="hoverButtonsContainer">
 				<span class="containerBackground"></span>
-				<button class="hoverButton" (click)="addCell('code', findCellIndex(cell) + 1)">
+				<button class="hoverButton" (click)="addCell('code', findCellIndex(cell) + 1, $event)">
 					<div class="addCodeIcon"></div>
 					<span>{{addCodeLabel}}</span>
 				</button>
-				<button class="hoverButton" (click)="addCell('markdown', findCellIndex(cell) + 1)">
+				<button class="hoverButton" (click)="addCell('markdown', findCellIndex(cell) + 1, $event)">
 					<div class="addTextIcon"></div>
 					<span>{{addTextLabel}}</span>
 				</button>

src/sql/workbench/parts/notebook/browser/notebook.component.ts

@@ -200,7 +200,10 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 	}
 
 	// Add cell based on cell type
-	public addCell(cellType: CellType, index?: number) {
+	public addCell(cellType: CellType, index?: number, event?: Event) {
+		if (event) {
+			event.stopPropagation();
+		}
 		this._model.addCell(cellType, index);
 	}
 

src/sql/workbench/parts/query/browser/actions.ts

@@ -219,10 +219,10 @@ export class ChartDataAction extends Action {
 	}
 
 	public run(context: IGridActionContext): Promise<boolean> {
+		// show the visualizer extension recommendation notification
+		this.extensionTipsService.promptRecommendedExtensionsByScenario(Constants.visualizerExtensions);
+
 		const activeEditor = this.editorService.activeControl as QueryEditor;
-		if (this.environmentService.appQuality !== 'stable') {
-			this.extensionTipsService.promptRecommendedExtensionsByScenario(Constants.visualizerExtensions);
-		}
 		activeEditor.chart({ batchId: context.batchId, resultId: context.resultId });
 		return Promise.resolve(true);
 	}

src/sql/workbench/parts/query/browser/gridPanel.ts

@@ -203,6 +203,10 @@ export class GridPanel {
 		let tables: GridTable<any>[] = [];
 
 		for (let set of resultSet) {
+			// ensure we aren't adding a resultSet that is already visible
+			if (this.tables.find(t => t.resultSet.batchId === set.batchId && t.resultSet.id === set.id)) {
+				continue;
+			}
 			let tableState: GridTableState;
 			if (this.state) {
 				tableState = this.state.tableStates.find(e => e.batchId === set.batchId && e.resultId === set.id);

src/sql/workbench/parts/query/common/resultSerializer.ts

@@ -130,7 +130,7 @@ export class ResultSerializer {
 	}
 
 
-	private promptForFilepath(format: SaveFormat, resourceUri: string): Thenable<string> {
+	private promptForFilepath(format: SaveFormat, resourceUri: string): Thenable<string | undefined> {
 		let filepathPlaceHolder = prevSavePath ? path.dirname(prevSavePath) : resolveCurrentDirectory(resourceUri, this.rootPath);
 		if (filepathPlaceHolder) {
 			filepathPlaceHolder = path.join(filepathPlaceHolder, this.getResultsDefaultFilename(format));
@@ -141,8 +141,11 @@ export class ResultSerializer {
 			defaultUri: filepathPlaceHolder ? URI.file(filepathPlaceHolder) : undefined,
 			filters: this.getResultsFileExtension(format)
 		}).then(filePath => {
-			prevSavePath = filePath.fsPath;
+			if (filePath) {
-			return filePath.fsPath;
+				prevSavePath = filePath.fsPath;
+				return filePath.fsPath;
+			}
+			return undefined;
 		});
 	}