From a8f21b56f0707e42383da5fe0614cf91e7addada Mon Sep 17 00:00:00 2001
From: Anthony Dresser <andresse@microsoft.com>
Date: Thu, 16 Aug 2018 17:34:52 -0700
Subject: [PATCH] Fix context menus in grids (#2245)

* fix context menus

* fix edit data context menu
---
 .../parts/grid/views/gridParentComponent.ts   |  8 ++++--
 .../grid/views/query/query.component.html     | 27 ++++++++++---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/sql/parts/grid/views/gridParentComponent.ts b/src/sql/parts/grid/views/gridParentComponent.ts
index 5fe5ee4a5c..2f54ede180 100644
--- a/src/sql/parts/grid/views/gridParentComponent.ts
+++ b/src/sql/parts/grid/views/gridParentComponent.ts
@@ -228,8 +228,12 @@ export abstract class GridParentComponent {
 
 	protected getSelection(index?: number): ISlickRange[] {
 		let selection = this.slickgrids.toArray()[index || this.activeGrid].getSelectedRanges();
-		selection = selection.map(c => { return <ISlickRange>{ fromCell: c.fromCell - 1, toCell: c.toCell - 1, toRow: c.toRow, fromRow: c.fromRow }; });
-		return selection;
+		if (selection) {
+			selection = selection.map(c => { return <ISlickRange>{ fromCell: c.fromCell - 1, toCell: c.toCell - 1, toRow: c.toRow, fromRow: c.fromRow }; });
+			return selection;
+		} else {
+			return undefined;
+		}
 	}
 
 	private copySelection(): void {
diff --git a/src/sql/parts/grid/views/query/query.component.html b/src/sql/parts/grid/views/query/query.component.html
index 823ccd572d..eccd4c3bc1 100644
--- a/src/sql/parts/grid/views/query/query.component.html
+++ b/src/sql/parts/grid/views/query/query.component.html
@@ -15,19 +15,20 @@
 		(focusin)="onGridFocus()" (focusout)="onGridFocusout()">
 		<div class="boxRow content horzBox slickgrid" *ngFor="let dataSet of renderedDataSets; let i = index"
 			[style.max-height]="dataSet.maxHeight" [style.min-height]="dataSet.minHeight">
-			<slick-grid #slickgrid id="slickgrid_{{i}}" [columnDefinitions]="dataSet.columnDefinitions"
-						[ngClass]="i === activeGrid ? 'active' : ''"
-						[dataRows]="dataSet.dataRows"
-						(contextMenu)="openContextMenu($event, dataSet.batchId, dataSet.resultId, i)"
-						enableAsyncPostRender="true"
-						showHeader="true"
-						[resized]="dataSet.resized"
-						(onActiveCellChanged)="onActiveCellChanged(i)"
-						(mousedown)="navigateToGrid(i)"
-						[selectionModel]="selectionModel"
-						[plugins]="plugins[i]"
-						class="boxCol content vertBox slickgrid"
-						[rowHeight]="rowHeight">
+			<slick-grid #slickgrid id="slickgrid_{{i}}"
+				class="boxCol content vertBox slickgrid"
+				enableAsyncPostRender="true"
+				showHeader="true"
+				[columnDefinitions]="dataSet.columnDefinitions"
+				[ngClass]="i === activeGrid ? 'active' : ''"
+				[dataRows]="dataSet.dataRows"
+				[resized]="dataSet.resized"
+				[selectionModel]="selectionModel"
+				[plugins]="plugins[i]"
+				[rowHeight]="rowHeight"
+				(onContextMenu)="openContextMenu($event, dataSet.batchId, dataSet.resultId, i)"
+				(onActiveCellChanged)="onActiveCellChanged(i)"
+				(mousedown)="navigateToGrid(i)">
 			</slick-grid>
 			<span class="boxCol content vertBox">
 				<div class="boxRow content maxHeight" *ngFor="let icon of dataIcons">