Fix chart error that caused query editor to close (#2652)

extensions/account-provider-azure/src/account-provider/azureAccountProviderService.ts

@@ -20,7 +20,7 @@ let localize = nls.loadMessageBundle();
 
 export class AzureAccountProviderService implements vscode.Disposable {
 	// CONSTANTS ///////////////////////////////////////////////////////////////
-	private static CommandClearTokenCache = 'accounts.azure.clearTokenCache';
+	private static CommandClearTokenCache = 'accounts.clearTokenCache';
 	private static ConfigurationSection = 'accounts.azure';
 	private static CredentialNamespace = 'azureAccountProviderCredentials';
 

src/sql/parts/jobManagement/views/jobManagementView.ts

@@ -70,8 +70,7 @@ export abstract class JobManagementView extends TabChild implements AfterContent
 	abstract onFirstVisible();
 
 	protected openContextMenu(event): void {
-		let grid = this._table.grid;
-		let rowIndex = grid.getCellFromEvent(event).row;
+		let rowIndex = event.cell.row;
 
 		let targetObject = this.getCurrentTableObject(rowIndex);
 		let actions = this.getTableActions();

src/sql/parts/modelComponents/markdown.css

@@ -100,12 +100,11 @@ modelview-dom-component img {
 	max-height: 100%;
 }
 
-modelview-dom-component a, a:link{
+modelview-dom-component a, modelview-dom-component a:link{
 	text-decoration: none;
-	color: rgb(0, 0, 238) !important;
 }
 
-modelview-dom-component a:hover, a:link {
+modelview-dom-component a:hover, modelview-dom-component a:link {
 	text-decoration: underline;
 }
 

src/sql/parts/query/editor/charting/chartView.ts

@@ -12,12 +12,13 @@ import { Insight } from './insights/insight';
 import QueryRunner from 'sql/parts/query/execution/queryRunner';
 import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces';
 import { ChartOptions, IChartOption, ControlType } from './chartOptions';
+import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry';
 import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox';
 import { IInsightOptions } from './insights/interfaces';
 import { CopyAction, SaveImageAction, CreateInsightAction, IChartActionContext } from './actions';
 import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar';
 import { ChartType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces';
-
+import { Registry } from 'vs/platform/registry/common/platform';
 import { Dimension, $, getContentHeight, getContentWidth } from 'vs/base/browser/dom';
 import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox';
 import { IContextViewService, IContextMenuService } from 'vs/platform/contextview/browser/contextView';
@@ -40,6 +41,8 @@ declare class Proxy {
 	constructor(object, handler);
 }
 
+const insightRegistry = Registry.as<IInsightRegistry>(Extensions.InsightContribution);
+
 export class ChartView implements IPanelView {
 	private insight: Insight;
 	private _queryRunner: QueryRunner;
@@ -123,6 +126,7 @@ export class ChartView implements IPanelView {
 			}
 		}) as IInsightOptions;
 
+		ChartOptions.general[0].options = insightRegistry.getAllIds();
 		ChartOptions.general.map(o => {
 			this.createOption(o, generalControls);
 		});
@@ -315,7 +319,7 @@ export class ChartView implements IPanelView {
 				});
 				setFunc = (val: string) => {
 					if (!isUndefinedOrNull(val)) {
-						input.value = val;
+						numberInput.value = val;
 					}
 				};
 				this.optionDisposables.push(attachInputBoxStyler(numberInput, this._themeService));
@@ -330,7 +334,7 @@ export class ChartView implements IPanelView {
 		this._state = val;
 		if (this.state.options) {
 			for (let key in this.state.options) {
-				if (this.state.options.hasOwnProperty(key)) {
+				if (this.state.options.hasOwnProperty(key) && this.optionMap[key]) {
 					this.options[key] = this.state.options[key];
 					this.optionMap[key].set(this.state.options[key]);
 				}

src/sql/parts/query/editor/messagePanel.ts

@@ -29,6 +29,7 @@ import { isArray, isUndefinedOrNull } from 'vs/base/common/types';
 import { IDisposable, dispose } from 'vs/base/common/lifecycle';
 import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
 import { IEditor } from 'vs/editor/common/editorCommon';
+import { QueryInput } from 'sql/parts/query/common/queryInput';
 
 export interface IResultMessageIntern extends IResultMessage {
 	id?: string;
@@ -302,14 +303,8 @@ export class MessageController extends WorkbenchTreeController {
 		if (element.selection) {
 			let selection: ISelectionData = element.selection;
 			// this is a batch statement
-			let control = this.workbenchEditorService.activeControl.getControl() as IEditor;
-			control.setSelection({
-				startColumn: selection.startColumn + 1,
-				endColumn: selection.endColumn + 1,
-				endLineNumber: selection.endLine + 1,
-				startLineNumber: selection.startLine + 1
-			});
-			control.focus();
+			let input = this.workbenchEditorService.activeEditor as QueryInput;
+			input.updateSelection(selection);
 		}
 
 		return true;