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/workbench/services/insights/browser/insightDialogActions.ts

@@ -3,7 +3,7 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInsightDialogActionContext } from 'sql/workbench/services/insights/common/insightsDialogService';
+import { IInsightDialogActionContext } from 'sql/workbench/services/insights/browser/insightsDialogService';
 
 import { Action } from 'vs/base/common/actions';
 import * as nls from 'vs/nls';

src/sql/workbench/services/insights/browser/insightsDialogModel.ts

@@ -3,11 +3,20 @@
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IInsightsDialogModel, ListResource } from 'sql/workbench/services/insights/common/insightsDialogService';
-import { IInsightsConfigDetails, IInsightsLabel } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
-import { Conditional } from 'sql/workbench/parts/dashboard/common/interfaces';
+import { IInsightsDialogModel, ListResource } from 'sql/workbench/services/insights/browser/insightsDialogService';
 
 import { Event, Emitter } from 'vs/base/common/event';
+import { IInsightsConfigDetails, IInsightsLabel } from 'sql/platform/dashboard/browser/insightRegistry';
+
+export enum Conditional {
+	'equals',
+	'notEquals',
+	'greaterThanOrEquals',
+	'greaterThan',
+	'lessThanOrEquals',
+	'lessThan',
+	'always'
+}
 
 export class InsightsDialogModel implements IInsightsDialogModel {
 	private _rows: string[][];

src/sql/workbench/services/insights/browser/insightsDialogService.ts

@@ -2,41 +2,42 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { Event } from 'vs/base/common/event';
+import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
 
-import { InsightsDialogController } from 'sql/workbench/services/insights/common/insightsDialogController';
-import { InsightsDialogView } from 'sql/workbench/services/insights/browser/insightsDialogView';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
-import { IInsightsDialogModel, IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService';
-import { InsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogModel';
+import { BaseActionContext } from 'sql/workbench/common/actions';
+import { IInsightsConfigDetails, IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry';
 
-export class InsightsDialogService implements IInsightsDialogService {
-	_serviceBrand: any;
-	private _insightsDialogController: InsightsDialogController;
-	private _insightsDialogView: InsightsDialogView;
-	private _insightsDialogModel: IInsightsDialogModel;
-
-	constructor(@IInstantiationService private _instantiationService: IInstantiationService) { }
-
-	// query string
-	public show(input: IInsightsConfig, connectionProfile: IConnectionProfile): void {
-		if (!this._insightsDialogView) {
-			this._insightsDialogModel = new InsightsDialogModel();
-			this._insightsDialogController = this._instantiationService.createInstance(InsightsDialogController, this._insightsDialogModel);
-			this._insightsDialogView = this._instantiationService.createInstance(InsightsDialogView, this._insightsDialogModel);
-			this._insightsDialogView.render();
-		} else {
-			this._insightsDialogModel.reset();
-			this._insightsDialogView.reset();
-		}
-
-		this._insightsDialogModel.insight = input.details;
-		this._insightsDialogController.update(input.details, connectionProfile);
-		this._insightsDialogView.open(input.details, connectionProfile);
-	}
-
-	public close(): void {
-		this._insightsDialogView.close();
-	}
+export interface IInsightsDialogModel {
+	rows: string[][];
+	columns: string[];
+	getListResources(labelIndex: number, valueIndex: number): ListResource[];
+	reset(): void;
+	onDataChange: Event<void>;
+	insight: IInsightsConfigDetails;
 }
+
+export interface ListResource {
+	value: string;
+	label: string;
+	icon?: string;
+	data?: string[];
+	stateColor?: string;
+	stateIcon?: string;
+}
+
+export const IInsightsDialogService = createDecorator<IInsightsDialogService>('insightsDialogService');
+
+export interface IInsightsDialogService {
+	_serviceBrand: any;
+	show(input: IInsightsConfig, connectionProfile: IConnectionProfile): void;
+	close();
+}
+
+export interface IInsightDialogActionContext extends BaseActionContext {
+	cellData: string;
+}
+
+/* Regex that matches the form `${value}` */
+export const insertValueRegex: RegExp = /\${(.*?)\}/;

src/sql/workbench/services/insights/browser/insightsDialogServiceImpl.ts

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the Source EULA. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+
+import { InsightsDialogView } from 'sql/workbench/services/insights/browser/insightsDialogView';
+import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
+import { IInsightsDialogModel, IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService';
+import { InsightsDialogModel } from 'sql/workbench/services/insights/browser/insightsDialogModel';
+import { IInsightsConfig } from 'sql/platform/dashboard/browser/insightRegistry';
+import { InsightsDialogController } from 'sql/workbench/services/insights/common/insightsDialogController';
+
+export class InsightsDialogService implements IInsightsDialogService {
+	_serviceBrand: any;
+	private _insightsDialogController: InsightsDialogController;
+	private _insightsDialogView: InsightsDialogView;
+	private _insightsDialogModel: IInsightsDialogModel;
+
+	constructor(@IInstantiationService private _instantiationService: IInstantiationService) { }
+
+	// query string
+	public show(input: IInsightsConfig, connectionProfile: IConnectionProfile): void {
+		if (!this._insightsDialogView) {
+			this._insightsDialogModel = new InsightsDialogModel();
+			this._insightsDialogController = this._instantiationService.createInstance(InsightsDialogController, this._insightsDialogModel);
+			this._insightsDialogView = this._instantiationService.createInstance(InsightsDialogView, this._insightsDialogModel);
+			this._insightsDialogView.render();
+		} else {
+			this._insightsDialogModel.reset();
+			this._insightsDialogView.reset();
+		}
+
+		this._insightsDialogModel.insight = input.details;
+		this._insightsDialogController.update(input.details, connectionProfile);
+		this._insightsDialogView.open(input.details, connectionProfile);
+	}
+
+	public close(): void {
+		this._insightsDialogView.close();
+	}
+}

src/sql/workbench/services/insights/browser/insightsDialogView.ts

@@ -7,16 +7,14 @@ import 'vs/css!./media/insightsDialog';
 import { Button } from 'sql/base/browser/ui/button/button';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 import { Modal } from 'sql/workbench/browser/modal/modal';
-import { IInsightsConfigDetails } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachPanelStyler } from 'sql/platform/theme/common/styler';
-import { TaskRegistry } from 'sql/platform/tasks/common/tasks';
 import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile';
-import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys';
-import { IInsightsDialogModel, ListResource, IInsightDialogActionContext, insertValueRegex } from 'sql/workbench/services/insights/common/insightsDialogService';
+import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
+import { IInsightsDialogModel, ListResource, IInsightDialogActionContext, insertValueRegex } from 'sql/workbench/services/insights/browser/insightsDialogService';
 import { TableDataView } from 'sql/base/browser/ui/table/tableDataView';
 import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin';
 import { Table } from 'sql/base/browser/ui/table/table';
-import { CopyInsightDialogSelectionAction } from 'sql/workbench/services/insights/common/insightDialogActions';
+import { CopyInsightDialogSelectionAction } from 'sql/workbench/services/insights/browser/insightDialogActions';
 import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService';
 import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService';
 import { IDisposableDataProvider } from 'sql/base/browser/ui/table/interfaces';
@@ -41,6 +39,8 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { ILogService } from 'vs/platform/log/common/log';
 import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
+import { IInsightsConfigDetails } from 'sql/platform/dashboard/browser/insightRegistry';
+import { TaskRegistry } from 'sql/platform/tasks/browser/tasksRegistry';
 
 const labelDisplay = nls.localize("insights.item", "Item");
 const valueDisplay = nls.localize("insights.value", "Value");

src/sql/workbench/services/insights/common/insightsDialogController.ts

@@ -5,10 +5,8 @@
 
 import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { IInsightsConfigDetails } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 import QueryRunner from 'sql/platform/query/common/queryRunner';
 import * as Utils from 'sql/platform/connection/common/utils';
-import { IInsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogService';
 import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService';
 import { resolveQueryFilePath } from './insightsUtils';
 
@@ -22,6 +20,8 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { ILogService } from 'vs/platform/log/common/log';
 import { IFileService } from 'vs/platform/files/common/files';
 import { URI } from 'vs/base/common/uri';
+import { IInsightsDialogModel } from 'sql/workbench/services/insights/browser/insightsDialogService';
+import { IInsightsConfigDetails } from 'sql/platform/dashboard/browser/insightRegistry';
 
 export class InsightsDialogController {
 	private _queryRunner: QueryRunner;

src/sql/workbench/services/insights/common/insightsDialogService.ts

@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------------------------
- *  Copyright (c) Microsoft Corporation. All rights reserved.
- *  Licensed under the Source EULA. See License.txt in the project root for license information.
- *--------------------------------------------------------------------------------------------*/
-import { Event } from 'vs/base/common/event';
-import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
-
-import { IInsightsConfigDetails, IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
-import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
-import { BaseActionContext } from 'sql/workbench/common/actions';
-
-export interface IInsightsDialogModel {
-	rows: string[][];
-	columns: string[];
-	getListResources(labelIndex: number, valueIndex: number): ListResource[];
-	reset(): void;
-	onDataChange: Event<void>;
-	insight: IInsightsConfigDetails;
-}
-
-export interface ListResource {
-	value: string;
-	label: string;
-	icon?: string;
-	data?: string[];
-	stateColor?: string;
-	stateIcon?: string;
-}
-
-export const IInsightsDialogService = createDecorator<IInsightsDialogService>('insightsDialogService');
-
-export interface IInsightsDialogService {
-	_serviceBrand: any;
-	show(input: IInsightsConfig, connectionProfile: IConnectionProfile): void;
-	close();
-}
-
-export interface IInsightDialogActionContext extends BaseActionContext {
-	cellData: string;
-}
-
-/* Regex that matches the form `${value}` */
-export const insertValueRegex: RegExp = /\${(.*?)\}/;

src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts

@@ -4,10 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { InsightsDialogController } from 'sql/workbench/services/insights/common/insightsDialogController';
-import { InsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogModel';
 import QueryRunner from 'sql/platform/query/common/queryRunner';
 import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService';
-import { IInsightsConfigDetails } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
 import { IConnectionProfile } from 'sql/platform/connection/common/interfaces';
 
 import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService';
@@ -17,6 +15,8 @@ import { equal } from 'assert';
 import { Mock, MockBehavior, It } from 'typemoq';
 import { TestStorageService } from 'vs/workbench/test/workbenchTestServices';
 import { Emitter } from 'vs/base/common/event';
+import { InsightsDialogModel } from 'sql/workbench/services/insights/browser/insightsDialogModel';
+import { IInsightsConfigDetails } from 'sql/platform/dashboard/browser/insightRegistry';
 
 const testData: string[][] = [
 	['1', '2', '3', '4'],

src/sql/workbench/services/insights/test/browser/insightsDialogModel.test.ts

@@ -2,11 +2,12 @@
  *  Copyright (c) Microsoft Corporation. All rights reserved.
  *  Licensed under the Source EULA. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
-import { IInsightsLabel, IInsightsConfigDetails } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces';
-import { InsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogModel';
+
+import { InsightsDialogModel } from 'sql/workbench/services/insights/browser/insightsDialogModel';
 import { isUndefinedOrNull } from 'vs/base/common/types';
 
 import * as assert from 'assert';
+import { IInsightsLabel, IInsightsConfigDetails } from 'sql/platform/dashboard/browser/insightRegistry';
 
 suite('Insights Dialog Model Tests', () => {
 	test('does parse condition right', () => {

src/sql/workbench/services/insights/test/electron-browser/insightsUtils.test.ts

@@ -9,9 +9,7 @@ import * as os from 'os';
 import { resolveQueryFilePath } from 'sql/workbench/services/insights/common/insightsUtils';
 
 import * as path from 'vs/base/common/path';
-import * as pfs from 'vs/base/node/pfs';
 
-import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 import { Workspace, toWorkspaceFolder, IWorkspaceContextService } from 'vs/platform/workspace/common/workspace';
 import { ConfigurationResolverService } from 'vs/workbench/services/configurationResolver/browser/configurationResolverService';
 import { TestContextService, TestFileService } from 'vs/workbench/test/workbenchTestServices';
@@ -22,6 +20,8 @@ import { IWindowConfiguration } from 'vs/platform/windows/common/windows';
 import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
 import { IConfigurationResolverService } from 'vs/workbench/services/configurationResolver/common/configurationResolver';
 import { IFileService } from 'vs/platform/files/common/files';
+import * as pfs from 'vs/base/node/pfs';
+import { getRandomTestPath } from 'vs/base/test/node/testUtils';
 
 class TestEnvironmentService implements IWorkbenchEnvironmentService {
 	webviewCspSource: string;
@@ -318,9 +318,4 @@ suite('Insights Utils tests', function () {
 		}
 
 	});
-
-	suiteTeardown(() => {
-		// Clean up our test files
-		return pfs.rimraf(testRootPath, pfs.RimRafMode.MOVE);
-	});
 });