diff --git a/extensions/notebook/src/types.d.ts b/extensions/notebook/src/types.d.ts index 5361a211fb..fdb53009cd 100644 --- a/extensions/notebook/src/types.d.ts +++ b/extensions/notebook/src/types.d.ts @@ -9,8 +9,7 @@ import { JupyterController } from './jupyter/jupyterController'; * The API provided by this extension. * * @export - * @interface IExtensionApi */ export interface IExtensionApi { getJupyterController(): JupyterController; -} \ No newline at end of file +} diff --git a/src/sql/base/browser/ui/checkbox/checkbox.ts b/src/sql/base/browser/ui/checkbox/checkbox.ts index 411dda8b14..b6175875e1 100644 --- a/src/sql/base/browser/ui/checkbox/checkbox.ts +++ b/src/sql/base/browser/ui/checkbox/checkbox.ts @@ -3,6 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ +import 'vs/css!./media/checkbox'; + import { Color } from 'vs/base/common/color'; import { Event, Emitter } from 'vs/base/common/event'; import { KeyCode } from 'vs/base/common/keyCodes'; diff --git a/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.css b/src/sql/base/browser/ui/scrollableSplitview/media/scrollableSplitview.css similarity index 100% rename from src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.css rename to src/sql/base/browser/ui/scrollableSplitview/media/scrollableSplitview.css diff --git a/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts b/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts index d85f71f4f5..b183c26af9 100644 --- a/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts +++ b/src/sql/base/browser/ui/scrollableSplitview/scrollableSplitview.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./scrollableSplitview'; +import 'vs/css!./media/scrollableSplitview'; import { HeightMap, IView as HeightIView, IViewItem as HeightIViewItem } from './heightMap'; import { IDisposable, combinedDisposable, toDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/base/browser/ui/selectBox/selectBox.ts b/src/sql/base/browser/ui/selectBox/selectBox.ts index 69998178bf..6c609eb8c7 100644 --- a/src/sql/base/browser/ui/selectBox/selectBox.ts +++ b/src/sql/base/browser/ui/selectBox/selectBox.ts @@ -11,8 +11,8 @@ import { IContextViewProvider, AnchorAlignment } from 'vs/base/browser/ui/contex import * as dom from 'vs/base/browser/dom'; import { RenderOptions, renderFormattedText, renderText } from 'vs/base/browser/htmlContentRenderer'; import { IMessage, MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; -import aria = require('vs/base/browser/ui/aria/aria'); -import nls = require('vs/nls'); +import * as aria from 'vs/base/browser/ui/aria/aria'; +import * as nls from 'vs/nls'; const $ = dom.$; diff --git a/src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts b/src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts index f38ed163d4..6027be72b2 100644 --- a/src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts +++ b/src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts @@ -1,7 +1,5 @@ // Adopted and converted to typescript from https://github.com/6pac/SlickGrid/blob/master/plugins/slick.checkboxselectcolumn.js -import 'vs/css!vs/base/browser/ui/checkbox/checkbox'; - import { mixin } from 'vs/base/common/objects'; import * as nls from 'vs/nls'; import { ICheckboxStyles } from 'vs/base/browser/ui/checkbox/checkbox'; diff --git a/src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts b/src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts index 7817373461..eef1b5c8af 100644 --- a/src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts +++ b/src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts @@ -2,10 +2,11 @@ // heavily modified import { mixin } from 'vs/base/common/objects'; -import { Button } from '../../button/button'; -import { attachButtonStyler } from 'sql/platform/theme/common/styler'; +import { IButtonStyles } from 'vs/base/browser/ui/button/button'; +import { localize } from 'vs/nls'; + +import { Button } from 'sql/base/browser/ui/button/button'; import { escape } from 'sql/base/common/strings'; -import { IThemeService } from 'vs/platform/theme/common/themeService'; export class HeaderFilter { @@ -28,7 +29,7 @@ export class HeaderFilter { private workingFilters: any; private columnDef: any; - constructor(options: any, private _themeService: IThemeService) { + constructor(options: any) { this.options = mixin(options, this.defaults, false); } @@ -191,8 +192,8 @@ export class HeaderFilter { .appendTo(this.$menu); this.okButton = new Button(this.$menu.get(0)); - this.okButton.label = 'OK'; - this.okButton.title = 'OK'; + this.okButton.label = localize('headerFilter.ok', "OK"); + this.okButton.title = localize('headerFilter.ok', "OK"); this.okButton.element.id = 'filter-ok-button'; const okElement = jQuery('#filter-ok-button'); okElement.bind('click', (ev) => { @@ -202,8 +203,8 @@ export class HeaderFilter { }); this.clearButton = new Button(this.$menu.get(0)); - this.clearButton.label = 'Clear'; - this.clearButton.title = 'Clear'; + this.clearButton.label = localize('headerFilter.clear', "Clear"); + this.clearButton.title = localize('headerFilter.clear', "Clear"); this.clearButton.element.id = 'filter-clear-button'; const clearElement = jQuery('#filter-clear-button'); clearElement.bind('click', (ev) => { @@ -213,14 +214,11 @@ export class HeaderFilter { }); this.cancelButton = new Button(this.$menu.get(0)); - this.cancelButton.label = 'Cancel'; - this.cancelButton.title = 'Cancel'; + this.cancelButton.label = localize('headerFilter.cancel', "Cancel"); + this.cancelButton.title = localize('headerFilter.cancel', "Cancel"); this.cancelButton.element.id = 'filter-cancel-button'; const cancelElement = jQuery('#filter-cancel-button'); cancelElement.bind('click', () => this.hideMenu()); - attachButtonStyler(this.okButton, this._themeService); - attachButtonStyler(this.clearButton, this._themeService); - attachButtonStyler(this.cancelButton, this._themeService); jQuery(':checkbox', $filter).bind('click', (e) => { this.workingFilters = this.changeWorkingFilter(filterItems, this.workingFilters, jQuery(e.target)); @@ -238,6 +236,12 @@ export class HeaderFilter { .css('left', (left > 0 ? left : 0)); } + public style(styles: IButtonStyles): void { + this.okButton.style(styles); + this.clearButton.style(styles); + this.cancelButton.style(styles); + } + private columnsResized() { this.hideMenu(); } diff --git a/src/sql/base/browser/ui/table/table.ts b/src/sql/base/browser/ui/table/table.ts index 004a753573..458a4a88df 100644 --- a/src/sql/base/browser/ui/table/table.ts +++ b/src/sql/base/browser/ui/table/table.ts @@ -11,7 +11,6 @@ import 'vs/css!./media/slickGrid'; import { TableDataView } from './tableDataView'; import { IDisposableDataProvider, ITableSorter, ITableMouseEvent, ITableConfiguration, ITableStyles } from 'sql/base/browser/ui/table/interfaces'; -import { IThemable } from 'vs/platform/theme/common/styler'; import * as DOM from 'vs/base/browser/dom'; import { mixin } from 'vs/base/common/objects'; import { IDisposable } from 'vs/base/common/lifecycle'; @@ -29,7 +28,7 @@ function getDefaultOptions(): Slick.GridOptions { }; } -export class Table extends Widget implements IThemable, IDisposable { +export class Table extends Widget implements IDisposable { private styleElement: HTMLStyleElement; private idPrefix: string; diff --git a/src/sql/base/browser/ui/taskbar/actionbar.ts b/src/sql/base/browser/ui/taskbar/actionbar.ts index a8b9c1ed9a..9d4bafc707 100644 --- a/src/sql/base/browser/ui/taskbar/actionbar.ts +++ b/src/sql/base/browser/ui/taskbar/actionbar.ts @@ -3,8 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!vs/base/browser/ui/actionbar/actionbar'; - import { IAction, IActionRunner, ActionRunner } from 'vs/base/common/actions'; import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; @@ -16,7 +14,7 @@ import * as lifecycle from 'vs/base/common/lifecycle'; import * as DOM from 'vs/base/browser/dom'; import * as types from 'vs/base/common/types'; -let defaultOptions: IActionBarOptions = { +const defaultOptions: IActionBarOptions = { orientation: ActionsOrientation.HORIZONTAL, context: null }; diff --git a/src/sql/base/browser/ui/taskbar/taskbar.ts b/src/sql/base/browser/ui/taskbar/taskbar.ts index df3a891995..9f6b8e9649 100644 --- a/src/sql/base/browser/ui/taskbar/taskbar.ts +++ b/src/sql/base/browser/ui/taskbar/taskbar.ts @@ -5,7 +5,6 @@ import 'vs/css!./media/taskbar'; import 'vs/css!./media/icons'; -import 'vs/css!sql/media/icons/common-icons'; import { ActionBar } from './actionbar'; diff --git a/src/sql/base/browser/ui/breadcrumb/breadcrumb.component.ts b/src/sql/base/electron-browser/ui/breadcrumb/breadcrumb.component.ts similarity index 98% rename from src/sql/base/browser/ui/breadcrumb/breadcrumb.component.ts rename to src/sql/base/electron-browser/ui/breadcrumb/breadcrumb.component.ts index c1ecf06450..0c369ad491 100644 --- a/src/sql/base/browser/ui/breadcrumb/breadcrumb.component.ts +++ b/src/sql/base/electron-browser/ui/breadcrumb/breadcrumb.component.ts @@ -3,7 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/media/icons/common-icons'; import 'vs/css!./media/breadcrumb'; import { Component, Inject, forwardRef, OnInit, OnDestroy, ChangeDetectorRef } from '@angular/core'; diff --git a/src/sql/base/browser/ui/breadcrumb/interfaces.ts b/src/sql/base/electron-browser/ui/breadcrumb/interfaces.ts similarity index 100% rename from src/sql/base/browser/ui/breadcrumb/interfaces.ts rename to src/sql/base/electron-browser/ui/breadcrumb/interfaces.ts diff --git a/src/sql/base/browser/ui/breadcrumb/media/breadcrumb.css b/src/sql/base/electron-browser/ui/breadcrumb/media/breadcrumb.css similarity index 100% rename from src/sql/base/browser/ui/breadcrumb/media/breadcrumb.css rename to src/sql/base/electron-browser/ui/breadcrumb/media/breadcrumb.css diff --git a/src/sql/base/browser/ui/breadcrumb/media/chevron_right.svg b/src/sql/base/electron-browser/ui/breadcrumb/media/chevron_right.svg similarity index 100% rename from src/sql/base/browser/ui/breadcrumb/media/chevron_right.svg rename to src/sql/base/electron-browser/ui/breadcrumb/media/chevron_right.svg diff --git a/src/sql/base/browser/ui/breadcrumb/media/chevron_right_inverse.svg b/src/sql/base/electron-browser/ui/breadcrumb/media/chevron_right_inverse.svg similarity index 100% rename from src/sql/base/browser/ui/breadcrumb/media/chevron_right_inverse.svg rename to src/sql/base/electron-browser/ui/breadcrumb/media/chevron_right_inverse.svg diff --git a/src/sql/base/browser/ui/checkbox/checkbox.component.ts b/src/sql/base/electron-browser/ui/checkbox/checkbox.component.ts similarity index 100% rename from src/sql/base/browser/ui/checkbox/checkbox.component.ts rename to src/sql/base/electron-browser/ui/checkbox/checkbox.component.ts diff --git a/src/sql/base/browser/ui/inputBox/inputBox.component.ts b/src/sql/base/electron-browser/ui/inputBox/inputBox.component.ts similarity index 100% rename from src/sql/base/browser/ui/inputBox/inputBox.component.ts rename to src/sql/base/electron-browser/ui/inputBox/inputBox.component.ts diff --git a/src/sql/base/browser/ui/panel/tabHeader.css b/src/sql/base/electron-browser/ui/panel/media/tabHeader.css similarity index 100% rename from src/sql/base/browser/ui/panel/tabHeader.css rename to src/sql/base/electron-browser/ui/panel/media/tabHeader.css diff --git a/src/sql/base/browser/ui/panel/panel.component.ts b/src/sql/base/electron-browser/ui/panel/panel.component.ts similarity index 92% rename from src/sql/base/browser/ui/panel/panel.component.ts rename to src/sql/base/electron-browser/ui/panel/panel.component.ts index a1ab75534e..0b332e5eb0 100644 --- a/src/sql/base/browser/ui/panel/panel.component.ts +++ b/src/sql/base/electron-browser/ui/panel/panel.component.ts @@ -8,8 +8,8 @@ import { Input, EventEmitter, Output, ViewChild, ElementRef } from '@angular/core'; -import { TabComponent } from './tab.component'; -import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive'; +import { TabComponent } from 'sql/base/electron-browser/ui/panel/tab.component'; +import { ScrollableDirective } from 'sql/base/electron-browser/ui/scrollable/scrollable.directive'; import { subscriptionToDisposable } from 'sql/base/node/lifecycle'; import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar'; @@ -17,7 +17,7 @@ import { Action } from 'vs/base/common/actions'; import * as types from 'vs/base/common/types'; import { mixin } from 'vs/base/common/objects'; import { Disposable } from 'vs/base/common/lifecycle'; -import { ScrollbarVisibility } from 'vs/editor/common/standalone/standaloneEnums'; +import { ScrollbarVisibility } from 'vs/base/common/scrollable'; export interface IPanelOptions { /** @@ -47,7 +47,7 @@ let idPool = 0;
-
+
@@ -79,7 +79,8 @@ export class PanelComponent extends Disposable { private _actionbar: ActionBar; private _mru: TabComponent[]; - protected ScrollbarVisibility = ScrollbarVisibility; // used by angular template + protected AutoScrollbarVisibility = ScrollbarVisibility.Auto; // used by angular template + protected HiddenScrollbarVisibility = ScrollbarVisibility.Hidden; // used by angular template protected NavigationBarLayout = NavigationBarLayout; // used by angular template @ViewChild('panelActionbar', { read: ElementRef }) private _actionbarRef: ElementRef; diff --git a/src/sql/base/browser/ui/panel/panel.module.ts b/src/sql/base/electron-browser/ui/panel/panel.module.ts similarity index 89% rename from src/sql/base/browser/ui/panel/panel.module.ts rename to src/sql/base/electron-browser/ui/panel/panel.module.ts index 1af8bc261b..60ad942a72 100644 --- a/src/sql/base/browser/ui/panel/panel.module.ts +++ b/src/sql/base/electron-browser/ui/panel/panel.module.ts @@ -10,7 +10,7 @@ import { TabComponent } from './tab.component'; import { TabHeaderComponent } from './tabHeader.component'; import { PanelComponent } from './panel.component'; -import { ScrollableModule } from 'sql/base/browser/ui/scrollable/scrollable.module'; +import { ScrollableModule } from 'sql/base/electron-browser/ui/scrollable/scrollable.module'; @NgModule({ imports: [CommonModule, ScrollableModule], diff --git a/src/sql/base/browser/ui/panel/tab.component.ts b/src/sql/base/electron-browser/ui/panel/tab.component.ts similarity index 100% rename from src/sql/base/browser/ui/panel/tab.component.ts rename to src/sql/base/electron-browser/ui/panel/tab.component.ts diff --git a/src/sql/base/browser/ui/panel/tabHeader.component.ts b/src/sql/base/electron-browser/ui/panel/tabHeader.component.ts similarity index 96% rename from src/sql/base/browser/ui/panel/tabHeader.component.ts rename to src/sql/base/electron-browser/ui/panel/tabHeader.component.ts index 06b6a36280..83fe6bb243 100644 --- a/src/sql/base/browser/ui/panel/tabHeader.component.ts +++ b/src/sql/base/electron-browser/ui/panel/tabHeader.component.ts @@ -3,8 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/media/icons/common-icons'; -import 'vs/css!./tabHeader'; +import 'vs/css!./media/tabHeader'; import { Component, AfterContentInit, OnDestroy, Input, Output, ElementRef, ViewChild, EventEmitter } from '@angular/core'; @@ -15,7 +14,7 @@ import * as DOM from 'vs/base/browser/dom'; import { Disposable } from 'vs/base/common/lifecycle'; import { TabComponent } from './tab.component'; -import { CloseTabAction } from './tabActions'; +import { CloseTabAction } from 'sql/base/browser/ui/panel/tabActions'; @Component({ selector: 'tab-header', diff --git a/src/sql/base/browser/ui/scrollable/scrollable.directive.ts b/src/sql/base/electron-browser/ui/scrollable/scrollable.directive.ts similarity index 100% rename from src/sql/base/browser/ui/scrollable/scrollable.directive.ts rename to src/sql/base/electron-browser/ui/scrollable/scrollable.directive.ts diff --git a/src/sql/base/browser/ui/scrollable/scrollable.module.ts b/src/sql/base/electron-browser/ui/scrollable/scrollable.module.ts similarity index 100% rename from src/sql/base/browser/ui/scrollable/scrollable.module.ts rename to src/sql/base/electron-browser/ui/scrollable/scrollable.module.ts diff --git a/src/sql/platform/dialog/dialog.module.ts b/src/sql/platform/dialog/dialog.module.ts index 5e6cc58621..45fc273b0c 100644 --- a/src/sql/platform/dialog/dialog.module.ts +++ b/src/sql/platform/dialog/dialog.module.ts @@ -20,10 +20,10 @@ import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelCompo import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; -import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; -import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; import { EditableDropDown } from 'sql/platform/electron-browser/editableDropdown/editableDropdown.component'; -import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component'; +import { Checkbox } from 'sql/base/electron-browser/ui/checkbox/checkbox.component'; +import { SelectBox } from 'sql/platform/ui/electron-browser/selectBox/selectBox.component'; +import { InputBox } from 'sql/base/electron-browser/ui/inputBox/inputBox.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Registry } from 'vs/platform/registry/common/platform'; diff --git a/src/sql/platform/dialog/dialogPane.ts b/src/sql/platform/dialog/dialogPane.ts index 38fb442574..18e43fc488 100644 --- a/src/sql/platform/dialog/dialogPane.ts +++ b/src/sql/platform/dialog/dialogPane.ts @@ -40,7 +40,7 @@ export class DialogPane extends Disposable implements IThemable { private _content: string | DialogTab[], private _validityChangedCallback: (valid: boolean) => void, private _instantiationService: IInstantiationService, - private themeService: IThemeService, + private _themeService: IThemeService, public displayPageTitle: boolean, public description?: string, ) { @@ -54,7 +54,7 @@ export class DialogPane extends Disposable implements IThemable { this.initializeModelViewContainer(this._body, modelViewId); } else { this._tabbedPanel = new TabbedPanel(this._body); - attachTabbedPanelStyler(this._tabbedPanel, this.themeService); + attachTabbedPanelStyler(this._tabbedPanel, this._themeService); this._content.forEach((tab, tabIndex) => { if (this._selectedTabIndex === tabIndex) { this._selectedTabContent = tab.content; diff --git a/src/sql/base/browser/ui/selectBox/selectBox.component.ts b/src/sql/platform/ui/electron-browser/selectBox/selectBox.component.ts similarity index 100% rename from src/sql/base/browser/ui/selectBox/selectBox.component.ts rename to src/sql/platform/ui/electron-browser/selectBox/selectBox.component.ts diff --git a/src/sql/workbench/electron-browser/modelComponents/dropdown.component.ts b/src/sql/workbench/electron-browser/modelComponents/dropdown.component.ts index 6e2aae1b71..1d55c6ea0b 100644 --- a/src/sql/workbench/electron-browser/modelComponents/dropdown.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/dropdown.component.ts @@ -19,7 +19,6 @@ import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; -import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; @Component({ selector: 'modelview-dropdown', @@ -43,8 +42,7 @@ export default class DropDownComponent extends ComponentBase implements ICompone @Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef, @Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService, @Inject(IContextViewService) private contextViewService: IContextViewService, - @Inject(forwardRef(() => ElementRef)) el: ElementRef, - @Inject(ILayoutService) private readonly layoutService: ILayoutService + @Inject(forwardRef(() => ElementRef)) el: ElementRef ) { super(changeRef, el); } diff --git a/src/sql/workbench/electron-browser/modelComponents/modelViewInput.ts b/src/sql/workbench/electron-browser/modelComponents/modelViewInput.ts index 254d12033c..845d6a9de3 100644 --- a/src/sql/workbench/electron-browser/modelComponents/modelViewInput.ts +++ b/src/sql/workbench/electron-browser/modelComponents/modelViewInput.ts @@ -65,7 +65,6 @@ export class ModelViewInput extends EditorInput { this._container = document.createElement('div'); this._container.id = `modelView-${_model.modelViewId}`; this.layoutService.getContainer(Parts.EDITOR_PART).appendChild(this._container); - } public get title(): string { diff --git a/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts b/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts index 2b76847c1e..8a9c98205c 100644 --- a/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts @@ -12,10 +12,10 @@ import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/service import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { WidgetConfig, TabConfig, TabSettingConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { IPropertiesConfig } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution'; -import { PanelComponent } from 'sql/base/browser/ui/panel/panel.component'; +import { PanelComponent } from 'sql/base/electron-browser/ui/panel/panel.component'; import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { PinUnpinTabAction, AddFeatureTabAction } from './actions'; -import { TabComponent, TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabComponent, TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/common/interfaces'; import * as dashboardHelper from 'sql/workbench/parts/dashboard/common/dashboardHelper'; diff --git a/src/sql/workbench/parts/dashboard/common/interfaces.ts b/src/sql/workbench/parts/dashboard/common/interfaces.ts index 8b02d2d4fc..6348459940 100644 --- a/src/sql/workbench/parts/dashboard/common/interfaces.ts +++ b/src/sql/workbench/parts/dashboard/common/interfaces.ts @@ -8,7 +8,7 @@ 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 { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; export enum Conditional { diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.component.ts index 5976d5b00d..49f9b5b49b 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.component.ts @@ -12,7 +12,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; import { TabConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { ControlHostContent } from 'sql/workbench/parts/dashboard/contents/controlHostContent.component'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; @Component({ selector: 'dashboard-controlhost-container', diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardErrorContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardErrorContainer.component.ts index 9a9a869e3a..97e90fd826 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardErrorContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardErrorContainer.component.ts @@ -9,7 +9,7 @@ import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ChangeDete import { TabConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { Event, Emitter } from 'vs/base/common/event'; import * as nls from 'vs/nls'; diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts index bcdf30ed41..a38fd3d625 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts @@ -12,7 +12,7 @@ import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/common/da import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component'; import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; import { WebviewContent } from 'sql/workbench/parts/dashboard/contents/webviewContent.component'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts index 39ecd2b58c..97ddfdb2d0 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts @@ -13,8 +13,8 @@ import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/service import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component'; -import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { ScrollableDirective } from 'sql/base/electron-browser/ui/scrollable/scrollable.directive'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ScrollbarVisibility } from 'vs/editor/common/standalone/standaloneEnums'; diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts index f4d05a5790..6933a0ad45 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts @@ -12,7 +12,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; import { TabConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; @Component({ selector: 'dashboard-modelview-container', diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts index ad84bca93e..1261cd543a 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts @@ -9,8 +9,8 @@ import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ViewChildr import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; -import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/electron-browser/ui/panel/panel.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/common/interfaces'; import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution'; import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution'; diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.component.ts index f9811ba42d..bfc4de3e31 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.component.ts @@ -12,7 +12,7 @@ import { Event, Emitter } from 'vs/base/common/event'; import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; import { TabConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { WebviewContent } from 'sql/workbench/parts/dashboard/contents/webviewContent.component'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; @Component({ selector: 'dashboard-webview-container', diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component.ts index d5fa78aa4f..2d45c3d2cb 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component.ts @@ -10,7 +10,7 @@ import { Component, Inject, Input, forwardRef, ViewChild, OnDestroy, ChangeDetec import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; import { WidgetContent } from 'sql/workbench/parts/dashboard/contents/widgetContent.component'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/parts/dashboard/dashboard.module.ts b/src/sql/workbench/parts/dashboard/dashboard.module.ts index 65cbfedd0f..dbf0f5d234 100644 --- a/src/sql/workbench/parts/dashboard/dashboard.module.ts +++ b/src/sql/workbench/parts/dashboard/dashboard.module.ts @@ -44,8 +44,8 @@ import { WidgetContent } from 'sql/workbench/parts/dashboard/contents/widgetCont import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component'; import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component'; import { WebviewContent } from 'sql/workbench/parts/dashboard/contents/webviewContent.component'; -import { BreadcrumbComponent } from 'sql/base/browser/ui/breadcrumb/breadcrumb.component'; -import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; +import { BreadcrumbComponent } from 'sql/base/electron-browser/ui/breadcrumb/breadcrumb.component'; +import { IBreadcrumbService } from 'sql/base/electron-browser/ui/breadcrumb/interfaces'; import { DashboardHomeContainer } from 'sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component'; import { ControlHostContent } from 'sql/workbench/parts/dashboard/contents/controlHostContent.component'; import { DashboardControlHostContainer } from 'sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.component'; @@ -55,11 +55,11 @@ import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/electron- import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobHistory.component'; import { OperatorsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/operatorsView.component'; import { ProxiesViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/proxiesView.component'; -import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; -import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; -import { EditableDropDown } from 'sql/platform/electron-browser/editableDropdown/editableDropdown.component'; -import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component'; import LoadingSpinner from 'sql/workbench/electron-browser/modelComponents/loadingSpinner.component'; +import { Checkbox } from 'sql/base/electron-browser/ui/checkbox/checkbox.component'; +import { SelectBox } from 'sql/platform/ui/electron-browser/selectBox/selectBox.component'; +import { InputBox } from 'sql/base/electron-browser/ui/inputBox/inputBox.component'; +import { EditableDropDown } from 'sql/platform/electron-browser/editableDropdown/editableDropdown.component'; const baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWidgetWrapper, DashboardWebviewContainer, DashboardWidgetContainer, DashboardGridContainer, DashboardErrorContainer, DashboardNavSection, ModelViewContent, WebviewContent, WidgetContent, @@ -68,9 +68,9 @@ const baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWid DashboardModelViewContainer, ModelComponentWrapper, Checkbox, EditableDropDown, SelectBox, InputBox, LoadingSpinner]; /* Panel */ -import { PanelModule } from 'sql/base/browser/ui/panel/panel.module'; +import { PanelModule } from 'sql/base/electron-browser/ui/panel/panel.module'; -import { ScrollableModule } from 'sql/base/browser/ui/scrollable/scrollable.module'; +import { ScrollableModule } from 'sql/base/electron-browser/ui/scrollable/scrollable.module'; /* Pages */ import { ServerDashboardPage } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.component'; diff --git a/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts b/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts index 16b1b06052..4dcf5775fb 100644 --- a/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts @@ -7,7 +7,7 @@ import { OnInit, Inject, forwardRef, ChangeDetectorRef, ElementRef } from '@angu import { DashboardPage } from 'sql/workbench/parts/dashboard/common/dashboardPage.component'; import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/services/breadcrumb.service'; -import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; +import { IBreadcrumbService } from 'sql/base/electron-browser/ui/breadcrumb/interfaces'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; diff --git a/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts b/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts index f9e2b2fd2d..f1d2bf3c1f 100644 --- a/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts @@ -7,7 +7,7 @@ import { OnInit, Inject, forwardRef, ChangeDetectorRef, ElementRef } from '@angu import { DashboardPage } from 'sql/workbench/parts/dashboard/common/dashboardPage.component'; import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/services/breadcrumb.service'; -import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; +import { IBreadcrumbService } from 'sql/base/electron-browser/ui/breadcrumb/interfaces'; import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; diff --git a/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts b/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts index b4c3d94d76..f36b10a60e 100644 --- a/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts +++ b/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts @@ -8,7 +8,7 @@ import { Subject } from 'rxjs/Subject'; import { DashboardServiceInterface } from './dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; -import { MenuItem, IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; +import { MenuItem, IBreadcrumbService } from 'sql/base/electron-browser/ui/breadcrumb/interfaces'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import * as nls from 'vs/nls'; diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.ts index 629cfba617..d43c324eca 100644 --- a/src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.ts @@ -8,7 +8,7 @@ import 'vs/css!./media/jobs'; import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core'; import { AgentJobInfo } from 'azdata'; -import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component'; +import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/electron-browser/ui/panel/panel.component'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.ts index b301861b3e..d455e924a0 100644 --- a/src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.ts @@ -9,7 +9,7 @@ import * as dom from 'vs/base/browser/dom'; import * as nls from 'vs/nls'; import * as azdata from 'azdata'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.ts index dc5066cd23..441d396ced 100644 --- a/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.ts @@ -28,7 +28,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/jobManagementView.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobManagementView.ts index fd5d4df952..784c8eb0d6 100644 --- a/src/sql/workbench/parts/jobManagement/electron-browser/jobManagementView.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobManagementView.ts @@ -15,7 +15,7 @@ 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/common/jobActions'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; export abstract class JobManagementView extends TabChild implements AfterContentChecked { diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts index aa83c03d43..c319fc2520 100644 --- a/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts @@ -22,7 +22,7 @@ import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardServi import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/jobsView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobsView.component.ts index 8360b4eeda..1108c7e1b4 100644 --- a/src/sql/workbench/parts/jobManagement/electron-browser/jobsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobsView.component.ts @@ -9,7 +9,7 @@ import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { Table } from 'sql/base/browser/ui/table/table'; import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component'; import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; @@ -31,6 +31,7 @@ import { IWorkbenchThemeService, IColorTheme } from 'vs/workbench/services/theme import { tableBackground, cellBackground, cellBorderColor } from 'sql/platform/theme/common/colors'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; +import { attachButtonStyler } from 'sql/platform/theme/common/styler'; export const JOBSVIEW_SELECTOR: string = 'jobsview-component'; export const ROW_HEIGHT: number = 45; @@ -172,7 +173,8 @@ export class JobsViewComponent extends JobManagementView implements OnInit, OnDe }); this.rowDetail = rowDetail; columns.unshift(this.rowDetail.getColumnDefinition()); - let filterPlugin = new HeaderFilter({}, this._themeService); + let filterPlugin = new HeaderFilter({}); + this._register(attachButtonStyler(filterPlugin, this._themeService)); this.filterPlugin = filterPlugin; jQuery(this._gridEl.nativeElement).empty(); jQuery(this.actionBarContainer.nativeElement).empty(); diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/operatorsView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/operatorsView.component.ts index 5d3e25f8d4..2d32667162 100644 --- a/src/sql/workbench/parts/jobManagement/electron-browser/operatorsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/operatorsView.component.ts @@ -15,7 +15,7 @@ import { IJobManagementService } from 'sql/platform/jobManagement/common/interfa import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/platform/jobManagement/common/jobActions'; import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/sql/workbench/parts/jobManagement/electron-browser/proxiesView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/proxiesView.component.ts index f182f8d3cf..e0819fb92e 100644 --- a/src/sql/workbench/parts/jobManagement/electron-browser/proxiesView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/proxiesView.component.ts @@ -14,7 +14,7 @@ import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-b import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditProxyAction, DeleteProxyAction, NewProxyAction } from 'sql/platform/jobManagement/common/jobActions'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; -import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; +import { TabChild } from 'sql/base/electron-browser/ui/panel/tab.component'; import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/sql/workbench/parts/notebook/notebook.module.ts b/src/sql/workbench/parts/notebook/notebook.module.ts index 3a929a0bfc..e517bac275 100644 --- a/src/sql/workbench/parts/notebook/notebook.module.ts +++ b/src/sql/workbench/parts/notebook/notebook.module.ts @@ -3,21 +3,15 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { forwardRef, NgModule, ComponentFactoryResolver, Inject, ApplicationRef } from '@angular/core'; import { FormsModule } from '@angular/forms'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; - import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; -import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; -import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; import { EditableDropDown } from 'sql/platform/electron-browser/editableDropdown/editableDropdown.component'; -import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component'; import { NotebookComponent } from 'sql/workbench/parts/notebook/notebook.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -29,6 +23,9 @@ import { OutputComponent } from 'sql/workbench/parts/notebook/cellViews/output.c import { StdInComponent } from 'sql/workbench/parts/notebook/cellViews/stdin.component'; import { PlaceholderCellComponent } from 'sql/workbench/parts/notebook/cellViews/placeholderCell.component'; import LoadingSpinner from 'sql/workbench/electron-browser/modelComponents/loadingSpinner.component'; +import { Checkbox } from 'sql/base/electron-browser/ui/checkbox/checkbox.component'; +import { SelectBox } from 'sql/platform/ui/electron-browser/selectBox/selectBox.component'; +import { InputBox } from 'sql/base/electron-browser/ui/inputBox/inputBox.component'; export const NotebookModule = (params, selector: string, instantiationService: IInstantiationService): any => { @NgModule({ diff --git a/src/sql/workbench/parts/query/browser/queryActions.ts b/src/sql/workbench/parts/query/browser/queryActions.ts index af7d2b445a..953ddd4f73 100644 --- a/src/sql/workbench/parts/query/browser/queryActions.ts +++ b/src/sql/workbench/parts/query/browser/queryActions.ts @@ -28,7 +28,6 @@ import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachEditableDropdownStyler, attachSelectBoxStyler } from 'sql/platform/theme/common/styler'; import { EventEmitter } from 'sql/base/common/eventEmitter'; import { Dropdown } from 'sql/base/parts/editableDropdown/browser/dropdown'; -import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; /** * Action class that query-based Actions will extend. This base class automatically handles activating and @@ -449,8 +448,7 @@ export class ListDatabasesActionItem extends EventEmitter implements IActionItem @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, @INotificationService private _notificationService: INotificationService, @IContextViewService contextViewProvider: IContextViewService, - @IConfigurationService private readonly _configurationService: IConfigurationService, - @ILayoutService layoutService: ILayoutService + @IConfigurationService private readonly _configurationService: IConfigurationService ) { super(); this._toDispose = []; diff --git a/src/sql/workbench/parts/query/browser/queryResultsView.ts b/src/sql/workbench/parts/query/browser/queryResultsView.ts index 23ecce7aa3..9c41f6d1bc 100644 --- a/src/sql/workbench/parts/query/browser/queryResultsView.ts +++ b/src/sql/workbench/parts/query/browser/queryResultsView.ts @@ -173,14 +173,15 @@ export class QueryResultsView extends Disposable { constructor( container: HTMLElement, + @IThemeService themeService: IThemeService, @IInstantiationService private instantiationService: IInstantiationService, - @IQueryModelService private queryModelService: IQueryModelService, - @IThemeService themeService: IThemeService + @IQueryModelService private queryModelService: IQueryModelService ) { super(); this.resultsTab = this._register(new ResultsTab(instantiationService)); this.chartTab = this._register(new ChartTab(instantiationService)); this._panelView = this._register(new TabbedPanel(container, { showHeaderWhenSingleView: false })); + attachTabbedPanelStyler(this._panelView, themeService); this.qpTab = this._register(new QueryPlanTab()); this.topOperationsTab = this._register(new TopOperationsTab(instantiationService)); diff --git a/src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.module.ts b/src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.module.ts index 00cfa7254a..0bacbcdf96 100644 --- a/src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.module.ts +++ b/src/sql/workbench/parts/query/modelViewTab/queryModelViewTab.module.ts @@ -16,14 +16,14 @@ import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelCompo import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; -import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; -import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; import { EditableDropDown } from 'sql/platform/electron-browser/editableDropdown/editableDropdown.component'; -import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component'; +import { QueryModelViewTabContainer } from 'sql/workbench/parts/query/modelViewTab/queryModelViewTabContainer.component'; +import { Checkbox } from 'sql/base/electron-browser/ui/checkbox/checkbox.component'; +import { SelectBox } from 'sql/platform/ui/electron-browser/selectBox/selectBox.component'; +import { InputBox } from 'sql/base/electron-browser/ui/inputBox/inputBox.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Registry } from 'vs/platform/registry/common/platform'; -import { QueryModelViewTabContainer } from 'sql/workbench/parts/query/modelViewTab/queryModelViewTabContainer.component'; export const QueryModelViewTabModule = (params, selector: string, instantiationService: IInstantiationService): any => { diff --git a/src/sql/workbench/services/connection/browser/cmsConnectionWidget.ts b/src/sql/workbench/services/connection/browser/cmsConnectionWidget.ts index c63d708a8b..c1d862ea79 100644 --- a/src/sql/workbench/services/connection/browser/cmsConnectionWidget.ts +++ b/src/sql/workbench/services/connection/browser/cmsConnectionWidget.ts @@ -51,7 +51,7 @@ export class CmsConnectionWidget extends ConnectionWidget { @IConfigurationService _configurationService: IConfigurationService, @IAccountManagementService _accountManagementService: IAccountManagementService ) { - super(options, callbacks, providerName, _themeService, _contextViewService, _layoutService, _connectionManagementService, _capabilitiesService, + super(options, callbacks, providerName, _themeService, _contextViewService, _connectionManagementService, _capabilitiesService, _clipboardService, _configurationService, _accountManagementService); let authTypeOption = this._optionsMaps[ConnectionOptionSpecialType.authType]; if (authTypeOption) { diff --git a/src/sql/workbench/services/connection/browser/connectionWidget.ts b/src/sql/workbench/services/connection/browser/connectionWidget.ts index c15a0bf0c0..580f9e0bdf 100644 --- a/src/sql/workbench/services/connection/browser/connectionWidget.ts +++ b/src/sql/workbench/services/connection/browser/connectionWidget.ts @@ -34,7 +34,6 @@ import { MessageType } from 'vs/base/browser/ui/inputbox/inputBox'; import { endsWith, startsWith } from 'vs/base/common/strings'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; -import { ILayoutService } from 'vs/platform/layout/browser/layoutService'; export class ConnectionWidget { private _previousGroupOption: string; @@ -98,7 +97,6 @@ export class ConnectionWidget { providerName: string, @IThemeService protected _themeService: IThemeService, @IContextViewService protected _contextViewService: IContextViewService, - @ILayoutService private _layoutService: ILayoutService, @IConnectionManagementService private _connectionManagementService: IConnectionManagementService, @ICapabilitiesService private _capabilitiesService: ICapabilitiesService, @IClipboardService private _clipboardService: IClipboardService, diff --git a/src/sqltest/parts/query/editor/queryActions.test.ts b/src/sqltest/parts/query/editor/queryActions.test.ts index 7cb7551051..091ff6925b 100644 --- a/src/sqltest/parts/query/editor/queryActions.test.ts +++ b/src/sqltest/parts/query/editor/queryActions.test.ts @@ -476,10 +476,8 @@ suite('SQL QueryAction Tests', () => { databaseName: databaseName }); - const layoutService = new TestLayoutService(); - // If I query without having initialized anything, state should be clear - listItem = new ListDatabasesActionItem(editor.object, connectionManagementService.object, undefined, undefined, configurationService.object, layoutService); + listItem = new ListDatabasesActionItem(editor.object, connectionManagementService.object, undefined, undefined, configurationService.object); assert.equal(listItem.isEnabled(), false, 'do not expect dropdown enabled unless connected'); assert.equal(listItem.currentDatabaseName, undefined, 'do not expect dropdown to have entries unless connected'); @@ -513,10 +511,8 @@ suite('SQL QueryAction Tests', () => { cms.setup(x => x.onConnectionChanged).returns(() => dbChangedEmitter.event); cms.setup(x => x.getConnectionProfile(TypeMoq.It.isAny())).returns(() => { databaseName: databaseName }); - const layoutService = new TestLayoutService(); - // ... Create a database dropdown that has been connected - let listItem = new ListDatabasesActionItem(editor.object, cms.object, null, null, configurationService.object, layoutService); + let listItem = new ListDatabasesActionItem(editor.object, cms.object, null, null, configurationService.object); listItem.onConnected(); // If: I raise a connection changed event @@ -539,10 +535,8 @@ suite('SQL QueryAction Tests', () => { cms.setup(x => x.onConnectionChanged).returns(() => dbChangedEmitter.event); cms.setup(x => x.getConnectionProfile(TypeMoq.It.isAny())).returns(() => { databaseName: databaseName }); - const layoutService = new TestLayoutService(); - // ... Create a database dropdown that has been connected - let listItem = new ListDatabasesActionItem(editor.object, cms.object, null, null, configurationService.object, layoutService); + let listItem = new ListDatabasesActionItem(editor.object, cms.object, null, null, configurationService.object); listItem.onConnected(); // If: I raise a connection changed event for the 'wrong' URI @@ -568,10 +562,8 @@ suite('SQL QueryAction Tests', () => { cms.callBase = true; cms.setup(x => x.onConnectionChanged).returns(() => dbChangedEmitter.event); - const layoutService = new TestLayoutService(); - // ... Create a database dropdown - let listItem = new ListDatabasesActionItem(editor.object, cms.object, null, null, configurationService.object, layoutService); + let listItem = new ListDatabasesActionItem(editor.object, cms.object, null, null, configurationService.object); // If: I raise a connection changed event let eventParams = { diff --git a/src/sqltest/parts/query/editor/queryEditor.test.ts b/src/sqltest/parts/query/editor/queryEditor.test.ts index e7b39517c1..d550a26684 100644 --- a/src/sqltest/parts/query/editor/queryEditor.test.ts +++ b/src/sqltest/parts/query/editor/queryEditor.test.ts @@ -81,7 +81,7 @@ suite('SQL QueryEditor Tests', () => { instantiationService.setup(x => x.createInstance(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns((classDef, editor, action) => { if (classDef.ID) { if (classDef.ID === 'listDatabaseQueryActionItem') { - return new ListDatabasesActionItem(editor, connectionManagementService.object, undefined, undefined, configurationService.object, undefined); + return new ListDatabasesActionItem(editor, connectionManagementService.object, undefined, undefined, configurationService.object); } } // Default @@ -317,7 +317,7 @@ suite('SQL QueryEditor Tests', () => { queryActionInstantiationService.setup(x => x.createInstance(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())) .returns((definition, editor, action, selectBox) => { if (definition.ID === 'listDatabaseQueryActionItem') { - let item = new ListDatabasesActionItem(editor, queryConnectionService.object, undefined, undefined, configurationService.object, undefined); + let item = new ListDatabasesActionItem(editor, queryConnectionService.object, undefined, undefined, configurationService.object); return item; } // Default diff --git a/src/sqltest/platform/dialog/dialogPane.test.ts b/src/sqltest/platform/dialog/dialogPane.test.ts index 9b7cab7930..00f019d5d8 100644 --- a/src/sqltest/platform/dialog/dialogPane.test.ts +++ b/src/sqltest/platform/dialog/dialogPane.test.ts @@ -3,8 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import * as assert from 'assert'; import { Dialog, DialogTab } from 'sql/platform/dialog/dialogTypes'; import { DialogPane } from 'sql/platform/dialog/dialogPane'; diff --git a/tslint.json b/tslint.json index 12512ea00b..e511cca051 100644 --- a/tslint.json +++ b/tslint.json @@ -35,6 +35,111 @@ "messageIndex": 1 } ], + // {{SQL CARBON EDIT}} @anthonydresser for the most part these rules should be the same as vscode with some changes + // anything that references **/vs/** should references **/{vs,sql}/** instead + // @angular/* and rxjs/* are added to browser and electron-browser restrictions since * doesn't cover them + // to begin with the only import patterns we are enforcing is import patterns in */base/* + "import-patterns": [ + true, + // !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + // !!! 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", + "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}/**" + ] + }, + { + "target": "**/{vs,sql}/base/node/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/{common,browser,node}/**", + "*", // node modules + "@angular/*", // angular + "rxjs/*" // rxjs + ] + }, + { + // 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}/**" + ] + }, + { + "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}/**" + ] + }, + { + "target": "**/{vs,sql}/base/parts/*/node/**", + "restrictions": [ + "vs/nls", + "**/{vs,sql}/base/{common,browser,node}/**", + "**/{vs,sql}/base/parts/*/{common,browser,node}/**", + "*", // node modules + "@angular/*", // angular + "rxjs/*" // rxjs + ] + }, + { + "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}/**", + "*", // node modules + "@angular/*", // angular + "rxjs/*" // 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}/**", + "*", // node modules + "@angular/*", // angular + "rxjs/*" // rxjs + ] + } + ], // {{SQL CARBON EDIT}} // remove import patterns and layering "duplicate-imports": true,