Revert "Refactor results grid (#2147)"

This reverts commit befa347.
microsoft · Aug 24, 2018 · cef195c · cef195c
1 parent df617f1
commit cef195c
Show file tree

Hide file tree

Showing 42 changed files with 1,414 additions and 3,476 deletions.
diff --git a/extensions/insights-default/yarn.lock b/extensions/insights-default/yarn.lock
diff --git a/extensions/markdown-basics/yarn.lock b/extensions/markdown-basics/yarn.lock
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "@angular/router": "~4.1.3",
     "@angular/upgrade": "~4.1.3",
     "angular2-grid": "2.0.6",
-    "angular2-slickgrid": "github:Microsoft/angular2-slickgrid#1.4.4",
+    "angular2-slickgrid": "github:Microsoft/angular2-slickgrid#1.4.3",
     "applicationinsights": "0.18.0",
     "chart.js": "^2.6.0",
     "fast-plist": "0.1.2",

diff --git a/src/sql/base/browser/ui/panel/panel.ts b/src/sql/base/browser/ui/panel/panel.ts
@@ -4,9 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IThemable } from 'vs/platform/theme/common/styler';
+import * as objects from 'sql/base/common/objects';
 import { Event, Emitter } from 'vs/base/common/event';
-import { Dimension, EventType } from 'vs/base/browser/dom';
+import { Dimension } from 'vs/base/browser/dom';
 import { $, Builder } from 'vs/base/browser/builder';
+import { EventType } from 'vs/base/browser/dom';
 import { IAction } from 'vs/base/common/actions';
 import { IActionOptions, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
@@ -15,16 +17,12 @@ import './panelStyles';
 import { Disposable } from 'vs/base/common/lifecycle';
 
 export interface IPanelStyles {
-}
 
-export interface IPanelOptions {
-	showHeaderWhenSingleView?: boolean;
 }
 
 export interface IPanelView {
 	render(container: HTMLElement): void;
 	layout(dimension: Dimension): void;
-	remove?(): void;
 }
 
 export interface IPanelTab {
@@ -38,10 +36,6 @@ interface IInternalPanelTab extends IPanelTab {
 	label: Builder;
 }
 
-const defaultOptions: IPanelOptions = {
-	showHeaderWhenSingleView: true
-};
-
 export type PanelTabIdentifier = string;
 
 export class TabbedPanel extends Disposable implements IThemable {
@@ -55,12 +49,11 @@ export class TabbedPanel extends Disposable implements IThemable {
 	private _actionbar: ActionBar;
 	private _currentDimensions: Dimension;
 	private _collapsed = false;
-	private _headerVisible: boolean;
 
 	private _onTabChange = new Emitter<PanelTabIdentifier>();
 	public onTabChange: Event<PanelTabIdentifier> = this._onTabChange.event;
 
-	constructor(private container: HTMLElement, private options: IPanelOptions = defaultOptions) {
+	constructor(private container: HTMLElement) {
 		super();
 		this.$parent = this._register($('.tabbedPanel'));
 		this.$parent.appendTo(container);
@@ -72,29 +65,20 @@ export class TabbedPanel extends Disposable implements IThemable {
 		let actionbarcontainer = $('.title-actions');
 		this._actionbar = new ActionBar(actionbarcontainer.getHTMLElement());
 		this.$header.append(actionbarcontainer);
-		if (options.showHeaderWhenSingleView) {
-			this._headerVisible = true;
-			this.$parent.append(this.$header);
-		} else {
-			this._headerVisible = false;
-		}
+		this.$parent.append(this.$header);
 		this.$body = $('tabBody');
 		this.$body.attr('role', 'tabpanel');
 		this.$body.attr('tabindex', '0');
 		this.$parent.append(this.$body);
 	}
 
 	public pushTab(tab: IPanelTab): PanelTabIdentifier {
-		let internalTab = tab as IInternalPanelTab;
+		let internalTab = objects.clone(tab) as IInternalPanelTab;
 		this._tabMap.set(tab.identifier, internalTab);
 		this._createTab(internalTab);
 		if (!this._shownTab) {
 			this.showTab(tab.identifier);
 		}
-		if (this._tabMap.size > 1 && !this._headerVisible) {
-			this.$parent.append(this.$header, 0);
-			this._headerVisible = true;
-		}
 		return tab.identifier as PanelTabIdentifier;
 	}
 
@@ -155,11 +139,6 @@ export class TabbedPanel extends Disposable implements IThemable {
 	}
 
 	public removeTab(tab: PanelTabIdentifier) {
-		let actualTab = this._tabMap.get(tab);
-		actualTab.header.destroy();
-		if (actualTab.view.remove) {
-			actualTab.view.remove();
-		}
 		this._tabMap.get(tab).header.destroy();
 		this._tabMap.delete(tab);
 	}
@@ -172,9 +151,8 @@ export class TabbedPanel extends Disposable implements IThemable {
 		this._currentDimensions = dimension;
 		this.$header.style('width', dimension.width + 'px');
 		this.$body.style('width', dimension.width + 'px');
-		const bodyHeight = dimension.height - (this._headerVisible ? this.headersize : 0);
-		this.$body.style('height', bodyHeight + 'px');
-		this._layoutCurrentTab(new Dimension(dimension.width, bodyHeight));
+		this.$body.style('height', (dimension.height - this.headersize) + 'px');
+		this._layoutCurrentTab(new Dimension(dimension.width, dimension.height - this.headersize));
 	}
 
 	private _layoutCurrentTab(dimension: Dimension): void {

diff --git a/src/sql/base/browser/ui/scrollableSplitview/heightMap.ts b/src/sql/base/browser/ui/scrollableSplitview/heightMap.ts
diff --git a/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.css b/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.css