diff --git a/.eslintrc.json b/.eslintrc.json index c80eb53cd6..af5be347d6 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -69,195 +69,186 @@ // !!! Do not relax these rules !!! // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! { - "target": "**/{vs,sql}/base/common/**", - "restrictions": [ - "vs/nls", - "**/{vs,sql}/base/common/**" - ] - }, - { - "target": "**/{vs,sql}/base/test/common/**", - "restrictions": [ - "assert", - "sinon", - "vs/nls", - "**/{vs,sql}/base/common/**", - "**/{vs,sql}/base/test/common/**" - ] - }, - { - "target": "**/{vs,sql}/base/browser/**", - "restrictions": [ - "vs/nls", - "vs/css!./**/*", - "**/{vs,sql}/base/{common,browser}/**", - "@angular/*", - "rxjs/*" - ] - }, - { - "target": "**/{vs,sql}/base/node/**", - "restrictions": [ - "vs/nls", - "**/{vs,sql}/base/{common,browser,node}/**", - "!path" // node modules (except path where we have our own impl) - ] - }, - { - // vs/base/test/browser contains tests for vs/base/browser - "target": "**/{vs,sql}/base/test/browser/**", - "restrictions": [ - "assert", - "vs/nls", - "**/{vs,sql}/base/{common,browser}/**", - "**/{vs,sql}/base/test/{common,browser}/**", - "@angular/*", - "rxjs/*" - ] - }, - { - "target": "**/{vs,sql}/base/parts/*/common/**", - "restrictions": [ - "vs/nls", - "**/{vs,sql}/base/common/**", - "**/{vs,sql}/base/parts/*/common/**" - ] - }, - { - "target": "**/{vs,sql}/base/parts/*/browser/**", - "restrictions": [ - "vs/nls", - "vs/css!./**/*", - "**/{vs,sql}/base/{common,browser}/**", - "**/{vs,sql}/base/parts/*/{common,browser}/**", - "@angular/*", - "rxjs/*" - ] - }, - { - "target": "**/{vs,sql}/base/parts/*/node/**", - "restrictions": [ - "vs/nls", - "**/{vs,sql}/base/{common,browser,node}/**", - "**/{vs,sql}/base/parts/*/{common,browser,node}/**", - "!path" // node modules (except path where we have our own impl) - ] - }, - { - "target": "**/{vs,sql}/base/parts/*/electron-browser/**", - "restrictions": [ - "vs/nls", - "vs/css!./**/*", - "**/{vs,sql}/base/{common,browser,node,electron-browser}/**", - "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**", - "!path", // node modules (except path where we have our own impl) - "@angular/*", - "rxjs/*" - ] - }, - { - "target": "**/{vs,sql}/base/parts/*/electron-main/**", - "restrictions": [ - "vs/nls", - "**/{vs,sql}/base/{common,browser,node,electron-main}/**", - "**/{vs,sql}/base/parts/*/{common,browser,node,electron-main}/**", - "!path", // node modules (except path where we have our own impl) - "@angular/*", - "rxjs/*" - ] - }, - { - "target": "**/{vs,sql}/platform/*/common/**", - "restrictions": [ - "vs/nls", - "**/{vs,sql}/base/common/**", - "**/{vs,sql}/base/parts/*/common/**", - "**/{vs,sql}/{platform,workbench}/**/common/**", - "**/vs/editor/common/**", - "azdata" // TODO remove - ] - }, - { - "target": "**/{vs,sql}/platform/*/test/common/**", - "restrictions": [ - "assert", - "sinon", - "vs/nls", - "**/{vs,sql}/base/common/**", - "**/{vs,sql}/{platform,workbench}/**/common/**", - "**/{vs,sql}/{base,platform,workbench}/**/test/common/**", - "typemoq", - "azdata" // TODO remove - ] - }, - { - "target": "**/{vs,sql}/platform/*/browser/**", - "restrictions": [ - "vs/nls", - "vs/css!./**/*", - "**/{vs,sql}/base/{common,browser}/**", - "**/{vs,sql}/base/parts/*/{common,browser}/**", - "**/{vs,sql}/{platform,workbench}/**/{common,browser}/**", - "**/vs/editor/{common,browser}/**", - "@angular/*", - "rxjs/*", - "azdata" // TODO remove - ] - }, - { - "target": "**/{vs,sql}/platform/*/node/**", - "restrictions": [ - "vs/nls", - "**/{vs,sql}/base/{common,browser,node}/**", - "**/{vs,sql}/base/parts/*/{common,browser,node}/**", - "**/{vs,sql}/{platform,workbench}/**/{common,browser,node}/**", - "**/vs/editor/{common,browser,node}/**", - "!path", // node modules (except path where we have our own impl) - "azdata" // TODO remove - ] - }, - { - "target": "**/{vs,sql}/platform/*/electron-browser/**", - "restrictions": [ - "vs/nls", - "vs/css!./**/*", - "**/{vs,sql}/base/{common,browser,node}/**", - "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**", - "**/{vs,sql}/{platform,workbench}/**/{common,browser,node,electron-browser}/**", - "**/vs/editor/{common,browser,node,electron-browser}/**", - "!path", // node modules (except path where we have our own impl) - "@angular/*", - "rxjs/*", - "azdata" // TODO remove - ] - }, - { - "target": "**/{vs,sql}/platform/*/electron-main/**", - "restrictions": [ - "vs/nls", - "**/{vs,sql}/base/{common,browser,node}/**", - "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**", - "**/{vs,sql}/{platform,workbench}/**/{common,browser,node,electron-main}/**", - "**/vs/editor/{common,browser,node,electron-main}/**", - "!path", // node modules (except path where we have our own impl) - "azdata" // TODO remove - ] - }, - { - "target": "**/{vs,sql}/platform/*/test/browser/**", - "restrictions": [ - "assert", - "sinon", - "vs/nls", - "**/{vs,sql}/base/{common,browser}/**", - "**/{vs,sql}/{platform,workbench}/**/{common,browser}/**", - "**/{vs,sql}/{base,platform,workbench}/**/test/{common,browser}/**", - "typemoq", - "@angular/*", - "rxjs/*", - "azdata" // TODO remove - ] - } + "target": "**/{vs,sql}/base/common/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/common/**" + ] + }, + { + "target": "**/{vs,sql}/base/test/common/**", + "restrictions": [ + "assert", + "sinon", + "vs/nls", + "**/{vs,sql}/base/common/**", + "**/{vs,sql}/base/test/common/**" + ] + }, + { + "target": "**/{vs,sql}/base/browser/**", + "restrictions": [ + "vs/nls", + "vs/css!./**/*", + "**/{vs,sql}/base/{common,browser}/**", + "@angular/*", + "rxjs/*" + ] + }, + { + "target": "**/{vs,sql}/base/node/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/{common,browser,node}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + // vs/base/test/browser contains tests for vs/base/browser + "target": "**/{vs,sql}/base/test/browser/**", + "restrictions": [ + "assert", + "vs/nls", + "**/{vs,sql}/base/{common,browser}/**", + "**/{vs,sql}/base/test/{common,browser}/**", + "@angular/*", + "rxjs/*" + ] + }, + { + "target": "**/{vs,sql}/base/parts/*/common/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/common/**", + "**/{vs,sql}/base/parts/*/common/**" + ] + }, + { + "target": "**/{vs,sql}/base/parts/*/browser/**", + "restrictions": [ + "vs/nls", + "vs/css!./**/*", + "**/{vs,sql}/base/{common,browser}/**", + "**/{vs,sql}/base/parts/*/{common,browser}/**", + "@angular/*", + "rxjs/*" + ] + }, + { + "target": "**/{vs,sql}/base/parts/*/node/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/{common,browser,node}/**", + "**/{vs,sql}/base/parts/*/{common,browser,node}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{vs,sql}/base/parts/*/electron-browser/**", + "restrictions": [ + "vs/nls", + "vs/css!./**/*", + "**/{vs,sql}/base/{common,browser,node,electron-browser}/**", + "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**", + "!path", // node modules (except path where we have our own impl) + "@angular/*", + "rxjs/*" + ] + }, + { + "target": "**/{vs,sql}/base/parts/*/electron-main/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/{common,browser,node,electron-main}/**", + "**/{vs,sql}/base/parts/*/{common,browser,node,electron-main}/**", + "!path", // node modules (except path where we have our own impl) + "@angular/*", + "rxjs/*" + ] + }, + { + "target": "**/{vs,sql}/platform/*/common/**", + "restrictions": [ + "vs/nls", + "azdata", + "**/{vs,sql}/base/common/**", + "**/{vs,sql}/base/parts/*/common/**", + "**/{vs,sql}/platform/*/common/**" + ] + }, + { + "target": "**/{vs,sql}/platform/*/test/common/**", + "restrictions": [ + "assert", + "typemoq", + "sinon", + "vs/nls", + "azdata", + "**/{vs,sql}/base/common/**", + "**/{vs,sql}/base/test/common/**", + "**/{vs,sql}/platform/*/common/**", + "**/{vs,sql}/platform/*/test/common/**" + ] + }, + { + "target": "**/{vs,sql}/platform/*/browser/**", + "restrictions": [ + "vs/nls", + "azdata", + "vs/css!./**/*", + "**/{vs,sql}/base/{common,browser}/**", + "**/{vs,sql}/base/parts/*/{common,browser}/**", + "**/{vs,sql}/platform/*/{common,browser}/**" + ] + }, + { + "target": "**/{vs,sql}/platform/*/node/**", + "restrictions": [ + "vs/nls", + "azdata", + "**/{vs,sql}/base/{common,node}/**", + "**/{vs,sql}/base/parts/*/{common,node}/**", + "**/{vs,sql}/platform/*/{common,node}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{vs,sql}/platform/*/electron-browser/**", + "restrictions": [ + "vs/nls", + "azdata", + "vs/css!./**/*", + "**/{vs,sql}/base/{common,browser,node}/**", + "**/{vs,sql}/base/parts/*/{common,browser,node,electron-browser}/**", + "**/{vs,sql}/platform/*/{common,browser,node,electron-browser}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{vs,sql}/platform/*/electron-main/**", + "restrictions": [ + "vs/nls", + "azdata", + "**/{vs,sql}/base/{common,node,electron-main}/**", + "**/{vs,sql}/base/parts/*/{common,node,electron-main}/**", + "**/{vs,sql}/platform/*/{common,node,electron-main}/**", + "!path" // node modules (except path where we have our own impl) + ] + }, + { + "target": "**/{vs,sql}/platform/*/test/browser/**", + "restrictions": [ + "assert", + "typemoq", + "sinon", + "azdata", + "vs/nls", + "**/{vs,sql}/base/{common,browser}/**", + "**/{vs,sql}/base/test/{common,browser}/**", + "**/{vs,sql}/platform/*/{common,browser}/**", + "**/{vs,sql}/platform/*/test/{common,browser}/**" + ] + } ] }, "overrides": [ diff --git a/src/sql/base/browser/ui/panel/tab.component.ts b/src/sql/base/browser/ui/panel/tab.component.ts index 745199c23e..ecb931f394 100644 --- a/src/sql/base/browser/ui/panel/tab.component.ts +++ b/src/sql/base/browser/ui/panel/tab.component.ts @@ -6,9 +6,9 @@ import { Component, Input, ContentChild, OnDestroy, TemplateRef, ChangeDetectorRef, forwardRef, Inject } from '@angular/core'; import { Action } from 'vs/base/common/actions'; -import { Disposable } from 'vs/base/common/lifecycle'; +import { AngularDisposable } from 'sql/base/browser/lifecycle'; -export abstract class TabChild extends Disposable { +export abstract class TabChild extends AngularDisposable { public abstract layout(): void; } diff --git a/src/sql/platform/angularEventing/browser/angularEventingService.ts b/src/sql/platform/angularEventing/browser/angularEventingService.ts index cef43c04a0..fc03970757 100644 --- a/src/sql/platform/angularEventing/browser/angularEventingService.ts +++ b/src/sql/platform/angularEventing/browser/angularEventingService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { Subscription } from 'rxjs/Subscription'; +import { Event } from 'vs/base/common/event'; const ANGULAREVENTING_SERVICE_ID = 'angularEventingService'; export const IAngularEventingService = createDecorator(ANGULAREVENTING_SERVICE_ID); @@ -33,9 +33,8 @@ export interface IAngularEventingService { /** * Adds a listener for the dashboard to send events, should only be called once for each dashboard by the dashboard itself * @param uri Uri of the dashboard - * @param cb Listening function */ - onAngularEvent(uri: string, cb: (event: IAngularEvent) => void): Subscription; + onAngularEvent(uri: string): Event; /** * Send an event to the dashboard; no op if the dashboard has not started listening yet diff --git a/src/sql/platform/angularEventing/browser/angularEventingServiceImpl.ts b/src/sql/platform/angularEventing/browser/angularEventingServiceImpl.ts index b0c5807fcf..8aaa8b0a89 100644 --- a/src/sql/platform/angularEventing/browser/angularEventingServiceImpl.ts +++ b/src/sql/platform/angularEventing/browser/angularEventingServiceImpl.ts @@ -3,36 +3,33 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Subject } from 'rxjs/Subject'; -import { Subscription } from 'rxjs/Subscription'; - import { IAngularEventingService, IAngularEvent, AngularEventType } from 'sql/platform/angularEventing/browser/angularEventingService'; import { ILogService } from 'vs/platform/log/common/log'; +import { Event, Emitter } from 'vs/base/common/event'; export class AngularEventingService implements IAngularEventingService { public _serviceBrand: undefined; - private _angularMap = new Map>(); + private _angularMap = new Map>(); constructor( @ILogService private readonly logService: ILogService ) { } - public onAngularEvent(uri: string, cb: (event: IAngularEvent) => void): Subscription { - let subject = this._angularMap.get(uri); - if (!subject) { - subject = new Subject(); - this._angularMap.set(uri, subject); + public onAngularEvent(uri: string): Event { + let emitter = this._angularMap.get(uri); + if (!emitter) { + emitter = new Emitter(); + this._angularMap.set(uri, emitter); } - let sub = subject.subscribe(cb); - return sub; + return emitter.event; } public sendAngularEvent(uri: string, event: AngularEventType, payload?: any): void { - const subject = this._angularMap.get(uri); - if (!subject) { + const emitter = this._angularMap.get(uri); + if (!emitter) { this.logService.warn('Got request to send an event to a dashboard that has not started listening'); } else { - subject.next({ event, payload }); + emitter.fire({ event, payload }); } } } diff --git a/src/sql/platform/capabilities/test/common/testCapabilitiesService.ts b/src/sql/platform/capabilities/test/common/testCapabilitiesService.ts index 9e6747ee80..1cd01f8b57 100644 --- a/src/sql/platform/capabilities/test/common/testCapabilitiesService.ts +++ b/src/sql/platform/capabilities/test/common/testCapabilitiesService.ts @@ -6,11 +6,11 @@ import * as azdata from 'azdata'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import { ICapabilitiesService, ProviderFeatures } from 'sql/platform/capabilities/common/capabilitiesService'; -import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { Event, Emitter } from 'vs/base/common/event'; import { Action } from 'vs/base/common/actions'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; +import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/platform/connection/common/interfaces'; export class TestCapabilitiesService implements ICapabilitiesService { diff --git a/src/sql/platform/connection/common/connectionProfile.ts b/src/sql/platform/connection/common/connectionProfile.ts index bb5a5267ed..8f8aafd5f4 100644 --- a/src/sql/platform/connection/common/connectionProfile.ts +++ b/src/sql/platform/connection/common/connectionProfile.ts @@ -12,7 +12,6 @@ import { generateUuid } from 'vs/base/common/uuid'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { isString } from 'vs/base/common/types'; import { deepClone } from 'vs/base/common/objects'; -import { ConnectionOptionSpecialType } from 'sql/workbench/api/common/sqlExtHostTypes'; import * as Constants from 'sql/platform/connection/common/constants'; import { find } from 'vs/base/common/arrays'; @@ -48,7 +47,7 @@ export class ConnectionProfile extends ProviderConnectionInfo implements interfa let capabilities = this.capabilitiesService.getCapabilities(model.providerName); if (capabilities && capabilities.connection && capabilities.connection.connectionOptions) { const options = capabilities.connection.connectionOptions; - let appNameOption = find(options, option => option.specialValueType === ConnectionOptionSpecialType.appName); + let appNameOption = find(options, option => option.specialValueType === interfaces.ConnectionOptionSpecialType.appName); if (appNameOption) { let appNameKey = appNameOption.name; this.options[appNameKey] = Constants.applicationName; diff --git a/src/sql/platform/connection/common/interfaces.ts b/src/sql/platform/connection/common/interfaces.ts index 2abab53d56..42eec4b501 100644 --- a/src/sql/platform/connection/common/interfaces.ts +++ b/src/sql/platform/connection/common/interfaces.ts @@ -18,3 +18,22 @@ export interface IConnectionProfileStore { id: string; } +export enum ServiceOptionType { + string = 'string', + multistring = 'multistring', + password = 'password', + number = 'number', + category = 'category', + boolean = 'boolean', + object = 'object' +} + +export enum ConnectionOptionSpecialType { + connectionName = 'connectionName', + serverName = 'serverName', + databaseName = 'databaseName', + authType = 'authType', + userName = 'userName', + password = 'password', + appName = 'appName' +} diff --git a/src/sql/platform/connection/common/providerConnectionInfo.ts b/src/sql/platform/connection/common/providerConnectionInfo.ts index 2f9eeedda4..361ce9de2f 100644 --- a/src/sql/platform/connection/common/providerConnectionInfo.ts +++ b/src/sql/platform/connection/common/providerConnectionInfo.ts @@ -7,11 +7,11 @@ import { Disposable, dispose, IDisposable } from 'vs/base/common/lifecycle'; import { isString } from 'vs/base/common/types'; import * as azdata from 'azdata'; -import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import * as Constants from 'sql/platform/connection/common/constants'; import { ICapabilitiesService, ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; import { assign } from 'vs/base/common/objects'; import { find } from 'vs/base/common/arrays'; +import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/platform/connection/common/interfaces'; type SettableProperty = 'serverName' | 'authenticationType' | 'databaseName' | 'password' | 'connectionName' | 'userName'; diff --git a/src/sql/platform/connection/test/common/connectionConfig.test.ts b/src/sql/platform/connection/test/common/connectionConfig.test.ts index 15377620b9..1f5dff01f9 100644 --- a/src/sql/platform/connection/test/common/connectionConfig.test.ts +++ b/src/sql/platform/connection/test/common/connectionConfig.test.ts @@ -9,9 +9,8 @@ import { ICapabilitiesService, ProviderFeatures } from 'sql/platform/capabilitie import { ConnectionConfig, ISaveGroupResult } from 'sql/platform/connection/common/connectionConfig'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; -import { IConnectionProfile, IConnectionProfileStore } from 'sql/platform/connection/common/interfaces'; +import { IConnectionProfile, IConnectionProfileStore, ConnectionOptionSpecialType, ServiceOptionType } from 'sql/platform/connection/common/interfaces'; import { TestConfigurationService } from 'sql/platform/connection/test/common/testConfigurationService'; -import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import * as TypeMoq from 'typemoq'; import { Emitter } from 'vs/base/common/event'; diff --git a/src/sql/platform/connection/test/common/connectionProfile.test.ts b/src/sql/platform/connection/test/common/connectionProfile.test.ts index 9bbb5a2d50..712f37eadc 100644 --- a/src/sql/platform/connection/test/common/connectionProfile.test.ts +++ b/src/sql/platform/connection/test/common/connectionProfile.test.ts @@ -4,10 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { IConnectionProfile, IConnectionProfileStore } from 'sql/platform/connection/common/interfaces'; +import { IConnectionProfile, IConnectionProfileStore, ServiceOptionType, ConnectionOptionSpecialType } from 'sql/platform/connection/common/interfaces'; import * as azdata from 'azdata'; import * as assert from 'assert'; -import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { ConnectionProviderProperties } from 'sql/platform/capabilities/common/capabilitiesService'; diff --git a/src/sql/platform/connection/test/common/connectionStore.test.ts b/src/sql/platform/connection/test/common/connectionStore.test.ts index fa88182ad4..0a2dce195a 100644 --- a/src/sql/platform/connection/test/common/connectionStore.test.ts +++ b/src/sql/platform/connection/test/common/connectionStore.test.ts @@ -8,10 +8,9 @@ import * as azdata from 'azdata'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import { ConnectionStore } from 'sql/platform/connection/common/connectionStore'; -import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { IConnectionProfile, ConnectionOptionSpecialType, ServiceOptionType } from 'sql/platform/connection/common/interfaces'; import { TestConfigurationService } from 'sql/platform/connection/test/common/testConfigurationService'; import { TestCredentialsService } from 'sql/platform/credentials/test/common/testCredentialsService'; -import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { deepClone, deepFreeze, assign } from 'vs/base/common/objects'; import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts b/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts index 1e31b04406..e0b385e0ea 100644 --- a/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts +++ b/src/sql/platform/connection/test/common/providerConnectionInfo.test.ts @@ -4,10 +4,9 @@ *--------------------------------------------------------------------------------------------*/ import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; -import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; +import { IConnectionProfile, ConnectionOptionSpecialType, ServiceOptionType } from 'sql/platform/connection/common/interfaces'; import * as azdata from 'azdata'; import * as assert from 'assert'; -import { ConnectionOptionSpecialType, ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { TestCapabilitiesService } from 'sql/platform/capabilities/test/common/testCapabilitiesService'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { assign } from 'vs/base/common/objects'; diff --git a/src/sql/platform/dashboard/browser/insightRegistry.ts b/src/sql/platform/dashboard/browser/insightRegistry.ts index ab00d99a97..2ddd77da9b 100644 --- a/src/sql/platform/dashboard/browser/insightRegistry.ts +++ b/src/sql/platform/dashboard/browser/insightRegistry.ts @@ -2,12 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Type } from '@angular/core'; import * as platform from 'vs/platform/registry/common/platform'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces'; import { values } from 'vs/base/common/collections'; export type InsightIdentifier = string; @@ -62,6 +60,11 @@ export interface ISize { y: number; } +export interface IInsightData { + columns: Array; + rows: Array>; +} + export interface IInsightsView { data: IInsightData; setConfig?: (config: { [key: string]: any }) => void; @@ -70,18 +73,22 @@ export interface IInsightsView { export interface IInsightRegistry { insightSchema: IJSONSchema; - registerInsight(id: string, description: string, schema: IJSONSchema, ctor: Type): InsightIdentifier; + registerInsight(id: string, description: string, schema: IJSONSchema, ctor: IInsightsViewCtor): InsightIdentifier; registerExtensionInsight(id: string, val: IInsightsConfig): void; getRegisteredExtensionInsights(id: string): IInsightsConfig; - getCtorFromId(id: string): Type; - getAllCtors(): Array>; + getCtorFromId(id: string): IInsightsViewCtor; + getAllCtors(): Array; getAllIds(): Array; } +interface IInsightsViewCtor { + new(...args: any[]): IInsightsView; +} + class InsightRegistry implements IInsightRegistry { private _insightSchema: IJSONSchema = { type: 'object', description: nls.localize('schema.dashboardWidgets.InsightsRegistry', "Widget used in the dashboards"), properties: {}, additionalProperties: false }; private _extensionInsights: { [x: string]: IInsightsConfig } = {}; - private _idToCtor: { [x: string]: Type } = {}; + private _idToCtor: { [x: string]: IInsightsViewCtor } = {}; /** * Register a dashboard widget @@ -89,7 +96,7 @@ class InsightRegistry implements IInsightRegistry { * @param description description of the widget * @param schema config schema of the widget */ - public registerInsight(id: string, description: string, schema: IJSONSchema, ctor: Type): InsightIdentifier { + public registerInsight(id: string, description: string, schema: IJSONSchema, ctor: IInsightsViewCtor): InsightIdentifier { this._insightSchema.properties![id] = schema; this._idToCtor[id] = ctor; return id; @@ -103,11 +110,11 @@ class InsightRegistry implements IInsightRegistry { return this._extensionInsights[id]; } - public getCtorFromId(id: string): Type { + public getCtorFromId(id: string): IInsightsViewCtor { return this._idToCtor[id]; } - public getAllCtors(): Array> { + public getAllCtors(): Array { return values(this._idToCtor); } @@ -123,7 +130,7 @@ class InsightRegistry implements IInsightRegistry { const insightRegistry = new InsightRegistry(); platform.Registry.add(Extensions.InsightContribution, insightRegistry); -export function registerInsight(id: string, description: string, schema: IJSONSchema, ctor: Type): InsightIdentifier { +export function registerInsight(id: string, description: string, schema: IJSONSchema, ctor: IInsightsViewCtor): InsightIdentifier { return insightRegistry.registerInsight(id, description, schema, ctor); } diff --git a/src/sql/platform/dashboard/browser/interfaces.ts b/src/sql/platform/dashboard/browser/interfaces.ts new file mode 100644 index 0000000000..21e03a304e --- /dev/null +++ b/src/sql/platform/dashboard/browser/interfaces.ts @@ -0,0 +1,129 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { IDisposable } from 'vs/base/common/lifecycle'; + +export interface IComponentEventArgs { + eventType: ComponentEventType; + args: any; + componentId?: string; +} + +export enum ComponentEventType { + PropertiesChanged, + onDidChange, + onDidClick, + validityChanged, + onMessage, + onSelectedRowChanged, + onComponentCreated, + onCellAction, + onEnterKeyPressed +} + +/** + * Defines a component and can be used to map from the model-backed version of the + * world to the frontend UI; + * + * @export + */ +export interface IComponentDescriptor { + /** + * The type of this component. Used to map to the correct angular selector + * when loading the component + */ + type: string; + /** + * A unique ID for this component + */ + id: string; +} + +export interface IModelStore { + /** + * Creates and saves the reference of a component descriptor. + * This can be used during creation of a component later + */ + createComponentDescriptor(type: string, createComponentDescriptor: string): IComponentDescriptor; + /** + * gets the descriptor for a previously created component ID + */ + getComponentDescriptor(componentId: string): IComponentDescriptor; + registerComponent(component: IComponent): void; + unregisterComponent(component: IComponent): void; + getComponent(componentId: string): IComponent; + /** + * Runs on a component immediately if the component exists, or runs on + * registration of the component otherwise + * + * @param componentId unique identifier of the component + * @param action some action to perform + */ + eventuallyRunOnComponent(componentId: string, action: (component: IComponent) => T): Promise; + /** + * Register a callback that will validate components when given a component ID + */ + registerValidationCallback(callback: (componentId: string) => Thenable): void; + /** + * Run all validations for the given component and return the new validation value + */ + validate(component: IComponent): Thenable; +} + +/** + * An instance of a model-backed component. This will be a UI element + * + * @export + */ +export interface IComponent extends IDisposable { + descriptor: IComponentDescriptor; + modelStore: IModelStore; + layout(): void; + registerEventHandler(handler: (event: IComponentEventArgs) => void): IDisposable; + clearContainer?: () => void; + addToContainer?: (componentDescriptor: IComponentDescriptor, config: any, index?: number) => void; + removeFromContainer?: (componentDescriptor: IComponentDescriptor) => void; + setLayout?: (layout: any) => void; + getHtml: () => any; + setProperties?: (properties: { [key: string]: any; }) => void; + enabled: boolean; + readonly valid?: boolean; + validate(): Thenable; + setDataProvider(handle: number, componentId: string, context: any): void; + refreshDataProvider(item: any): void; + focus(): void; +} + +export enum ModelComponentTypes { + NavContainer, + DivContainer, + FlexContainer, + SplitViewContainer, + Card, + InputBox, + DropDown, + DeclarativeTable, + ListBox, + Button, + CheckBox, + RadioButton, + WebView, + Text, + Table, + DashboardWidget, + DashboardWebview, + Form, + Group, + Toolbar, + LoadingComponent, + TreeComponent, + FileBrowserTree, + Editor, + DiffEditor, + Dom, + Hyperlink, + Image, + RadioCardGroup +} diff --git a/src/sql/platform/dashboard/browser/modelComponentRegistry.ts b/src/sql/platform/dashboard/browser/modelComponentRegistry.ts index 7c01ce2cbd..b4c0f7d467 100644 --- a/src/sql/platform/dashboard/browser/modelComponentRegistry.ts +++ b/src/sql/platform/dashboard/browser/modelComponentRegistry.ts @@ -2,12 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Type } from '@angular/core'; -import { ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes'; import * as platform from 'vs/platform/registry/common/platform'; -import { IComponent } from 'sql/workbench/browser/modelComponents/interfaces'; import { values } from 'vs/base/common/collections'; +import { IComponent, ModelComponentTypes } from 'sql/platform/dashboard/browser/interfaces'; export type ComponentIdentifier = string; @@ -15,20 +13,24 @@ export const Extensions = { ComponentContribution: 'dashboard.contributions.components' }; +interface ComponentCtor { + new(...args: any[]): IComponent; +} + export interface IComponentRegistry { - registerComponentType(id: string, typeMapping: ModelComponentTypes, ctor: Type): ComponentIdentifier; + registerComponentType(id: string, typeMapping: ModelComponentTypes, ctor: ComponentCtor): ComponentIdentifier; getIdForTypeMapping(typeMapping: ModelComponentTypes): string; - getCtorForType(typeMapping: ModelComponentTypes): Type | undefined; - getCtorFromId(id: string): Type; - getAllCtors(): Array>; + getCtorForType(typeMapping: ModelComponentTypes): ComponentCtor | undefined; + getCtorFromId(id: string): ComponentCtor; + getAllCtors(): Array; getAllIds(): Array; } class ComponentRegistry implements IComponentRegistry { - private _idToCtor: { [x: string]: Type } = {}; + private _idToCtor: { [x: string]: ComponentCtor } = {}; private _typeNameToId: { [x: string]: string } = {}; - registerComponentType(id: string, typeMapping: ModelComponentTypes, ctor: Type): string { + registerComponentType(id: string, typeMapping: ModelComponentTypes, ctor: ComponentCtor): string { this._idToCtor[id] = ctor; this._typeNameToId[ModelComponentTypes[typeMapping]] = id; return id; @@ -38,15 +40,15 @@ class ComponentRegistry implements IComponentRegistry { return this._typeNameToId[ModelComponentTypes[typeMapping]]; } - public getCtorForType(typeMapping: ModelComponentTypes): Type | undefined { + public getCtorForType(typeMapping: ModelComponentTypes): ComponentCtor | undefined { let id = this.getIdForTypeMapping(typeMapping); return id ? this._idToCtor[id] : undefined; } - public getCtorFromId(id: string): Type { + public getCtorFromId(id: string): ComponentCtor { return this._idToCtor[id]; } - public getAllCtors(): Array> { + public getAllCtors(): Array { return values(this._idToCtor); } @@ -59,6 +61,6 @@ class ComponentRegistry implements IComponentRegistry { const componentRegistry = new ComponentRegistry(); platform.Registry.add(Extensions.ComponentContribution, componentRegistry); -export function registerComponentType(id: string, typeMapping: ModelComponentTypes, ctor: Type): ComponentIdentifier { +export function registerComponentType(id: string, typeMapping: ModelComponentTypes, ctor: ComponentCtor): ComponentIdentifier { return componentRegistry.registerComponentType(id, typeMapping, ctor); } diff --git a/src/sql/platform/model/browser/modelViewService.ts b/src/sql/platform/model/browser/modelViewService.ts index d6456dfe7f..d25d5d658c 100644 --- a/src/sql/platform/model/browser/modelViewService.ts +++ b/src/sql/platform/model/browser/modelViewService.ts @@ -4,9 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import * as azdata from 'azdata'; -import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IComponentEventArgs } from 'sql/workbench/browser/modelComponents/interfaces'; import { Event } from 'vs/base/common/event'; +import { IComponentEventArgs, ModelComponentTypes } from 'sql/platform/dashboard/browser/interfaces'; export interface IView { readonly id: string; @@ -14,6 +13,19 @@ export interface IView { readonly serverInfo: azdata.ServerInfo; } +export interface IComponentShape { + type: ModelComponentTypes; + id: string; + properties?: { [key: string]: any }; + layout?: any; + itemConfigs?: IItemConfig[]; +} + +export interface IItemConfig { + componentShape: IComponentShape; + config: any; +} + export interface IModelViewEventArgs extends IComponentEventArgs { isRootComponent: boolean; } diff --git a/src/sql/platform/theme/common/styler.ts b/src/sql/platform/theme/common/styler.ts index b86a5137e8..0f76f6731e 100644 --- a/src/sql/platform/theme/common/styler.ts +++ b/src/sql/platform/theme/common/styler.ts @@ -9,23 +9,8 @@ import { IThemeService } from 'vs/platform/theme/common/themeService'; import * as cr from 'vs/platform/theme/common/colorRegistry'; import { attachStyler } from 'vs/platform/theme/common/styler'; import { IDisposable } from 'vs/base/common/lifecycle'; -import { SIDE_BAR_BACKGROUND, SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, PANEL_INACTIVE_TITLE_FOREGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND } from 'vs/workbench/common/theme'; import { IThemable } from 'vs/base/common/styler'; -export function attachModalDialogStyler(widget: IThemable, themeService: IThemeService, style?: - { - dialogForeground?: cr.ColorIdentifier, - dialogHeaderAndFooterBackground?: cr.ColorIdentifier, - dialogBodyBackground?: cr.ColorIdentifier, - }): IDisposable { - return attachStyler(themeService, { - dialogForeground: (style && style.dialogForeground) || cr.foreground, - dialogBorder: cr.contrastBorder, - dialogHeaderAndFooterBackground: (style && style.dialogHeaderAndFooterBackground) || SIDE_BAR_BACKGROUND, - dialogBodyBackground: (style && style.dialogBodyBackground) || cr.editorBackground - }, widget); -} - export function attachDropdownStyler(widget: IThemable, themeService: IThemeService, style?: { backgroundColor?: cr.ColorIdentifier, @@ -270,22 +255,3 @@ export function attachCheckboxStyler(widget: IThemable, themeService: IThemeServ disabledCheckboxForeground: (style && style.disabledCheckboxForeground) || sqlcolors.disabledCheckboxForeground }, widget); } - -export function attachPanelStyler(widget: IThemable, themeService: IThemeService) { - return attachStyler(themeService, { - headerForeground: SIDE_BAR_SECTION_HEADER_FOREGROUND, - headerBackground: SIDE_BAR_SECTION_HEADER_BACKGROUND, - // headerHighContrastBorder: index === 0 ? null : contrastBorder, - dropBackground: SIDE_BAR_DRAG_AND_DROP_BACKGROUND - }, widget); -} - -export function attachTabbedPanelStyler(widget: IThemable, themeService: IThemeService) { - return attachStyler(themeService, { - titleActiveForeground: PANEL_ACTIVE_TITLE_FOREGROUND, - titleActiveBorder: PANEL_ACTIVE_TITLE_BORDER, - titleInactiveForeground: PANEL_INACTIVE_TITLE_FOREGROUND, - focusBorder: cr.focusBorder, - outline: cr.activeContrastBorder - }, widget); -} diff --git a/src/sql/workbench/api/browser/mainThreadBackgroundTaskManagement.ts b/src/sql/workbench/api/browser/mainThreadBackgroundTaskManagement.ts index 1773e09b24..12829f3d85 100644 --- a/src/sql/workbench/api/browser/mainThreadBackgroundTaskManagement.ts +++ b/src/sql/workbench/api/browser/mainThreadBackgroundTaskManagement.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ITaskService } from 'sql/platform/tasks/common/tasksService'; +import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService'; import { MainThreadBackgroundTaskManagementShape, SqlMainContext, ExtHostBackgroundTaskManagementShape, SqlExtHostContext } from 'sql/workbench/api/common/sqlExtHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; diff --git a/src/sql/workbench/api/browser/mainThreadDataProtocol.ts b/src/sql/workbench/api/browser/mainThreadDataProtocol.ts index 9d97bc391e..e040cfed9f 100644 --- a/src/sql/workbench/api/browser/mainThreadDataProtocol.ts +++ b/src/sql/workbench/api/browser/mainThreadDataProtocol.ts @@ -10,19 +10,19 @@ import { } from 'sql/workbench/api/common/sqlExtHost.protocol'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import * as azdata from 'azdata'; import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IObjectExplorerService, NodeExpandInfoWithProviderId } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; import { IBackupService } from 'sql/platform/backup/common/backupService'; -import { IRestoreService } from 'sql/platform/restore/common/restoreService'; -import { ITaskService } from 'sql/platform/tasks/common/tasksService'; +import { IRestoreService } from 'sql/workbench/services/restore/common/restoreService'; +import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService'; import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; import { ISerializationService } from 'sql/platform/serialization/common/serializationService'; -import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; +import { IFileBrowserService } from 'sql/workbench/services/fileBrowser/common/interfaces'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; import { extHostNamedCustomer } from 'vs/workbench/api/common/extHostCustomers'; import { assign } from 'vs/base/common/objects'; diff --git a/src/sql/workbench/api/browser/mainThreadQueryEditor.ts b/src/sql/workbench/api/browser/mainThreadQueryEditor.ts index 0b77ffb937..8dc2ad3c6b 100644 --- a/src/sql/workbench/api/browser/mainThreadQueryEditor.ts +++ b/src/sql/workbench/api/browser/mainThreadQueryEditor.ts @@ -10,9 +10,9 @@ import { IConnectionManagementService, IConnectionCompletionOptions, ConnectionT import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import * as azdata from 'azdata'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ILogService } from 'vs/platform/log/common/log'; diff --git a/src/sql/workbench/api/browser/mainThreadTasks.ts b/src/sql/workbench/api/browser/mainThreadTasks.ts index 46d68696c9..ce6b105889 100644 --- a/src/sql/workbench/api/browser/mainThreadTasks.ts +++ b/src/sql/workbench/api/browser/mainThreadTasks.ts @@ -17,7 +17,7 @@ import { import { IConnectionProfile } from 'azdata'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { TaskRegistry } from 'sql/platform/tasks/browser/tasksRegistry'; +import { TaskRegistry } from 'sql/workbench/services/tasks/browser/tasksRegistry'; @extHostNamedCustomer(SqlMainContext.MainThreadTasks) export class MainThreadTasks implements MainThreadTasksShape { diff --git a/src/sql/workbench/api/common/extHostQueryEditor.ts b/src/sql/workbench/api/common/extHostQueryEditor.ts index 0d2c560e8d..e3be3e9d6b 100644 --- a/src/sql/workbench/api/common/extHostQueryEditor.ts +++ b/src/sql/workbench/api/common/extHostQueryEditor.ts @@ -6,7 +6,7 @@ import { IMainContext } from 'vs/workbench/api/common/extHost.protocol'; import { ExtHostQueryEditorShape, SqlMainContext, MainThreadQueryEditorShape } from 'sql/workbench/api/common/sqlExtHost.protocol'; import * as azdata from 'azdata'; -import { IQueryEvent } from 'sql/platform/query/common/queryModel'; +import { IQueryEvent } from 'sql/workbench/services/query/common/queryModel'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; class ExtHostQueryDocument implements azdata.queryeditor.QueryDocument { diff --git a/src/sql/workbench/api/common/extHostTasks.ts b/src/sql/workbench/api/common/extHostTasks.ts index 79b0c2056d..b2c682ddc9 100644 --- a/src/sql/workbench/api/common/extHostTasks.ts +++ b/src/sql/workbench/api/common/extHostTasks.ts @@ -10,7 +10,7 @@ import * as extHostTypes from 'vs/workbench/api/common/extHostTypes'; import * as azdata from 'azdata'; -import { ITaskHandlerDescription } from 'sql/platform/tasks/common/tasks'; +import { ITaskHandlerDescription } from 'sql/workbench/services/tasks/common/tasks'; import { SqlMainContext, MainThreadTasksShape, ExtHostTasksShape } from 'sql/workbench/api/common/sqlExtHost.protocol'; interface TaskHandler { diff --git a/src/sql/workbench/api/common/sqlExtHost.protocol.ts b/src/sql/workbench/api/common/sqlExtHost.protocol.ts index 39e7b7dc11..cdaabf4b3e 100644 --- a/src/sql/workbench/api/common/sqlExtHost.protocol.ts +++ b/src/sql/workbench/api/common/sqlExtHost.protocol.ts @@ -15,7 +15,7 @@ import * as azdata from 'azdata'; import * as vscode from 'vscode'; import { ITreeComponentItem } from 'sql/workbench/common/views'; -import { ITaskHandlerDescription } from 'sql/platform/tasks/common/tasks'; +import { ITaskHandlerDescription } from 'sql/workbench/services/tasks/common/tasks'; import { IItemConfig, IComponentShape, IModelViewDialogDetails, IModelViewTabDetails, IModelViewButtonDetails, IModelViewWizardDetails, IModelViewWizardPageDetails, INotebookManagerDetails, INotebookSessionDetails, @@ -25,7 +25,7 @@ import { import { EditorViewColumn } from 'vs/workbench/api/common/shared/editor'; import { IUndoStopOptions } from 'vs/workbench/api/common/extHost.protocol'; import { IExtensionDescription } from 'vs/platform/extensions/common/extensions'; -import { IQueryEvent } from 'sql/platform/query/common/queryModel'; +import { IQueryEvent } from 'sql/workbench/services/query/common/queryModel'; export abstract class ExtHostAccountManagementShape { $autoOAuthCancelled(handle: number): Thenable { throw ni(); } diff --git a/src/sql/workbench/browser/actions.ts b/src/sql/workbench/browser/actions.ts index 2a5e8dcd0d..bd43ab80a8 100644 --- a/src/sql/workbench/browser/actions.ts +++ b/src/sql/workbench/browser/actions.ts @@ -7,7 +7,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/browser/angularEventingService'; import { IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; -import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; +import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry'; import { ObjectMetadata } from 'azdata'; diff --git a/src/sql/workbench/browser/modal/optionsDialog.ts b/src/sql/workbench/browser/modal/optionsDialog.ts index 32897cbe27..01f780572f 100644 --- a/src/sql/workbench/browser/modal/optionsDialog.ts +++ b/src/sql/workbench/browser/modal/optionsDialog.ts @@ -8,7 +8,7 @@ import * as DialogHelper from './dialogHelper'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { IModalOptions, Modal } from './modal'; import * as OptionsDialogHelper from './optionsDialogHelper'; -import { attachButtonStyler, attachModalDialogStyler, attachPanelStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ScrollableSplitView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview'; @@ -34,6 +34,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer'; +import { attachModalDialogStyler, attachPanelStyler } from 'sql/workbench/common/styler'; import { IViewDescriptorService } from 'vs/workbench/common/views'; export class CategoryView extends ViewPane { diff --git a/src/sql/workbench/browser/modelComponents/button.component.ts b/src/sql/workbench/browser/modelComponents/button.component.ts index fad48121f6..0637096625 100644 --- a/src/sql/workbench/browser/modelComponents/button.component.ts +++ b/src/sql/workbench/browser/modelComponents/button.component.ts @@ -11,7 +11,6 @@ import { import * as azdata from 'azdata'; import { ComponentWithIconBase } from 'sql/workbench/browser/modelComponents/componentWithIconBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { SIDE_BAR_BACKGROUND, SIDE_BAR_TITLE_FOREGROUND } from 'vs/workbench/common/theme'; @@ -19,6 +18,7 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work import { focusBorder, foreground } from 'vs/platform/theme/common/colorRegistry'; import { Button } from 'sql/base/browser/ui/button/button'; import { Color } from 'vs/base/common/color'; +import { IComponentDescriptor, IComponent, IModelStore, ComponentEventType } from 'sql/platform/dashboard/browser/interfaces'; @Component({ selector: 'modelview-button', diff --git a/src/sql/workbench/browser/modelComponents/card.component.ts b/src/sql/workbench/browser/modelComponents/card.component.ts index f0ea0e6346..34232ed973 100644 --- a/src/sql/workbench/browser/modelComponents/card.component.ts +++ b/src/sql/workbench/browser/modelComponents/card.component.ts @@ -14,11 +14,11 @@ import * as colors from 'vs/platform/theme/common/colorRegistry'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { ComponentWithIconBase } from 'sql/workbench/browser/modelComponents/componentWithIconBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; -import { StatusIndicator, CardProperties, ActionDescriptor, CardDescriptionItem } from 'sql/workbench/api/common/sqlExtHostTypes'; +import { StatusIndicator, CardProperties, ActionDescriptor, CardDescriptionItem, ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; import * as DOM from 'vs/base/browser/dom'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; @Component({ templateUrl: decodeURI(require.toUrl('./card.component.html')) diff --git a/src/sql/workbench/browser/modelComponents/checkbox.component.ts b/src/sql/workbench/browser/modelComponents/checkbox.component.ts index 908bae4c2e..560ba1e51a 100644 --- a/src/sql/workbench/browser/modelComponents/checkbox.component.ts +++ b/src/sql/workbench/browser/modelComponents/checkbox.component.ts @@ -11,10 +11,11 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { Checkbox, ICheckboxOptions } from 'sql/base/browser/ui/checkbox/checkbox'; import { attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ selector: 'modelview-checkbox', diff --git a/src/sql/workbench/browser/modelComponents/componentBase.ts b/src/sql/workbench/browser/modelComponents/componentBase.ts index 3297064a7b..ffe4240a14 100644 --- a/src/sql/workbench/browser/modelComponents/componentBase.ts +++ b/src/sql/workbench/browser/modelComponents/componentBase.ts @@ -10,7 +10,6 @@ import { import * as types from 'vs/base/common/types'; -import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import * as azdata from 'azdata'; import { Emitter } from 'vs/base/common/event'; import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; @@ -21,6 +20,8 @@ import { EventType, addDisposableListener } from 'vs/base/browser/dom'; import { IKeyboardEvent, StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { endsWith } from 'vs/base/common/strings'; import { firstIndex } from 'vs/base/common/arrays'; +import { IComponentDescriptor, IComponent, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { IComponentEventArgs, ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; export type IUserFriendlyIcon = string | URI | { light: string | URI; dark: string | URI }; diff --git a/src/sql/workbench/browser/modelComponents/componentWithIconBase.ts b/src/sql/workbench/browser/modelComponents/componentWithIconBase.ts index 9334f02529..8660bee33f 100644 --- a/src/sql/workbench/browser/modelComponents/componentWithIconBase.ts +++ b/src/sql/workbench/browser/modelComponents/componentWithIconBase.ts @@ -7,9 +7,9 @@ import { ChangeDetectorRef, ElementRef } from '@angular/core'; import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; import { createIconCssClass, IUserFriendlyIcon } from 'sql/workbench/browser/modelComponents/iconUtils'; -import { IComponentDescriptor } from 'sql/workbench/browser/modelComponents/interfaces'; import { removeCSSRulesContainingSelector } from 'vs/base/browser/dom'; import { URI } from 'vs/base/common/uri'; +import { IComponentDescriptor } from 'sql/platform/dashboard/browser/interfaces'; export class ItemDescriptor { constructor(public descriptor: IComponentDescriptor, public config: T) { } diff --git a/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts b/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts index edb81433e1..7a8c3ee17a 100644 --- a/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts +++ b/src/sql/workbench/browser/modelComponents/declarativeTable.component.ts @@ -12,10 +12,11 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox'; import { find } from 'vs/base/common/arrays'; import { localize } from 'vs/nls'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; export enum DeclarativeDataType { string = 'string', diff --git a/src/sql/workbench/browser/modelComponents/diffeditor.component.ts b/src/sql/workbench/browser/modelComponents/diffeditor.component.ts index d4906533c2..cb4900acb2 100644 --- a/src/sql/workbench/browser/modelComponents/diffeditor.component.ts +++ b/src/sql/workbench/browser/modelComponents/diffeditor.component.ts @@ -16,7 +16,6 @@ import { IModeService } from 'vs/editor/common/services/modeService'; import { IModelService } from 'vs/editor/common/services/modelService'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { TextDiffEditor } from 'vs/workbench/browser/parts/editor/textDiffEditor'; import { DiffEditorInput } from 'vs/workbench/common/editor/diffEditorInput'; import { TextDiffEditorModel } from 'vs/workbench/common/editor/textDiffEditorModel'; @@ -26,6 +25,7 @@ import { ITextModel } from 'vs/editor/common/model'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { SimpleProgressIndicator } from 'sql/workbench/services/progress/browser/simpleProgressIndicator'; import { IEditorProgressService } from 'vs/platform/progress/common/progress'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; @Component({ template: ` diff --git a/src/sql/workbench/browser/modelComponents/divContainer.component.ts b/src/sql/workbench/browser/modelComponents/divContainer.component.ts index 84f8b643cc..7bfb812a5c 100644 --- a/src/sql/workbench/browser/modelComponents/divContainer.component.ts +++ b/src/sql/workbench/browser/modelComponents/divContainer.component.ts @@ -9,13 +9,14 @@ import { ViewChild, ElementRef, OnDestroy, } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import * as azdata from 'azdata'; import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; +import { IComponentDescriptor, IComponent, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; class DivItem { constructor(public descriptor: IComponentDescriptor, public config: azdata.DivItemLayout) { } diff --git a/src/sql/workbench/browser/modelComponents/dom.component.ts b/src/sql/workbench/browser/modelComponents/dom.component.ts index 85e0f68302..5005aa8e16 100644 --- a/src/sql/workbench/browser/modelComponents/dom.component.ts +++ b/src/sql/workbench/browser/modelComponents/dom.component.ts @@ -14,7 +14,7 @@ import * as azdata from 'azdata'; import * as DOM from 'vs/base/browser/dom'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; @Component({ template: '', diff --git a/src/sql/workbench/browser/modelComponents/dropdown.component.ts b/src/sql/workbench/browser/modelComponents/dropdown.component.ts index 693849d5d6..2620264eb8 100644 --- a/src/sql/workbench/browser/modelComponents/dropdown.component.ts +++ b/src/sql/workbench/browser/modelComponents/dropdown.component.ts @@ -11,7 +11,6 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { Dropdown, IDropdownOptions } from 'sql/base/parts/editableDropdown/browser/dropdown'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachEditableDropdownStyler } from 'sql/platform/theme/common/styler'; @@ -21,6 +20,8 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { find } from 'vs/base/common/arrays'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ selector: 'modelview-dropdown', diff --git a/src/sql/workbench/browser/modelComponents/editor.component.ts b/src/sql/workbench/browser/modelComponents/editor.component.ts index e77d3496bf..4a3ba80ca9 100644 --- a/src/sql/workbench/browser/modelComponents/editor.component.ts +++ b/src/sql/workbench/browser/modelComponents/editor.component.ts @@ -17,13 +17,14 @@ import { IModeService } from 'vs/editor/common/services/modeService'; import { IModelService } from 'vs/editor/common/services/modelService'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { QueryTextEditor } from 'sql/workbench/browser/modelComponents/queryTextEditor'; import { ILogService } from 'vs/platform/log/common/log'; import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { IEditorProgressService } from 'vs/platform/progress/common/progress'; import { SimpleProgressIndicator } from 'sql/workbench/services/progress/browser/simpleProgressIndicator'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ template: '', diff --git a/src/sql/workbench/browser/modelComponents/fileBrowserTree.component.ts b/src/sql/workbench/browser/modelComponents/fileBrowserTree.component.ts index 9dfd792126..a3c953acda 100644 --- a/src/sql/workbench/browser/modelComponents/fileBrowserTree.component.ts +++ b/src/sql/workbench/browser/modelComponents/fileBrowserTree.component.ts @@ -10,11 +10,12 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { FileBrowserViewModel } from 'sql/workbench/services/fileBrowser/common/fileBrowserViewModel'; import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { FileBrowserTreeView } from 'sql/workbench/services/fileBrowser/browser/fileBrowserTreeView'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ selector: 'modelview-fileBrowserTree', diff --git a/src/sql/workbench/browser/modelComponents/flexContainer.component.ts b/src/sql/workbench/browser/modelComponents/flexContainer.component.ts index 8add3ef9f9..0c821ac342 100644 --- a/src/sql/workbench/browser/modelComponents/flexContainer.component.ts +++ b/src/sql/workbench/browser/modelComponents/flexContainer.component.ts @@ -9,10 +9,10 @@ import { ElementRef, OnDestroy } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { FlexLayout, FlexItemLayout } from 'azdata'; import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase'; +import { IComponentDescriptor, IComponent, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; export class FlexItem { constructor(public descriptor: IComponentDescriptor, public config: FlexItemLayout) { } diff --git a/src/sql/workbench/browser/modelComponents/formContainer.component.ts b/src/sql/workbench/browser/modelComponents/formContainer.component.ts index faa1512d19..a34888a06a 100644 --- a/src/sql/workbench/browser/modelComponents/formContainer.component.ts +++ b/src/sql/workbench/browser/modelComponents/formContainer.component.ts @@ -9,11 +9,11 @@ import { ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { FormLayout, FormItemLayout } from 'azdata'; import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase'; import { find } from 'vs/base/common/arrays'; +import { IComponentDescriptor, IComponent, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; export interface TitledFormItemLayout { title: string; diff --git a/src/sql/workbench/browser/modelComponents/groupContainer.component.ts b/src/sql/workbench/browser/modelComponents/groupContainer.component.ts index 0563e5e9e9..65e200ad38 100644 --- a/src/sql/workbench/browser/modelComponents/groupContainer.component.ts +++ b/src/sql/workbench/browser/modelComponents/groupContainer.component.ts @@ -9,7 +9,6 @@ import { ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { GroupLayout, GroupContainerProperties } from 'azdata'; import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase'; @@ -17,6 +16,7 @@ import { endsWith } from 'vs/base/common/strings'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; import * as DOM from 'vs/base/browser/dom'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; @Component({ selector: 'modelview-groupContainer', diff --git a/src/sql/workbench/browser/modelComponents/hyperlink.component.ts b/src/sql/workbench/browser/modelComponents/hyperlink.component.ts index d86d97ca0c..dc190573e0 100644 --- a/src/sql/workbench/browser/modelComponents/hyperlink.component.ts +++ b/src/sql/workbench/browser/modelComponents/hyperlink.component.ts @@ -10,8 +10,9 @@ import { import * as azdata from 'azdata'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { TitledComponent } from 'sql/workbench/browser/modelComponents/titledComponent'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ selector: 'modelview-hyperlink', diff --git a/src/sql/workbench/browser/modelComponents/image.component.ts b/src/sql/workbench/browser/modelComponents/image.component.ts index 3d0f73b2d2..bea9eeb38d 100644 --- a/src/sql/workbench/browser/modelComponents/image.component.ts +++ b/src/sql/workbench/browser/modelComponents/image.component.ts @@ -9,8 +9,9 @@ import { } from '@angular/core'; import * as DOM from 'vs/base/browser/dom'; -import { IComponent, IComponentDescriptor, IModelStore, ITitledComponent } from 'sql/workbench/browser/modelComponents/interfaces'; +import { ITitledComponent } from 'sql/workbench/browser/modelComponents/interfaces'; import { ComponentWithIconBase } from 'sql/workbench/browser/modelComponents/componentWithIconBase'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; @Component({ selector: 'modelview-image', diff --git a/src/sql/workbench/browser/modelComponents/inputbox.component.ts b/src/sql/workbench/browser/modelComponents/inputbox.component.ts index 1247069345..e245392b4d 100644 --- a/src/sql/workbench/browser/modelComponents/inputbox.component.ts +++ b/src/sql/workbench/browser/modelComponents/inputbox.component.ts @@ -11,7 +11,6 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { attachInputBoxStyler } from 'sql/platform/theme/common/styler'; @@ -24,6 +23,8 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; import * as DOM from 'vs/base/browser/dom'; import { assign } from 'vs/base/common/objects'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ selector: 'modelview-inputBox', diff --git a/src/sql/workbench/browser/modelComponents/interfaces.ts b/src/sql/workbench/browser/modelComponents/interfaces.ts index 2e428d49e0..2506e5cb88 100644 --- a/src/sql/workbench/browser/modelComponents/interfaces.ts +++ b/src/sql/workbench/browser/modelComponents/interfaces.ts @@ -2,33 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { InjectionToken } from '@angular/core'; - -import { IDisposable } from 'vs/base/common/lifecycle'; - -/** - * An instance of a model-backed component. This will be a UI element - * - * @export - */ -export interface IComponent extends IDisposable { - descriptor: IComponentDescriptor; - modelStore: IModelStore; - layout(): void; - registerEventHandler(handler: (event: IComponentEventArgs) => void): IDisposable; - clearContainer?: () => void; - addToContainer?: (componentDescriptor: IComponentDescriptor, config: any, index?: number) => void; - removeFromContainer?: (componentDescriptor: IComponentDescriptor) => void; - setLayout?: (layout: any) => void; - getHtml: () => any; - setProperties?: (properties: { [key: string]: any; }) => void; - enabled: boolean; - readonly valid?: boolean; - validate(): Thenable; - setDataProvider(handle: number, componentId: string, context: any): void; - refreshDataProvider(item: any): void; - focus(): void; -} +import { IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; export const COMPONENT_CONFIG = new InjectionToken('component_config'); @@ -37,73 +13,6 @@ export interface IComponentConfig { modelStore: IModelStore; } -/** - * Defines a component and can be used to map from the model-backed version of the - * world to the frontend UI; - * - * @export - */ -export interface IComponentDescriptor { - /** - * The type of this component. Used to map to the correct angular selector - * when loading the component - */ - type: string; - /** - * A unique ID for this component - */ - id: string; -} - -export interface IComponentEventArgs { - eventType: ComponentEventType; - args: any; - componentId?: string; -} - -export enum ComponentEventType { - PropertiesChanged, - onDidChange, - onDidClick, - validityChanged, - onMessage, - onSelectedRowChanged, - onComponentCreated, - onCellAction, - onEnterKeyPressed -} - -export interface IModelStore { - /** - * Creates and saves the reference of a component descriptor. - * This can be used during creation of a component later - */ - createComponentDescriptor(type: string, createComponentDescriptor: string): IComponentDescriptor; - /** - * gets the descriptor for a previously created component ID - */ - getComponentDescriptor(componentId: string): IComponentDescriptor; - registerComponent(component: IComponent): void; - unregisterComponent(component: IComponent): void; - getComponent(componentId: string): IComponent; - /** - * Runs on a component immediately if the component exists, or runs on - * registration of the component otherwise - * - * @param componentId unique identifier of the component - * @param action some action to perform - */ - eventuallyRunOnComponent(componentId: string, action: (component: IComponent) => T): Promise; - /** - * Register a callback that will validate components when given a component ID - */ - registerValidationCallback(callback: (componentId: string) => Thenable): void; - /** - * Run all validations for the given component and return the new validation value - */ - validate(component: IComponent): Thenable; -} - export interface ITitledComponent { title?: string; } diff --git a/src/sql/workbench/browser/modelComponents/listbox.component.ts b/src/sql/workbench/browser/modelComponents/listbox.component.ts index 1ecf3d8b64..5a345e25e2 100644 --- a/src/sql/workbench/browser/modelComponents/listbox.component.ts +++ b/src/sql/workbench/browser/modelComponents/listbox.component.ts @@ -11,7 +11,6 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { ListBox } from 'sql/base/browser/ui/listBox/listBox'; import { attachListBoxStyler } from 'sql/platform/theme/common/styler'; @@ -19,6 +18,8 @@ import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/work import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { KeyCode } from 'vs/base/common/keyCodes'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ selector: 'modelview-listBox', diff --git a/src/sql/workbench/browser/modelComponents/loadingComponent.component.ts b/src/sql/workbench/browser/modelComponents/loadingComponent.component.ts index 54f0ab72c8..e2b91e8db6 100644 --- a/src/sql/workbench/browser/modelComponents/loadingComponent.component.ts +++ b/src/sql/workbench/browser/modelComponents/loadingComponent.component.ts @@ -11,8 +11,8 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { localize } from 'vs/nls'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; @Component({ selector: 'modelview-loadingComponent', diff --git a/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts b/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts index cf678f86c1..f65ef96fc0 100644 --- a/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts +++ b/src/sql/workbench/browser/modelComponents/modelComponentWrapper.component.ts @@ -10,7 +10,7 @@ import { import { ComponentHostDirective } from 'sql/workbench/contrib/dashboard/browser/core/componentHost.directive'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; -import { IComponent, IComponentConfig, IComponentDescriptor, IModelStore, COMPONENT_CONFIG } from './interfaces'; +import { IComponentConfig, COMPONENT_CONFIG } from './interfaces'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry'; import * as colors from 'vs/platform/theme/common/colorRegistry'; @@ -23,6 +23,7 @@ import { LayoutRequestParams } from 'sql/workbench/services/dialog/browser/dialo import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; import { ILogService } from 'vs/platform/log/common/log'; import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; +import { IComponentDescriptor, IModelStore, IComponent } from 'sql/platform/dashboard/browser/interfaces'; const componentRegistry = Registry.as(Extensions.ComponentContribution); diff --git a/src/sql/workbench/browser/modelComponents/modelStore.ts b/src/sql/workbench/browser/modelComponents/modelStore.ts index c6d31ef256..a278ec4076 100644 --- a/src/sql/workbench/browser/modelComponents/modelStore.ts +++ b/src/sql/workbench/browser/modelComponents/modelStore.ts @@ -3,10 +3,10 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IModelStore, IComponentDescriptor, IComponent } from './interfaces'; import { Deferred } from 'sql/base/common/promise'; import { entries } from 'sql/base/common/collections'; import { find } from 'vs/base/common/arrays'; +import { IComponentDescriptor, IModelStore, IComponent } from 'sql/platform/dashboard/browser/interfaces'; class ComponentDescriptor implements IComponentDescriptor { constructor(public readonly id: string, public readonly type: string) { diff --git a/src/sql/workbench/browser/modelComponents/radioButton.component.ts b/src/sql/workbench/browser/modelComponents/radioButton.component.ts index d394ebc29a..a679d1394a 100644 --- a/src/sql/workbench/browser/modelComponents/radioButton.component.ts +++ b/src/sql/workbench/browser/modelComponents/radioButton.component.ts @@ -12,8 +12,9 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { RadioButton } from 'sql/base/browser/ui/radioButton/radioButton'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ selector: 'modelview-radioButton', diff --git a/src/sql/workbench/browser/modelComponents/radioCardGroup.component.ts b/src/sql/workbench/browser/modelComponents/radioCardGroup.component.ts index 523d9e872f..cd8452cb94 100644 --- a/src/sql/workbench/browser/modelComponents/radioCardGroup.component.ts +++ b/src/sql/workbench/browser/modelComponents/radioCardGroup.component.ts @@ -6,11 +6,12 @@ import { ChangeDetectorRef, Component, ElementRef, forwardRef, Inject, Input, On import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; import { createIconCssClass } from 'sql/workbench/browser/modelComponents/iconUtils'; -import { ComponentEventType, IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import * as DOM from 'vs/base/browser/dom'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; import 'vs/css!./media/card'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; +import { ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ templateUrl: decodeURI(require.toUrl('./radioCardGroup.component.html')) diff --git a/src/sql/workbench/browser/modelComponents/splitviewContainer.component.ts b/src/sql/workbench/browser/modelComponents/splitviewContainer.component.ts index 512f7fff8b..da44e88185 100644 --- a/src/sql/workbench/browser/modelComponents/splitviewContainer.component.ts +++ b/src/sql/workbench/browser/modelComponents/splitviewContainer.component.ts @@ -6,12 +6,12 @@ import 'vs/css!./media/flexContainer'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { FlexItemLayout, SplitViewLayout } from 'azdata'; import { FlexItem } from './flexContainer.component'; import { ContainerBase, ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; import { Event } from 'vs/base/common/event'; import { SplitView, Orientation, Sizing, IView } from 'vs/base/browser/ui/splitview/splitview'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; class SplitPane implements IView { orientation: Orientation; diff --git a/src/sql/workbench/browser/modelComponents/table.component.ts b/src/sql/workbench/browser/modelComponents/table.component.ts index fa80e00585..92861ba1d5 100644 --- a/src/sql/workbench/browser/modelComponents/table.component.ts +++ b/src/sql/workbench/browser/modelComponents/table.component.ts @@ -10,10 +10,9 @@ import { } from '@angular/core'; import * as azdata from 'azdata'; -import { ColumnSizingMode } from 'sql/workbench/api/common/sqlExtHostTypes'; +import { ColumnSizingMode, ComponentEventType } from 'sql/workbench/api/common/sqlExtHostTypes'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; @@ -27,6 +26,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { slickGridDataItemColumnValueWithNoData, textFormatter } from 'sql/base/browser/ui/table/formatters'; import { isUndefinedOrNull } from 'vs/base/common/types'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; @Component({ selector: 'modelview-table', diff --git a/src/sql/workbench/browser/modelComponents/text.component.ts b/src/sql/workbench/browser/modelComponents/text.component.ts index e74d91695c..149b8bc04b 100644 --- a/src/sql/workbench/browser/modelComponents/text.component.ts +++ b/src/sql/workbench/browser/modelComponents/text.component.ts @@ -11,9 +11,9 @@ import { import * as azdata from 'azdata'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { SafeHtml, DomSanitizer } from '@angular/platform-browser'; import { TitledComponent } from 'sql/workbench/browser/modelComponents/titledComponent'; +import { IComponentDescriptor, IComponent, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; @Component({ selector: 'modelview-text', diff --git a/src/sql/workbench/browser/modelComponents/toolbarContainer.component.ts b/src/sql/workbench/browser/modelComponents/toolbarContainer.component.ts index 4dddd4287d..80032844f9 100644 --- a/src/sql/workbench/browser/modelComponents/toolbarContainer.component.ts +++ b/src/sql/workbench/browser/modelComponents/toolbarContainer.component.ts @@ -11,9 +11,8 @@ import { import { Orientation, ToolbarLayout } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; - import { ContainerBase } from 'sql/workbench/browser/modelComponents/componentBase'; +import { IComponentDescriptor, IComponent, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; export interface ToolbarItemConfig { title?: string; diff --git a/src/sql/workbench/browser/modelComponents/tree.component.ts b/src/sql/workbench/browser/modelComponents/tree.component.ts index 1aa3acae86..863efda9aa 100644 --- a/src/sql/workbench/browser/modelComponents/tree.component.ts +++ b/src/sql/workbench/browser/modelComponents/tree.component.ts @@ -12,7 +12,6 @@ import { import * as azdata from 'azdata'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/browser/modelComponents/interfaces'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { TreeComponentRenderer } from 'sql/workbench/browser/modelComponents/treeComponentRenderer'; import { TreeComponentDataSource } from 'sql/workbench/browser/modelComponents/treeDataSource'; @@ -26,6 +25,7 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; import { values } from 'vs/base/common/collections'; import { IThemeService } from 'vs/platform/theme/common/themeService'; +import { IComponentDescriptor, IComponent, IModelStore } from 'sql/platform/dashboard/browser/interfaces'; class Root implements ITreeComponentItem { label = { diff --git a/src/sql/workbench/browser/modelComponents/viewBase.ts b/src/sql/workbench/browser/modelComponents/viewBase.ts index 2010c33abc..0273db6e55 100644 --- a/src/sql/workbench/browser/modelComponents/viewBase.ts +++ b/src/sql/workbench/browser/modelComponents/viewBase.ts @@ -9,7 +9,6 @@ import { Registry } from 'vs/platform/registry/common/platform'; import * as nls from 'vs/nls'; import * as azdata from 'azdata'; -import { IModelStore, IComponentDescriptor, IComponent } from './interfaces'; import { IItemConfig, ModelComponentTypes, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; import { IModelView, IModelViewEventArgs } from 'sql/platform/model/browser/modelViewService'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/browser/modelComponentRegistry'; @@ -17,6 +16,7 @@ import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { ModelStore } from 'sql/workbench/browser/modelComponents/modelStore'; import { Event, Emitter } from 'vs/base/common/event'; import { assign } from 'vs/base/common/objects'; +import { IModelStore, IComponentDescriptor, IComponent } from 'sql/platform/dashboard/browser/interfaces'; const componentRegistry = Registry.as(Extensions.ComponentContribution); diff --git a/src/sql/workbench/browser/modelComponents/webview.component.ts b/src/sql/workbench/browser/modelComponents/webview.component.ts index 8e78fdf2fe..da54498f94 100644 --- a/src/sql/workbench/browser/modelComponents/webview.component.ts +++ b/src/sql/workbench/browser/modelComponents/webview.component.ts @@ -18,7 +18,7 @@ import { WebviewContentOptions, IWebviewService, WebviewElement } from 'vs/workb import { generateUuid } from 'vs/base/common/uuid'; import { ComponentBase } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; +import { ComponentEventType, IModelStore, IComponentDescriptor, IComponent } from 'sql/platform/dashboard/browser/interfaces'; function reviveWebviewOptions(options: vscode.WebviewOptions): vscode.WebviewOptions { return { diff --git a/src/sql/workbench/common/styler.ts b/src/sql/workbench/common/styler.ts new file mode 100644 index 0000000000..9709cc68cd --- /dev/null +++ b/src/sql/workbench/common/styler.ts @@ -0,0 +1,44 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { IThemeService } from 'vs/platform/theme/common/themeService'; +import { IDisposable } from 'vs/base/common/lifecycle'; +import * as cr from 'vs/platform/theme/common/colorRegistry'; +import { IThemable } from 'vs/base/common/styler'; +import { attachStyler } from 'vs/platform/theme/common/styler'; +import { SIDE_BAR_SECTION_HEADER_FOREGROUND, SIDE_BAR_BACKGROUND, SIDE_BAR_SECTION_HEADER_BACKGROUND, SIDE_BAR_DRAG_AND_DROP_BACKGROUND, PANEL_ACTIVE_TITLE_BORDER, PANEL_ACTIVE_TITLE_FOREGROUND, PANEL_INACTIVE_TITLE_FOREGROUND } from 'vs/workbench/common/theme'; + +export function attachModalDialogStyler(widget: IThemable, themeService: IThemeService, style?: + { + dialogForeground?: cr.ColorIdentifier, + dialogHeaderAndFooterBackground?: cr.ColorIdentifier, + dialogBodyBackground?: cr.ColorIdentifier, + }): IDisposable { + return attachStyler(themeService, { + dialogForeground: (style && style.dialogForeground) || cr.foreground, + dialogBorder: cr.contrastBorder, + dialogHeaderAndFooterBackground: (style && style.dialogHeaderAndFooterBackground) || SIDE_BAR_BACKGROUND, + dialogBodyBackground: (style && style.dialogBodyBackground) || cr.editorBackground + }, widget); +} + +export function attachPanelStyler(widget: IThemable, themeService: IThemeService) { + return attachStyler(themeService, { + headerForeground: SIDE_BAR_SECTION_HEADER_FOREGROUND, + headerBackground: SIDE_BAR_SECTION_HEADER_BACKGROUND, + // headerHighContrastBorder: index === 0 ? null : contrastBorder, + dropBackground: SIDE_BAR_DRAG_AND_DROP_BACKGROUND + }, widget); +} + +export function attachTabbedPanelStyler(widget: IThemable, themeService: IThemeService) { + return attachStyler(themeService, { + titleActiveForeground: PANEL_ACTIVE_TITLE_FOREGROUND, + titleActiveBorder: PANEL_ACTIVE_TITLE_BORDER, + titleInactiveForeground: PANEL_INACTIVE_TITLE_FOREGROUND, + focusBorder: cr.focusBorder, + outline: cr.activeContrastBorder + }, widget); +} diff --git a/src/sql/workbench/contrib/accounts/browser/accountDialog.ts b/src/sql/workbench/contrib/accounts/browser/accountDialog.ts index 5fa23cceb1..7ebc6d9d3c 100644 --- a/src/sql/workbench/contrib/accounts/browser/accountDialog.ts +++ b/src/sql/workbench/contrib/accounts/browser/accountDialog.ts @@ -24,7 +24,7 @@ import * as azdata from 'azdata'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; -import { attachModalDialogStyler, attachButtonStyler, attachPanelStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { AccountViewModel } from 'sql/platform/accounts/common/accountViewModel'; import { AddAccountAction } from 'sql/platform/accounts/common/accountActions'; import { AccountListRenderer, AccountListDelegate } from 'sql/workbench/contrib/accounts/browser/accountListRenderer'; @@ -36,6 +36,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { IViewPaneOptions, ViewPane } from 'vs/workbench/browser/parts/views/viewPaneContainer'; +import { attachModalDialogStyler, attachPanelStyler } from 'sql/workbench/common/styler'; import { IViewDescriptorService } from 'vs/workbench/common/views'; class AccountPanel extends ViewPane { diff --git a/src/sql/workbench/contrib/accounts/browser/autoOAuthDialog.ts b/src/sql/workbench/contrib/accounts/browser/autoOAuthDialog.ts index cda80e5c72..5c408757d3 100644 --- a/src/sql/workbench/contrib/accounts/browser/autoOAuthDialog.ts +++ b/src/sql/workbench/contrib/accounts/browser/autoOAuthDialog.ts @@ -17,13 +17,14 @@ import { $, append } from 'vs/base/browser/dom'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; -import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { ILogService } from 'vs/platform/log/common/log'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; export class AutoOAuthDialog extends Modal { private _copyAndOpenButton: Button; diff --git a/src/sql/workbench/contrib/accounts/browser/firewallRuleDialog.ts b/src/sql/workbench/contrib/accounts/browser/firewallRuleDialog.ts index fa58880328..1296bc0759 100644 --- a/src/sql/workbench/contrib/accounts/browser/firewallRuleDialog.ts +++ b/src/sql/workbench/contrib/accounts/browser/firewallRuleDialog.ts @@ -22,7 +22,7 @@ import * as azdata from 'azdata'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; import { FirewallRuleViewModel } from 'sql/platform/accounts/common/firewallRuleViewModel'; -import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { IAccountPickerService } from 'sql/workbench/contrib/accounts/browser/accountPicker'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; @@ -31,6 +31,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; // TODO: Make the help link 1) extensible (01/08/2018, https://github.com/Microsoft/azuredatastudio/issues/450) // in case that other non-Azure sign in is to be used diff --git a/src/sql/workbench/contrib/backup/browser/backupActions.ts b/src/sql/workbench/contrib/backup/browser/backupActions.ts index 6322a6a606..1fa8ffc885 100644 --- a/src/sql/workbench/contrib/backup/browser/backupActions.ts +++ b/src/sql/workbench/contrib/backup/browser/backupActions.ts @@ -14,7 +14,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import { getCurrentGlobalConnection } from 'sql/workbench/browser/taskUtilities'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; -import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; +import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/contrib/backup/browser/backupDialog.ts b/src/sql/workbench/contrib/backup/browser/backupDialog.ts index a37097b867..8176398b48 100644 --- a/src/sql/workbench/contrib/backup/browser/backupDialog.ts +++ b/src/sql/workbench/contrib/backup/browser/backupDialog.ts @@ -7,7 +7,6 @@ import { Modal } from 'sql/workbench/browser/modal/modal'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { BackupModule } from 'sql/workbench/contrib/backup/browser/backup.module'; import { BACKUP_SELECTOR } from 'sql/workbench/contrib/backup/browser/backup.component'; -import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -20,6 +19,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; export class BackupDialog extends Modal { private _body: HTMLElement; diff --git a/src/sql/workbench/contrib/charts/browser/chartTab.ts b/src/sql/workbench/contrib/charts/browser/chartTab.ts index d36ff495df..aa1a2aca87 100644 --- a/src/sql/workbench/contrib/charts/browser/chartTab.ts +++ b/src/sql/workbench/contrib/charts/browser/chartTab.ts @@ -5,7 +5,7 @@ import { IPanelTab } from 'sql/base/browser/ui/panel/panel'; import { ChartView } from './chartView'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { localize } from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -34,4 +34,4 @@ export class ChartTab implements IPanelTab { public clear() { this.view.clear(); } -} \ No newline at end of file +} diff --git a/src/sql/workbench/contrib/charts/browser/chartView.ts b/src/sql/workbench/contrib/charts/browser/chartView.ts index 173c6a8760..7df8a20a84 100644 --- a/src/sql/workbench/contrib/charts/browser/chartView.ts +++ b/src/sql/workbench/contrib/charts/browser/chartView.ts @@ -7,10 +7,9 @@ import 'vs/css!./media/chartView'; import { IPanelView } from 'sql/base/browser/ui/panel/panel'; import { Insight } from './insight'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { ChartOptions, IChartOption, ControlType } from './chartOptions'; -import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/browser/insightRegistry'; -import { IInsightData } from './interfaces'; +import { Extensions, IInsightRegistry, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; import * as DOM from 'vs/base/browser/dom'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; diff --git a/src/sql/workbench/contrib/charts/browser/countInsight.ts b/src/sql/workbench/contrib/charts/browser/countInsight.ts index 9615e0a5e0..58bda17468 100644 --- a/src/sql/workbench/contrib/charts/browser/countInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/countInsight.ts @@ -5,10 +5,11 @@ import 'vs/css!./media/countInsight'; -import { IInsight, IInsightData } from './interfaces'; +import { IInsight } from './interfaces'; import { $, clearNode } from 'vs/base/browser/dom'; import { InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; export class CountInsight implements IInsight { public options; diff --git a/src/sql/workbench/contrib/charts/browser/graphInsight.ts b/src/sql/workbench/contrib/charts/browser/graphInsight.ts index c0ade16a30..1eb88c1ab4 100644 --- a/src/sql/workbench/contrib/charts/browser/graphInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/graphInsight.ts @@ -11,10 +11,11 @@ import * as colors from 'vs/platform/theme/common/colorRegistry'; import { editorLineNumbers } from 'vs/editor/common/view/editorColorRegistry'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; -import { IInsight, IInsightData, IPointDataSet, customMixin } from './interfaces'; +import { IInsight, IPointDataSet, customMixin } from './interfaces'; import { IInsightOptions, DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/contrib/charts/common/interfaces'; import { values } from 'vs/base/common/collections'; import { find } from 'vs/base/common/arrays'; +import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; const noneLineGraphs = [ChartType.Doughnut, ChartType.Pie]; diff --git a/src/sql/workbench/contrib/charts/browser/imageInsight.ts b/src/sql/workbench/contrib/charts/browser/imageInsight.ts index 9dc3f27f1b..c8999dfd85 100644 --- a/src/sql/workbench/contrib/charts/browser/imageInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/imageInsight.ts @@ -3,13 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IInsight, IInsightData } from './interfaces'; +import { IInsight } from './interfaces'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { $ } from 'vs/base/browser/dom'; import { mixin } from 'vs/base/common/objects'; import { IInsightOptions, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; import * as nls from 'vs/nls'; import { startsWith } from 'vs/base/common/strings'; +import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; export interface IConfig extends IInsightOptions { encoding?: string; diff --git a/src/sql/workbench/contrib/charts/browser/insight.ts b/src/sql/workbench/contrib/charts/browser/insight.ts index ec6d870670..08d4502ad8 100644 --- a/src/sql/workbench/contrib/charts/browser/insight.ts +++ b/src/sql/workbench/contrib/charts/browser/insight.ts @@ -6,7 +6,7 @@ import { Graph } from './graphInsight'; import { ImageInsight } from './imageInsight'; import { TableInsight } from './tableInsight'; -import { IInsight, IInsightCtor, IInsightData } from './interfaces'; +import { IInsight, IInsightCtor } from './interfaces'; import { CountInsight } from './countInsight'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -14,6 +14,7 @@ import { Dimension, clearNode } from 'vs/base/browser/dom'; import { deepClone } from 'vs/base/common/objects'; import { IInsightOptions, ChartType, DataDirection, InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; import { find } from 'vs/base/common/arrays'; +import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; const defaultOptions: IInsightOptions = { type: ChartType.Bar, diff --git a/src/sql/workbench/contrib/charts/browser/interfaces.ts b/src/sql/workbench/contrib/charts/browser/interfaces.ts index fbed797c7d..967cc60ca4 100644 --- a/src/sql/workbench/contrib/charts/browser/interfaces.ts +++ b/src/sql/workbench/contrib/charts/browser/interfaces.ts @@ -7,6 +7,7 @@ import { Dimension } from 'vs/base/browser/dom'; import { mixin } from 'sql/base/common/objects'; import * as types from 'vs/base/common/types'; import { IInsightOptions, InsightType, ChartType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; export interface IPointDataSet { data: Array<{ x: number | string, y: number }>; @@ -32,11 +33,6 @@ export function customMixin(destination: any, source: any, overwrite?: boolean): return destination; } -export interface IInsightData { - columns: Array; - rows: Array>; -} - export interface IInsight { options: IInsightOptions; data: IInsightData; diff --git a/src/sql/workbench/contrib/charts/browser/tableInsight.ts b/src/sql/workbench/contrib/charts/browser/tableInsight.ts index f216cf4d35..1551252ae1 100644 --- a/src/sql/workbench/contrib/charts/browser/tableInsight.ts +++ b/src/sql/workbench/contrib/charts/browser/tableInsight.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IInsight, IInsightData } from './interfaces'; +import { IInsight } from './interfaces'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { Table } from 'sql/base/browser/ui/table/table'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; @@ -13,6 +13,7 @@ import { $, Dimension } from 'vs/base/browser/dom'; import { Disposable } from 'vs/base/common/lifecycle'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { InsightType } from 'sql/workbench/contrib/charts/common/interfaces'; +import { IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; export class TableInsight extends Disposable implements IInsight { public static readonly types = [InsightType.Table]; diff --git a/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts b/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts index b5ada50808..155f76ae59 100644 --- a/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts +++ b/src/sql/workbench/contrib/commandLine/test/electron-browser/commandLine.test.ts @@ -25,9 +25,9 @@ import { TestConfigurationService } from 'vs/platform/configuration/test/common/ import { TestEditorService, TestDialogService } from 'vs/workbench/test/workbenchTestServices'; import { URI } from 'vs/base/common/uri'; import { UntitledQueryEditorInput } from 'sql/workbench/contrib/query/common/untitledQueryEditorInput'; -import { TestQueryModelService } from 'sql/platform/query/test/common/testQueryModelService'; +import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService'; import { Event } from 'vs/base/common/event'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import { INotificationService } from 'vs/platform/notification/common/notification'; diff --git a/src/sql/workbench/contrib/connection/common/connectionContextKey.ts b/src/sql/workbench/contrib/connection/common/connectionContextKey.ts index f6da4ccfa1..0c40c82db7 100644 --- a/src/sql/workbench/contrib/connection/common/connectionContextKey.ts +++ b/src/sql/workbench/contrib/connection/common/connectionContextKey.ts @@ -5,7 +5,7 @@ import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IConnectionProfile } from 'azdata'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; export class ConnectionContextKey implements IContextKey { diff --git a/src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.component.ts index 004e8ba661..58626bd098 100644 --- a/src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardHomeContainer.component.ts @@ -53,14 +53,14 @@ export class DashboardHomeContainer extends DashboardWidgetContainer { if (collapsedVal === 'collapsed') { this._propertiesClass.collapsed = true; } - this.angularEventingService.onAngularEvent(this.dashboardService.getUnderlyingUri(), event => { + this._register(this.angularEventingService.onAngularEvent(this.dashboardService.getUnderlyingUri())(event => { if (event.event === AngularEventType.COLLAPSE_WIDGET && this._propertiesClass && event.payload === this._propertiesClass.guid) { this._propertiesClass.collapsed = !this._propertiesClass.collapsed; this._cd.detectChanges(); this._configurationService.updateValue(`dashboard.${this.properties.context}.properties`, this._propertiesClass.collapsed ? 'collapsed' : true, ConfigurationTarget.USER); } - }); + })); } public layout() { diff --git a/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component.ts b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component.ts index b6c2e11d8b..3b85c3fc4b 100644 --- a/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/containers/dashboardWidgetContainer.component.ts @@ -5,7 +5,7 @@ import 'vs/css!./dashboardWidgetContainer'; -import { Component, Inject, Input, forwardRef, ViewChild, OnDestroy, ChangeDetectorRef, AfterContentInit } from '@angular/core'; +import { Component, Inject, Input, forwardRef, ViewChild, ChangeDetectorRef, AfterContentInit } from '@angular/core'; import { TabConfig, WidgetConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; import { DashboardTab } from 'sql/workbench/contrib/dashboard/browser/core/interfaces'; @@ -23,7 +23,7 @@ import { values } from 'vs/base/common/collections'; ` }) -export class DashboardWidgetContainer extends DashboardTab implements OnDestroy, AfterContentInit { +export class DashboardWidgetContainer extends DashboardTab implements AfterContentInit { @Input() protected tab: TabConfig; protected widgets: WidgetConfig[]; private _onResize = new Emitter(); @@ -50,10 +50,6 @@ export class DashboardWidgetContainer extends DashboardTab implements OnDestroy, })); } - ngOnDestroy() { - this.dispose(); - } - public get id(): string { return this.tab.id; } diff --git a/src/sql/workbench/contrib/dashboard/browser/core/actions.ts b/src/sql/workbench/contrib/dashboard/browser/core/actions.ts index 52775eb8d4..9be47aeb60 100644 --- a/src/sql/workbench/contrib/dashboard/browser/core/actions.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/actions.ts @@ -11,7 +11,6 @@ import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { IAngularEventingService, AngularEventType, IAngularEvent } from 'sql/platform/angularEventing/browser/angularEventingService'; import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog'; import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; -import { subscriptionToDisposable } from 'sql/base/browser/lifecycle'; import { find, firstIndex } from 'vs/base/common/arrays'; import { CellContext } from 'sql/workbench/contrib/notebook/browser/cellViews/codeActions'; @@ -166,7 +165,7 @@ export class AddFeatureTabAction extends Action { @IAngularEventingService private _angularEventService: IAngularEventingService ) { super(AddFeatureTabAction.ID, AddFeatureTabAction.LABEL, AddFeatureTabAction.ICON); - this._register(subscriptionToDisposable(this._angularEventService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event)))); + this._register(this._angularEventService.onAngularEvent(this._uri)(event => this.handleDashboardEvent(event))); } run(): Promise { diff --git a/src/sql/workbench/contrib/dashboard/browser/core/interfaces.ts b/src/sql/workbench/contrib/dashboard/browser/core/interfaces.ts index 6bbbeb5577..d42d3d3f70 100644 --- a/src/sql/workbench/contrib/dashboard/browser/core/interfaces.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/interfaces.ts @@ -3,15 +3,13 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { OnDestroy } from '@angular/core'; - import { Event } from 'vs/base/common/event'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { SingleConnectionManagementService } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -export abstract class DashboardTab extends TabChild implements OnDestroy { +export abstract class DashboardTab extends TabChild { public abstract layout(): void; public abstract readonly id: string; public abstract readonly editable: boolean; @@ -23,10 +21,6 @@ export abstract class DashboardTab extends TabChild implements OnDestroy { constructor() { super(); } - - ngOnDestroy() { - this.dispose(); - } } export interface IConfigModifierCollection { diff --git a/src/sql/workbench/contrib/dashboard/browser/dashboardEditor.ts b/src/sql/workbench/contrib/dashboard/browser/dashboardEditor.ts index ab60fe8797..268d817f22 100644 --- a/src/sql/workbench/contrib/dashboard/browser/dashboardEditor.ts +++ b/src/sql/workbench/contrib/dashboard/browser/dashboardEditor.ts @@ -23,7 +23,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; export class DashboardEditor extends BaseEditor { diff --git a/src/sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service.ts b/src/sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service.ts index 4da83e35cf..d737cb09f2 100644 --- a/src/sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service.ts +++ b/src/sql/workbench/contrib/dashboard/browser/services/dashboardServiceInterface.service.ts @@ -12,7 +12,7 @@ import { IDashboardComponentParams, IBootstrapParams } from 'sql/workbench/servi import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingService'; import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; import { TabSettingConfig } from 'sql/workbench/contrib/dashboard/browser/core/dashboardWidget'; @@ -26,7 +26,6 @@ import * as nls from 'vs/nls'; import { deepClone } from 'vs/base/common/objects'; import { RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { subscriptionToDisposable } from 'sql/base/browser/lifecycle'; const DASHBOARD_SETTINGS = 'dashboard'; @@ -77,7 +76,7 @@ export class DashboardServiceInterface extends CommonServiceInterface { // during testing there may not be params if (this._params) { this.dashboardContextKey = this._dashboardContextKey.bindTo(this.scopedContextKeyService); - this._register(subscriptionToDisposable(this.angularEventingService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event)))); + this._register(this.angularEventingService.onAngularEvent(this._uri)(event => this.handleDashboardEvent(event))); } } diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts index da7116c981..a79cfdc96b 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/charts/chartInsight.component.ts @@ -16,8 +16,8 @@ import * as types from 'vs/base/common/types'; import { Disposable } from 'vs/base/common/lifecycle'; import * as nls from 'vs/nls'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; -import { IInsightData, IPointDataSet } from 'sql/workbench/contrib/charts/browser/interfaces'; -import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry'; +import { IPointDataSet } from 'sql/workbench/contrib/charts/browser/interfaces'; +import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; import { ChartType, LegendPosition } from 'sql/workbench/contrib/charts/common/interfaces'; import { createMemoizer } from 'vs/base/common/decorators'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.component.ts index dd89b997d3..21b8933c94 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/countInsight.component.ts @@ -5,8 +5,7 @@ import { Component, Input, Inject, ChangeDetectorRef, forwardRef } from '@angular/core'; -import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces'; -import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry'; +import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; @Component({ template: ` diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.component.ts index a2839da5ef..edc6dfedc7 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/imageInsight.component.ts @@ -6,8 +6,7 @@ import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, OnInit, ElementRef } from '@angular/core'; import { mixin } from 'vs/base/common/objects'; -import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces'; -import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry'; +import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; import { startsWith } from 'vs/base/common/strings'; interface IConfig { diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.component.ts index 93fa377646..e7912cb945 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/insights/views/tableInsight.component.ts @@ -13,8 +13,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; -import { IInsightData } from 'sql/workbench/contrib/charts/browser/interfaces'; -import { IInsightsView } from 'sql/platform/dashboard/browser/insightRegistry'; +import { IInsightsView, IInsightData } from 'sql/platform/dashboard/browser/insightRegistry'; @Component({ template: '' diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.ts index 170de5047a..2d4fddb1bc 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.component.ts @@ -27,7 +27,7 @@ import { MenuRegistry, ICommandAction } from 'vs/platform/actions/common/actions import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; -import { TaskRegistry } from 'sql/platform/tasks/browser/tasksRegistry'; +import { TaskRegistry } from 'sql/workbench/services/tasks/browser/tasksRegistry'; interface ITask { name: string; diff --git a/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.contribution.ts b/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.contribution.ts index cdac309715..cc18042af6 100644 --- a/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.contribution.ts +++ b/src/sql/workbench/contrib/dashboard/browser/widgets/tasks/tasksWidget.contribution.ts @@ -6,7 +6,7 @@ import { registerDashboardWidget } from 'sql/platform/dashboard/browser/widgetRegistry'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; -import { TaskRegistry } from 'sql/platform/tasks/browser/tasksRegistry'; +import { TaskRegistry } from 'sql/workbench/services/tasks/browser/tasksRegistry'; const singleTaskSchema: IJSONSchema = { type: 'string', diff --git a/src/sql/workbench/contrib/dataExplorer/browser/nodeContext.ts b/src/sql/workbench/contrib/dataExplorer/browser/nodeContext.ts index e0782328c0..1f8bb2e89f 100644 --- a/src/sql/workbench/contrib/dataExplorer/browser/nodeContext.ts +++ b/src/sql/workbench/contrib/dataExplorer/browser/nodeContext.ts @@ -8,7 +8,7 @@ import { IOEShimService } from 'sql/workbench/contrib/objectExplorer/browser/obj import { ITreeItem } from 'sql/workbench/common/views'; import { Disposable } from 'vs/base/common/lifecycle'; import { IContextKey, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { MssqlNodeContext } from 'sql/workbench/contrib/dataExplorer/browser/mssqlNodeContext'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; diff --git a/src/sql/workbench/contrib/editData/browser/editDataActions.ts b/src/sql/workbench/contrib/editData/browser/editDataActions.ts index 10fbe021f4..c8b5cbd205 100644 --- a/src/sql/workbench/contrib/editData/browser/editDataActions.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataActions.ts @@ -5,7 +5,7 @@ import { Action, IActionViewItem, IActionRunner } from 'vs/base/common/actions'; import { Disposable } from 'vs/base/common/lifecycle'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { EditDataEditor } from 'sql/workbench/contrib/editData/browser/editDataEditor'; diff --git a/src/sql/workbench/contrib/editData/browser/editDataEditor.ts b/src/sql/workbench/contrib/editData/browser/editDataEditor.ts index f9b6902713..c03c658ccb 100644 --- a/src/sql/workbench/contrib/editData/browser/editDataEditor.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataEditor.ts @@ -21,7 +21,7 @@ import * as queryContext from 'sql/workbench/contrib/query/common/queryContext'; import { Taskbar, ITaskbarContent } from 'sql/base/browser/ui/taskbar/taskbar'; import { IActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { Action } from 'vs/base/common/actions'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { IEditorDescriptorService } from 'sql/workbench/services/queryEditor/browser/editorDescriptorService'; import { RefreshTableAction, StopRefreshTableAction, ChangeMaxRowsAction, ChangeMaxRowsActionItem, ShowQueryPaneAction diff --git a/src/sql/workbench/contrib/editData/browser/editDataInput.ts b/src/sql/workbench/contrib/editData/browser/editDataInput.ts index 012e22273c..945f708e0f 100644 --- a/src/sql/workbench/contrib/editData/browser/editDataInput.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataInput.ts @@ -5,7 +5,7 @@ import { EditorInput, EditorModel, EncodingMode, IEditorInput } from 'vs/workbench/common/editor'; import { IConnectionManagementService, IConnectableInput, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { Event, Emitter } from 'vs/base/common/event'; import { EditSessionReadyParams } from 'azdata'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/workbench/contrib/editData/browser/editDataResultsEditor.ts b/src/sql/workbench/contrib/editData/browser/editDataResultsEditor.ts index 57c2f4ff3c..f7fe6ef06c 100644 --- a/src/sql/workbench/contrib/editData/browser/editDataResultsEditor.ts +++ b/src/sql/workbench/contrib/editData/browser/editDataResultsEditor.ts @@ -14,7 +14,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import * as types from 'vs/base/common/types'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { BareResultsGridInfo, getBareResultsGridInfoStyles } from 'sql/workbench/contrib/query/browser/queryResultsEditor'; import { EditDataGridPanel } from 'sql/workbench/contrib/editData/browser/editDataGridPanel'; import { EditDataResultsInput } from 'sql/workbench/contrib/editData/browser/editDataResultsInput'; diff --git a/src/sql/workbench/contrib/editData/browser/gridCommands.ts b/src/sql/workbench/contrib/editData/browser/gridCommands.ts index 0e8e2e162f..5404a88ab2 100644 --- a/src/sql/workbench/contrib/editData/browser/gridCommands.ts +++ b/src/sql/workbench/contrib/editData/browser/gridCommands.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as GridContentEvents from 'sql/workbench/contrib/grid/common/gridContentEvents'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; import { EditDataEditor } from 'sql/workbench/contrib/editData/browser/editDataEditor'; diff --git a/src/sql/workbench/contrib/grid/common/dataService.ts b/src/sql/workbench/contrib/grid/common/dataService.ts index 3f06e8a634..9a7352f4ef 100644 --- a/src/sql/workbench/contrib/grid/common/dataService.ts +++ b/src/sql/workbench/contrib/grid/common/dataService.ts @@ -6,7 +6,7 @@ import { Subject } from 'rxjs/Subject'; import { EditUpdateCellResult, EditSubsetResult, EditCreateRowResult } from 'azdata'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { ResultSerializer } from 'sql/workbench/contrib/query/common/resultSerializer'; import { ISaveRequest } from 'sql/workbench/contrib/grid/common/interfaces'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/agentView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/agentView.component.ts index 239c46f98a..e44fa15cbd 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/agentView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/agentView.component.ts @@ -9,7 +9,7 @@ import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core'; import { AgentJobInfo, AgentNotebookInfo } from 'azdata'; import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; export const DASHBOARD_SELECTOR: string = 'agentview-component'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/alertsView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/alertsView.component.ts index d96fe1c0c7..38f1451f48 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/alertsView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/alertsView.component.ts @@ -12,8 +12,8 @@ import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; -import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/platform/jobManagement/browser/jobActions'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; +import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/workbench/services/jobManagement/browser/jobActions'; import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; @@ -22,7 +22,7 @@ import { IAction } from 'vs/base/common/actions'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; -import { AlertsCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; +import { AlertsCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; export const VIEW_SELECTOR: string = 'jobalertsview-component'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts b/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts index b966565921..95ec46af11 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobHistory.component.ts @@ -12,10 +12,10 @@ import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetecto import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/platform/jobManagement/browser/jobActions'; -import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; -import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/workbench/services/jobManagement/browser/jobActions'; +import { JobCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService'; +import { JobManagementUtilities } from 'sql/workbench/services/jobManagement/browser/jobManagementUtilities'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; import { JobHistoryController, JobHistoryDataSource, JobHistoryRenderer, JobHistoryFilter, JobHistoryModel, JobHistoryRow diff --git a/src/sql/workbench/contrib/jobManagement/browser/jobManagementView.ts b/src/sql/workbench/contrib/jobManagement/browser/jobManagementView.ts index fd32092fc9..2a903b1464 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/jobManagementView.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobManagementView.ts @@ -14,7 +14,7 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { JobsRefreshAction, IJobActionInfo } from 'sql/platform/jobManagement/browser/jobActions'; +import { JobsRefreshAction, IJobActionInfo } from 'sql/workbench/services/jobManagement/browser/jobActions'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { ITableMouseEvent } from 'sql/base/browser/ui/table/interfaces'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/jobsView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/jobsView.component.ts index db08ac8979..051e89b120 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/jobsView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/jobsView.component.ts @@ -13,11 +13,11 @@ import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; -import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; -import { EditJobAction, DeleteJobAction, NewJobAction, RunJobAction } from 'sql/platform/jobManagement/browser/jobActions'; -import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities'; +import { JobCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService'; +import { EditJobAction, DeleteJobAction, NewJobAction, RunJobAction } from 'sql/workbench/services/jobManagement/browser/jobActions'; +import { JobManagementUtilities } from 'sql/workbench/services/jobManagement/browser/jobManagementUtilities'; import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; import { JobManagementView, JobActionContext } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.ts b/src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.ts index b0a625b512..90d3957279 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/notebookHistory.component.ts @@ -12,9 +12,9 @@ import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetecto import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; -import { RunJobAction, StopJobAction, JobsRefreshAction, EditNotebookJobAction, OpenMaterializedNotebookAction, OpenTemplateNotebookAction, RenameNotebookMaterializedAction, PinNotebookMaterializedAction, UnpinNotebookMaterializedAction, DeleteMaterializedNotebookAction } from 'sql/platform/jobManagement/browser/jobActions'; -import { NotebookCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { RunJobAction, StopJobAction, JobsRefreshAction, EditNotebookJobAction, OpenMaterializedNotebookAction, OpenTemplateNotebookAction, RenameNotebookMaterializedAction, PinNotebookMaterializedAction, UnpinNotebookMaterializedAction, DeleteMaterializedNotebookAction } from 'sql/workbench/services/jobManagement/browser/jobActions'; +import { NotebookCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; import { JobStepsViewRow } from 'sql/workbench/contrib/jobManagement/browser/jobStepsViewTree'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IAction } from 'vs/base/common/actions'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.ts index cf2a9297ff..f0f2700290 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/notebooksView.component.ts @@ -13,11 +13,11 @@ import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; -import { NotebookCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; -import { NewNotebookJobAction, RunJobAction, EditNotebookJobAction, JobsRefreshAction, IJobActionInfo, DeleteNotebookAction, OpenLatestRunMaterializedNotebook } from 'sql/platform/jobManagement/browser/jobActions'; -import { JobManagementUtilities } from 'sql/platform/jobManagement/browser/jobManagementUtilities'; +import { NotebookCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService'; +import { NewNotebookJobAction, RunJobAction, EditNotebookJobAction, JobsRefreshAction, IJobActionInfo, DeleteNotebookAction, OpenLatestRunMaterializedNotebook } from 'sql/workbench/services/jobManagement/browser/jobActions'; +import { JobManagementUtilities } from 'sql/workbench/services/jobManagement/browser/jobManagementUtilities'; import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; import { JobManagementView, JobActionContext } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.ts index 35d8ce038c..555deff2ea 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/operatorsView.component.ts @@ -11,8 +11,8 @@ import * as azdata from 'azdata'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; -import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/platform/jobManagement/browser/jobActions'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; +import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/workbench/services/jobManagement/browser/jobActions'; import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; @@ -22,7 +22,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IAction } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; -import { OperatorsCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; +import { OperatorsCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; export const VIEW_SELECTOR: string = 'joboperatorsview-component'; diff --git a/src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.ts b/src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.ts index 5ad17a320d..ffd8fe1512 100644 --- a/src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.ts +++ b/src/sql/workbench/contrib/jobManagement/browser/proxiesView.component.ts @@ -11,8 +11,8 @@ import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/workbench/contrib/jobManagement/browser/agentView.component'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; -import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/platform/jobManagement/browser/jobActions'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; +import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/workbench/services/jobManagement/browser/jobActions'; import { CommonServiceInterface } from 'sql/workbench/services/bootstrap/browser/commonServiceInterface.service'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { JobManagementView } from 'sql/workbench/contrib/jobManagement/browser/jobManagementView'; @@ -22,7 +22,7 @@ import { IAction } from 'vs/base/common/actions'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; -import { ProxiesCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; +import { ProxiesCacheObject } from 'sql/workbench/services/jobManagement/common/jobManagementService'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; export const VIEW_SELECTOR: string = 'jobproxiesview-component'; diff --git a/src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts b/src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts index bd6911856e..e2284b4b56 100644 --- a/src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts +++ b/src/sql/workbench/contrib/notebook/browser/outputs/gridOutput.component.ts @@ -6,7 +6,7 @@ import { OnInit, Component, Input, Inject, ViewChild, ElementRef } from '@angular/core'; import * as azdata from 'azdata'; -import { IGridDataProvider, getResultsString } from 'sql/platform/query/common/gridDataProvider'; +import { IGridDataProvider, getResultsString } from 'sql/workbench/services/query/common/gridDataProvider'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; @@ -14,7 +14,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; import { IDataResource } from 'sql/workbench/services/notebook/browser/sql/sqlSessionManager'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; -import { getEolString, shouldIncludeHeaders, shouldRemoveNewLines } from 'sql/platform/query/common/queryRunner'; +import { getEolString, shouldIncludeHeaders, shouldRemoveNewLines } from 'sql/workbench/services/query/common/queryRunner'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; diff --git a/src/sql/workbench/contrib/objectExplorer/browser/serverGroupDialog.ts b/src/sql/workbench/contrib/objectExplorer/browser/serverGroupDialog.ts index 008550f372..9636b3d99a 100644 --- a/src/sql/workbench/contrib/objectExplorer/browser/serverGroupDialog.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/serverGroupDialog.ts @@ -21,7 +21,7 @@ import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { ServerGroupViewModel } from 'sql/workbench/contrib/objectExplorer/common/serverGroupViewModel'; -import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { ILogService } from 'vs/platform/log/common/log'; @@ -29,6 +29,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { Color } from 'vs/base/common/color'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; export class ServerGroupDialog extends Modal { private _addServerButton: Button; diff --git a/src/sql/workbench/contrib/objectExplorer/browser/serverTreeActionProvider.ts b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeActionProvider.ts index e862aa689e..e18e786a8b 100644 --- a/src/sql/workbench/contrib/objectExplorer/browser/serverTreeActionProvider.ts +++ b/src/sql/workbench/contrib/objectExplorer/browser/serverTreeActionProvider.ts @@ -22,7 +22,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import { MenuId, IMenuService } from 'vs/platform/actions/common/actions'; import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; import { TreeNodeContextKey } from 'sql/workbench/contrib/objectExplorer/common/treeNodeContextKey'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { ServerInfoContextKey } from 'sql/workbench/contrib/connection/common/serverInfoContextKey'; import { fillInActions } from 'vs/platform/actions/browser/menuEntryActionViewItem'; import { Separator } from 'vs/base/browser/ui/actionbar/actionbar'; diff --git a/src/sql/workbench/contrib/profiler/browser/profilerActions.ts b/src/sql/workbench/contrib/profiler/browser/profilerActions.ts index 0816ce0837..a05d52256e 100644 --- a/src/sql/workbench/contrib/profiler/browser/profilerActions.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerActions.ts @@ -6,7 +6,7 @@ import { IProfilerService } from 'sql/workbench/services/profiler/browser/interfaces'; import { IProfilerController } from 'sql/workbench/contrib/profiler/common/interfaces'; import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; -import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; +import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/contrib/profiler/browser/profilerColumnEditorDialog.ts b/src/sql/workbench/contrib/profiler/browser/profilerColumnEditorDialog.ts index 8a4e9c2ddd..8e55e456cc 100644 --- a/src/sql/workbench/contrib/profiler/browser/profilerColumnEditorDialog.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerColumnEditorDialog.ts @@ -6,7 +6,6 @@ import 'vs/css!./media/profiler'; import { Modal } from 'sql/workbench/browser/modal/modal'; -import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import { ProfilerInput } from 'sql/workbench/contrib/profiler/browser/profilerInput'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; @@ -27,6 +26,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; class EventItem { diff --git a/src/sql/workbench/contrib/profiler/browser/profilerEditor.ts b/src/sql/workbench/contrib/profiler/browser/profilerEditor.ts index 7cd233b034..fb45615c2e 100644 --- a/src/sql/workbench/contrib/profiler/browser/profilerEditor.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerEditor.ts @@ -9,7 +9,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { IProfilerService, IProfilerViewTemplate } from 'sql/workbench/services/profiler/browser/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { attachTableStyler, attachTabbedPanelStyler } from 'sql/platform/theme/common/styler'; +import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { IProfilerStateChangedEvent } from 'sql/workbench/contrib/profiler/common/profilerState'; import { ProfilerTableEditor, ProfilerTableViewState } from 'sql/workbench/contrib/profiler/browser/profilerTableEditor'; import * as Actions from 'sql/workbench/contrib/profiler/browser/profilerActions'; @@ -52,6 +52,7 @@ import { handleCopyRequest } from 'sql/workbench/contrib/profiler/browser/profil import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { find } from 'vs/base/common/arrays'; import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput'; +import { attachTabbedPanelStyler } from 'sql/workbench/common/styler'; class BasicView implements IView { public get element(): HTMLElement { diff --git a/src/sql/workbench/contrib/profiler/browser/profilerFilterDialog.ts b/src/sql/workbench/contrib/profiler/browser/profilerFilterDialog.ts index 0c066be56a..421a838c37 100644 --- a/src/sql/workbench/contrib/profiler/browser/profilerFilterDialog.ts +++ b/src/sql/workbench/contrib/profiler/browser/profilerFilterDialog.ts @@ -7,7 +7,7 @@ import 'vs/css!./media/profilerFilterDialog'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; -import { attachButtonStyler, attachModalDialogStyler, attachInputBoxStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler, attachInputBoxStyler } from 'sql/platform/theme/common/styler'; import { KeyCode } from 'vs/base/common/keyCodes'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -28,6 +28,7 @@ import { ITextResourcePropertiesService } from 'vs/editor/common/services/textRe import { find, firstIndex } from 'vs/base/common/arrays'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { onUnexpectedError } from 'vs/base/common/errors'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; const ClearText: string = localize('profilerFilterDialog.clear', "Clear all"); diff --git a/src/sql/workbench/contrib/query/browser/actions.ts b/src/sql/workbench/contrib/query/browser/actions.ts index c07e3d2901..5989048dcf 100644 --- a/src/sql/workbench/contrib/query/browser/actions.ts +++ b/src/sql/workbench/contrib/query/browser/actions.ts @@ -15,9 +15,9 @@ import { QueryEditor } from './queryEditor'; import { CellSelectionModel } from 'sql/base/browser/ui/table/plugins/cellSelectionModel.plugin'; import { isWindows } from 'vs/base/common/platform'; import { removeAnsiEscapeCodes } from 'vs/base/common/strings'; -import { IGridDataProvider } from 'sql/platform/query/common/gridDataProvider'; +import { IGridDataProvider } from 'sql/workbench/services/query/common/gridDataProvider'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { GridTableState } from 'sql/workbench/contrib/query/common/gridPanelState'; import * as Constants from 'sql/workbench/contrib/extensions/common/constants'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/contrib/query/browser/gridPanel.ts b/src/sql/workbench/contrib/query/browser/gridPanel.ts index 5c79c9f53c..453cef9e64 100644 --- a/src/sql/workbench/contrib/query/browser/gridPanel.ts +++ b/src/sql/workbench/contrib/query/browser/gridPanel.ts @@ -6,7 +6,7 @@ import 'vs/css!./media/gridPanel'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; -import QueryRunner, { QueryGridDataProvider } from 'sql/platform/query/common/queryRunner'; +import QueryRunner, { QueryGridDataProvider } from 'sql/workbench/services/query/common/queryRunner'; import { VirtualizedCollection, AsyncDataProvider } from 'sql/base/browser/ui/table/asyncDataView'; import { Table } from 'sql/base/browser/ui/table/table'; import { ScrollableSplitView, IView } from 'sql/base/browser/ui/scrollableSplitview/scrollableSplitview'; @@ -42,7 +42,7 @@ import { IAction } from 'vs/base/common/actions'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { ILogService } from 'vs/platform/log/common/log'; import { localize } from 'vs/nls'; -import { IGridDataProvider } from 'sql/platform/query/common/gridDataProvider'; +import { IGridDataProvider } from 'sql/workbench/services/query/common/gridDataProvider'; import { formatDocumentWithSelectedProvider, FormattingMode } from 'vs/editor/contrib/format/format'; import { CancellationToken } from 'vs/base/common/cancellation'; import { GridPanelState, GridTableState } from 'sql/workbench/contrib/query/common/gridPanelState'; diff --git a/src/sql/workbench/contrib/query/browser/keyboardQueryActions.ts b/src/sql/workbench/contrib/query/browser/keyboardQueryActions.ts index 8e1e2b2737..93e33b0303 100644 --- a/src/sql/workbench/contrib/query/browser/keyboardQueryActions.ts +++ b/src/sql/workbench/contrib/query/browser/keyboardQueryActions.ts @@ -10,10 +10,10 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import * as azdata from 'azdata'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import * as Constants from 'sql/workbench/contrib/query/common/constants'; import * as ConnectionConstants from 'sql/platform/connection/common/constants'; diff --git a/src/sql/workbench/contrib/query/browser/messagePanel.ts b/src/sql/workbench/contrib/query/browser/messagePanel.ts index 78c9227095..22d17480bb 100644 --- a/src/sql/workbench/contrib/query/browser/messagePanel.ts +++ b/src/sql/workbench/contrib/query/browser/messagePanel.ts @@ -5,7 +5,7 @@ import 'vs/css!./media/messagePanel'; import { IMessagesActionContext, CopyMessagesAction, CopyAllMessagesAction } from './actions'; -import QueryRunner, { IQueryMessage } from 'sql/platform/query/common/queryRunner'; +import QueryRunner, { IQueryMessage } from 'sql/workbench/services/query/common/queryRunner'; import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; import { ISelectionData } from 'azdata'; diff --git a/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.component.ts b/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.component.ts index d15abc3fbe..43b9faefac 100644 --- a/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.component.ts +++ b/src/sql/workbench/contrib/query/browser/modelViewTab/queryModelViewTabContainer.component.ts @@ -7,9 +7,9 @@ import 'vs/css!./media/dialogModal'; import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core'; import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component'; import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; -import { ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; +import { ComponentEventType } from 'sql/platform/dashboard/browser/interfaces'; export interface LayoutRequestParams { modelViewId?: string; diff --git a/src/sql/workbench/contrib/query/browser/queryActions.ts b/src/sql/workbench/contrib/query/browser/queryActions.ts index a1ea339bc6..5806ed11fa 100644 --- a/src/sql/workbench/contrib/query/browser/queryActions.ts +++ b/src/sql/workbench/contrib/query/browser/queryActions.ts @@ -25,11 +25,11 @@ import { IConnectableInput } from 'sql/platform/connection/common/connectionManagement'; import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachEditableDropdownStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/styler'; import { Dropdown } from 'sql/base/parts/editableDropdown/browser/dropdown'; -import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; +import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; @@ -41,7 +41,7 @@ import { OEAction } from 'sql/workbench/contrib/objectExplorer/browser/objectExp import { TreeViewItemHandleArg } from 'sql/workbench/common/views'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; /** * Action class that query-based Actions will extend. This base class automatically handles activating and diff --git a/src/sql/workbench/contrib/query/browser/queryResultsView.ts b/src/sql/workbench/contrib/query/browser/queryResultsView.ts index d2ebf8899e..656a03a1c1 100644 --- a/src/sql/workbench/contrib/query/browser/queryResultsView.ts +++ b/src/sql/workbench/contrib/query/browser/queryResultsView.ts @@ -5,8 +5,8 @@ import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; import { TabbedPanel, IPanelTab, IPanelView } from 'sql/base/browser/ui/panel/panel'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { MessagePanel } from 'sql/workbench/contrib/query/browser/messagePanel'; import { GridPanel } from 'sql/workbench/contrib/query/browser/gridPanel'; import { ChartTab } from 'sql/workbench/contrib/charts/browser/chartTab'; @@ -20,11 +20,11 @@ import * as nls from 'vs/nls'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import * as DOM from 'vs/base/browser/dom'; import { dispose, Disposable, DisposableStore } from 'vs/base/common/lifecycle'; -import { attachTabbedPanelStyler } from 'sql/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { Event } from 'vs/base/common/event'; import { startsWith } from 'vs/base/common/strings'; import { URI } from 'vs/base/common/uri'; +import { attachTabbedPanelStyler } from 'sql/workbench/common/styler'; class MessagesView extends Disposable implements IPanelView { private messagePanel: MessagePanel; diff --git a/src/sql/workbench/contrib/query/browser/statusBarItems.ts b/src/sql/workbench/contrib/query/browser/statusBarItems.ts index 9912c7fbab..71452c5561 100644 --- a/src/sql/workbench/contrib/query/browser/statusBarItems.ts +++ b/src/sql/workbench/contrib/query/browser/statusBarItems.ts @@ -4,12 +4,12 @@ *--------------------------------------------------------------------------------------------*/ import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { IntervalTimer } from 'vs/base/common/async'; import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { localize } from 'vs/nls'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { parseNumAsTimeString } from 'sql/platform/connection/common/utils'; import { Event } from 'vs/base/common/event'; import { QueryEditorInput } from 'sql/workbench/contrib/query/common/queryEditorInput'; diff --git a/src/sql/workbench/contrib/query/common/fileQueryEditorInput.ts b/src/sql/workbench/contrib/query/common/fileQueryEditorInput.ts index 67457a6d05..04451c4461 100644 --- a/src/sql/workbench/contrib/query/common/fileQueryEditorInput.ts +++ b/src/sql/workbench/contrib/query/common/fileQueryEditorInput.ts @@ -6,7 +6,7 @@ import { QueryEditorInput } from 'sql/workbench/contrib/query/common/queryEditorInput'; import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/workbench/contrib/query/common/queryEditorInput.ts b/src/sql/workbench/contrib/query/common/queryEditorInput.ts index 0d85989f0f..dd949001ee 100644 --- a/src/sql/workbench/contrib/query/common/queryEditorInput.ts +++ b/src/sql/workbench/contrib/query/common/queryEditorInput.ts @@ -13,7 +13,7 @@ import { IFileService } from 'vs/platform/files/common/files'; import { IConnectionManagementService, IConnectableInput, INewConnectionParams, RunQueryOnConnectionMode } from 'sql/platform/connection/common/connectionManagement'; import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { ISelectionData, ExecutionPlanOptions } from 'azdata'; import { startsWith } from 'vs/base/common/strings'; diff --git a/src/sql/workbench/contrib/query/common/resultSerializer.ts b/src/sql/workbench/contrib/query/common/resultSerializer.ts index 60760374f5..99a9aad3d4 100644 --- a/src/sql/workbench/contrib/query/common/resultSerializer.ts +++ b/src/sql/workbench/contrib/query/common/resultSerializer.ts @@ -6,7 +6,7 @@ import * as ConnectionConstants from 'sql/platform/connection/common/constants'; import * as LocalizedConstants from 'sql/workbench/contrib/query/common/localizedConstants'; import { SaveResultsRequestParams } from 'azdata'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { ISaveRequest, SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; diff --git a/src/sql/workbench/contrib/query/common/untitledQueryEditorInput.ts b/src/sql/workbench/contrib/query/common/untitledQueryEditorInput.ts index df9189c443..e8bf6b824e 100644 --- a/src/sql/workbench/contrib/query/common/untitledQueryEditorInput.ts +++ b/src/sql/workbench/contrib/query/common/untitledQueryEditorInput.ts @@ -6,7 +6,7 @@ import { QueryEditorInput } from 'sql/workbench/contrib/query/common/queryEditorInput'; import { QueryResultsInput } from 'sql/workbench/contrib/query/common/queryResultsInput'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; import { IEncodingSupport, EncodingMode } from 'vs/workbench/common/editor'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/workbench/contrib/query/test/browser/queryActions.test.ts b/src/sql/workbench/contrib/query/test/browser/queryActions.test.ts index d400e508c6..c8992bcb96 100644 --- a/src/sql/workbench/contrib/query/test/browser/queryActions.test.ts +++ b/src/sql/workbench/contrib/query/test/browser/queryActions.test.ts @@ -18,7 +18,7 @@ import { DisconnectDatabaseAction, ConnectDatabaseAction, QueryTaskbarAction } from 'sql/workbench/contrib/query/browser/queryActions'; import { QueryEditor } from 'sql/workbench/contrib/query/browser/queryEditor'; -import { QueryModelService } from 'sql/platform/query/common/queryModelService'; +import { QueryModelService } from 'sql/workbench/services/query/common/queryModelService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as TypeMoq from 'typemoq'; @@ -27,7 +27,7 @@ import { TestStorageService, TestFileService } from 'vs/workbench/test/workbench import { MockContextKeyService } from 'vs/platform/keybinding/test/common/mockKeybindingService'; import { UntitledQueryEditorInput } from 'sql/workbench/contrib/query/common/untitledQueryEditorInput'; import { TestThemeService } from 'vs/platform/theme/test/common/testThemeService'; -import { TestQueryModelService } from 'sql/platform/query/test/common/testQueryModelService'; +import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService'; import { URI } from 'vs/base/common/uri'; import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock'; import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService'; diff --git a/src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts b/src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts index 85923239e9..f3afe2188d 100644 --- a/src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts +++ b/src/sql/workbench/contrib/query/test/browser/queryEditor.test.ts @@ -22,7 +22,7 @@ import { TestStorageService } from 'vs/workbench/test/workbenchTestServices'; import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService'; import { UntitledTextEditorInput } from 'vs/workbench/common/editor/untitledTextEditorInput'; import { UntitledQueryEditorInput } from 'sql/workbench/contrib/query/common/untitledQueryEditorInput'; -import { TestQueryModelService } from 'sql/platform/query/test/common/testQueryModelService'; +import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService'; import { Event } from 'vs/base/common/event'; import { LabelService } from 'vs/workbench/services/label/common/labelService'; diff --git a/src/sql/workbench/contrib/queryHistory/browser/queryHistoryActions.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryActions.ts index eedac0f222..8f9adc25d7 100644 --- a/src/sql/workbench/contrib/queryHistory/browser/queryHistoryActions.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryActions.ts @@ -11,7 +11,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { IPanelService } from 'vs/workbench/services/panel/common/panelService'; import { TogglePanelAction } from 'vs/workbench/browser/panel'; import { localize } from 'vs/nls'; -import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService'; +import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService'; import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { openNewQuery } from 'sql/workbench/contrib/query/browser/queryActions'; diff --git a/src/sql/workbench/contrib/queryHistory/browser/queryHistoryNode.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryNode.ts index 93a05d95de..e35c4f2f69 100644 --- a/src/sql/workbench/contrib/queryHistory/browser/queryHistoryNode.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryNode.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { QueryHistoryInfo } from 'sql/platform/queryHistory/common/queryHistoryInfo'; +import { QueryHistoryInfo } from 'sql/workbench/services/queryHistory/common/queryHistoryInfo'; /** * Wrapper around a QueryHistoryInfo for displaying in the panel TreeView diff --git a/src/sql/workbench/contrib/queryHistory/browser/queryHistoryRenderer.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryRenderer.ts index af4844012b..2c2e63f6ea 100644 --- a/src/sql/workbench/contrib/queryHistory/browser/queryHistoryRenderer.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryRenderer.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; -import { QueryStatus } from 'sql/platform/queryHistory/common/queryHistoryInfo'; +import { QueryStatus } from 'sql/workbench/services/queryHistory/common/queryHistoryInfo'; import * as dom from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; diff --git a/src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts index 38835099dd..581cb916d1 100644 --- a/src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts +++ b/src/sql/workbench/contrib/queryHistory/browser/queryHistoryView.ts @@ -18,9 +18,9 @@ import { QueryHistoryDataSource } from 'sql/workbench/contrib/queryHistory/brows import { QueryHistoryController } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryController'; import { QueryHistoryActionProvider } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryActionProvider'; import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; -import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService'; +import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService'; import { QueryHistoryNode } from 'sql/workbench/contrib/queryHistory/browser/queryHistoryNode'; -import { QueryHistoryInfo } from 'sql/platform/queryHistory/common/queryHistoryInfo'; +import { QueryHistoryInfo } from 'sql/workbench/services/queryHistory/common/queryHistoryInfo'; import { IAction } from 'vs/base/common/actions'; /** * QueryHistoryView implements the dynamic tree view for displaying Query History diff --git a/src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.ts b/src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.ts index b941509d92..0d2e75b048 100644 --- a/src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.ts +++ b/src/sql/workbench/contrib/queryHistory/electron-browser/queryHistory.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; -import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService'; +import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService'; import { KeyMod, KeyCode } from 'vs/base/common/keyCodes'; import { localize } from 'vs/nls'; import { SyncActionDescriptor, MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; diff --git a/src/sql/workbench/contrib/restore/browser/restoreActions.ts b/src/sql/workbench/contrib/restore/browser/restoreActions.ts index 0a2a9b5e7c..233baa3a14 100644 --- a/src/sql/workbench/contrib/restore/browser/restoreActions.ts +++ b/src/sql/workbench/contrib/restore/browser/restoreActions.ts @@ -8,12 +8,12 @@ import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiati import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { getCurrentGlobalConnection } from 'sql/workbench/browser/taskUtilities'; -import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService'; +import { IRestoreDialogController } from 'sql/workbench/services/restore/common/restoreService'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { Task } from 'sql/platform/tasks/browser/tasksRegistry'; +import { Task } from 'sql/workbench/services/tasks/browser/tasksRegistry'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/contrib/restore/browser/restoreDialog.ts b/src/sql/workbench/contrib/restore/browser/restoreDialog.ts index 75ce44da97..d25ab36749 100644 --- a/src/sql/workbench/contrib/restore/browser/restoreDialog.ts +++ b/src/sql/workbench/contrib/restore/browser/restoreDialog.ts @@ -30,7 +30,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; import { Modal } from 'sql/workbench/browser/modal/modal'; -import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachInputBoxStyler, attachSelectBoxStyler, attachEditableDropdownStyler, attachCheckboxStyler, attachTabbedPanelStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler, attachTableStyler, attachInputBoxStyler, attachSelectBoxStyler, attachEditableDropdownStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import * as BackupConstants from 'sql/workbench/contrib/backup/common/constants'; import { RestoreViewModel, RestoreOptionParam, SouceDatabaseNamesParam } from 'sql/workbench/contrib/restore/browser/restoreViewModel'; @@ -44,6 +44,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { attachModalDialogStyler, attachTabbedPanelStyler } from 'sql/workbench/common/styler'; interface FileListElement { logicalFileName: string; diff --git a/src/sql/workbench/contrib/tasks/browser/tasks.contribution.ts b/src/sql/workbench/contrib/tasks/browser/tasks.contribution.ts index 12b013deac..28f91cba59 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasks.contribution.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasks.contribution.ts @@ -11,7 +11,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { TasksPanel } from 'sql/workbench/contrib/tasks/browser/tasksPanel'; import * as lifecycle from 'vs/base/common/lifecycle'; import * as ext from 'vs/workbench/common/contributions'; -import { ITaskService } from 'sql/platform/tasks/common/tasksService'; +import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService'; import { IActivityService, NumberBadge } from 'vs/workbench/services/activity/common/activity'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import { PanelRegistry, Extensions as PanelExtensions, PanelDescriptor } from 'vs/workbench/browser/panel'; diff --git a/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts b/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts index 612d37d329..b855a20295 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksActionProvider.ts @@ -7,7 +7,7 @@ import { ITree } from 'vs/base/parts/tree/browser/tree'; import { ContributableActionProvider } from 'vs/workbench/browser/actions'; import { IAction } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/platform/tasks/common/tasksNode'; +import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/workbench/services/tasks/common/tasksNode'; import { CancelAction, ScriptAction } from 'sql/workbench/contrib/tasks/common/tasksAction'; /** diff --git a/src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts b/src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts index 75d65e8122..76d00817b8 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksDataSource.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; -import { TaskNode } from 'sql/platform/tasks/common/tasksNode'; +import { TaskNode } from 'sql/workbench/services/tasks/common/tasksNode'; /** * Implements the DataSource(that returns a parent/children of an element) for the task history diff --git a/src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts b/src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts index 54674a98f2..bb029d1716 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksRenderer.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; -import { TaskNode, TaskStatus } from 'sql/platform/tasks/common/tasksNode'; +import { TaskNode, TaskStatus } from 'sql/workbench/services/tasks/common/tasksNode'; import * as dom from 'vs/base/browser/dom'; import { localize } from 'vs/nls'; import * as Utils from 'sql/platform/connection/common/utils'; diff --git a/src/sql/workbench/contrib/tasks/browser/tasksView.ts b/src/sql/workbench/contrib/tasks/browser/tasksView.ts index c5da9603be..da770c3fd4 100644 --- a/src/sql/workbench/contrib/tasks/browser/tasksView.ts +++ b/src/sql/workbench/contrib/tasks/browser/tasksView.ts @@ -19,8 +19,8 @@ import { TaskHistoryRenderer } from 'sql/workbench/contrib/tasks/browser/tasksRe import { TaskHistoryDataSource } from 'sql/workbench/contrib/tasks/browser/tasksDataSource'; import { TaskHistoryController } from 'sql/workbench/contrib/tasks/browser/tasksController'; import { TaskHistoryActionProvider } from 'sql/workbench/contrib/tasks/browser/tasksActionProvider'; -import { ITaskService } from 'sql/platform/tasks/common/tasksService'; -import { TaskNode, TaskStatus } from 'sql/platform/tasks/common/tasksNode'; +import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService'; +import { TaskNode, TaskStatus } from 'sql/workbench/services/tasks/common/tasksNode'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { IExpandableTree } from 'sql/workbench/contrib/objectExplorer/browser/treeUpdateUtils'; diff --git a/src/sql/workbench/contrib/tasks/common/tasksAction.ts b/src/sql/workbench/contrib/tasks/common/tasksAction.ts index 15ad481016..4692c51007 100644 --- a/src/sql/workbench/contrib/tasks/common/tasksAction.ts +++ b/src/sql/workbench/contrib/tasks/common/tasksAction.ts @@ -5,8 +5,8 @@ import { localize } from 'vs/nls'; import { Action } from 'vs/base/common/actions'; -import { ITaskService } from 'sql/platform/tasks/common/tasksService'; -import { TaskNode } from 'sql/platform/tasks/common/tasksNode'; +import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService'; +import { TaskNode } from 'sql/workbench/services/tasks/common/tasksNode'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import Severity from 'vs/base/common/severity'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; diff --git a/src/sql/workbench/contrib/webview/browser/webViewDialog.ts b/src/sql/workbench/contrib/webview/browser/webViewDialog.ts index 4fcdd360a7..db528f9c18 100644 --- a/src/sql/workbench/contrib/webview/browser/webViewDialog.ts +++ b/src/sql/workbench/contrib/webview/browser/webViewDialog.ts @@ -7,7 +7,7 @@ import 'vs/css!sql/media/icons/common-icons'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; -import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { Event, Emitter } from 'vs/base/common/event'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -21,6 +21,7 @@ import { IWebviewService, WebviewElement } from 'vs/workbench/contrib/webview/br import { generateUuid } from 'vs/base/common/uuid'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; export class WebViewDialog extends Modal { diff --git a/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts b/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts index 8e17741f1f..fd23c05904 100644 --- a/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts +++ b/src/sql/workbench/services/bootstrap/browser/commonServiceInterface.service.ts @@ -13,7 +13,7 @@ import { IMetadataService } from 'sql/platform/metadata/common/metadataService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { AngularDisposable } from 'sql/base/browser/lifecycle'; import { ConnectionContextKey } from 'sql/workbench/contrib/connection/common/connectionContextKey'; diff --git a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts index 457d0ea91e..c5091ee248 100644 --- a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!./media/connectionDialog'; import { Button } from 'sql/base/browser/ui/button/button'; -import { attachModalDialogStyler, attachButtonStyler, attachTabbedPanelStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Modal } from 'sql/workbench/browser/modal/modal'; @@ -38,6 +38,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { entries } from 'sql/base/common/collections'; +import { attachTabbedPanelStyler, attachModalDialogStyler } from 'sql/workbench/common/styler'; export interface OnShowUIResponse { selectedProviderDisplayName: string; diff --git a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts index 53f95a9704..e93c5855fc 100644 --- a/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts +++ b/src/sql/workbench/services/dashboard/browser/newDashboardTabDialogImpl.ts @@ -19,7 +19,7 @@ import { KeyCode } from 'vs/base/common/keyCodes'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; -import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { NewDashboardTabViewModel, IDashboardUITab } from 'sql/workbench/services/dashboard/browser/newDashboardTabViewModel'; import { IDashboardTab } from 'sql/workbench/contrib/dashboard/browser/dashboardRegistry'; @@ -28,6 +28,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; class ExtensionListDelegate implements IListVirtualDelegate { diff --git a/src/sql/workbench/services/dialog/browser/dialogContainer.component.ts b/src/sql/workbench/services/dialog/browser/dialogContainer.component.ts index 187a820500..2807f7aa9a 100644 --- a/src/sql/workbench/services/dialog/browser/dialogContainer.component.ts +++ b/src/sql/workbench/services/dialog/browser/dialogContainer.component.ts @@ -7,9 +7,9 @@ import 'vs/css!./media/dialogModal'; import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core'; import { ModelViewContent } from 'sql/workbench/browser/modelComponents/modelViewContent.component'; import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; -import { ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; import { IBootstrapParams } from 'sql/workbench/services/bootstrap/common/bootstrapParams'; +import { ComponentEventType } from 'sql/platform/dashboard/browser/interfaces'; export interface LayoutRequestParams { modelViewId?: string; diff --git a/src/sql/workbench/services/dialog/browser/dialogModal.ts b/src/sql/workbench/services/dialog/browser/dialogModal.ts index 515f6e1f5c..ed204df8d0 100644 --- a/src/sql/workbench/services/dialog/browser/dialogModal.ts +++ b/src/sql/workbench/services/dialog/browser/dialogModal.ts @@ -5,7 +5,6 @@ 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/workbench/services/dialog/common/dialogTypes'; import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; @@ -25,6 +24,7 @@ import { ILogService } from 'vs/platform/log/common/log'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { onUnexpectedError } from 'vs/base/common/errors'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; export class DialogModal extends Modal { private _dialogPane: DialogPane; diff --git a/src/sql/workbench/services/dialog/browser/dialogPane.ts b/src/sql/workbench/services/dialog/browser/dialogPane.ts index 879579ed0b..4d2093d144 100644 --- a/src/sql/workbench/services/dialog/browser/dialogPane.ts +++ b/src/sql/workbench/services/dialog/browser/dialogPane.ts @@ -18,9 +18,9 @@ import * as DOM from 'vs/base/browser/dom'; import { Disposable } from 'vs/base/common/lifecycle'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Emitter } from 'vs/base/common/event'; -import { attachTabbedPanelStyler } from 'sql/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IThemable } from 'vs/base/common/styler'; +import { attachTabbedPanelStyler } from 'sql/workbench/common/styler'; export class DialogPane extends Disposable implements IThemable { private _tabbedPanel: TabbedPanel; diff --git a/src/sql/workbench/services/dialog/browser/wizardModal.ts b/src/sql/workbench/services/dialog/browser/wizardModal.ts index 0dfb090447..ea1524ef4d 100644 --- a/src/sql/workbench/services/dialog/browser/wizardModal.ts +++ b/src/sql/workbench/services/dialog/browser/wizardModal.ts @@ -5,7 +5,6 @@ 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/workbench/services/dialog/common/dialogTypes'; import { DialogPane } from 'sql/workbench/services/dialog/browser/dialogPane'; import { bootstrapAngular } from 'sql/workbench/services/bootstrap/browser/bootstrapService'; @@ -26,6 +25,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { onUnexpectedError } from 'vs/base/common/errors'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; export class WizardModal extends Modal { private _dialogPanes = new Map(); diff --git a/src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts b/src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts index 6a4ed103d2..f2932e91fc 100644 --- a/src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts +++ b/src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/errorMessageDialog'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; -import { attachButtonStyler, attachModalDialogStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import Severity from 'vs/base/common/severity'; import { IThemeService } from 'vs/platform/theme/common/themeService'; @@ -24,6 +24,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { onUnexpectedError } from 'vs/base/common/errors'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; const maxActions = 1; diff --git a/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts index b53e0adda2..dde87a20eb 100644 --- a/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDataSource.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; +import { IFileBrowserService } from 'sql/workbench/services/fileBrowser/common/interfaces'; import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; diff --git a/src/sql/workbench/services/fileBrowser/browser/fileBrowserDialog.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDialog.ts index 89de1700b6..b2c3d6ceb3 100644 --- a/src/sql/workbench/services/fileBrowser/browser/fileBrowserDialog.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserDialog.ts @@ -10,7 +10,7 @@ import { InputBox, OnLoseFocusParams } from 'sql/base/browser/ui/inputBox/inputB import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; import { Modal } from 'sql/workbench/browser/modal/modal'; -import { attachModalDialogStyler, attachButtonStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { FileBrowserTreeView } from 'sql/workbench/services/fileBrowser/browser/fileBrowserTreeView'; @@ -33,6 +33,7 @@ import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/la import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { onUnexpectedError } from 'vs/base/common/errors'; +import { attachModalDialogStyler } from 'sql/workbench/common/styler'; export class FileBrowserDialog extends Modal { private _viewModel: FileBrowserViewModel; diff --git a/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts b/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts index bdd529ecd8..2a65d1d538 100644 --- a/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts +++ b/src/sql/workbench/services/fileBrowser/browser/fileBrowserTreeView.ts @@ -6,7 +6,7 @@ import { FileBrowserDataSource } from 'sql/workbench/services/fileBrowser/browser/fileBrowserDataSource'; import { FileBrowserController } from 'sql/workbench/services/fileBrowser/browser/fileBrowserController'; import { FileBrowserRenderer } from 'sql/workbench/services/fileBrowser/browser/fileBrowserRenderer'; -import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; +import { IFileBrowserService } from 'sql/workbench/services/fileBrowser/common/interfaces'; import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; import * as DOM from 'vs/base/browser/dom'; diff --git a/src/sql/platform/fileBrowser/common/fileBrowserService.ts b/src/sql/workbench/services/fileBrowser/common/fileBrowserService.ts similarity index 98% rename from src/sql/platform/fileBrowser/common/fileBrowserService.ts rename to src/sql/workbench/services/fileBrowser/common/fileBrowserService.ts index e201c69efa..421cd953a5 100644 --- a/src/sql/platform/fileBrowser/common/fileBrowserService.ts +++ b/src/sql/workbench/services/fileBrowser/common/fileBrowserService.ts @@ -7,7 +7,7 @@ import * as azdata from 'azdata'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { FileBrowserTree } from 'sql/workbench/services/fileBrowser/common/fileBrowserTree'; import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; -import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; +import { IFileBrowserService } from 'sql/workbench/services/fileBrowser/common/interfaces'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/services/fileBrowser/common/fileBrowserViewModel.ts b/src/sql/workbench/services/fileBrowser/common/fileBrowserViewModel.ts index 6c9a1a6104..be5173e4c0 100644 --- a/src/sql/workbench/services/fileBrowser/common/fileBrowserViewModel.ts +++ b/src/sql/workbench/services/fileBrowser/common/fileBrowserViewModel.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; +import { IFileBrowserService } from 'sql/workbench/services/fileBrowser/common/interfaces'; import { localize } from 'vs/nls'; import { onUnexpectedError } from 'vs/base/common/errors'; diff --git a/src/sql/platform/fileBrowser/common/interfaces.ts b/src/sql/workbench/services/fileBrowser/common/interfaces.ts similarity index 100% rename from src/sql/platform/fileBrowser/common/interfaces.ts rename to src/sql/workbench/services/fileBrowser/common/interfaces.ts diff --git a/src/sql/workbench/services/insights/browser/insightsDialogController.ts b/src/sql/workbench/services/insights/browser/insightsDialogController.ts index 19adf95005..ea409b6c69 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogController.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogController.ts @@ -5,7 +5,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import * as Utils from 'sql/platform/connection/common/utils'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { resolveQueryFilePath } from '../common/insightsUtils'; diff --git a/src/sql/workbench/services/insights/browser/insightsDialogView.ts b/src/sql/workbench/services/insights/browser/insightsDialogView.ts index 9d448eadcc..255cac86f1 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogView.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogView.ts @@ -7,7 +7,7 @@ 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 { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachPanelStyler } from 'sql/platform/theme/common/styler'; +import { attachButtonStyler, attachTableStyler } from 'sql/platform/theme/common/styler'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IInsightsDialogModel, ListResource, IInsightDialogActionContext, insertValueRegex } from 'sql/workbench/services/insights/browser/insightsDialogService'; @@ -38,11 +38,12 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur 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'; +import { TaskRegistry } from 'sql/workbench/services/tasks/browser/tasksRegistry'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { onUnexpectedError } from 'vs/base/common/errors'; import { ViewPane, IViewPaneOptions } from 'vs/workbench/browser/parts/views/viewPaneContainer'; +import { attachPanelStyler, attachModalDialogStyler } from 'sql/workbench/common/styler'; import { IViewDescriptorService } from 'vs/workbench/common/views'; const labelDisplay = nls.localize("insights.item", "Item"); diff --git a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts index 164c17e17f..8123d1e83d 100644 --- a/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts +++ b/src/sql/workbench/services/insights/test/browser/insightsDialogController.test.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { InsightsDialogController } from 'sql/workbench/services/insights/browser/insightsDialogController'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { ConnectionManagementService } from 'sql/workbench/services/connection/browser/connectionManagementService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/platform/jobManagement/browser/jobActions.ts b/src/sql/workbench/services/jobManagement/browser/jobActions.ts similarity index 100% rename from src/sql/platform/jobManagement/browser/jobActions.ts rename to src/sql/workbench/services/jobManagement/browser/jobActions.ts diff --git a/src/sql/platform/jobManagement/browser/jobManagementUtilities.ts b/src/sql/workbench/services/jobManagement/browser/jobManagementUtilities.ts similarity index 100% rename from src/sql/platform/jobManagement/browser/jobManagementUtilities.ts rename to src/sql/workbench/services/jobManagement/browser/jobManagementUtilities.ts diff --git a/src/sql/platform/jobManagement/common/interfaces.ts b/src/sql/workbench/services/jobManagement/common/interfaces.ts similarity index 100% rename from src/sql/platform/jobManagement/common/interfaces.ts rename to src/sql/workbench/services/jobManagement/common/interfaces.ts diff --git a/src/sql/platform/jobManagement/common/jobManagementService.ts b/src/sql/workbench/services/jobManagement/common/jobManagementService.ts similarity index 99% rename from src/sql/platform/jobManagement/common/jobManagementService.ts rename to src/sql/workbench/services/jobManagement/common/jobManagementService.ts index 1ad9aeff8a..4ed885ce26 100644 --- a/src/sql/platform/jobManagement/common/jobManagementService.ts +++ b/src/sql/workbench/services/jobManagement/common/jobManagementService.ts @@ -5,7 +5,7 @@ import { localize } from 'vs/nls'; import * as azdata from 'azdata'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/platform/jobManagement/test/common/jobManagementService.test.ts b/src/sql/workbench/services/jobManagement/test/common/jobManagementService.test.ts similarity index 87% rename from src/sql/platform/jobManagement/test/common/jobManagementService.test.ts rename to src/sql/workbench/services/jobManagement/test/common/jobManagementService.test.ts index 08de3f1eb0..63536d1b3e 100644 --- a/src/sql/platform/jobManagement/test/common/jobManagementService.test.ts +++ b/src/sql/workbench/services/jobManagement/test/common/jobManagementService.test.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { JobManagementService } from 'sql/platform/jobManagement/common/jobManagementService'; +import { JobManagementService } from 'sql/workbench/services/jobManagement/common/jobManagementService'; import * as assert from 'assert'; // TESTS /////////////////////////////////////////////////////////////////// diff --git a/src/sql/platform/jobManagement/test/electron-browser/jobActions.test.ts b/src/sql/workbench/services/jobManagement/test/electron-browser/jobActions.test.ts similarity index 98% rename from src/sql/platform/jobManagement/test/electron-browser/jobActions.test.ts rename to src/sql/workbench/services/jobManagement/test/electron-browser/jobActions.test.ts index 9116009763..a9e75f2559 100644 --- a/src/sql/platform/jobManagement/test/electron-browser/jobActions.test.ts +++ b/src/sql/workbench/services/jobManagement/test/electron-browser/jobActions.test.ts @@ -6,8 +6,8 @@ import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; import * as assert from 'assert'; -import { JobsRefreshAction, NewJobAction, EditJobAction, RunJobAction, StopJobAction, DeleteJobAction, NewStepAction, DeleteStepAction, NewAlertAction, EditAlertAction, DeleteAlertAction, NewOperatorAction, EditOperatorAction, DeleteOperatorAction, NewProxyAction, EditProxyAction, DeleteProxyAction } from 'sql/platform/jobManagement/browser/jobActions'; -import { JobManagementService } from 'sql/platform/jobManagement/common/jobManagementService'; +import { JobsRefreshAction, NewJobAction, EditJobAction, RunJobAction, StopJobAction, DeleteJobAction, NewStepAction, DeleteStepAction, NewAlertAction, EditAlertAction, DeleteAlertAction, NewOperatorAction, EditOperatorAction, DeleteOperatorAction, NewProxyAction, EditProxyAction, DeleteProxyAction } from 'sql/workbench/services/jobManagement/browser/jobActions'; +import { JobManagementService } from 'sql/workbench/services/jobManagement/common/jobManagementService'; // Mock View Components let mockJobsViewComponent: TypeMoq.Mock; diff --git a/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts b/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts index a73a420dbd..8895a72004 100644 --- a/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts +++ b/src/sql/workbench/services/notebook/browser/notebookServiceImpl.ts @@ -29,7 +29,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import { NotebookEditor } from 'sql/workbench/contrib/notebook/browser/notebookEditor'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { registerNotebookThemes } from 'sql/workbench/contrib/notebook/browser/notebookStyles'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { notebookConstants, ICellModel } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import { SqlNotebookProvider } from 'sql/workbench/services/notebook/browser/sql/sqlNotebookProvider'; diff --git a/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts b/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts index e135f29f23..72ba20888f 100644 --- a/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts +++ b/src/sql/workbench/services/notebook/browser/sql/sqlSessionManager.ts @@ -6,7 +6,7 @@ import { nb, QueryExecuteSubsetResult, IDbColumn, BatchSummary, IResultMessage, ResultSetSummary } from 'azdata'; import { localize } from 'vs/nls'; import { FutureInternal, notebookConstants } from 'sql/workbench/contrib/notebook/browser/models/modelInterfaces'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import Severity from 'vs/base/common/severity'; diff --git a/src/sql/platform/query/common/gridDataProvider.ts b/src/sql/workbench/services/query/common/gridDataProvider.ts similarity index 100% rename from src/sql/platform/query/common/gridDataProvider.ts rename to src/sql/workbench/services/query/common/gridDataProvider.ts diff --git a/src/sql/platform/query/common/queryManagement.ts b/src/sql/workbench/services/query/common/queryManagement.ts similarity index 99% rename from src/sql/platform/query/common/queryManagement.ts rename to src/sql/workbench/services/query/common/queryManagement.ts index 1378e5aa66..03bd82bae7 100644 --- a/src/sql/platform/query/common/queryManagement.ts +++ b/src/sql/workbench/services/query/common/queryManagement.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/platform/query/common/queryModel.ts b/src/sql/workbench/services/query/common/queryModel.ts similarity index 95% rename from src/sql/platform/query/common/queryModel.ts rename to src/sql/workbench/services/query/common/queryModel.ts index 58440cfb3f..7096b0cb90 100644 --- a/src/sql/platform/query/common/queryModel.ts +++ b/src/sql/workbench/services/query/common/queryModel.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import QueryRunner, { IQueryMessage } from 'sql/platform/query/common/queryRunner'; +import QueryRunner, { IQueryMessage } from 'sql/workbench/services/query/common/queryRunner'; import { DataService } from 'sql/workbench/contrib/grid/common/dataService'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; @@ -19,7 +19,7 @@ import { ExecutionPlanOptions, queryeditor } from 'azdata'; -import { QueryInfo } from 'sql/platform/query/common/queryModelService'; +import { QueryInfo } from 'sql/workbench/services/query/common/queryModelService'; export const SERVICE_ID = 'queryModelService'; diff --git a/src/sql/platform/query/common/queryModelService.ts b/src/sql/workbench/services/query/common/queryModelService.ts similarity index 99% rename from src/sql/platform/query/common/queryModelService.ts rename to src/sql/workbench/services/query/common/queryModelService.ts index e28fe88b38..441454efeb 100644 --- a/src/sql/platform/query/common/queryModelService.ts +++ b/src/sql/workbench/services/query/common/queryModelService.ts @@ -5,9 +5,9 @@ import * as GridContentEvents from 'sql/workbench/contrib/grid/common/gridContentEvents'; import * as LocalizedConstants from 'sql/workbench/contrib/query/common/localizedConstants'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import { DataService } from 'sql/workbench/contrib/grid/common/dataService'; -import { IQueryModelService, IQueryEvent } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService, IQueryEvent } from 'sql/workbench/services/query/common/queryModel'; import * as azdata from 'azdata'; diff --git a/src/sql/platform/query/common/queryRunner.ts b/src/sql/workbench/services/query/common/queryRunner.ts similarity index 98% rename from src/sql/platform/query/common/queryRunner.ts rename to src/sql/workbench/services/query/common/queryRunner.ts index 5644e4e49e..2887dc1efe 100644 --- a/src/sql/platform/query/common/queryRunner.ts +++ b/src/sql/workbench/services/query/common/queryRunner.ts @@ -5,11 +5,11 @@ import * as azdata from 'azdata'; -import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import * as Utils from 'sql/platform/connection/common/utils'; import { SaveFormat } from 'sql/workbench/contrib/grid/common/interfaces'; import { Deferred } from 'sql/base/common/promise'; -import { IQueryPlanInfo } from 'sql/platform/query/common/queryModel'; +import { IQueryPlanInfo } from 'sql/workbench/services/query/common/queryModel'; import { ResultSerializer } from 'sql/workbench/contrib/query/common/resultSerializer'; import Severity from 'vs/base/common/severity'; @@ -24,7 +24,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur import { ITextResourcePropertiesService } from 'vs/editor/common/services/textResourceConfigurationService'; import { URI } from 'vs/base/common/uri'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; -import { IGridDataProvider, getResultsString } from 'sql/platform/query/common/gridDataProvider'; +import { IGridDataProvider, getResultsString } from 'sql/workbench/services/query/common/gridDataProvider'; import { getErrorMessage } from 'vs/base/common/errors'; import { ILogService } from 'vs/platform/log/common/log'; import { find } from 'vs/base/common/arrays'; diff --git a/src/sql/platform/query/test/common/testQueryModelService.ts b/src/sql/workbench/services/query/test/common/testQueryModelService.ts similarity index 94% rename from src/sql/platform/query/test/common/testQueryModelService.ts rename to src/sql/workbench/services/query/test/common/testQueryModelService.ts index ee9cda3122..1733d63490 100644 --- a/src/sql/platform/query/test/common/testQueryModelService.ts +++ b/src/sql/workbench/services/query/test/common/testQueryModelService.ts @@ -3,12 +3,12 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IQueryModelService, IQueryEvent } from 'sql/platform/query/common/queryModel'; -import QueryRunner from 'sql/platform/query/common/queryRunner'; +import { IQueryModelService, IQueryEvent } from 'sql/workbench/services/query/common/queryModel'; +import QueryRunner from 'sql/workbench/services/query/common/queryRunner'; import * as azdata from 'azdata'; import { QueryEditorInput } from 'sql/workbench/contrib/query/common/queryEditorInput'; import { Event } from 'vs/base/common/event'; -import { QueryInfo } from 'sql/platform/query/common/queryModelService'; +import { QueryInfo } from 'sql/workbench/services/query/common/queryModelService'; import { DataService } from 'sql/workbench/contrib/grid/common/dataService'; export class TestQueryModelService implements IQueryModelService { diff --git a/src/sql/platform/queryHistory/common/queryHistoryInfo.ts b/src/sql/workbench/services/queryHistory/common/queryHistoryInfo.ts similarity index 100% rename from src/sql/platform/queryHistory/common/queryHistoryInfo.ts rename to src/sql/workbench/services/queryHistory/common/queryHistoryInfo.ts diff --git a/src/sql/platform/queryHistory/common/queryHistoryService.ts b/src/sql/workbench/services/queryHistory/common/queryHistoryService.ts similarity index 94% rename from src/sql/platform/queryHistory/common/queryHistoryService.ts rename to src/sql/workbench/services/queryHistory/common/queryHistoryService.ts index dbb3559c1b..972c98a2a4 100644 --- a/src/sql/platform/queryHistory/common/queryHistoryService.ts +++ b/src/sql/workbench/services/queryHistory/common/queryHistoryService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { QueryHistoryInfo } from 'sql/platform/queryHistory/common/queryHistoryInfo'; +import { QueryHistoryInfo } from 'sql/workbench/services/queryHistory/common/queryHistoryInfo'; import { Event } from 'vs/base/common/event'; export const SERVICE_ID = 'queryHistoryService'; diff --git a/src/sql/platform/queryHistory/common/queryHistoryServiceImpl.ts b/src/sql/workbench/services/queryHistory/common/queryHistoryServiceImpl.ts similarity index 94% rename from src/sql/platform/queryHistory/common/queryHistoryServiceImpl.ts rename to src/sql/workbench/services/queryHistory/common/queryHistoryServiceImpl.ts index d633bd8382..4c87555d6c 100644 --- a/src/sql/platform/queryHistory/common/queryHistoryServiceImpl.ts +++ b/src/sql/workbench/services/queryHistory/common/queryHistoryServiceImpl.ts @@ -3,13 +3,13 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService.ts'; +import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService'; -import { IQueryModelService, IQueryEvent } from 'sql/platform/query/common/queryModel'; +import { IQueryModelService, IQueryEvent } from 'sql/workbench/services/query/common/queryModel'; import { IModelService } from 'vs/editor/common/services/modelService'; import { URI } from 'vs/base/common/uri'; import { Range } from 'vs/editor/common/core/range'; -import { QueryHistoryInfo, QueryStatus } from 'sql/platform/queryHistory/common/queryHistoryInfo'; +import { QueryHistoryInfo, QueryStatus } from 'sql/workbench/services/queryHistory/common/queryHistoryInfo'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { Event, Emitter } from 'vs/base/common/event'; import { Disposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/platform/restore/browser/restoreServiceImpl.ts b/src/sql/workbench/services/restore/browser/restoreServiceImpl.ts similarity index 97% rename from src/sql/platform/restore/browser/restoreServiceImpl.ts rename to src/sql/workbench/services/restore/browser/restoreServiceImpl.ts index bdf7273314..e9ef264a41 100644 --- a/src/sql/platform/restore/browser/restoreServiceImpl.ts +++ b/src/sql/workbench/services/restore/browser/restoreServiceImpl.ts @@ -7,17 +7,17 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import * as types from 'vs/base/common/types'; import * as azdata from 'azdata'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; -import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/platform/restore/common/restoreService'; +import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/workbench/services/restore/common/restoreService'; import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { RestoreDialog } from 'sql/workbench/contrib/restore/browser/restoreDialog'; import * as ConnectionConstants from 'sql/platform/connection/common/constants'; -import { MssqlRestoreInfo } from 'sql/platform/restore/common/mssqlRestoreInfo'; +import { MssqlRestoreInfo } from 'sql/workbench/services/restore/common/mssqlRestoreInfo'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; import * as Utils from 'sql/platform/connection/common/utils'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/browser/objectExplorerService'; -import { ITaskService } from 'sql/platform/tasks/common/tasksService'; -import { TaskStatus, TaskNode } from 'sql/platform/tasks/common/tasksNode'; +import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService'; +import { TaskStatus, TaskNode } from 'sql/workbench/services/tasks/common/tasksNode'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { invalidProvider } from 'sql/base/common/errors'; diff --git a/src/sql/platform/restore/common/mssqlRestoreInfo.ts b/src/sql/workbench/services/restore/common/mssqlRestoreInfo.ts similarity index 100% rename from src/sql/platform/restore/common/mssqlRestoreInfo.ts rename to src/sql/workbench/services/restore/common/mssqlRestoreInfo.ts diff --git a/src/sql/platform/restore/common/restoreService.ts b/src/sql/workbench/services/restore/common/restoreService.ts similarity index 100% rename from src/sql/platform/restore/common/restoreService.ts rename to src/sql/workbench/services/restore/common/restoreService.ts diff --git a/src/sql/platform/tasks/browser/tasksRegistry.ts b/src/sql/workbench/services/tasks/browser/tasksRegistry.ts similarity index 98% rename from src/sql/platform/tasks/browser/tasksRegistry.ts rename to src/sql/workbench/services/tasks/browser/tasksRegistry.ts index 1738602127..b08e9e5141 100644 --- a/src/sql/platform/tasks/browser/tasksRegistry.ts +++ b/src/sql/workbench/services/tasks/browser/tasksRegistry.ts @@ -5,7 +5,7 @@ import { MenuRegistry, ICommandAction } from 'vs/platform/actions/common/actions'; import { IDisposable } from 'vs/base/common/lifecycle'; -import { ITaskRegistry, ITaskHandler, ITask, ITaskHandlerDescription, ITaskOptions } from 'sql/platform/tasks/common/tasks'; +import { ITaskRegistry, ITaskHandler, ITask, ITaskHandlerDescription, ITaskOptions } from 'sql/workbench/services/tasks/common/tasks'; import * as types from 'vs/base/common/types'; import { Event, Emitter } from 'vs/base/common/event'; import { URI } from 'vs/base/common/uri'; diff --git a/src/sql/platform/tasks/common/tasks.ts b/src/sql/workbench/services/tasks/common/tasks.ts similarity index 100% rename from src/sql/platform/tasks/common/tasks.ts rename to src/sql/workbench/services/tasks/common/tasks.ts diff --git a/src/sql/platform/tasks/common/tasksNode.ts b/src/sql/workbench/services/tasks/common/tasksNode.ts similarity index 100% rename from src/sql/platform/tasks/common/tasksNode.ts rename to src/sql/workbench/services/tasks/common/tasksNode.ts diff --git a/src/sql/platform/tasks/common/tasksService.ts b/src/sql/workbench/services/tasks/common/tasksService.ts similarity index 98% rename from src/sql/platform/tasks/common/tasksService.ts rename to src/sql/workbench/services/tasks/common/tasksService.ts index 51f21353b9..d761180a98 100644 --- a/src/sql/platform/tasks/common/tasksService.ts +++ b/src/sql/workbench/services/tasks/common/tasksService.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as azdata from 'azdata'; -import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/platform/tasks/common/tasksNode'; +import { TaskNode, TaskStatus, TaskExecutionMode } from 'sql/workbench/services/tasks/common/tasksNode'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/test/electron-browser/api/mainThreadBackgroundTaskManagement.test.ts b/src/sql/workbench/test/electron-browser/api/mainThreadBackgroundTaskManagement.test.ts index 9b9d1235ce..4e41241d74 100644 --- a/src/sql/workbench/test/electron-browser/api/mainThreadBackgroundTaskManagement.test.ts +++ b/src/sql/workbench/test/electron-browser/api/mainThreadBackgroundTaskManagement.test.ts @@ -6,9 +6,9 @@ import * as azdata from 'azdata'; import { Mock, It, Times } from 'typemoq'; import { MainThreadBackgroundTaskManagement, TaskStatus } from 'sql/workbench/api/browser/mainThreadBackgroundTaskManagement'; -import { ITaskService } from 'sql/platform/tasks/common/tasksService'; +import { ITaskService } from 'sql/workbench/services/tasks/common/tasksService'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; -import { TaskNode } from 'sql/platform/tasks/common/tasksNode'; +import { TaskNode } from 'sql/workbench/services/tasks/common/tasksNode'; import { Emitter } from 'vs/base/common/event'; import { ExtHostBackgroundTaskManagementShape } from 'sql/workbench/api/common/sqlExtHost.protocol'; diff --git a/src/sql/workbench/test/electron-browser/modalComponents/componentBase.test.ts b/src/sql/workbench/test/electron-browser/modalComponents/componentBase.test.ts index 669a949d20..342a67708c 100644 --- a/src/sql/workbench/test/electron-browser/modalComponents/componentBase.test.ts +++ b/src/sql/workbench/test/electron-browser/modalComponents/componentBase.test.ts @@ -5,9 +5,9 @@ import * as assert from 'assert'; import { ComponentBase, ContainerBase, ItemDescriptor } from 'sql/workbench/browser/modelComponents/componentBase'; -import { IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/browser/modelComponents/interfaces'; import { ModelStore } from 'sql/workbench/browser/modelComponents/modelStore'; import { ChangeDetectorRef } from '@angular/core'; +import { IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/platform/dashboard/browser/interfaces'; class TestComponent extends ComponentBase { diff --git a/src/sql/workbench/test/workbenchTestServices.ts b/src/sql/workbench/test/workbenchTestServices.ts index fd40230291..7282a62111 100644 --- a/src/sql/workbench/test/workbenchTestServices.ts +++ b/src/sql/workbench/test/workbenchTestServices.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { ITestInstantiationService, workbenchInstantiationService as vsworkbenchInstantiationService } from 'vs/workbench/test/workbenchTestServices'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { TestQueryModelService } from 'sql/platform/query/test/common/testQueryModelService'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; +import { TestQueryModelService } from 'sql/workbench/services/query/test/common/testQueryModelService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { TestConnectionManagementService } from 'sql/platform/connection/test/common/testConnectionManagementService'; import { TestObjectExplorerService } from 'sql/workbench/services/objectExplorer/test/browser/testObjectExplorerService'; diff --git a/src/tsconfig.vscode.json b/src/tsconfig.vscode.json index 3dda04e2bd..9a7843987d 100644 --- a/src/tsconfig.vscode.json +++ b/src/tsconfig.vscode.json @@ -24,15 +24,12 @@ "./vs/base/**/*.ts", // "./vs/code/**/*.ts", "./vs/editor/**/*.ts", - // "./vs/platform/**/*.ts", + "./vs/platform/**/*.ts", "./sql/base/**/*.ts", "./sql/editor/**/*.ts", "./sql/platform/**/*.ts" ], "exclude": [ - "./sql/platform/jobManagement/**/*.ts", - "./sql/platform/query/**/*.ts", - "./sql/platform/queryHistory/**/*.ts", - "./sql/platform/restore/**/*.ts", + "./vs/platform/workspaces/test/electron-main/workspacesMainService.test.ts" ] } diff --git a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts index 1ecc884123..3f9705f493 100644 --- a/src/vs/platform/actions/browser/menuEntryActionViewItem.ts +++ b/src/vs/platform/actions/browser/menuEntryActionViewItem.ts @@ -313,7 +313,9 @@ export class LabeledMenuItemActionItem extends MenuEntryActionViewItem { } updateLabel(): void { - this.label.innerText = this._commandAction.label; + if (this.label) { + this.label.innerText = this._commandAction.label; + } } // Overwrite item class to ensure that we can pass in a CSS class that other items use @@ -327,19 +329,28 @@ export class LabeledMenuItemActionItem extends MenuEntryActionViewItem { } else if (item.icon) { let iconClass: string; - const iconPathMapKey = item.icon.dark.toString(); - if (MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) { - iconClass = MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!; - } else { - iconClass = ids.nextId(); - createCSSRule(`.codicon.${iconClass}`, `background-image: ${asCSSUrl(item.icon.light || item.icon.dark)}`); - createCSSRule(`.vs-dark .codicon.${iconClass}, .hc-black .codicon.${iconClass}`, `background-image: ${asCSSUrl(item.icon.dark)}`); - MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass); + if (item.icon?.dark?.scheme) { + const iconPathMapKey = item.icon.dark.toString(); + + if (MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.has(iconPathMapKey)) { + iconClass = MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.get(iconPathMapKey)!; + } else { + iconClass = ids.nextId(); + createCSSRule(`.codicon.${iconClass}`, `background-image: ${asCSSUrl(item.icon.light || item.icon.dark)}`); + createCSSRule(`.vs-dark .codicon.${iconClass}, .hc-black .codicon.${iconClass}`, `background-image: ${asCSSUrl(item.icon.dark)}`); + MenuEntryActionViewItem.ICON_PATH_TO_CSS_RULES.set(iconPathMapKey, iconClass); + } + + if (this.label) { + addClasses(this.label, 'codicon', this._defaultCSSClassToAdd, iconClass); + this._labeledItemClassDispose = toDisposable(() => { + if (this.label) { + removeClasses(this.label, 'codicon', this._defaultCSSClassToAdd, iconClass); + } + }); + } } - - addClasses(this.label, 'codicon', this._defaultCSSClassToAdd, iconClass); - this._labeledItemClassDispose = toDisposable(() => removeClasses(this.label, 'codicon', this._defaultCSSClassToAdd, iconClass)); } } diff --git a/src/vs/workbench/workbench.common.main.ts b/src/vs/workbench/workbench.common.main.ts index 18f64fb88e..72ca447b17 100644 --- a/src/vs/workbench/workbench.common.main.ts +++ b/src/vs/workbench/workbench.common.main.ts @@ -142,11 +142,11 @@ import { IServerGroupController } from 'sql/platform/serverGroup/common/serverGr import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { CapabilitiesService } from 'sql/workbench/services/capabilities/common/capabilitiesServiceImpl'; import { ICredentialsService as sqlICredentialsService, CredentialsService } from 'sql/platform/credentials/common/credentialsService'; -import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { QueryModelService } from 'sql/platform/query/common/queryModelService'; +import { IQueryModelService } from 'sql/workbench/services/query/common/queryModel'; +import { QueryModelService } from 'sql/workbench/services/query/common/queryModelService'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { QueryEditorService } from 'sql/workbench/services/queryEditor/browser/queryEditorService'; -import { IQueryManagementService, QueryManagementService } from 'sql/platform/query/common/queryManagement'; +import { IQueryManagementService, QueryManagementService } from 'sql/workbench/services/query/common/queryManagement'; import { IResourceProviderService } from 'sql/workbench/services/resourceProvider/common/resourceProviderService'; import { ResourceProviderService } from 'sql/workbench/services/resourceProvider/browser/resourceProviderService'; import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; @@ -157,21 +157,21 @@ import { IAngularEventingService } from 'sql/platform/angularEventing/browser/an import { AngularEventingService } from 'sql/platform/angularEventing/browser/angularEventingServiceImpl'; import { ISerializationService, SerializationService } from 'sql/platform/serialization/common/serializationService'; import { IMetadataService, MetadataService } from 'sql/platform/metadata/common/metadataService'; -import { ITaskService, TaskService } from 'sql/platform/tasks/common/tasksService'; +import { ITaskService, TaskService } from 'sql/workbench/services/tasks/common/tasksService'; import { IEditorDescriptorService, EditorDescriptorService } from 'sql/workbench/services/queryEditor/browser/editorDescriptorService'; import { IAdminService, AdminService } from 'sql/workbench/services/admin/common/adminService'; -import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; -import { JobManagementService } from 'sql/platform/jobManagement/common/jobManagementService'; +import { IJobManagementService } from 'sql/workbench/services/jobManagement/common/interfaces'; +import { JobManagementService } from 'sql/workbench/services/jobManagement/common/jobManagementService'; import { IBackupService } from 'sql/platform/backup/common/backupService'; import { BackupService } from 'sql/platform/backup/common/backupServiceImp'; import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; import { BackupUiService } from 'sql/workbench/services/backup/browser/backupUiService'; -import { IRestoreDialogController, IRestoreService } from 'sql/platform/restore/common/restoreService'; -import { RestoreService, RestoreDialogController } from 'sql/platform/restore/browser/restoreServiceImpl'; +import { IRestoreDialogController, IRestoreService } from 'sql/workbench/services/restore/common/restoreService'; +import { RestoreService, RestoreDialogController } from 'sql/workbench/services/restore/browser/restoreServiceImpl'; import { INewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialog'; import { NewDashboardTabDialogService } from 'sql/workbench/services/dashboard/browser/newDashboardTabDialogService'; -import { IFileBrowserService } from 'sql/platform/fileBrowser/common/interfaces'; -import { FileBrowserService } from 'sql/platform/fileBrowser/common/fileBrowserService'; +import { IFileBrowserService } from 'sql/workbench/services/fileBrowser/common/interfaces'; +import { FileBrowserService } from 'sql/workbench/services/fileBrowser/common/fileBrowserService'; import { IFileBrowserDialogController } from 'sql/workbench/services/fileBrowser/common/fileBrowserDialogController'; import { FileBrowserDialogController } from 'sql/workbench/services/fileBrowser/browser/fileBrowserDialogController'; import { IInsightsDialogService } from 'sql/workbench/services/insights/browser/insightsDialogService'; diff --git a/src/vs/workbench/workbench.desktop.main.ts b/src/vs/workbench/workbench.desktop.main.ts index a872041fbe..223afae6a1 100644 --- a/src/vs/workbench/workbench.desktop.main.ts +++ b/src/vs/workbench/workbench.desktop.main.ts @@ -80,8 +80,8 @@ import { ISqlOAuthService } from 'sql/platform/oAuth/common/sqlOAuthService'; import { SqlOAuthService } from 'sql/platform/oAuth/electron-browser/sqlOAuthServiceImpl'; import { IClipboardService as sqlIClipboardService } from 'sql/platform/clipboard/common/clipboardService'; import { ClipboardService as sqlClipboardService } from 'sql/platform/clipboard/electron-browser/clipboardService'; -import { IQueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryService'; -import { QueryHistoryService } from 'sql/platform/queryHistory/common/queryHistoryServiceImpl'; +import { IQueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryService'; +import { QueryHistoryService } from 'sql/workbench/services/queryHistory/common/queryHistoryServiceImpl'; registerSingleton(ISqlOAuthService, SqlOAuthService); registerSingleton(sqlIClipboardService, sqlClipboardService);