Inital platform relayering (#6385)

* moving test files and inital refactoring

* relayer extension host code

* fix imports

* make insights work

* relayer dashboard

* relayer notebooks

* moveing more code around

* formatting

* accept angular as browser

* fix serializer

* add missing files

* remove declarations from extensions

* fix build errors

* more relayering

* change urls to relative to help code relayering

* remove layering to prep for merge

* fix hygiene errors

* fix hygiene errors

* fix tests

src/sql/platform/dialog/browser/customDialogService.ts

@@ -3,9 +3,9 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { DialogModal } from 'sql/platform/dialog/dialogModal';
-import { WizardModal } from 'sql/platform/dialog/wizardModal';
-import { Dialog, Wizard } from 'sql/platform/dialog/dialogTypes';
+import { DialogModal } from 'sql/platform/dialog/browser/dialogModal';
+import { WizardModal } from 'sql/platform/dialog/browser/wizardModal';
+import { Dialog, Wizard } from 'sql/platform/dialog/common/dialogTypes';
 import { IModalOptions } from 'sql/workbench/browser/modal/modal';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 

src/sql/platform/dialog/browser/dialog.module.ts

@@ -10,21 +10,22 @@ import { FormsModule } from '@angular/forms';
 import { CommonModule, APP_BASE_HREF } from '@angular/common';
 import { BrowserModule } from '@angular/platform-browser';
 
-import { DialogContainer } from 'sql/platform/dialog/dialogContainer.component';
-import { WizardNavigation } from 'sql/platform/dialog/wizardNavigation.component';
-import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry';
-import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
-import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component';
-import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive';
-import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService';
-import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service';
-import { EditableDropDown } from 'sql/platform/electron-browser/editableDropdown/editableDropdown.component';
-import { Checkbox } from 'sql/base/electron-browser/ui/checkbox/checkbox.component';
-import { SelectBox } from 'sql/platform/ui/electron-browser/selectBox/selectBox.component';
-import { InputBox } from 'sql/base/electron-browser/ui/inputBox/inputBox.component';
+import { DialogContainer } from 'sql/platform/dialog/browser/dialogContainer.component';
+import { WizardNavigation } from 'sql/platform/dialog/browser/wizardNavigation.component';
+import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry';
+import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component';
+import { ModelComponentWrapper } from 'sql/workbench/browser/modelComponents/modelComponentWrapper.component';
+import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/browser/core/componentHost.directive';
+import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService';
+import { CommonServiceInterface } from 'sql/platform/bootstrap/browser/commonServiceInterface.service';
+import { EditableDropDown } from 'sql/platform/browser/editableDropdown/editableDropdown.component';
+import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component';
+import { SelectBox } from 'sql/platform/browser/selectBox/selectBox.component';
+import { InputBox } from 'sql/platform/browser/inputbox/inputBox.component';
 
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { Registry } from 'vs/platform/registry/common/platform';
+import { IBootstrapParams, ISelector } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 export const DialogModule = (params, selector: string, instantiationService: IInstantiationService): any => {
 

src/sql/platform/dialog/browser/dialogContainer.component.ts

@@ -5,11 +5,11 @@
 
 import 'vs/css!./media/dialogModal';
 import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core';
-import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component';
-import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
-import { DialogPane } from 'sql/platform/dialog/dialogPane';
-import { ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces';
+import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component';
+import { DialogPane } from 'sql/platform/dialog/browser/dialogPane';
+import { ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces';
 import { Event, Emitter } from 'vs/base/common/event';
+import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 export interface LayoutRequestParams {
 	modelViewId?: string;

src/sql/platform/dialog/browser/dialogModal.ts

@@ -6,8 +6,8 @@
 import 'vs/css!./media/dialogModal';
 import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal';
 import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
-import { Dialog, DialogButton } from 'sql/platform/dialog/dialogTypes';
-import { DialogPane } from 'sql/platform/dialog/dialogPane';
+import { Dialog, DialogButton } from 'sql/platform/dialog/common/dialogTypes';
+import { DialogPane } from 'sql/platform/dialog/browser/dialogPane';
 
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
@@ -18,7 +18,7 @@ import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { Emitter } from 'vs/base/common/event';
 import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
-import { DialogMessage } from '../../workbench/api/common/sqlExtHostTypes';
+import { DialogMessage } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
 import { append, $ } from 'vs/base/browser/dom';

src/sql/platform/dialog/browser/dialogPane.ts

@@ -8,11 +8,11 @@ import 'vs/css!./media/dialogModal';
 import { NgModuleRef } from '@angular/core';
 
 import { IModalDialogStyles } from 'sql/workbench/browser/modal/modal';
-import { DialogTab } from 'sql/platform/dialog/dialogTypes';
-import { TabbedPanel, IPanelTab, IPanelView } from 'sql/base/browser/ui/panel/panel';
-import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
-import { DialogModule } from 'sql/platform/dialog/dialog.module';
-import { DialogComponentParams, LayoutRequestParams } from 'sql/platform/dialog/dialogContainer.component';
+import { DialogTab } from 'sql/platform/dialog/common/dialogTypes';
+import { TabbedPanel } from 'sql/base/browser/ui/panel/panel';
+import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
+import { DialogModule } from 'sql/platform/dialog/browser/dialog.module';
+import { DialogComponentParams, LayoutRequestParams } from 'sql/platform/dialog/browser/dialogContainer.component';
 
 import * as DOM from 'vs/base/browser/dom';
 import { IThemable } from 'vs/platform/theme/common/styler';

src/sql/platform/dialog/browser/wizardModal.ts

@@ -6,11 +6,11 @@
 import 'vs/css!./media/dialogModal';
 import { Modal, IModalOptions } from 'sql/workbench/browser/modal/modal';
 import { attachModalDialogStyler } from 'sql/platform/theme/common/styler';
-import { Wizard, DialogButton, WizardPage } from 'sql/platform/dialog/dialogTypes';
-import { DialogPane } from 'sql/platform/dialog/dialogPane';
-import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService';
+import { Wizard, DialogButton, WizardPage } from 'sql/platform/dialog/common/dialogTypes';
+import { DialogPane } from 'sql/platform/dialog/browser/dialogPane';
+import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
 import { DialogMessage } from 'sql/workbench/api/common/sqlExtHostTypes';
-import { DialogModule } from 'sql/platform/dialog/dialog.module';
+import { DialogModule } from 'sql/platform/dialog/browser/dialog.module';
 import { Button } from 'vs/base/browser/ui/button/button';
 import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';

src/sql/platform/dialog/browser/wizardNavigation.component.ts

@@ -5,11 +5,11 @@
 
 import 'vs/css!./media/wizardNavigation';
 import { Component, Inject, forwardRef, ElementRef, AfterViewInit, ChangeDetectorRef, ViewChild } from '@angular/core';
-import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService';
 import { Event, Emitter } from 'vs/base/common/event';
-import { Wizard } from './dialogTypes';
+import { Wizard } from '../common/dialogTypes';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { SIDE_BAR_BACKGROUND } from 'vs/workbench/common/theme';
+import { IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams';
 
 export class WizardNavigationParams implements IBootstrapParams {
 	wizard: Wizard;

src/sql/platform/dialog/test/electron-browser/dialogPane.test.ts

@@ -0,0 +1,105 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import * as assert from 'assert';
+import { Dialog, DialogTab } from 'sql/platform/dialog/common/dialogTypes';
+import { DialogPane } from 'sql/platform/dialog/browser/dialogPane';
+import { DialogComponentParams } from 'sql/platform/dialog/browser/dialogContainer.component';
+import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService';
+import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService';
+
+
+interface BootstrapAngular {
+	(collection, moduleType, container, selectorString, params: DialogComponentParams, input, callbackSetModule): void;
+}
+
+suite('Dialog Pane Tests', () => {
+	let dialog: Dialog;
+	let container: HTMLElement;
+
+	let bootstrapSave: BootstrapAngular;
+
+	function setupBootstrap(fn: BootstrapAngular): void {
+		(<any>bootstrapAngular) = fn;
+	}
+
+	setup(() => {
+		dialog = new Dialog('test_dialog');
+		container = document.createElement('div');
+		bootstrapSave = bootstrapAngular;
+	});
+
+	test('Creating a pane from content without tabs initializes the model view content correctly', () => {
+		// If I fill in a dialog's content with the ID of a specific model view provider and then render the dialog
+		let modelViewId = 'test_content';
+		let bootstrapCalls = 0;
+		setupBootstrap((collection, moduleType, container, selectorString, params: DialogComponentParams, input, callbackSetModule) => {
+			assert.equal(params.modelViewId, modelViewId);
+			bootstrapCalls++;
+		});
+		dialog.content = modelViewId;
+		const themeService = new TestThemeService();
+		let dialogPane = new DialogPane(dialog.title, dialog.content, () => undefined, undefined, themeService, false);
+		dialogPane.createBody(container);
+		assert.equal(bootstrapCalls, 1);
+	});
+
+	test('Creating a pane from content with a single tab initializes without showing tabs', () => {
+		// If I fill in a dialog's content with a single tab and then render the dialog
+		let modelViewId = 'test_content';
+		let bootstrapCalls = 0;
+		setupBootstrap((collection, moduleType, container, selectorString, params: DialogComponentParams, input, callbackSetModule) => {
+			assert.equal(params.modelViewId, modelViewId);
+			bootstrapCalls++;
+		});
+		dialog.content = [new DialogTab('', modelViewId)];
+		const themeService = new TestThemeService();
+		let dialogPane = new DialogPane(dialog.title, dialog.content, () => undefined, undefined, themeService, false);
+		dialogPane.createBody(container);
+		assert.equal(bootstrapCalls, 1);
+	});
+
+	test('Dialog validation gets set based on the validity of the model view content', () => {
+		// Set up the mock bootstrap service to intercept validation callbacks
+		let validationCallbacks: ((valid: boolean) => void)[] = [];
+
+		setupBootstrap((collection, moduleType, container, selectorString, params: DialogComponentParams, input, callbackSetModule) => {
+			validationCallbacks.push(params.validityChangedCallback);
+		});
+
+		let modelViewId1 = 'test_content_1';
+		let modelViewId2 = 'test_content_2';
+		dialog.content = [new DialogTab('tab1', modelViewId1), new DialogTab('tab2', modelViewId2)];
+		const themeService = new TestThemeService();
+		let dialogPane = new DialogPane(dialog.title, dialog.content, valid => dialog.notifyValidityChanged(valid), undefined, themeService, false);
+		dialogPane.createBody(container);
+
+		let validityChanges: boolean[] = [];
+
+		dialog.onValidityChanged(valid => validityChanges.push(valid));
+		// If I set tab 2's validation to false
+		validationCallbacks[1](false);
+		// Then the whole dialog's validation is false
+		assert.equal(dialog.valid, false);
+		assert.equal(validityChanges.length, 1);
+		assert.equal(validityChanges[0], false);
+		// If I then set it back to true
+		validationCallbacks[1](true);
+		// Then the whole dialog's validation is true
+		assert.equal(dialog.valid, true);
+		assert.equal(validityChanges.length, 2);
+		assert.equal(validityChanges[1], true);
+		// If I set tab 1's validation to false
+		validationCallbacks[0](false);
+		// Then the whole dialog's validation is false
+		assert.equal(dialog.valid, false);
+		assert.equal(validityChanges.length, 3);
+		assert.equal(validityChanges[2], false);
+	});
+
+	teardown(() => {
+		(<any>bootstrapAngular) = bootstrapSave;
+	});
+});