diff --git a/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts b/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts index dfe27d95a1..fbc98446f7 100644 --- a/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts +++ b/src/sql/parts/objectExplorer/viewlet/serverTreeActionProvider.ts @@ -26,12 +26,12 @@ import { TreeUpdateUtils } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtil import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { MenuId, IMenuService } from 'vs/platform/actions/common/actions'; import { NewQueryAction, BackupAction, RestoreAction } from 'sql/workbench/common/actions'; -import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; +import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { TreeNodeContextKey } from 'sql/parts/objectExplorer/viewlet/treeNodeContextKey'; import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; -import { ServerInfoContextKey } from 'sql/parts/connection/common/serverInfoContextKey'; +import { ServerInfoContextKey } from 'sql/workbench/parts/connection/common/serverInfoContextKey'; /** * Provides actions for the server tree elements diff --git a/src/sql/platform/bootstrap/node/bootstrapParams.ts b/src/sql/platform/bootstrap/node/bootstrapParams.ts index 6554d44f29..2cee7e7469 100644 --- a/src/sql/platform/bootstrap/node/bootstrapParams.ts +++ b/src/sql/platform/bootstrap/node/bootstrapParams.ts @@ -6,7 +6,7 @@ import { DataService } from 'sql/parts/grid/services/dataService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; +import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { Event } from 'vs/base/common/event'; diff --git a/src/sql/platform/bootstrap/node/commonServiceInterface.service.ts b/src/sql/platform/bootstrap/node/commonServiceInterface.service.ts index 547a504746..28f72c5c4a 100644 --- a/src/sql/platform/bootstrap/node/commonServiceInterface.service.ts +++ b/src/sql/platform/bootstrap/node/commonServiceInterface.service.ts @@ -17,7 +17,7 @@ import { IAdminService } from 'sql/workbench/services/admin/common/adminService' import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { AngularDisposable } from 'sql/base/node/lifecycle'; -import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; +import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; import { ProviderMetadata, DatabaseInfo, SimpleExecuteResult } from 'azdata'; diff --git a/src/sql/platform/connection/common/connectionManagementService.ts b/src/sql/platform/connection/common/connectionManagementService.ts index a8502872e6..23be36890d 100644 --- a/src/sql/platform/connection/common/connectionManagementService.ts +++ b/src/sql/platform/connection/common/connectionManagementService.ts @@ -18,11 +18,11 @@ import * as Utils from 'sql/platform/connection/common/utils'; import * as Constants from 'sql/platform/connection/common/constants'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; -import * as ConnectionContracts from 'sql/parts/connection/common/connection'; +import * as ConnectionContracts from 'sql/workbench/parts/connection/common/connection'; import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; -import { ConnectionGlobalStatus } from 'sql/parts/connection/common/connectionGlobalStatus'; -import { ConnectionStatusbarItem } from 'sql/parts/connection/common/connectionStatus'; +import { ConnectionGlobalStatus } from 'sql/workbench/parts/connection/common/connectionGlobalStatus'; +import { ConnectionStatusbarItem } from 'sql/workbench/parts/connection/browser/connectionStatus'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; import * as TelemetryUtils from 'sql/platform/telemetry/telemetryUtilities'; import { warn } from 'sql/base/common/log'; diff --git a/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts b/src/sql/workbench/parts/connection/browser/advancedPropertiesController.ts similarity index 95% rename from src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts rename to src/sql/workbench/parts/connection/browser/advancedPropertiesController.ts index 32efc89e35..a40885ce02 100644 --- a/src/sql/parts/connection/connectionDialog/advancedPropertiesController.ts +++ b/src/sql/workbench/parts/connection/browser/advancedPropertiesController.ts @@ -3,9 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - -// // import { AdvancedPropertiesDialog } from 'sql/parts/connection/connectionDialog/advancedPropertiesDialog'; import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import * as azdata from 'azdata'; diff --git a/src/sql/parts/connection/common/connection.contribution.ts b/src/sql/workbench/parts/connection/browser/connection.contribution.ts similarity index 70% rename from src/sql/parts/connection/common/connection.contribution.ts rename to src/sql/workbench/parts/connection/browser/connection.contribution.ts index c106696765..00e41c5524 100644 --- a/src/sql/parts/connection/common/connection.contribution.ts +++ b/src/sql/workbench/parts/connection/browser/connection.contribution.ts @@ -3,33 +3,18 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry'; -import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { Registry } from 'vs/platform/registry/common/platform'; -import { DashboardEditor } from 'sql/workbench/parts/dashboard/dashboardEditor'; -import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; import { AddServerGroupAction, AddServerAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; -import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/parts/connection/common/connectionActions'; +import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/workbench/parts/connection/common/connectionActions'; import { IWorkbenchActionRegistry, Extensions } from 'vs/workbench/common/actions'; import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { localize } from 'vs/nls'; -import { IExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/common/extensions'; -import { ExtensionTipsService } from 'vs/workbench/contrib/extensions/electron-browser/extensionTipsService'; -import { ExtensionsWorkbenchService } from 'vs/workbench/contrib/extensions/node/extensionsWorkbenchService'; // Connection Dashboard registration -const dashboardEditorDescriptor = new EditorDescriptor( - DashboardEditor, - DashboardEditor.ID, - 'Dashboard' -); -Registry.as(EditorExtensions.Editors) - .registerEditor(dashboardEditorDescriptor, [new SyncDescriptor(DashboardInput)]); - -let actionRegistry = Registry.as(Extensions.WorkbenchActions); +const actionRegistry = Registry.as(Extensions.WorkbenchActions); // Connection Actions actionRegistry.registerWorkbenchAction( @@ -68,7 +53,7 @@ actionRegistry.registerWorkbenchAction( GetCurrentConnectionStringAction.LABEL ); -let configurationRegistry = Registry.as(ConfigExtensions.Configuration); +const configurationRegistry = Registry.as(ConfigExtensions.Configuration); configurationRegistry.registerConfiguration({ 'id': 'connection', 'title': 'Connection', diff --git a/src/sql/parts/connection/common/connectionStatus.ts b/src/sql/workbench/parts/connection/browser/connectionStatus.ts similarity index 89% rename from src/sql/parts/connection/common/connectionStatus.ts rename to src/sql/workbench/parts/connection/browser/connectionStatus.ts index 1f28ae6540..8355534d13 100644 --- a/src/sql/parts/connection/common/connectionStatus.ts +++ b/src/sql/workbench/parts/connection/browser/connectionStatus.ts @@ -2,16 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { $, append, show, hide } from 'vs/base/browser/dom'; import { IDisposable, combinedDisposable } from 'vs/base/common/lifecycle'; import { IStatusbarItem } from 'vs/workbench/browser/parts/statusbar/statusbar'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; -import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor'; // Connection status bar showing the current global connection export class ConnectionStatusbarItem implements IStatusbarItem { @@ -22,7 +21,7 @@ export class ConnectionStatusbarItem implements IStatusbarItem { constructor( @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, - @IEditorService private _editorService: EditorServiceImpl, + @IEditorService private _editorService: IEditorService, @IObjectExplorerService private _objectExplorerService: IObjectExplorerService, ) { } @@ -37,8 +36,7 @@ export class ConnectionStatusbarItem implements IStatusbarItem { this._connectionManagementService.onConnect(() => this._updateStatus()), this._connectionManagementService.onConnectionChanged(() => this._updateStatus()), this._connectionManagementService.onDisconnect(() => this._updateStatus()), - this._editorService.onDidVisibleEditorsChange(() => this._updateStatus()), - this._editorService.onDidCloseEditor(() => this._updateStatus()), + this._editorService.onDidActiveEditorChange(() => this._updateStatus()), this._objectExplorerService.onSelectionOrFocusChange(() => this._updateStatus()) ); diff --git a/src/sql/parts/connection/connectionDialog/recentConnectionTreeController.ts b/src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts similarity index 95% rename from src/sql/parts/connection/connectionDialog/recentConnectionTreeController.ts rename to src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts index 583a51acc2..91cfbdf4c0 100644 --- a/src/sql/parts/connection/connectionDialog/recentConnectionTreeController.ts +++ b/src/sql/workbench/parts/connection/browser/recentConnectionTreeController.ts @@ -3,12 +3,11 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { DefaultController, ICancelableEvent } from 'vs/base/parts/tree/browser/treeDefaults'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { ClearSingleRecentConnectionAction } from 'sql/parts/connection/common/connectionActions'; +import { ClearSingleRecentConnectionAction } from 'sql/workbench/parts/connection/common/connectionActions'; import { ContributableActionProvider } from 'vs/workbench/browser/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; @@ -23,8 +22,7 @@ export class RecentConnectionActionsProvider extends ContributableActionProvider public onRecentConnectionRemoved: Event = this._onRecentConnectionRemoved.event; constructor( - @IInstantiationService private _instantiationService: IInstantiationService, - @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, + @IInstantiationService private _instantiationService: IInstantiationService ) { super(); } @@ -135,4 +133,4 @@ export class RecentConnectionTreeController extends DefaultController { }); return true; } -} \ No newline at end of file +} diff --git a/src/sql/parts/connection/connectionDialog/savedConnectionTreeController.ts b/src/sql/workbench/parts/connection/browser/savedConnectionTreeController.ts similarity index 98% rename from src/sql/parts/connection/connectionDialog/savedConnectionTreeController.ts rename to src/sql/workbench/parts/connection/browser/savedConnectionTreeController.ts index 46842bac4b..fca1a65749 100644 --- a/src/sql/parts/connection/connectionDialog/savedConnectionTreeController.ts +++ b/src/sql/workbench/parts/connection/browser/savedConnectionTreeController.ts @@ -3,7 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { DefaultController, ICancelableEvent } from 'vs/base/parts/tree/browser/treeDefaults'; import { ITree } from 'vs/base/parts/tree/browser/tree'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; @@ -28,4 +27,4 @@ export class SavedConnectionTreeController extends DefaultController { tree.toggleExpansion(selection[0]); return true; } -} \ No newline at end of file +} diff --git a/src/sql/parts/connection/common/connection.ts b/src/sql/workbench/parts/connection/common/connection.ts similarity index 100% rename from src/sql/parts/connection/common/connection.ts rename to src/sql/workbench/parts/connection/common/connection.ts diff --git a/src/sql/parts/connection/common/connectionActions.ts b/src/sql/workbench/parts/connection/common/connectionActions.ts similarity index 100% rename from src/sql/parts/connection/common/connectionActions.ts rename to src/sql/workbench/parts/connection/common/connectionActions.ts diff --git a/src/sql/parts/connection/common/connectionContextKey.ts b/src/sql/workbench/parts/connection/common/connectionContextKey.ts similarity index 99% rename from src/sql/parts/connection/common/connectionContextKey.ts rename to src/sql/workbench/parts/connection/common/connectionContextKey.ts index cf658038a0..d5b5243241 100644 --- a/src/sql/parts/connection/common/connectionContextKey.ts +++ b/src/sql/workbench/parts/connection/common/connectionContextKey.ts @@ -3,8 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { IConnectionProfile } from 'azdata'; diff --git a/src/sql/parts/connection/common/connectionGlobalStatus.ts b/src/sql/workbench/parts/connection/common/connectionGlobalStatus.ts similarity index 93% rename from src/sql/parts/connection/common/connectionGlobalStatus.ts rename to src/sql/workbench/parts/connection/common/connectionGlobalStatus.ts index b82f7cbdaf..856008d7d1 100644 --- a/src/sql/parts/connection/common/connectionGlobalStatus.ts +++ b/src/sql/workbench/parts/connection/common/connectionGlobalStatus.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { ConnectionSummary } from 'azdata'; import { IStatusbarService } from 'vs/platform/statusbar/common/statusbar'; -import * as LocalizedConstants from 'sql/parts/connection/common/localizedConstants'; +import * as LocalizedConstants from 'sql/workbench/parts/connection/common/localizedConstants'; // Status when making connections from the viewlet export class ConnectionGlobalStatus { diff --git a/src/sql/workbench/parts/connection/common/connectionViewlet.ts b/src/sql/workbench/parts/connection/common/connectionViewlet.ts deleted file mode 100644 index f9b26c22c1..0000000000 --- a/src/sql/workbench/parts/connection/common/connectionViewlet.ts +++ /dev/null @@ -1,9 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the Source EULA. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ -import { IViewlet } from 'vs/workbench/common/viewlet'; - -export interface IConnectionsViewlet extends IViewlet { - search(text: string): void; -} diff --git a/src/sql/parts/connection/common/localizedConstants.ts b/src/sql/workbench/parts/connection/common/localizedConstants.ts similarity index 100% rename from src/sql/parts/connection/common/localizedConstants.ts rename to src/sql/workbench/parts/connection/common/localizedConstants.ts diff --git a/src/sql/parts/connection/common/serverInfoContextKey.ts b/src/sql/workbench/parts/connection/common/serverInfoContextKey.ts similarity index 98% rename from src/sql/parts/connection/common/serverInfoContextKey.ts rename to src/sql/workbench/parts/connection/common/serverInfoContextKey.ts index e0eadf6327..c3ba706aa4 100644 --- a/src/sql/parts/connection/common/serverInfoContextKey.ts +++ b/src/sql/workbench/parts/connection/common/serverInfoContextKey.ts @@ -3,8 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { RawContextKey, IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { ServerInfo } from 'azdata'; diff --git a/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts b/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts index 045a0f3923..d03465d199 100644 --- a/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts +++ b/src/sql/workbench/parts/connection/electron-browser/connectionViewlet.ts @@ -3,33 +3,24 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import 'vs/css!./media/connectionViewlet'; import * as DOM from 'vs/base/browser/dom'; import { Viewlet } from 'vs/workbench/browser/viewlet'; import { IAction } from 'vs/base/common/actions'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; -import { attachInputBoxStyler } from 'vs/platform/theme/common/styler'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { isPromiseCanceledError } from 'vs/base/common/errors'; -import Severity from 'vs/base/common/severity'; import { VIEWLET_ID } from 'sql/platform/connection/common/connectionManagement'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; -import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; -import { ClearSearchAction, AddServerAction, AddServerGroupAction, ActiveConnectionsFilterAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; +import { AddServerAction, AddServerGroupAction, ActiveConnectionsFilterAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; import { warn } from 'sql/base/common/log'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; -import { INotificationService } from 'vs/platform/notification/common/notification'; -import { localize } from 'vs/nls'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { IStorageService } from 'vs/platform/storage/common/storage'; -import { IConnectionsViewlet } from 'sql/workbench/parts/connection/common/connectionViewlet'; import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService'; -export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet { +export class ConnectionViewlet extends Viewlet { private _root: HTMLElement; private _toDisposeViewlet: IDisposable[] = []; @@ -40,16 +31,15 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet { constructor( @ITelemetryService telemetryService: ITelemetryService, - @IThemeService private _themeService: IThemeService, + @IThemeService themeService: IThemeService, @IInstantiationService private _instantiationService: IInstantiationService, - @INotificationService private _notificationService: INotificationService, @IObjectExplorerService private objectExplorerService: IObjectExplorerService, @IWorkbenchLayoutService layoutService: IWorkbenchLayoutService, @IConfigurationService configurationService: IConfigurationService, @IStorageService storageService: IStorageService ) { - super(VIEWLET_ID, configurationService, layoutService, telemetryService, _themeService, storageService); + super(VIEWLET_ID, configurationService, layoutService, telemetryService, themeService, storageService); this._addServerAction = this._instantiationService.createInstance(AddServerAction, AddServerAction.ID, @@ -62,16 +52,6 @@ export class ConnectionViewlet extends Viewlet implements IConnectionsViewlet { this.objectExplorerService.registerServerTreeView(this._serverTreeView); } - private onError(err: any): void { - if (isPromiseCanceledError(err)) { - return; - } - this._notificationService.notify({ - severity: Severity.Error, - message: err - }); - } - public create(parent: HTMLElement): void { super.create(parent); this._root = parent; diff --git a/src/sql/workbench/parts/dashboard/dashboard.contribution.ts b/src/sql/workbench/parts/dashboard/dashboard.contribution.ts new file mode 100644 index 0000000000..b2898fa93b --- /dev/null +++ b/src/sql/workbench/parts/dashboard/dashboard.contribution.ts @@ -0,0 +1,21 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { DashboardEditor } from 'sql/workbench/parts/dashboard/dashboardEditor'; +import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; + +import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; +import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; +import { Registry } from 'vs/platform/registry/common/platform'; +import { localize } from 'vs/nls'; + +const dashboardEditorDescriptor = new EditorDescriptor( + DashboardEditor, + DashboardEditor.ID, + localize('dashboard.editor.label', "Dashboard") +); + +Registry.as(EditorExtensions.Editors) + .registerEditor(dashboardEditorDescriptor, [new SyncDescriptor(DashboardInput)]); diff --git a/src/sql/workbench/parts/dashboard/dashboardEditor.ts b/src/sql/workbench/parts/dashboard/dashboardEditor.ts index 3c4fde73b0..c47559992d 100644 --- a/src/sql/workbench/parts/dashboard/dashboardEditor.ts +++ b/src/sql/workbench/parts/dashboard/dashboardEditor.ts @@ -16,7 +16,7 @@ import { DashboardModule } from './dashboard.module'; import { bootstrapAngular } from 'sql/platform/bootstrap/node/bootstrapService'; import { IDashboardComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams'; import { DASHBOARD_SELECTOR } from 'sql/workbench/parts/dashboard/dashboard.component'; -import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; +import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts b/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts index 32427c4e1c..77ff08e511 100644 --- a/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts +++ b/src/sql/workbench/parts/dataExplorer/common/nodeContext.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; +import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; import { IOEShimService } from 'sql/parts/objectExplorer/common/objectExplorerViewTreeShim'; import { ITreeItem } from 'sql/workbench/common/views'; import { Disposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/workbench/services/connection/browser/connectionController.ts b/src/sql/workbench/services/connection/browser/connectionController.ts index f672c2ae1b..302f732d5f 100644 --- a/src/sql/workbench/services/connection/browser/connectionController.ts +++ b/src/sql/workbench/services/connection/browser/connectionController.ts @@ -7,7 +7,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionComponentCallbacks, IConnectionComponentController, IConnectionValidateResult } from 'sql/workbench/services/connection/browser/connectionDialogService'; -import { AdvancedPropertiesController } from 'sql/parts/connection/connectionDialog/advancedPropertiesController'; +import { AdvancedPropertiesController } from 'sql/workbench/parts/connection/browser/advancedPropertiesController'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { ConnectionProfileGroup, IConnectionProfileGroup } from 'sql/platform/connection/common/connectionProfileGroup'; import * as Constants from 'sql/platform/connection/common/constants'; @@ -193,4 +193,4 @@ export class ConnectionController implements IConnectionComponentController { public set databaseDropdownExpanded(val: boolean) { this._connectionWidget.databaseDropdownExpanded = val; } -} \ No newline at end of file +} diff --git a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts index fd07ac4da7..c3c309793e 100644 --- a/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionDialogWidget.ts @@ -15,10 +15,10 @@ import { TreeCreationUtils } from 'sql/parts/objectExplorer/viewlet/treeCreation import { TreeUpdateUtils, IExpandableTree } from 'sql/parts/objectExplorer/viewlet/treeUpdateUtils'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel'; -import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/parts/connection/connectionDialog/recentConnectionTreeController'; -import { SavedConnectionTreeController } from 'sql/parts/connection/connectionDialog/savedConnectionTreeController'; +import { RecentConnectionTreeController, RecentConnectionActionsProvider } from 'sql/workbench/parts/connection/browser/recentConnectionTreeController'; +import { SavedConnectionTreeController } from 'sql/workbench/parts/connection/browser/savedConnectionTreeController'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; -import { ClearRecentConnectionsAction } from 'sql/parts/connection/common/connectionActions'; +import { ClearRecentConnectionsAction } from 'sql/workbench/parts/connection/common/connectionActions'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { contrastBorder } from 'vs/platform/theme/common/colorRegistry'; diff --git a/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts b/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts index 4d2f5b1e2d..a3bdcd37d9 100644 --- a/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts +++ b/src/sqltest/parts/connection/advancedPropertiesDialog.test.ts @@ -5,7 +5,7 @@ 'use strict'; import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; -import { AdvancedPropertiesController } from 'sql/parts/connection/connectionDialog/advancedPropertiesController'; +import { AdvancedPropertiesController } from 'sql/workbench/parts/connection/browser/advancedPropertiesController'; import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub'; import * as azdata from 'azdata'; import * as TypeMoq from 'typemoq'; diff --git a/src/sqltest/parts/connection/connectionTreeActions.test.ts b/src/sqltest/parts/connection/connectionTreeActions.test.ts index 5846c83daa..8cd352acb0 100644 --- a/src/sqltest/parts/connection/connectionTreeActions.test.ts +++ b/src/sqltest/parts/connection/connectionTreeActions.test.ts @@ -19,7 +19,7 @@ import { ErrorMessageServiceStub } from 'sqltest/stubs/errorMessageServiceStub'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; import { ServerTreeView } from 'sql/parts/objectExplorer/viewlet/serverTreeView'; import * as Constants from 'sql/platform/connection/common/constants'; -import * as LocalizedConstants from 'sql/parts/connection/common/localizedConstants'; +import * as LocalizedConstants from 'sql/workbench/parts/connection/common/localizedConstants'; import { ObjectExplorerService, ObjectExplorerNodeEventArgs } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { TreeNode } from 'sql/parts/objectExplorer/common/treeNode'; import { NodeType } from 'sql/parts/objectExplorer/common/nodeType'; diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 375878f1a2..4c7ae4f00a 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -450,14 +450,16 @@ import 'sql/workbench/parts/dataExplorer/electron-browser/nodeActions.contributi import 'sql/platform/telemetry/telemetry.contribution'; import 'sql/workbench/parts/connection/electron-browser/connectionViewlet'; import 'sql/workbench/api/node/sqlExtHost.contribution'; -import 'sql/parts/connection/common/connection.contribution'; +import 'sql/workbench/parts/connection/browser/connection.contribution'; import 'sql/parts/query/common/query.contribution'; import 'sql/parts/query/editor/resultsGridContribution'; import 'sql/parts/profiler/contrib/profiler.contribution'; import 'sql/parts/profiler/contrib/profilerActions.contribution'; import 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; import 'sql/platform/accounts/browser/accountManagement.contribution'; -/* Insights */ + +// dashboard +import 'sql/workbench/parts/dashboard/dashboard.contribution'; import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution'; import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution';