diff --git a/build/gulpfile.hygiene.js b/build/gulpfile.hygiene.js index ad49b731fa..a7521f66c2 100644 --- a/build/gulpfile.hygiene.js +++ b/build/gulpfile.hygiene.js @@ -147,6 +147,7 @@ const copyrightFilter = [ '!src/sql/workbench/parts/notebook/outputs/factories.ts', '!src/sql/workbench/parts/notebook/models/nbformat.ts', '!extensions/markdown-language-features/media/tomorrow.css', + '!src/sql/workbench/electron-browser/modelComponents/media/highlight.css', '!src/sql/parts/modelComponents/highlight.css', '!extensions/mssql/sqltoolsservice/**', '!extensions/import/flatfileimportservice/**', diff --git a/src/sql/parts/profiler/editor/controller/interfaces.ts b/src/sql/parts/profiler/editor/controller/interfaces.ts deleted file mode 100644 index 23c06c4a54..0000000000 --- a/src/sql/parts/profiler/editor/controller/interfaces.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. - *--------------------------------------------------------------------------------------------*/ - -export interface IProfilerController { - findNext(): void; - findPrevious(): void; -} diff --git a/src/sql/parts/query/common/query.contribution.ts b/src/sql/parts/query/common/query.contribution.ts index 9c494927c2..90192d6bdf 100644 --- a/src/sql/parts/query/common/query.contribution.ts +++ b/src/sql/parts/query/common/query.contribution.ts @@ -21,8 +21,8 @@ import { QueryResultsEditor } from 'sql/parts/query/editor/queryResultsEditor'; import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; import * as queryContext from 'sql/parts/query/common/queryContext'; import { QueryInput } from 'sql/parts/query/common/queryInput'; -import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor'; -import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; +import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor'; +import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput'; import { RunQueryKeyboardAction, RunCurrentQueryKeyboardAction, CancelQueryKeyboardAction, RefreshIntellisenseKeyboardAction, ToggleQueryResultsKeyboardAction, RunQueryShortcutAction, RunCurrentQueryWithActualPlanKeyboardAction, FocusOnCurrentQueryKeyboardAction, ParseSyntaxAction @@ -33,8 +33,8 @@ import { QueryPlanEditor } from 'sql/workbench/parts/queryPlan/electron-browser/ import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; import * as Constants from 'sql/parts/query/common/constants'; import { localize } from 'vs/nls'; -import { EditDataResultsEditor } from 'sql/parts/editData/editor/editDataResultsEditor'; -import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput'; +import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor'; +import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput'; const gridCommandsWeightBonus = 100; // give our commands a little bit more weight over other default list/tree commands diff --git a/src/sql/parts/query/execution/keyboardQueryActions.ts b/src/sql/parts/query/execution/keyboardQueryActions.ts index 792441a48e..5ea500fc97 100644 --- a/src/sql/parts/query/execution/keyboardQueryActions.ts +++ b/src/sql/parts/query/execution/keyboardQueryActions.ts @@ -17,7 +17,7 @@ import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import * as WorkbenchUtils from 'sql/workbench/common/sqlWorkbenchUtils'; import * as Constants from 'sql/parts/query/common/constants'; import * as ConnectionConstants from 'sql/platform/connection/common/constants'; -import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor'; +import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; diff --git a/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts b/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts index 39ac271fbf..c8afe4977b 100644 --- a/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts +++ b/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts @@ -13,8 +13,8 @@ import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; import { WizardNavigation } from 'sql/platform/dialog/wizardNavigation.component'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry'; -import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; -import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; +import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component'; +import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component'; import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; diff --git a/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts b/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts index 0eed1f58d3..e71c2a21c0 100644 --- a/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts +++ b/src/sql/parts/query/modelViewTab/queryModelViewTabContainer.component.ts @@ -7,10 +7,10 @@ import 'vs/css!./media/dialogModal'; import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core'; -import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; +import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component'; import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { DialogPane } from 'sql/platform/dialog/dialogPane'; -import { ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; export interface LayoutRequestParams { diff --git a/src/sql/platform/dashboard/common/modelComponentRegistry.ts b/src/sql/platform/dashboard/common/modelComponentRegistry.ts index 637178f6bb..0f43f96c9a 100644 --- a/src/sql/platform/dashboard/common/modelComponentRegistry.ts +++ b/src/sql/platform/dashboard/common/modelComponentRegistry.ts @@ -8,7 +8,7 @@ import { ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes'; import * as platform from 'vs/platform/registry/common/platform'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { IComponent } from 'sql/parts/modelComponents/interfaces'; +import { IComponent } from 'sql/workbench/electron-browser/modelComponents/interfaces'; export type ComponentIdentifier = string; diff --git a/src/sql/platform/dialog/dialog.module.ts b/src/sql/platform/dialog/dialog.module.ts index 1920c29f9d..2d6c598aae 100644 --- a/src/sql/platform/dialog/dialog.module.ts +++ b/src/sql/platform/dialog/dialog.module.ts @@ -15,8 +15,8 @@ import { BrowserModule } from '@angular/platform-browser'; import { DialogContainer } from 'sql/platform/dialog/dialogContainer.component'; import { WizardNavigation } from 'sql/platform/dialog/wizardNavigation.component'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry'; -import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; -import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; +import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component'; +import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component'; import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; diff --git a/src/sql/platform/dialog/dialogContainer.component.ts b/src/sql/platform/dialog/dialogContainer.component.ts index ca0dc590fb..eea549f111 100644 --- a/src/sql/platform/dialog/dialogContainer.component.ts +++ b/src/sql/platform/dialog/dialogContainer.component.ts @@ -7,10 +7,10 @@ import 'vs/css!./media/dialogModal'; import { Component, ViewChild, Inject, forwardRef, ElementRef, AfterViewInit } from '@angular/core'; -import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; +import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component'; import { IBootstrapParams } from 'sql/platform/bootstrap/node/bootstrapService'; import { DialogPane } from 'sql/platform/dialog/dialogPane'; -import { ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; export interface LayoutRequestParams { diff --git a/src/sql/platform/jobManagement/common/jobActions.ts b/src/sql/platform/jobManagement/common/jobActions.ts index 73674afd94..57943ccd59 100644 --- a/src/sql/platform/jobManagement/common/jobActions.ts +++ b/src/sql/platform/jobManagement/common/jobActions.ts @@ -8,18 +8,18 @@ import * as nls from 'vs/nls'; import * as azdata from 'azdata'; import { INotificationService } from 'vs/platform/notification/common/notification'; import Severity from 'vs/base/common/severity'; -import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component'; +import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobHistory.component'; import { IJobManagementService } from '../common/interfaces'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { JobsViewComponent } from 'sql/parts/jobManagement/views/jobsView.component'; -import { AlertsViewComponent } from 'sql/parts/jobManagement/views/alertsView.component'; -import { OperatorsViewComponent } from 'sql/parts/jobManagement/views/operatorsView.component'; -import { ProxiesViewComponent } from 'sql/parts/jobManagement/views/proxiesView.component'; +import { JobsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobsView.component'; +import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/alertsView.component'; +import { OperatorsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/operatorsView.component'; +import { ProxiesViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/proxiesView.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; -import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; +import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView'; export const successLabel: string = nls.localize('jobaction.successLabel', 'Success'); export const errorLabel: string = nls.localize('jobaction.faillabel', 'Error'); diff --git a/src/sql/platform/model/common/modelViewService.ts b/src/sql/platform/model/common/modelViewService.ts index 72f9ba3076..582abb6f73 100644 --- a/src/sql/platform/model/common/modelViewService.ts +++ b/src/sql/platform/model/common/modelViewService.ts @@ -6,7 +6,7 @@ 'use strict'; import * as azdata from 'azdata'; import { IItemConfig, IComponentShape } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IComponentEventArgs } from 'sql/parts/modelComponents/interfaces'; +import { IComponentEventArgs } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { Event } from 'vs/base/common/event'; export interface IView { diff --git a/src/sql/platform/restore/common/restoreServiceImpl.ts b/src/sql/platform/restore/common/restoreServiceImpl.ts index 94c2fe8afe..f28731d66a 100644 --- a/src/sql/platform/restore/common/restoreServiceImpl.ts +++ b/src/sql/platform/restore/common/restoreServiceImpl.ts @@ -12,7 +12,7 @@ import * as azdata from 'azdata'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { IRestoreService, IRestoreDialogController, TaskExecutionMode } from 'sql/platform/restore/common/restoreService'; import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; -import { RestoreDialog } from 'sql/parts/disasterRecovery/restore/restoreDialog'; +import { RestoreDialog } from 'sql/workbench/parts/restore/browser/restoreDialog'; import * as ConnectionConstants from 'sql/platform/connection/common/constants'; import { MssqlRestoreInfo } from 'sql/platform/restore/common/mssqlRestoreInfo'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; diff --git a/src/sql/workbench/api/node/mainThreadModelViewDialog.ts b/src/sql/workbench/api/node/mainThreadModelViewDialog.ts index c0aba793c5..dc96edc5b0 100644 --- a/src/sql/workbench/api/node/mainThreadModelViewDialog.ts +++ b/src/sql/workbench/api/node/mainThreadModelViewDialog.ts @@ -13,7 +13,7 @@ import { MainThreadModelViewDialogShape, SqlMainContext, ExtHostModelViewDialogS import { Dialog, DialogTab, DialogButton, WizardPage, Wizard } from 'sql/platform/dialog/dialogTypes'; import { CustomDialogService } from 'sql/platform/dialog/customDialogService'; import { IModelViewDialogDetails, IModelViewTabDetails, IModelViewButtonDetails, IModelViewWizardPageDetails, IModelViewWizardDetails } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { ModelViewInput, ModelViewInputModel, ModeViewSaveHandler } from 'sql/parts/modelComponents/modelEditor/modelViewInput'; +import { ModelViewInput, ModelViewInputModel, ModeViewSaveHandler } from 'sql/workbench/electron-browser/modelComponents/modelViewInput'; import * as vscode from 'vscode'; import * as azdata from 'azdata'; diff --git a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts index 8ae96ee462..4221d7e13f 100644 --- a/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts +++ b/src/sql/workbench/api/node/mainThreadNotebookDocumentsAndEditors.ts @@ -30,7 +30,7 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { viewColumnToEditorGroup } from 'vs/workbench/api/common/shared/editor'; -import { notebookModeId } from 'sql/parts/common/customInputConverter'; +import { notebookModeId } from 'sql/workbench/common/customInputConverter'; class MainThreadNotebookEditor extends Disposable { private _contentChangedEmitter = new Emitter(); diff --git a/src/sql/parts/common/customInputConverter.ts b/src/sql/workbench/common/customInputConverter.ts similarity index 100% rename from src/sql/parts/common/customInputConverter.ts rename to src/sql/workbench/common/customInputConverter.ts diff --git a/src/sql/workbench/common/taskUtilities.ts b/src/sql/workbench/common/taskUtilities.ts index 96a88cb849..f4083ceca3 100644 --- a/src/sql/workbench/common/taskUtilities.ts +++ b/src/sql/workbench/common/taskUtilities.ts @@ -13,7 +13,7 @@ import { } from 'sql/platform/connection/common/connectionManagement'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; -import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; +import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput'; import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService'; import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService'; @@ -21,7 +21,7 @@ import { ConnectionManagementInfo } from 'sql/platform/connection/common/connect import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { QueryInput } from 'sql/parts/query/common/queryInput'; import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; -import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; diff --git a/src/sql/parts/modelComponents/button.component.ts b/src/sql/workbench/electron-browser/modelComponents/button.component.ts similarity index 96% rename from src/sql/parts/modelComponents/button.component.ts rename to src/sql/workbench/electron-browser/modelComponents/button.component.ts index 32391e9ef5..da9405ed96 100644 --- a/src/sql/parts/modelComponents/button.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/button.component.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./button'; +import 'vs/css!./media/button'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, ElementRef, OnDestroy, AfterViewInit @@ -10,8 +10,8 @@ import { import * as azdata from 'azdata'; -import { ComponentWithIconBase } from 'sql/parts/modelComponents/componentWithIconBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentWithIconBase } from 'sql/workbench/electron-browser/modelComponents/componentWithIconBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { SIDE_BAR_BACKGROUND, SIDE_BAR_TITLE_FOREGROUND } from 'vs/workbench/common/theme'; diff --git a/src/sql/parts/modelComponents/card.component.html b/src/sql/workbench/electron-browser/modelComponents/card.component.html similarity index 100% rename from src/sql/parts/modelComponents/card.component.html rename to src/sql/workbench/electron-browser/modelComponents/card.component.html diff --git a/src/sql/parts/modelComponents/card.component.ts b/src/sql/workbench/electron-browser/modelComponents/card.component.ts similarity index 89% rename from src/sql/parts/modelComponents/card.component.ts rename to src/sql/workbench/electron-browser/modelComponents/card.component.ts index 6255380961..6437597e3c 100644 --- a/src/sql/parts/modelComponents/card.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/card.component.ts @@ -2,26 +2,23 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./card'; +import 'vs/css!./media/card'; import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver, - ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, + Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy } from '@angular/core'; import * as azdata from 'azdata'; -import { ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { ComponentWithIconBase } from 'sql/parts/modelComponents/componentWithIconBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentWithIconBase } from 'sql/workbench/electron-browser/modelComponents/componentWithIconBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { StatusIndicator, CardProperties, ActionDescriptor } from 'sql/workbench/api/common/sqlExtHostTypes'; @Component({ - templateUrl: decodeURI(require.toUrl('sql/parts/modelComponents/card.component.html')) + templateUrl: decodeURI(require.toUrl('sql/workbench/electron-browser/modelComponents/card.component.html')) }) export default class CardComponent extends ComponentWithIconBase implements IComponent, OnDestroy { @Input() descriptor: IComponentDescriptor; diff --git a/src/sql/parts/modelComponents/checkbox.component.ts b/src/sql/workbench/electron-browser/modelComponents/checkbox.component.ts similarity index 95% rename from src/sql/parts/modelComponents/checkbox.component.ts rename to src/sql/workbench/electron-browser/modelComponents/checkbox.component.ts index 9a110df5d5..3cc6111a37 100644 --- a/src/sql/parts/modelComponents/checkbox.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/checkbox.component.ts @@ -10,8 +10,8 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { Checkbox, ICheckboxOptions } from 'sql/base/browser/ui/checkbox/checkbox'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { attachCheckboxStyler } from 'sql/platform/theme/common/styler'; diff --git a/src/sql/parts/modelComponents/componentBase.ts b/src/sql/workbench/electron-browser/modelComponents/componentBase.ts similarity index 97% rename from src/sql/parts/modelComponents/componentBase.ts rename to src/sql/workbench/electron-browser/modelComponents/componentBase.ts index d5029895c3..a04828fbcc 100644 --- a/src/sql/parts/modelComponents/componentBase.ts +++ b/src/sql/workbench/electron-browser/modelComponents/componentBase.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./flexContainer'; +import 'vs/css!./media/flexContainer'; import { ChangeDetectorRef, ViewChildren, ElementRef, OnDestroy, OnInit, QueryList @@ -10,11 +10,11 @@ import { import * as types from 'vs/base/common/types'; -import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import * as azdata from 'azdata'; import { Emitter } from 'vs/base/common/event'; import { IDisposable, Disposable } from 'vs/base/common/lifecycle'; -import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; +import { ModelComponentWrapper } from 'sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component'; import { URI } from 'vs/base/common/uri'; import * as nls from 'vs/nls'; diff --git a/src/sql/parts/modelComponents/componentWithIconBase.ts b/src/sql/workbench/electron-browser/modelComponents/componentWithIconBase.ts similarity index 88% rename from src/sql/parts/modelComponents/componentWithIconBase.ts rename to src/sql/workbench/electron-browser/modelComponents/componentWithIconBase.ts index 12d7b057b3..db2420d70f 100644 --- a/src/sql/parts/modelComponents/componentWithIconBase.ts +++ b/src/sql/workbench/electron-browser/modelComponents/componentWithIconBase.ts @@ -3,17 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver, - ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, OnInit, QueryList, AfterViewInit -} from '@angular/core'; +import { ChangeDetectorRef, ElementRef } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore, IComponentEventArgs, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { IComponentDescriptor } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import * as azdata from 'azdata'; import { URI } from 'vs/base/common/uri'; import { IdGenerator } from 'vs/base/common/idGenerator'; import { createCSSRule, removeCSSRulesContainingSelector } from 'vs/base/browser/dom'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; export type IUserFriendlyIcon = string | URI | { light: string | URI; dark: string | URI }; diff --git a/src/sql/parts/modelComponents/components.contribution.ts b/src/sql/workbench/electron-browser/modelComponents/components.contribution.ts similarity index 94% rename from src/sql/parts/modelComponents/components.contribution.ts rename to src/sql/workbench/electron-browser/modelComponents/components.contribution.ts index d957961d8a..cd96403c03 100644 --- a/src/sql/parts/modelComponents/components.contribution.ts +++ b/src/sql/workbench/electron-browser/modelComponents/components.contribution.ts @@ -14,7 +14,7 @@ import DeclarativeTableComponent from './declarativeTable.component'; import ListBoxComponent from './listbox.component'; import ButtonComponent from './button.component'; import CheckBoxComponent from './checkbox.component'; -import TreeComponent from './tree/tree.component'; +import TreeComponent from './tree.component'; import RadioButtonComponent from './radioButton.component'; import WebViewComponent from './webview.component'; import TableComponent from './table.component'; @@ -26,8 +26,8 @@ import DiffEditorComponent from './diffeditor.component'; import DomComponent from './dom.component'; import { registerComponentType } from 'sql/platform/dashboard/common/modelComponentRegistry'; import { ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes'; -import HyperlinkComponent from 'sql/parts/modelComponents/hyperlink.component'; -import SplitViewContainer from 'sql/parts/modelComponents/splitviewContainer.component'; +import HyperlinkComponent from 'sql/workbench/electron-browser/modelComponents/hyperlink.component'; +import SplitViewContainer from 'sql/workbench/electron-browser/modelComponents/splitviewContainer.component'; export const DIV_CONTAINER = 'div-container'; registerComponentType(DIV_CONTAINER, ModelComponentTypes.DivContainer, DivContainer); diff --git a/src/sql/parts/modelComponents/declarativeTable.component.ts b/src/sql/workbench/electron-browser/modelComponents/declarativeTable.component.ts similarity index 97% rename from src/sql/parts/modelComponents/declarativeTable.component.ts rename to src/sql/workbench/electron-browser/modelComponents/declarativeTable.component.ts index 690cb91c2d..a911a8007c 100644 --- a/src/sql/parts/modelComponents/declarativeTable.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/declarativeTable.component.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./declarativeTable'; +import 'vs/css!./media/declarativeTable'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, ElementRef, OnDestroy, AfterViewInit @@ -11,8 +11,8 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { ISelectData } from 'vs/base/browser/ui/selectBox/selectBox'; export enum DeclarativeDataType { diff --git a/src/sql/parts/modelComponents/diffeditor.component.ts b/src/sql/workbench/electron-browser/modelComponents/diffeditor.component.ts similarity index 96% rename from src/sql/parts/modelComponents/diffeditor.component.ts rename to src/sql/workbench/electron-browser/modelComponents/diffeditor.component.ts index 1cea0cf5e0..f65b10f161 100644 --- a/src/sql/parts/modelComponents/diffeditor.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/diffeditor.component.ts @@ -2,10 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./editor'; +import 'vs/css!./media/editor'; import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver, - ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList + Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy } from '@angular/core'; import * as azdata from 'azdata'; @@ -17,8 +16,8 @@ import { Schemas } from 'vs/base/common/network'; import { IModeService } from 'vs/editor/common/services/modeService'; import { IModelService } from 'vs/editor/common/services/modelService'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { SimpleProgressService } from 'vs/editor/standalone/browser/simpleServices'; import { IProgressService } from 'vs/platform/progress/common/progress'; diff --git a/src/sql/parts/modelComponents/divContainer.component.ts b/src/sql/workbench/electron-browser/modelComponents/divContainer.component.ts similarity index 87% rename from src/sql/parts/modelComponents/divContainer.component.ts rename to src/sql/workbench/electron-browser/modelComponents/divContainer.component.ts index 02113177c4..66b1fee441 100644 --- a/src/sql/parts/modelComponents/divContainer.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/divContainer.component.ts @@ -2,21 +2,18 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./divContainer'; +import 'vs/css!./media/divContainer'; import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver, - ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, + Component, Input, Inject, ChangeDetectorRef, forwardRef, + ViewChild, ElementRef, OnDestroy, } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import * as azdata from 'azdata'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; -import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; +import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; -import types = require('vs/base/common/types'); import { StandardKeyboardEvent } from 'vs/base/browser/keyboardEvent'; import { KeyCode } from 'vs/base/common/keyCodes'; diff --git a/src/sql/parts/modelComponents/dom.component.ts b/src/sql/workbench/electron-browser/modelComponents/dom.component.ts similarity index 90% rename from src/sql/parts/modelComponents/dom.component.ts rename to src/sql/workbench/electron-browser/modelComponents/dom.component.ts index 613299be84..2df84b25a7 100644 --- a/src/sql/parts/modelComponents/dom.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/dom.component.ts @@ -2,9 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./dom'; -import 'vs/css!./highlight'; -import 'vs/css!./markdown'; +import 'vs/css!./media/dom'; +import 'vs/css!./media/highlight'; +import 'vs/css!./media/markdown'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy @@ -13,8 +13,8 @@ import { import * as azdata from 'azdata'; import * as DOM from 'vs/base/browser/dom'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; @Component({ template: '', diff --git a/src/sql/parts/modelComponents/dropdown.component.ts b/src/sql/workbench/electron-browser/modelComponents/dropdown.component.ts similarity index 97% rename from src/sql/parts/modelComponents/dropdown.component.ts rename to src/sql/workbench/electron-browser/modelComponents/dropdown.component.ts index f8fa88f5ca..0f78fa3377 100644 --- a/src/sql/parts/modelComponents/dropdown.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/dropdown.component.ts @@ -10,8 +10,8 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { Dropdown, IDropdownOptions } from 'sql/base/browser/ui/editableDropdown/dropdown'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachEditableDropdownStyler } from 'sql/platform/theme/common/styler'; diff --git a/src/sql/parts/modelComponents/editor.component.ts b/src/sql/workbench/electron-browser/modelComponents/editor.component.ts similarity index 95% rename from src/sql/parts/modelComponents/editor.component.ts rename to src/sql/workbench/electron-browser/modelComponents/editor.component.ts index d13de3ef5d..a901eb9ae8 100644 --- a/src/sql/parts/modelComponents/editor.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/editor.component.ts @@ -2,10 +2,9 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./editor'; +import 'vs/css!./media/editor'; import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver, - ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList + Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy } from '@angular/core'; import * as azdata from 'azdata'; @@ -18,9 +17,9 @@ import { Schemas } from 'vs/base/common/network'; import { IModeService } from 'vs/editor/common/services/modeService'; import { IModelService } from 'vs/editor/common/services/modelService'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; -import { QueryTextEditor } from 'sql/parts/modelComponents/queryTextEditor'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; +import { QueryTextEditor } from 'sql/workbench/electron-browser/modelComponents/queryTextEditor'; import { ServiceCollection } from 'vs/platform/instantiation/common/serviceCollection'; import { SimpleProgressService } from 'vs/editor/standalone/browser/simpleServices'; import { IProgressService } from 'vs/platform/progress/common/progress'; diff --git a/src/sql/parts/modelComponents/fileBrowserTree.component.ts b/src/sql/workbench/electron-browser/modelComponents/fileBrowserTree.component.ts similarity index 96% rename from src/sql/parts/modelComponents/fileBrowserTree.component.ts rename to src/sql/workbench/electron-browser/modelComponents/fileBrowserTree.component.ts index b9a641e57c..5fd0cebd7e 100644 --- a/src/sql/parts/modelComponents/fileBrowserTree.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/fileBrowserTree.component.ts @@ -9,8 +9,8 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { FileBrowserViewModel } from 'sql/workbench/services/fileBrowser/common/fileBrowserViewModel'; import { FileNode } from 'sql/workbench/services/fileBrowser/common/fileNode'; diff --git a/src/sql/parts/modelComponents/flexContainer.component.ts b/src/sql/workbench/electron-browser/modelComponents/flexContainer.component.ts similarity index 85% rename from src/sql/parts/modelComponents/flexContainer.component.ts rename to src/sql/workbench/electron-browser/modelComponents/flexContainer.component.ts index 6a4848f0e0..3faaaedc69 100644 --- a/src/sql/parts/modelComponents/flexContainer.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/flexContainer.component.ts @@ -2,21 +2,17 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./flexContainer'; +import 'vs/css!./media/flexContainer'; import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver, - ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, + Component, Input, Inject, ChangeDetectorRef, forwardRef, + ElementRef, OnDestroy } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { FlexLayout, FlexItemLayout } from 'azdata'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; -import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; - -import types = require('vs/base/common/types'); +import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; export class FlexItem { constructor(public descriptor: IComponentDescriptor, public config: FlexItemLayout) { } diff --git a/src/sql/parts/modelComponents/formContainer.component.ts b/src/sql/workbench/electron-browser/modelComponents/formContainer.component.ts similarity index 91% rename from src/sql/parts/modelComponents/formContainer.component.ts rename to src/sql/workbench/electron-browser/modelComponents/formContainer.component.ts index 35d510b721..e5f34ebb29 100644 --- a/src/sql/parts/modelComponents/formContainer.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/formContainer.component.ts @@ -2,22 +2,18 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./formLayout'; -import 'vs/css!sql/media/icons/common-icons'; +import 'vs/css!./media/formLayout'; import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver, - ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit + Component, Input, Inject, ChangeDetectorRef, forwardRef, + ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { FormLayout, FormItemLayout } from 'azdata'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; -import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; +import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; -import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/dom'; export interface TitledFormItemLayout { title: string; diff --git a/src/sql/parts/modelComponents/groupContainer.component.ts b/src/sql/workbench/electron-browser/modelComponents/groupContainer.component.ts similarity index 77% rename from src/sql/parts/modelComponents/groupContainer.component.ts rename to src/sql/workbench/electron-browser/modelComponents/groupContainer.component.ts index d3571b406f..81394ec522 100644 --- a/src/sql/parts/modelComponents/groupContainer.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/groupContainer.component.ts @@ -2,20 +2,17 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./groupLayout'; +import 'vs/css!./media/groupLayout'; import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver, - ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit + Component, Input, Inject, ChangeDetectorRef, forwardRef, + ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; -import { GroupLayout, GroupItemLayout } from 'azdata'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; +import { GroupLayout } from 'azdata'; -import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; -import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; -import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; +import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; @Component({ selector: 'modelview-groupContainer', @@ -45,7 +42,6 @@ export default class GroupContainer extends ContainerBase implement @ViewChild('container', { read: ElementRef }) private _container: ElementRef; constructor( - @Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface, @Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef, @Inject(forwardRef(() => ElementRef)) el: ElementRef) { super(changeRef, el); diff --git a/src/sql/parts/modelComponents/hyperlink.component.ts b/src/sql/workbench/electron-browser/modelComponents/hyperlink.component.ts similarity index 86% rename from src/sql/parts/modelComponents/hyperlink.component.ts rename to src/sql/workbench/electron-browser/modelComponents/hyperlink.component.ts index dac5829017..7d7408578d 100644 --- a/src/sql/parts/modelComponents/hyperlink.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/hyperlink.component.ts @@ -10,9 +10,8 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; @Component({ selector: 'modelview-hyperlink', @@ -23,7 +22,6 @@ export default class HyperlinkComponent extends ComponentBase implements ICompon @Input() modelStore: IModelStore; constructor( - @Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface, @Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef, @Inject(forwardRef(() => ElementRef)) el: ElementRef) { super(changeRef, el); diff --git a/src/sql/parts/modelComponents/inputbox.component.ts b/src/sql/workbench/electron-browser/modelComponents/inputbox.component.ts similarity index 98% rename from src/sql/parts/modelComponents/inputbox.component.ts rename to src/sql/workbench/electron-browser/modelComponents/inputbox.component.ts index 96cff0c8f3..59e4f9eca1 100644 --- a/src/sql/parts/modelComponents/inputbox.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/inputbox.component.ts @@ -10,8 +10,8 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { attachInputBoxStyler } from 'sql/platform/theme/common/styler'; diff --git a/src/sql/parts/modelComponents/interfaces.ts b/src/sql/workbench/electron-browser/modelComponents/interfaces.ts similarity index 97% rename from src/sql/parts/modelComponents/interfaces.ts rename to src/sql/workbench/electron-browser/modelComponents/interfaces.ts index ea99f6a621..53c77d9dd6 100644 --- a/src/sql/parts/modelComponents/interfaces.ts +++ b/src/sql/workbench/electron-browser/modelComponents/interfaces.ts @@ -4,8 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { InjectionToken } from '@angular/core'; -import * as azdata from 'azdata'; -import { Event, Emitter } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; /** diff --git a/src/sql/parts/modelComponents/listbox.component.ts b/src/sql/workbench/electron-browser/modelComponents/listbox.component.ts similarity index 95% rename from src/sql/parts/modelComponents/listbox.component.ts rename to src/sql/workbench/electron-browser/modelComponents/listbox.component.ts index 8df1354854..5f6e678d39 100644 --- a/src/sql/parts/modelComponents/listbox.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/listbox.component.ts @@ -10,8 +10,8 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { ListBox } from 'sql/base/browser/ui/listBox/listBox'; import { attachListBoxStyler } from 'sql/platform/theme/common/styler'; diff --git a/src/sql/parts/modelComponents/loadingComponent.component.ts b/src/sql/workbench/electron-browser/modelComponents/loadingComponent.component.ts similarity index 92% rename from src/sql/parts/modelComponents/loadingComponent.component.ts rename to src/sql/workbench/electron-browser/modelComponents/loadingComponent.component.ts index 4d82639fd9..29c26da6ea 100644 --- a/src/sql/parts/modelComponents/loadingComponent.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/loadingComponent.component.ts @@ -3,15 +3,15 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./loadingComponent'; +import 'vs/css!./media/loadingComponent'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, OnDestroy, AfterViewInit, ElementRef } from '@angular/core'; import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import * as nls from 'vs/nls'; @Component({ diff --git a/src/sql/parts/modelComponents/loadingSpinner.component.ts b/src/sql/workbench/electron-browser/modelComponents/loadingSpinner.component.ts similarity index 72% rename from src/sql/parts/modelComponents/loadingSpinner.component.ts rename to src/sql/workbench/electron-browser/modelComponents/loadingSpinner.component.ts index 2fcd417a13..e3c1bde297 100644 --- a/src/sql/parts/modelComponents/loadingSpinner.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/loadingSpinner.component.ts @@ -3,10 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./loadingComponent'; -import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef -} from '@angular/core'; +import 'vs/css!./media/loadingComponent'; +import { Component, Input } from '@angular/core'; import * as nls from 'vs/nls'; @@ -22,9 +20,4 @@ export default class LoadingSpinner { private readonly _loadingTitle = nls.localize('loadingMessage', 'Loading'); @Input() loading: boolean; - - constructor( - @Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef, - @Inject(forwardRef(() => ElementRef)) el: ElementRef) { - } } diff --git a/src/sql/parts/modelComponents/button.css b/src/sql/workbench/electron-browser/modelComponents/media/button.css similarity index 100% rename from src/sql/parts/modelComponents/button.css rename to src/sql/workbench/electron-browser/modelComponents/media/button.css diff --git a/src/sql/parts/modelComponents/card.css b/src/sql/workbench/electron-browser/modelComponents/media/card.css similarity index 100% rename from src/sql/parts/modelComponents/card.css rename to src/sql/workbench/electron-browser/modelComponents/media/card.css diff --git a/src/sql/parts/modelComponents/declarativeTable.css b/src/sql/workbench/electron-browser/modelComponents/media/declarativeTable.css similarity index 100% rename from src/sql/parts/modelComponents/declarativeTable.css rename to src/sql/workbench/electron-browser/modelComponents/media/declarativeTable.css diff --git a/src/sql/parts/modelComponents/divContainer.css b/src/sql/workbench/electron-browser/modelComponents/media/divContainer.css similarity index 100% rename from src/sql/parts/modelComponents/divContainer.css rename to src/sql/workbench/electron-browser/modelComponents/media/divContainer.css diff --git a/src/sql/parts/modelComponents/dom.css b/src/sql/workbench/electron-browser/modelComponents/media/dom.css similarity index 100% rename from src/sql/parts/modelComponents/dom.css rename to src/sql/workbench/electron-browser/modelComponents/media/dom.css diff --git a/src/sql/parts/modelComponents/editor.css b/src/sql/workbench/electron-browser/modelComponents/media/editor.css similarity index 100% rename from src/sql/parts/modelComponents/editor.css rename to src/sql/workbench/electron-browser/modelComponents/media/editor.css diff --git a/src/sql/parts/modelComponents/flexContainer.css b/src/sql/workbench/electron-browser/modelComponents/media/flexContainer.css similarity index 100% rename from src/sql/parts/modelComponents/flexContainer.css rename to src/sql/workbench/electron-browser/modelComponents/media/flexContainer.css diff --git a/src/sql/parts/modelComponents/formLayout.css b/src/sql/workbench/electron-browser/modelComponents/media/formLayout.css similarity index 100% rename from src/sql/parts/modelComponents/formLayout.css rename to src/sql/workbench/electron-browser/modelComponents/media/formLayout.css diff --git a/src/sql/parts/modelComponents/groupLayout.css b/src/sql/workbench/electron-browser/modelComponents/media/groupLayout.css similarity index 100% rename from src/sql/parts/modelComponents/groupLayout.css rename to src/sql/workbench/electron-browser/modelComponents/media/groupLayout.css diff --git a/src/sql/parts/modelComponents/highlight.css b/src/sql/workbench/electron-browser/modelComponents/media/highlight.css similarity index 100% rename from src/sql/parts/modelComponents/highlight.css rename to src/sql/workbench/electron-browser/modelComponents/media/highlight.css diff --git a/src/sql/parts/modelComponents/loading.svg b/src/sql/workbench/electron-browser/modelComponents/media/loading.svg similarity index 100% rename from src/sql/parts/modelComponents/loading.svg rename to src/sql/workbench/electron-browser/modelComponents/media/loading.svg diff --git a/src/sql/parts/modelComponents/loadingComponent.css b/src/sql/workbench/electron-browser/modelComponents/media/loadingComponent.css similarity index 100% rename from src/sql/parts/modelComponents/loadingComponent.css rename to src/sql/workbench/electron-browser/modelComponents/media/loadingComponent.css diff --git a/src/sql/parts/modelComponents/loading_inverse.svg b/src/sql/workbench/electron-browser/modelComponents/media/loading_inverse.svg similarity index 100% rename from src/sql/parts/modelComponents/loading_inverse.svg rename to src/sql/workbench/electron-browser/modelComponents/media/loading_inverse.svg diff --git a/src/sql/parts/modelComponents/markdown.css b/src/sql/workbench/electron-browser/modelComponents/media/markdown.css similarity index 100% rename from src/sql/parts/modelComponents/markdown.css rename to src/sql/workbench/electron-browser/modelComponents/media/markdown.css diff --git a/src/sql/parts/modelComponents/modelViewContent.css b/src/sql/workbench/electron-browser/modelComponents/media/modelViewContent.css similarity index 100% rename from src/sql/parts/modelComponents/modelViewContent.css rename to src/sql/workbench/electron-browser/modelComponents/media/modelViewContent.css diff --git a/src/sql/parts/modelComponents/modelEditor/modelViewEditor.css b/src/sql/workbench/electron-browser/modelComponents/media/modelViewEditor.css similarity index 100% rename from src/sql/parts/modelComponents/modelEditor/modelViewEditor.css rename to src/sql/workbench/electron-browser/modelComponents/media/modelViewEditor.css diff --git a/src/sql/parts/modelComponents/radioButton.css b/src/sql/workbench/electron-browser/modelComponents/media/radioButton.css similarity index 100% rename from src/sql/parts/modelComponents/radioButton.css rename to src/sql/workbench/electron-browser/modelComponents/media/radioButton.css diff --git a/src/sql/parts/modelComponents/table.css b/src/sql/workbench/electron-browser/modelComponents/media/table.css similarity index 100% rename from src/sql/parts/modelComponents/table.css rename to src/sql/workbench/electron-browser/modelComponents/media/table.css diff --git a/src/sql/parts/modelComponents/toolbarLayout.css b/src/sql/workbench/electron-browser/modelComponents/media/toolbarLayout.css similarity index 100% rename from src/sql/parts/modelComponents/toolbarLayout.css rename to src/sql/workbench/electron-browser/modelComponents/media/toolbarLayout.css diff --git a/src/sql/parts/modelComponents/tree/treeComponent.css b/src/sql/workbench/electron-browser/modelComponents/media/treeComponent.css similarity index 100% rename from src/sql/parts/modelComponents/tree/treeComponent.css rename to src/sql/workbench/electron-browser/modelComponents/media/treeComponent.css diff --git a/src/sql/parts/modelComponents/webview.css b/src/sql/workbench/electron-browser/modelComponents/media/webview.css similarity index 100% rename from src/sql/parts/modelComponents/webview.css rename to src/sql/workbench/electron-browser/modelComponents/media/webview.css diff --git a/src/sql/parts/modelComponents/modelComponentWrapper.component.ts b/src/sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component.ts similarity index 99% rename from src/sql/parts/modelComponents/modelComponentWrapper.component.ts rename to src/sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component.ts index f758d25575..0325d83573 100644 --- a/src/sql/parts/modelComponents/modelComponentWrapper.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/modelComponentWrapper.component.ts @@ -2,7 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/media/icons/common-icons'; import { Component, Input, Inject, forwardRef, ComponentFactoryResolver, ViewChild, diff --git a/src/sql/parts/modelComponents/modelStore.ts b/src/sql/workbench/electron-browser/modelComponents/modelStore.ts similarity index 100% rename from src/sql/parts/modelComponents/modelStore.ts rename to src/sql/workbench/electron-browser/modelComponents/modelStore.ts diff --git a/src/sql/parts/modelComponents/modelViewContent.component.ts b/src/sql/workbench/electron-browser/modelComponents/modelViewContent.component.ts similarity index 96% rename from src/sql/parts/modelComponents/modelViewContent.component.ts rename to src/sql/workbench/electron-browser/modelComponents/modelViewContent.component.ts index 643de0adb6..c91a2565a6 100644 --- a/src/sql/parts/modelComponents/modelViewContent.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/modelViewContent.component.ts @@ -2,7 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -// import 'vs/css!./modelViewContent'; import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef } from '@angular/core'; @@ -13,7 +12,7 @@ import { memoize } from 'vs/base/common/decorators'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IModelView } from 'sql/platform/model/common/modelViewService'; -import { ViewBase } from 'sql/parts/modelComponents/viewBase'; +import { ViewBase } from 'sql/workbench/electron-browser/modelComponents/viewBase'; import { IModelViewService } from 'sql/platform/modelComponents/common/modelViewService'; import * as azdata from 'azdata'; diff --git a/src/sql/parts/modelComponents/modelEditor/modelViewEditor.contribution.ts b/src/sql/workbench/electron-browser/modelComponents/modelViewEditor.contribution.ts similarity index 80% rename from src/sql/parts/modelComponents/modelEditor/modelViewEditor.contribution.ts rename to src/sql/workbench/electron-browser/modelComponents/modelViewEditor.contribution.ts index d1f160826d..f768691652 100644 --- a/src/sql/parts/modelComponents/modelEditor/modelViewEditor.contribution.ts +++ b/src/sql/workbench/electron-browser/modelComponents/modelViewEditor.contribution.ts @@ -6,8 +6,8 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } from 'vs/workbench/browser/editor'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; -import { ModelViewInput } from 'sql/parts/modelComponents/modelEditor/modelViewInput'; -import { ModelViewEditor } from 'sql/parts/modelComponents/modelEditor/modelViewEditor'; +import { ModelViewInput } from 'sql/workbench/electron-browser/modelComponents/modelViewInput'; +import { ModelViewEditor } from 'sql/workbench/electron-browser/modelComponents/modelViewEditor'; // Model View editor registration const viewModelEditorDescriptor = new EditorDescriptor( diff --git a/src/sql/parts/modelComponents/modelEditor/modelViewEditor.ts b/src/sql/workbench/electron-browser/modelComponents/modelViewEditor.ts similarity index 96% rename from src/sql/parts/modelComponents/modelEditor/modelViewEditor.ts rename to src/sql/workbench/electron-browser/modelComponents/modelViewEditor.ts index 1abfe81919..7295867ce8 100644 --- a/src/sql/parts/modelComponents/modelEditor/modelViewEditor.ts +++ b/src/sql/workbench/electron-browser/modelComponents/modelViewEditor.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./modelViewEditor'; +import 'vs/css!./media/modelViewEditor'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; @@ -10,7 +10,7 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor'; import { EditorOptions } from 'vs/workbench/common/editor'; import * as DOM from 'vs/base/browser/dom'; -import { ModelViewInput } from 'sql/parts/modelComponents/modelEditor/modelViewInput'; +import { ModelViewInput } from 'sql/workbench/electron-browser/modelComponents/modelViewInput'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/sql/parts/modelComponents/modelEditor/modelViewInput.ts b/src/sql/workbench/electron-browser/modelComponents/modelViewInput.ts similarity index 100% rename from src/sql/parts/modelComponents/modelEditor/modelViewInput.ts rename to src/sql/workbench/electron-browser/modelComponents/modelViewInput.ts diff --git a/src/sql/parts/modelComponents/queryTextEditor.ts b/src/sql/workbench/electron-browser/modelComponents/queryTextEditor.ts similarity index 100% rename from src/sql/parts/modelComponents/queryTextEditor.ts rename to src/sql/workbench/electron-browser/modelComponents/queryTextEditor.ts diff --git a/src/sql/parts/modelComponents/radioButton.component.ts b/src/sql/workbench/electron-browser/modelComponents/radioButton.component.ts similarity index 85% rename from src/sql/parts/modelComponents/radioButton.component.ts rename to src/sql/workbench/electron-browser/modelComponents/radioButton.component.ts index afedc1da99..da0d78a869 100644 --- a/src/sql/parts/modelComponents/radioButton.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/radioButton.component.ts @@ -3,19 +3,17 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./radioButton'; +import 'vs/css!./media/radioButton'; import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver, - ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit + Component, Input, Inject, ChangeDetectorRef, forwardRef, + ViewChild, ElementRef, OnDestroy, AfterViewInit } from '@angular/core'; import * as azdata from 'azdata'; -import { Event, Emitter } from 'vs/base/common/event'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { RadioButton } from 'sql/base/browser/ui/radioButton/radioButton'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; @Component({ selector: 'modelview-radioButton', @@ -32,7 +30,6 @@ export default class RadioButtonComponent extends ComponentBase implements IComp @ViewChild('input', { read: ElementRef }) private _inputContainer: ElementRef; constructor( - @Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface, @Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef, @Inject(forwardRef(() => ElementRef)) el: ElementRef) { super(changeRef, el); diff --git a/src/sql/parts/modelComponents/splitviewContainer.component.ts b/src/sql/workbench/electron-browser/modelComponents/splitviewContainer.component.ts similarity index 94% rename from src/sql/parts/modelComponents/splitviewContainer.component.ts rename to src/sql/workbench/electron-browser/modelComponents/splitviewContainer.component.ts index c2830efe24..5544548161 100644 --- a/src/sql/parts/modelComponents/splitviewContainer.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/splitviewContainer.component.ts @@ -2,16 +2,14 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./flexContainer'; +import 'vs/css!./media/flexContainer'; -import { - Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy, -} from '@angular/core'; +import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy } from '@angular/core'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { FlexItemLayout, SplitViewLayout } from 'azdata'; import { FlexItem } from './flexContainer.component'; -import { ContainerBase, ComponentBase } from 'sql/parts/modelComponents/componentBase'; +import { ContainerBase, ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; import { Event } from 'vs/base/common/event'; import { SplitView, Orientation, Sizing, IView } from 'vs/base/browser/ui/splitview/splitview'; diff --git a/src/sql/parts/modelComponents/table.component.ts b/src/sql/workbench/electron-browser/modelComponents/table.component.ts similarity index 96% rename from src/sql/parts/modelComponents/table.component.ts rename to src/sql/workbench/electron-browser/modelComponents/table.component.ts index fed80a9a50..641d7a46c2 100644 --- a/src/sql/parts/modelComponents/table.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/table.component.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./table'; +import 'vs/css!./media/table'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, ElementRef, OnDestroy, AfterViewInit @@ -11,8 +11,8 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; diff --git a/src/sql/parts/modelComponents/text.component.ts b/src/sql/workbench/electron-browser/modelComponents/text.component.ts similarity index 87% rename from src/sql/parts/modelComponents/text.component.ts rename to src/sql/workbench/electron-browser/modelComponents/text.component.ts index 14d6ecc441..b764ee1cea 100644 --- a/src/sql/parts/modelComponents/text.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/text.component.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./radioButton'; +import 'vs/css!./media/radioButton'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, OnDestroy, AfterViewInit, ElementRef, SecurityContext @@ -11,9 +11,8 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; -import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { SafeHtml, DomSanitizer } from '@angular/platform-browser'; @Component({ @@ -26,7 +25,6 @@ export default class TextComponent extends ComponentBase implements IComponent, @Input() modelStore: IModelStore; constructor( - @Inject(forwardRef(() => CommonServiceInterface)) private _commonService: CommonServiceInterface, @Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef, @Inject(forwardRef(() => ElementRef)) el: ElementRef, @Inject(forwardRef(() => DomSanitizer)) private _domSanitizer: DomSanitizer) { diff --git a/src/sql/parts/modelComponents/toolbarContainer.component.ts b/src/sql/workbench/electron-browser/modelComponents/toolbarContainer.component.ts similarity index 94% rename from src/sql/parts/modelComponents/toolbarContainer.component.ts rename to src/sql/workbench/electron-browser/modelComponents/toolbarContainer.component.ts index f3fd8830dd..0f84c8d704 100644 --- a/src/sql/parts/modelComponents/toolbarContainer.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/toolbarContainer.component.ts @@ -2,8 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./toolbarLayout'; -import 'vs/css!../../../sql/base/browser/ui/taskbar/media/taskbar'; +import 'vs/css!./media/toolbarLayout'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, @@ -12,9 +11,9 @@ import { import { Orientation, ToolbarLayout } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; -import { ContainerBase } from 'sql/parts/modelComponents/componentBase'; +import { ContainerBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; export interface ToolbarItemConfig { diff --git a/src/sql/parts/modelComponents/tree/tree.component.ts b/src/sql/workbench/electron-browser/modelComponents/tree.component.ts similarity index 90% rename from src/sql/parts/modelComponents/tree/tree.component.ts rename to src/sql/workbench/electron-browser/modelComponents/tree.component.ts index 9120ed8fac..366180562f 100644 --- a/src/sql/parts/modelComponents/tree/tree.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/tree.component.ts @@ -2,8 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/parts/modelComponents/tree/treeComponent'; -import 'vs/css!sql/media/icons/common-icons'; +import 'vs/css!./media/treeComponent'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, @@ -12,19 +11,19 @@ import { import * as azdata from 'azdata'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; -import { TreeComponentRenderer } from 'sql/parts/modelComponents/tree/treeComponentRenderer'; -import { TreeComponentDataSource } from 'sql/parts/modelComponents/tree/treeDataSource'; +import { TreeComponentRenderer } from 'sql/workbench/electron-browser/modelComponents/treeComponentRenderer'; +import { TreeComponentDataSource } from 'sql/workbench/electron-browser/modelComponents/treeDataSource'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { attachListStyler } from 'vs/platform/theme/common/styler'; import { DefaultFilter, DefaultAccessibilityProvider, DefaultController } from 'vs/base/parts/tree/browser/treeDefaults'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITreeComponentItem } from 'sql/workbench/common/views'; -import { TreeViewDataProvider } from './treeViewDataProvider'; +import { TreeViewDataProvider } from 'sql/workbench/electron-browser/modelComponents/treeViewDataProvider'; import { getContentHeight, getContentWidth } from 'vs/base/browser/dom'; class Root implements ITreeComponentItem { diff --git a/src/sql/parts/modelComponents/tree/treeComponentRenderer.ts b/src/sql/workbench/electron-browser/modelComponents/treeComponentRenderer.ts similarity index 95% rename from src/sql/parts/modelComponents/tree/treeComponentRenderer.ts rename to src/sql/workbench/electron-browser/modelComponents/treeComponentRenderer.ts index 2eaf84739b..d0d8378f69 100644 --- a/src/sql/parts/modelComponents/tree/treeComponentRenderer.ts +++ b/src/sql/workbench/electron-browser/modelComponents/treeComponentRenderer.ts @@ -3,13 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; -import 'vs/css!sql/media/icons/common-icons'; import * as dom from 'vs/base/browser/dom'; -import { localize } from 'vs/nls'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ITree, IRenderer } from 'vs/base/parts/tree/browser/tree'; -import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { LIGHT } from 'vs/platform/theme/common/themeService'; import { Disposable } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/parts/modelComponents/tree/treeDataSource.ts b/src/sql/workbench/electron-browser/modelComponents/treeDataSource.ts similarity index 99% rename from src/sql/parts/modelComponents/tree/treeDataSource.ts rename to src/sql/workbench/electron-browser/modelComponents/treeDataSource.ts index a158aa3887..b783740077 100644 --- a/src/sql/parts/modelComponents/tree/treeDataSource.ts +++ b/src/sql/workbench/electron-browser/modelComponents/treeDataSource.ts @@ -3,8 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; import { IModelViewTreeViewDataProvider, ITreeComponentItem } from 'sql/workbench/common/views'; import { TreeItemCollapsibleState } from 'vs/workbench/common/views'; diff --git a/src/sql/parts/modelComponents/tree/treeViewDataProvider.ts b/src/sql/workbench/electron-browser/modelComponents/treeViewDataProvider.ts similarity index 99% rename from src/sql/parts/modelComponents/tree/treeViewDataProvider.ts rename to src/sql/workbench/electron-browser/modelComponents/treeViewDataProvider.ts index fc30901e48..d9ed70a1fc 100644 --- a/src/sql/parts/modelComponents/tree/treeViewDataProvider.ts +++ b/src/sql/workbench/electron-browser/modelComponents/treeViewDataProvider.ts @@ -2,7 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { ExtHostModelViewTreeViewsShape, SqlExtHostContext } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IExtHostContext } from 'vs/workbench/api/common/extHost.protocol'; diff --git a/src/sql/parts/modelComponents/viewBase.ts b/src/sql/workbench/electron-browser/modelComponents/viewBase.ts similarity index 97% rename from src/sql/parts/modelComponents/viewBase.ts rename to src/sql/workbench/electron-browser/modelComponents/viewBase.ts index ccb091b76f..46c51e4014 100644 --- a/src/sql/parts/modelComponents/viewBase.ts +++ b/src/sql/workbench/electron-browser/modelComponents/viewBase.ts @@ -6,7 +6,7 @@ import { ChangeDetectorRef } from '@angular/core'; import { Registry } from 'vs/platform/registry/common/platform'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import * as azdata from 'azdata'; import { IModelStore, IComponentDescriptor, IComponent } from './interfaces'; @@ -14,7 +14,7 @@ import { IItemConfig, ModelComponentTypes, IComponentShape } from 'sql/workbench import { IModelView, IModelViewEventArgs } from 'sql/platform/model/common/modelViewService'; import { Extensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry'; import { AngularDisposable } from 'sql/base/node/lifecycle'; -import { ModelStore } from 'sql/parts/modelComponents/modelStore'; +import { ModelStore } from 'sql/workbench/electron-browser/modelComponents/modelStore'; import { Event, Emitter } from 'vs/base/common/event'; const componentRegistry = Registry.as(Extensions.ComponentContribution); diff --git a/src/sql/parts/modelComponents/webview.component.ts b/src/sql/workbench/electron-browser/modelComponents/webview.component.ts similarity index 96% rename from src/sql/parts/modelComponents/webview.component.ts rename to src/sql/workbench/electron-browser/modelComponents/webview.component.ts index be12e133ec..7b5331f789 100644 --- a/src/sql/parts/modelComponents/webview.component.ts +++ b/src/sql/workbench/electron-browser/modelComponents/webview.component.ts @@ -2,7 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./webview'; +import 'vs/css!./media/webview'; import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnDestroy } from '@angular/core'; @@ -14,8 +14,8 @@ import { URI, UriComponents } from 'vs/base/common/uri'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { ComponentBase } from 'sql/parts/modelComponents/componentBase'; -import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; +import { ComponentBase } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement'; diff --git a/src/sql/parts/disasterRecovery/backup/constants.ts b/src/sql/workbench/parts/backup/common/constants.ts similarity index 99% rename from src/sql/parts/disasterRecovery/backup/constants.ts rename to src/sql/workbench/parts/backup/common/constants.ts index 5ee021fd4b..396cd252e8 100644 --- a/src/sql/parts/disasterRecovery/backup/constants.ts +++ b/src/sql/workbench/parts/backup/common/constants.ts @@ -2,6 +2,7 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { localize } from 'vs/nls'; // Constants diff --git a/src/sql/parts/disasterRecovery/backup/backup.component.html b/src/sql/workbench/parts/backup/electron-browser/backup.component.html similarity index 100% rename from src/sql/parts/disasterRecovery/backup/backup.component.html rename to src/sql/workbench/parts/backup/electron-browser/backup.component.html diff --git a/src/sql/parts/disasterRecovery/backup/backup.component.ts b/src/sql/workbench/parts/backup/electron-browser/backup.component.ts similarity index 99% rename from src/sql/parts/disasterRecovery/backup/backup.component.ts rename to src/sql/workbench/parts/backup/electron-browser/backup.component.ts index 0e1d745c12..a6bebfa642 100644 --- a/src/sql/parts/disasterRecovery/backup/backup.component.ts +++ b/src/sql/workbench/parts/backup/electron-browser/backup.component.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/parts/disasterRecovery/backup/media/backupDialog'; +import 'vs/css!./media/backupDialog'; import { ElementRef, Component, Inject, forwardRef, ViewChild, ChangeDetectorRef } from '@angular/core'; import { Button } from 'sql/base/browser/ui/button/button'; @@ -14,7 +14,7 @@ import { ModalFooterStyle } from 'sql/workbench/browser/modal/modal'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachButtonStyler, attachListBoxStyler, attachInputBoxStyler, attachSelectBoxStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import * as BackupConstants from 'sql/parts/disasterRecovery/backup/constants'; +import * as BackupConstants from 'sql/workbench/parts/backup/common/constants'; import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; @@ -111,7 +111,7 @@ const LocalizedStrings = { @Component({ selector: BACKUP_SELECTOR, - templateUrl: decodeURI(require.toUrl('sql/parts/disasterRecovery/backup/backup.component.html')) + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/backup/electron-browser/backup.component.html')) }) export class BackupComponent { @ViewChild('pathContainer', { read: ElementRef }) pathElement; diff --git a/src/sql/parts/disasterRecovery/backup/backup.module.ts b/src/sql/workbench/parts/backup/electron-browser/backup.module.ts similarity index 95% rename from src/sql/parts/disasterRecovery/backup/backup.module.ts rename to src/sql/workbench/parts/backup/electron-browser/backup.module.ts index b1d081fb9c..1c9fc98f4a 100644 --- a/src/sql/parts/disasterRecovery/backup/backup.module.ts +++ b/src/sql/workbench/parts/backup/electron-browser/backup.module.ts @@ -12,7 +12,7 @@ import { FormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/platform/bootstrap/node/bootstrapService'; -import { BackupComponent } from 'sql/parts/disasterRecovery/backup/backup.component'; +import { BackupComponent } from 'sql/workbench/parts/backup/electron-browser/backup.component'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/parts/disasterRecovery/backup/backupDialog.ts b/src/sql/workbench/parts/backup/electron-browser/backupDialog.ts similarity index 94% rename from src/sql/parts/disasterRecovery/backup/backupDialog.ts rename to src/sql/workbench/parts/backup/electron-browser/backupDialog.ts index 01578726db..0b70b9af60 100644 --- a/src/sql/parts/disasterRecovery/backup/backupDialog.ts +++ b/src/sql/workbench/parts/backup/electron-browser/backupDialog.ts @@ -5,8 +5,8 @@ import { Modal } from 'sql/workbench/browser/modal/modal'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { BackupModule } from 'sql/parts/disasterRecovery/backup/backup.module'; -import { BACKUP_SELECTOR } from 'sql/parts/disasterRecovery/backup/backup.component'; +import { BackupModule } from 'sql/workbench/parts/backup/electron-browser/backup.module'; +import { BACKUP_SELECTOR } from 'sql/workbench/parts/backup/electron-browser/backup.component'; import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; diff --git a/src/sql/parts/disasterRecovery/backup/media/backupDialog.css b/src/sql/workbench/parts/backup/electron-browser/media/backupDialog.css similarity index 100% rename from src/sql/parts/disasterRecovery/backup/media/backupDialog.css rename to src/sql/workbench/parts/backup/electron-browser/media/backupDialog.css diff --git a/src/sql/workbench/parts/connection/common/connectionActions.ts b/src/sql/workbench/parts/connection/common/connectionActions.ts index 07c976bf77..5b85174ca0 100644 --- a/src/sql/workbench/parts/connection/common/connectionActions.ts +++ b/src/sql/workbench/parts/connection/common/connectionActions.ts @@ -13,7 +13,7 @@ import Severity from 'vs/base/common/severity'; import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/dialogs/common/dialogs'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import { QueryInput } from 'sql/parts/query/common/queryInput'; -import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; +import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput'; import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts index 92930ad1f0..f4d05a5790 100644 --- a/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts @@ -11,7 +11,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/parts/modelComponents/modelViewContent.component'; +import { ModelViewContent } from 'sql/workbench/electron-browser/modelComponents/modelViewContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; @Component({ diff --git a/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts b/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts index 19e169197e..7c00f1d3a3 100644 --- a/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts +++ b/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts @@ -13,7 +13,7 @@ import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServic import * as azdata from 'azdata'; import { memoize } from 'vs/base/common/decorators'; -import { AgentViewComponent } from '../../../../parts/jobManagement/agent/agentView.component'; +import { AgentViewComponent } from '../../jobManagement/electron-browser/agentView.component'; @Component({ templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/contents/controlHostContent.component.html')), diff --git a/src/sql/workbench/parts/dashboard/dashboard.module.ts b/src/sql/workbench/parts/dashboard/dashboard.module.ts index 95ee3998c0..82bfb6a27e 100644 --- a/src/sql/workbench/parts/dashboard/dashboard.module.ts +++ b/src/sql/workbench/parts/dashboard/dashboard.module.ts @@ -41,25 +41,25 @@ import { DashboardModelViewContainer } from 'sql/workbench/parts/dashboard/conta import { DashboardErrorContainer } from 'sql/workbench/parts/dashboard/containers/dashboardErrorContainer.component'; import { DashboardNavSection } from 'sql/workbench/parts/dashboard/containers/dashboardNavSection.component'; import { WidgetContent } from 'sql/workbench/parts/dashboard/contents/widgetContent.component'; -import { ModelViewContent } from 'sql/parts/modelComponents/modelViewContent.component'; -import { ModelComponentWrapper } from 'sql/parts/modelComponents/modelComponentWrapper.component'; +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 { 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'; -import { JobsViewComponent } from 'sql/parts/jobManagement/views/jobsView.component'; -import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; -import { AlertsViewComponent } from 'sql/parts/jobManagement/views/alertsView.component'; -import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component'; -import { OperatorsViewComponent } from 'sql/parts/jobManagement/views/operatorsView.component'; -import { ProxiesViewComponent } from 'sql/parts/jobManagement/views/proxiesView.component'; +import { JobsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobsView.component'; +import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component'; +import { AlertsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/alertsView.component'; +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/base/browser/ui/editableDropdown/editableDropdown.component'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component'; -import LoadingSpinner from 'sql/parts/modelComponents/loadingSpinner.component'; +import LoadingSpinner from 'sql/workbench/electron-browser/modelComponents/loadingSpinner.component'; const baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWidgetWrapper, DashboardWebviewContainer, DashboardWidgetContainer, DashboardGridContainer, DashboardErrorContainer, DashboardNavSection, ModelViewContent, WebviewContent, WidgetContent, @@ -84,7 +84,7 @@ import { ExplorerWidget } from 'sql/workbench/parts/dashboard/widgets/explorer/e import { TasksWidget } from 'sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component'; import { InsightsWidget } from 'sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component'; import { WebviewWidget } from 'sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component'; -import { JobStepsViewComponent } from 'sql/parts/jobManagement/views/jobStepsView.component'; +import { JobStepsViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component'; import { IInstantiationService, _util } from 'vs/platform/instantiation/common/instantiation'; const widgetComponents = [ diff --git a/src/sql/parts/editData/execution/editDataActions.ts b/src/sql/workbench/parts/editData/browser/editDataActions.ts similarity index 97% rename from src/sql/parts/editData/execution/editDataActions.ts rename to src/sql/workbench/parts/editData/browser/editDataActions.ts index 13538e1d37..5ebe3dda42 100644 --- a/src/sql/parts/editData/execution/editDataActions.ts +++ b/src/sql/workbench/parts/editData/browser/editDataActions.ts @@ -9,11 +9,11 @@ import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { EventEmitter } from 'sql/base/common/eventEmitter'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor'; -import nls = require('vs/nls'); +import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor'; +import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; -import { INotificationService, INotificationActions } from 'vs/platform/notification/common/notification'; +import { INotificationService } from 'vs/platform/notification/common/notification'; import Severity from 'vs/base/common/severity'; import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; diff --git a/src/sql/parts/editData/editor/editDataEditor.ts b/src/sql/workbench/parts/editData/browser/editDataEditor.ts similarity index 98% rename from src/sql/parts/editData/editor/editDataEditor.ts rename to src/sql/workbench/parts/editData/browser/editDataEditor.ts index 5f13876843..ed6a496b1e 100644 --- a/src/sql/parts/editData/editor/editDataEditor.ts +++ b/src/sql/workbench/parts/editData/browser/editDataEditor.ts @@ -16,7 +16,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; +import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; import * as queryContext from 'sql/parts/query/common/queryContext'; @@ -27,14 +27,14 @@ import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { IEditorDescriptorService } from 'sql/workbench/services/queryEditor/common/editorDescriptorService'; import { RefreshTableAction, StopRefreshTableAction, ChangeMaxRowsAction, ChangeMaxRowsActionItem, ShowQueryPaneAction -} from 'sql/parts/editData/execution/editDataActions'; +} from 'sql/workbench/parts/editData/browser/editDataActions'; import { TextResourceEditor } from 'vs/workbench/browser/parts/editor/textResourceEditor'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { IContextKey, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; import { IFlexibleSash, HorizontalFlexibleSash } from 'sql/parts/query/views/flexibleSash'; -import { EditDataResultsEditor } from 'sql/parts/editData/editor/editDataResultsEditor'; -import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput'; +import { EditDataResultsEditor } from 'sql/workbench/parts/editData/browser/editDataResultsEditor'; +import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { IEditorGroup } from 'vs/workbench/services/editor/common/editorGroupsService'; @@ -46,9 +46,6 @@ export class EditDataEditor extends BaseEditor { public static ID: string = 'workbench.editor.editDataEditor'; - // The height of the tabs above the editor - private readonly _tabHeight: number = 35; - // The minimum width/height of the editors hosted in the QueryEditor private readonly _minEditorSize: number = 220; diff --git a/src/sql/parts/editData/editor/editDataResultsEditor.ts b/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts similarity index 98% rename from src/sql/parts/editData/editor/editDataResultsEditor.ts rename to src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts index c0d53d9280..9dbb85a40b 100644 --- a/src/sql/parts/editData/editor/editDataResultsEditor.ts +++ b/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts @@ -20,7 +20,7 @@ import { BareResultsGridInfo } from 'sql/parts/query/editor/queryResultsEditor'; import { IEditDataComponentParams } from 'sql/platform/bootstrap/node/bootstrapParams'; import { EditDataModule } from 'sql/workbench/parts/grid/views/editData/editData.module'; import { EDITDATA_SELECTOR } from 'sql/workbench/parts/grid/views/editData/editData.component'; -import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput'; +import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/sql/parts/editData/common/editDataInput.ts b/src/sql/workbench/parts/editData/common/editDataInput.ts similarity index 96% rename from src/sql/parts/editData/common/editDataInput.ts rename to src/sql/workbench/parts/editData/common/editDataInput.ts index 023ac5d3fd..f19cc624a8 100644 --- a/src/sql/parts/editData/common/editDataInput.ts +++ b/src/sql/workbench/parts/editData/common/editDataInput.ts @@ -6,15 +6,15 @@ import { EditorInput, EditorModel, ConfirmResult, EncodingMode } from 'vs/workbench/common/editor'; import { IConnectionManagementService, IConnectableInput, INewConnectionParams } from 'sql/platform/connection/common/connectionManagement'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; -import { IDisposable, dispose } from 'vs/base/common/lifecycle'; +import { dispose } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; -import { EditSessionReadyParams, ISelectionData } from 'azdata'; +import { EditSessionReadyParams } from 'azdata'; import { URI } from 'vs/base/common/uri'; -import nls = require('vs/nls'); +import * as nls from 'vs/nls'; import { INotificationService } from 'vs/platform/notification/common/notification'; import Severity from 'vs/base/common/severity'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; -import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput'; +import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput'; import { IEditorViewState } from 'vs/editor/common/editorCommon'; /** @@ -22,7 +22,6 @@ import { IEditorViewState } from 'vs/editor/common/editorCommon'; */ export class EditDataInput extends EditorInput implements IConnectableInput { public static ID: string = 'workbench.editorinputs.editDataInput'; - private _visible: boolean; private _hasBootstrapped: boolean; private _editorContainer: HTMLElement; private _updateTaskbar: Emitter; @@ -50,7 +49,6 @@ export class EditDataInput extends EditorInput implements IConnectableInput { @INotificationService private notificationService: INotificationService ) { super(); - this._visible = false; this._hasBootstrapped = false; this._updateTaskbar = new Emitter(); this._showResultsEditor = new Emitter(); diff --git a/src/sql/parts/editData/common/editDataResultsInput.ts b/src/sql/workbench/parts/editData/common/editDataResultsInput.ts similarity index 98% rename from src/sql/parts/editData/common/editDataResultsInput.ts rename to src/sql/workbench/parts/editData/common/editDataResultsInput.ts index 8adef4839a..367bbfd7b9 100644 --- a/src/sql/parts/editData/common/editDataResultsInput.ts +++ b/src/sql/workbench/parts/editData/common/editDataResultsInput.ts @@ -3,9 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - -import { localize } from 'vs/nls'; import { EditorInput } from 'vs/workbench/common/editor'; import { Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/parts/grid/views/gridCommands.ts b/src/sql/workbench/parts/grid/views/gridCommands.ts index 4eb13e9318..bc4b8578cd 100644 --- a/src/sql/workbench/parts/grid/views/gridCommands.ts +++ b/src/sql/workbench/parts/grid/views/gridCommands.ts @@ -6,7 +6,7 @@ import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents'; import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; -import { EditDataEditor } from 'sql/parts/editData/editor/editDataEditor'; +import { EditDataEditor } from 'sql/workbench/parts/editData/browser/editDataEditor'; import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; import { IEditorService } from 'vs/workbench/services/editor/common/editorService'; diff --git a/src/sql/parts/jobManagement/agent/agentView.component.html b/src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.html similarity index 100% rename from src/sql/parts/jobManagement/agent/agentView.component.html rename to src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.html diff --git a/src/sql/parts/jobManagement/agent/agentView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.ts similarity index 97% rename from src/sql/parts/jobManagement/agent/agentView.component.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.ts index 38e199fc32..629cfba617 100644 --- a/src/sql/parts/jobManagement/agent/agentView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/agentView.component.ts @@ -3,8 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!../common/media/jobs'; -import 'sql/workbench/parts/dashboard/common/dashboardPanelStyles'; +import 'vs/css!./media/jobs'; import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core'; diff --git a/src/sql/parts/jobManagement/views/alertsView.component.html b/src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.html similarity index 100% rename from src/sql/parts/jobManagement/views/alertsView.component.html rename to src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.html diff --git a/src/sql/parts/jobManagement/views/alertsView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.ts similarity index 95% rename from src/sql/parts/jobManagement/views/alertsView.component.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.ts index 6e75a6e310..b301861b3e 100644 --- a/src/sql/parts/jobManagement/views/alertsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/alertsView.component.ts @@ -3,10 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/workbench/parts/grid/media/flexbox'; -import 'vs/css!sql/workbench/parts/grid/media/styles'; -import 'vs/css!../common/media/jobs'; -import 'vs/css!sql/media/icons/common-icons'; +import 'vs/css!./media/jobs'; import * as dom from 'vs/base/browser/dom'; import * as nls from 'vs/nls'; @@ -14,10 +11,10 @@ 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 { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditAlertAction, DeleteAlertAction, NewAlertAction } from 'sql/platform/jobManagement/common/jobActions'; -import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; +import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; @@ -26,7 +23,7 @@ import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { AlertsCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; -import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview'; +import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; export const VIEW_SELECTOR: string = 'jobalertsview-component'; export const ROW_HEIGHT: number = 45; diff --git a/src/sql/parts/jobManagement/views/jobHistory.component.html b/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.html similarity index 100% rename from src/sql/parts/jobManagement/views/jobHistory.component.html rename to src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.html diff --git a/src/sql/parts/jobManagement/views/jobHistory.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.ts similarity index 97% rename from src/sql/parts/jobManagement/views/jobHistory.component.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.ts index 19ff49e1f1..dc5066cd23 100644 --- a/src/sql/parts/jobManagement/views/jobHistory.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobHistory.component.ts @@ -3,15 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./jobHistory'; -import 'vs/css!sql/media/icons/common-icons'; +import 'vs/css!./media/jobHistory'; import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import * as dom from 'vs/base/browser/dom'; import { OnInit, Component, Inject, Input, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, ChangeDetectionStrategy, Injectable } from '@angular/core'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { RunJobAction, StopJobAction, EditJobAction, JobsRefreshAction } from 'sql/platform/jobManagement/common/jobActions'; import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; @@ -20,15 +19,15 @@ import { IJobManagementService } from 'sql/platform/jobManagement/common/interfa import { JobHistoryController, JobHistoryDataSource, JobHistoryRenderer, JobHistoryFilter, JobHistoryModel, JobHistoryRow -} from 'sql/parts/jobManagement/views/jobHistoryTree'; -import { JobStepsViewRow } from 'sql/parts/jobManagement/views/jobStepsViewTree'; +} from 'sql/workbench/parts/jobManagement/electron-browser/jobHistoryTree'; +import { JobStepsViewRow } from 'sql/workbench/parts/jobManagement/electron-browser/jobStepsViewTree'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { attachListStyler } from 'vs/platform/theme/common/styler'; import { Tree } from 'vs/base/parts/tree/browser/treeImpl'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { ScrollbarVisibility } from 'vs/base/common/scrollable'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; -import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; +import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; diff --git a/src/sql/parts/jobManagement/views/jobHistoryTree.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobHistoryTree.ts similarity index 95% rename from src/sql/parts/jobManagement/views/jobHistoryTree.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/jobHistoryTree.ts index 740b62a10c..c5dbb2ec8e 100644 --- a/src/sql/parts/jobManagement/views/jobHistoryTree.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobHistoryTree.ts @@ -3,10 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { - NewQueryAction, ScriptSelectAction, EditDataAction, ScriptCreateAction, ScriptExecuteAction, ScriptAlterAction, - BackupAction, ManageActionContext, BaseActionContext, ManageAction, RestoreAction -} from 'sql/workbench/common/actions'; import * as tree from 'vs/base/parts/tree/browser/tree'; import * as TreeDefaults from 'vs/base/parts/tree/browser/treeDefaults'; import { IMouseEvent } from 'vs/base/browser/mouseEvent'; diff --git a/src/sql/parts/jobManagement/views/jobManagementView.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobManagementView.ts similarity index 96% rename from src/sql/parts/jobManagement/views/jobManagementView.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/jobManagementView.ts index 0b0d7f6420..fd5d4df952 100644 --- a/src/sql/parts/jobManagement/views/jobManagementView.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobManagementView.ts @@ -6,14 +6,14 @@ import * as azdata from 'azdata'; import { ElementRef, AfterContentChecked, ViewChild } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { IAction, Action } from 'vs/base/common/actions'; import { ResolvedKeybinding } from 'vs/base/common/keyCodes'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { Taskbar } from '../../../base/browser/ui/taskbar/taskbar'; +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 { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; diff --git a/src/sql/parts/jobManagement/views/jobStepsView.component.html b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.html similarity index 100% rename from src/sql/parts/jobManagement/views/jobStepsView.component.html rename to src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.html diff --git a/src/sql/parts/jobManagement/views/jobStepsView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts similarity index 94% rename from src/sql/parts/jobManagement/views/jobStepsView.component.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts index 2c48a418a9..aa83c03d43 100644 --- a/src/sql/parts/jobManagement/views/jobStepsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsView.component.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!./jobStepsView'; +import 'vs/css!./media/jobStepsView'; import * as dom from 'vs/base/browser/dom'; import { OnInit, Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, AfterContentChecked } from '@angular/core'; @@ -15,9 +15,9 @@ import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServic import { JobStepsViewController, JobStepsViewDataSource, JobStepsViewFilter, JobStepsViewRenderer, JobStepsViewModel -} from 'sql/parts/jobManagement/views/jobStepsViewTree'; -import { JobHistoryComponent } from 'sql/parts/jobManagement/views/jobHistory.component'; -import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; +} from 'sql/workbench/parts/jobManagement/electron-browser/jobStepsViewTree'; +import { JobHistoryComponent } from 'sql/workbench/parts/jobManagement/electron-browser/jobHistory.component'; +import { JobManagementView } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/parts/jobManagement/views/jobStepsViewTree.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobStepsViewTree.ts similarity index 100% rename from src/sql/parts/jobManagement/views/jobStepsViewTree.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/jobStepsViewTree.ts diff --git a/src/sql/parts/jobManagement/views/jobsView.component.html b/src/sql/workbench/parts/jobManagement/electron-browser/jobsView.component.html similarity index 100% rename from src/sql/parts/jobManagement/views/jobsView.component.html rename to src/sql/workbench/parts/jobManagement/electron-browser/jobsView.component.html diff --git a/src/sql/parts/jobManagement/views/jobsView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/jobsView.component.ts similarity index 98% rename from src/sql/parts/jobManagement/views/jobsView.component.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/jobsView.component.ts index c0981e4b35..8360b4eeda 100644 --- a/src/sql/parts/jobManagement/views/jobsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/jobsView.component.ts @@ -3,10 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/workbench/parts/grid/media/flexbox'; -import 'vs/css!sql/workbench/parts/grid/media/styles'; -import 'vs/css!../common/media/jobs'; -import 'vs/css!sql/media/icons/common-icons'; +import 'vs/css!./media/jobs'; import * as azdata from 'azdata'; import * as nls from 'vs/nls'; @@ -14,14 +11,14 @@ 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 { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; -import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview'; +import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component'; +import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; import { JobCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; -import { EditJobAction, DeleteJobAction, NewJobAction, IJobActionInfo } from 'sql/platform/jobManagement/common/jobActions'; +import { EditJobAction, DeleteJobAction, NewJobAction } from 'sql/platform/jobManagement/common/jobActions'; import { JobManagementUtilities } from 'sql/platform/jobManagement/common/jobManagementUtilities'; import { HeaderFilter } from 'sql/base/browser/ui/table/plugins/headerFilter.plugin'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; -import { JobManagementView, JobActionContext } from 'sql/parts/jobManagement/views/jobManagementView'; +import { JobManagementView, JobActionContext } from 'sql/workbench/parts/jobManagement/electron-browser/jobManagementView'; import { CommonServiceInterface } from 'sql/platform/bootstrap/node/commonServiceInterface.service'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; diff --git a/src/sql/parts/jobManagement/common/media/alert.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/alert.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/alert.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/alert.svg diff --git a/src/sql/parts/jobManagement/common/media/alert_inverse.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/alert_inverse.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/alert_inverse.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/alert_inverse.svg diff --git a/src/sql/parts/jobManagement/common/media/back.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/back.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/back.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/back.svg diff --git a/src/sql/parts/jobManagement/common/media/back_inverse.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/back_inverse.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/back_inverse.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/back_inverse.svg diff --git a/src/sql/parts/jobManagement/common/media/detailview.css b/src/sql/workbench/parts/jobManagement/electron-browser/media/detailview.css similarity index 100% rename from src/sql/parts/jobManagement/common/media/detailview.css rename to src/sql/workbench/parts/jobManagement/electron-browser/media/detailview.css diff --git a/src/sql/parts/jobManagement/common/media/failed.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/failed.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/failed.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/failed.svg diff --git a/src/sql/parts/jobManagement/common/media/job.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/job.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/job.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/job.svg diff --git a/src/sql/parts/jobManagement/views/jobHistory.css b/src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css similarity index 100% rename from src/sql/parts/jobManagement/views/jobHistory.css rename to src/sql/workbench/parts/jobManagement/electron-browser/media/jobHistory.css diff --git a/src/sql/parts/jobManagement/views/jobStepsView.css b/src/sql/workbench/parts/jobManagement/electron-browser/media/jobStepsView.css similarity index 100% rename from src/sql/parts/jobManagement/views/jobStepsView.css rename to src/sql/workbench/parts/jobManagement/electron-browser/media/jobStepsView.css diff --git a/src/sql/parts/jobManagement/common/media/job_inverse.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/job_inverse.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/job_inverse.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/job_inverse.svg diff --git a/src/sql/parts/jobManagement/common/media/jobs.css b/src/sql/workbench/parts/jobManagement/electron-browser/media/jobs.css similarity index 100% rename from src/sql/parts/jobManagement/common/media/jobs.css rename to src/sql/workbench/parts/jobManagement/electron-browser/media/jobs.css diff --git a/src/sql/parts/jobManagement/common/media/new.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/new.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/new.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/new.svg diff --git a/src/sql/parts/jobManagement/common/media/new_inverse.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/new_inverse.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/new_inverse.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/new_inverse.svg diff --git a/src/sql/parts/jobManagement/common/media/operator.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/operator.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/operator.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/operator.svg diff --git a/src/sql/parts/jobManagement/common/media/operator_inverse.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/operator_inverse.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/operator_inverse.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/operator_inverse.svg diff --git a/src/sql/parts/jobManagement/common/media/proxy.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/proxy.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/proxy.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/proxy.svg diff --git a/src/sql/parts/jobManagement/common/media/proxy_inverse.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/proxy_inverse.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/proxy_inverse.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/proxy_inverse.svg diff --git a/src/sql/parts/jobManagement/common/media/refresh.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/refresh.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/refresh.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/refresh.svg diff --git a/src/sql/parts/jobManagement/common/media/refresh_inverse.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/refresh_inverse.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/refresh_inverse.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/refresh_inverse.svg diff --git a/src/sql/parts/jobManagement/common/media/step.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/step.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/step.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/step.svg diff --git a/src/sql/parts/jobManagement/common/media/step_inverse.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/step_inverse.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/step_inverse.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/step_inverse.svg diff --git a/src/sql/parts/jobManagement/common/media/success_complete.svg b/src/sql/workbench/parts/jobManagement/electron-browser/media/success_complete.svg similarity index 100% rename from src/sql/parts/jobManagement/common/media/success_complete.svg rename to src/sql/workbench/parts/jobManagement/electron-browser/media/success_complete.svg diff --git a/src/sql/parts/jobManagement/views/operatorsView.component.html b/src/sql/workbench/parts/jobManagement/electron-browser/operatorsView.component.html similarity index 100% rename from src/sql/parts/jobManagement/views/operatorsView.component.html rename to src/sql/workbench/parts/jobManagement/electron-browser/operatorsView.component.html diff --git a/src/sql/parts/jobManagement/views/operatorsView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/operatorsView.component.ts similarity index 95% rename from src/sql/parts/jobManagement/views/operatorsView.component.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/operatorsView.component.ts index 37653563a6..5d3e25f8d4 100644 --- a/src/sql/parts/jobManagement/views/operatorsView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/operatorsView.component.ts @@ -3,20 +3,17 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/workbench/parts/grid/media/flexbox'; -import 'vs/css!sql/workbench/parts/grid/media/styles'; -import 'vs/css!../common/media/jobs'; -import 'vs/css!sql/media/icons/common-icons'; +import 'vs/css!./media/jobs'; 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 { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component'; import { IJobManagementService } from 'sql/platform/jobManagement/common/interfaces'; import { EditOperatorAction, DeleteOperatorAction, NewOperatorAction } from 'sql/platform/jobManagement/common/jobActions'; -import { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; +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 { ICommandService } from 'vs/platform/commands/common/commands'; @@ -26,7 +23,7 @@ import { IAction } from 'vs/base/common/actions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { OperatorsCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; -import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview'; +import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; export const VIEW_SELECTOR: string = 'joboperatorsview-component'; export const ROW_HEIGHT: number = 45; diff --git a/src/sql/parts/jobManagement/views/proxiesView.component.html b/src/sql/workbench/parts/jobManagement/electron-browser/proxiesView.component.html similarity index 100% rename from src/sql/parts/jobManagement/views/proxiesView.component.html rename to src/sql/workbench/parts/jobManagement/electron-browser/proxiesView.component.html diff --git a/src/sql/parts/jobManagement/views/proxiesView.component.ts b/src/sql/workbench/parts/jobManagement/electron-browser/proxiesView.component.ts similarity index 95% rename from src/sql/parts/jobManagement/views/proxiesView.component.ts rename to src/sql/workbench/parts/jobManagement/electron-browser/proxiesView.component.ts index 1c434a2107..f182f8d3cf 100644 --- a/src/sql/parts/jobManagement/views/proxiesView.component.ts +++ b/src/sql/workbench/parts/jobManagement/electron-browser/proxiesView.component.ts @@ -3,22 +3,19 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/workbench/parts/grid/media/flexbox'; -import 'vs/css!sql/workbench/parts/grid/media/styles'; -import 'vs/css!../common/media/jobs'; -import 'vs/css!sql/media/icons/common-icons'; +import 'vs/css!./media/jobs'; import * as dom from 'vs/base/browser/dom'; import * as azdata from 'azdata'; import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ElementRef, ChangeDetectorRef, ViewChild, OnInit, OnDestroy } from '@angular/core'; import { Table } from 'sql/base/browser/ui/table/table'; -import { AgentViewComponent } from 'sql/parts/jobManagement/agent/agentView.component'; +import { AgentViewComponent } from 'sql/workbench/parts/jobManagement/electron-browser/agentView.component'; 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 { JobManagementView } from 'sql/parts/jobManagement/views/jobManagementView'; +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'; import { IAction } from 'vs/base/common/actions'; @@ -26,7 +23,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { ProxiesCacheObject } from 'sql/platform/jobManagement/common/jobManagementService'; -import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowdetailview'; +import { RowDetailView } from 'sql/base/browser/ui/table/plugins/rowDetailView'; export const VIEW_SELECTOR: string = 'jobproxiesview-component'; export const ROW_HEIGHT: number = 45; diff --git a/src/sql/workbench/parts/notebook/cellViews/code.component.ts b/src/sql/workbench/parts/notebook/cellViews/code.component.ts index 4e40f3e60d..b800be5bf0 100644 --- a/src/sql/workbench/parts/notebook/cellViews/code.component.ts +++ b/src/sql/workbench/parts/notebook/cellViews/code.component.ts @@ -7,7 +7,7 @@ import 'vs/css!./code'; import { OnInit, Component, Input, Inject, ElementRef, ViewChild, Output, EventEmitter, OnChanges, SimpleChange, forwardRef, ChangeDetectorRef } from '@angular/core'; import { AngularDisposable } from 'sql/base/node/lifecycle'; -import { QueryTextEditor } from 'sql/parts/modelComponents/queryTextEditor'; +import { QueryTextEditor } from 'sql/workbench/electron-browser/modelComponents/queryTextEditor'; import { CellToggleMoreActions } from 'sql/workbench/parts/notebook/cellToggleMoreActions'; import { ICellModel, notebookConstants } from 'sql/workbench/parts/notebook/models/modelInterfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; diff --git a/src/sql/workbench/parts/notebook/notebook.module.ts b/src/sql/workbench/parts/notebook/notebook.module.ts index b3d4c00cda..572d6bff79 100644 --- a/src/sql/workbench/parts/notebook/notebook.module.ts +++ b/src/sql/workbench/parts/notebook/notebook.module.ts @@ -27,7 +27,7 @@ import { TextCellComponent } from 'sql/workbench/parts/notebook/cellViews/textCe import { OutputAreaComponent } from 'sql/workbench/parts/notebook/cellViews/outputArea.component'; import { OutputComponent } from 'sql/workbench/parts/notebook/cellViews/output.component'; import { PlaceholderCellComponent } from 'sql/workbench/parts/notebook/cellViews/placeholderCell.component'; -import LoadingSpinner from 'sql/parts/modelComponents/loadingSpinner.component'; +import LoadingSpinner from 'sql/workbench/electron-browser/modelComponents/loadingSpinner.component'; export const NotebookModule = (params, selector: string, instantiationService: IInstantiationService): any => { @NgModule({ diff --git a/src/sql/parts/profiler/media/clear.svg b/src/sql/workbench/parts/profiler/browser/media/clear.svg similarity index 100% rename from src/sql/parts/profiler/media/clear.svg rename to src/sql/workbench/parts/profiler/browser/media/clear.svg diff --git a/src/sql/parts/profiler/media/clear_inverse.svg b/src/sql/workbench/parts/profiler/browser/media/clear_inverse.svg similarity index 100% rename from src/sql/parts/profiler/media/clear_inverse.svg rename to src/sql/workbench/parts/profiler/browser/media/clear_inverse.svg diff --git a/src/sql/parts/profiler/media/profiler.css b/src/sql/workbench/parts/profiler/browser/media/profiler.css similarity index 100% rename from src/sql/parts/profiler/media/profiler.css rename to src/sql/workbench/parts/profiler/browser/media/profiler.css diff --git a/src/sql/parts/profiler/dialog/media/profilerFilterDialog.css b/src/sql/workbench/parts/profiler/browser/media/profilerFilterDialog.css similarity index 100% rename from src/sql/parts/profiler/dialog/media/profilerFilterDialog.css rename to src/sql/workbench/parts/profiler/browser/media/profilerFilterDialog.css diff --git a/src/sql/parts/profiler/contrib/profiler.contribution.ts b/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts similarity index 98% rename from src/sql/parts/profiler/contrib/profiler.contribution.ts rename to src/sql/workbench/parts/profiler/browser/profiler.contribution.ts index d14c6084eb..5825829f0b 100644 --- a/src/sql/parts/profiler/contrib/profiler.contribution.ts +++ b/src/sql/workbench/parts/profiler/browser/profiler.contribution.ts @@ -2,7 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { EditorDescriptor, Extensions as EditorExtensions, IEditorRegistry } from 'vs/workbench/browser/editor'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; @@ -11,8 +10,8 @@ import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigu import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import * as nls from 'vs/nls'; -import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; -import { ProfilerEditor } from 'sql/parts/profiler/editor/profilerEditor'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { ProfilerEditor } from 'sql/workbench/parts/profiler/browser/profilerEditor'; import { PROFILER_VIEW_TEMPLATE_SETTINGS, PROFILER_SESSION_TEMPLATE_SETTINGS, IProfilerViewTemplate, IProfilerSessionTemplate } from 'sql/workbench/services/profiler/common/interfaces'; const profilerDescriptor = new EditorDescriptor( diff --git a/src/sql/parts/profiler/contrib/profilerActions.contribution.ts b/src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts similarity index 95% rename from src/sql/parts/profiler/contrib/profilerActions.contribution.ts rename to src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts index 687bc0b187..573e3159c3 100644 --- a/src/sql/parts/profiler/contrib/profilerActions.contribution.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerActions.contribution.ts @@ -2,24 +2,23 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { ServicesAccessor, IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry'; -import { KeyCode, KeyMod } from 'vs/editor/editor.api'; -import { ProfilerEditor } from '../editor/profilerEditor'; +import { ProfilerEditor } from 'sql/workbench/parts/profiler/browser/profilerEditor'; import { ObjectExplorerActionsContext } from 'sql/workbench/parts/objectExplorer/browser/objectExplorerActions'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilitiesService'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { IConnectionDialogService } from 'sql/workbench/services/connection/common/connectionDialogService'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; +import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; CommandsRegistry.registerCommand({ id: 'profiler.newProfiler', diff --git a/src/sql/parts/profiler/contrib/profilerActions.ts b/src/sql/workbench/parts/profiler/browser/profilerActions.ts similarity index 97% rename from src/sql/parts/profiler/contrib/profilerActions.ts rename to src/sql/workbench/parts/profiler/browser/profilerActions.ts index c48fb8ee5b..bafcbe49e8 100644 --- a/src/sql/parts/profiler/contrib/profilerActions.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerActions.ts @@ -3,11 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; -import 'vs/css!sql/parts/profiler/media/profiler'; import { IProfilerService } from 'sql/workbench/services/profiler/common/interfaces'; -import { IProfilerController } from 'sql/parts/profiler/editor/controller/interfaces'; -import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; +import { IProfilerController } from 'sql/workbench/parts/profiler/common/interfaces'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import { Task } from 'sql/platform/tasks/common/tasks'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; import { IConnectionManagementService, IConnectionCompletionOptions } from 'sql/platform/connection/common/connectionManagement'; diff --git a/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts b/src/sql/workbench/parts/profiler/browser/profilerColumnEditorDialog.ts similarity index 99% rename from src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts rename to src/sql/workbench/parts/profiler/browser/profilerColumnEditorDialog.ts index ffb7da8bc3..95e727cf33 100644 --- a/src/sql/parts/profiler/dialog/profilerColumnEditorDialog.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerColumnEditorDialog.ts @@ -3,11 +3,11 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/parts/profiler/media/profiler'; +import 'vs/css!./media/profiler'; import { Modal } from 'sql/workbench/browser/modal/modal'; import { attachModalDialogStyler } from 'sql/platform/theme/common/styler'; -import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; diff --git a/src/sql/parts/profiler/editor/profilerEditor.ts b/src/sql/workbench/parts/profiler/browser/profilerEditor.ts similarity index 97% rename from src/sql/parts/profiler/editor/profilerEditor.ts rename to src/sql/workbench/parts/profiler/browser/profilerEditor.ts index 4d69dc0f06..0b4d34df12 100644 --- a/src/sql/parts/profiler/editor/profilerEditor.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerEditor.ts @@ -3,20 +3,20 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ProfilerInput } from './profilerInput'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import { TabbedPanel } from 'sql/base/browser/ui/panel/panel'; import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { IProfilerService, IProfilerViewTemplate } from 'sql/workbench/services/profiler/common/interfaces'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; -import { IProfilerStateChangedEvent } from './profilerState'; -import { ProfilerTableEditor, ProfilerTableViewState } from './controller/profilerTableEditor'; -import * as Actions from 'sql/parts/profiler/contrib/profilerActions'; -import { CONTEXT_PROFILER_EDITOR, PROFILER_TABLE_COMMAND_SEARCH } from './interfaces'; +import { IProfilerStateChangedEvent } from 'sql/workbench/parts/profiler/common/profilerState'; +import { ProfilerTableEditor, ProfilerTableViewState } from 'sql/workbench/parts/profiler/browser/profilerTableEditor'; +import * as Actions from 'sql/workbench/parts/profiler/browser/profilerActions'; +import { CONTEXT_PROFILER_EDITOR, PROFILER_TABLE_COMMAND_SEARCH } from 'sql/workbench/parts/profiler/common/interfaces'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { textFormatter, slickGridDataItemColumnValueExtractor } from 'sql/base/browser/ui/table/formatters'; -import { ProfilerResourceEditor } from './profilerResourceEditor'; +import { ProfilerResourceEditor } from 'sql/workbench/parts/profiler/browser/profilerResourceEditor'; import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; import { ITextModel } from 'vs/editor/common/model'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; diff --git a/src/sql/parts/profiler/dialog/profilerFilterDialog.ts b/src/sql/workbench/parts/profiler/browser/profilerFilterDialog.ts similarity index 99% rename from src/sql/parts/profiler/dialog/profilerFilterDialog.ts rename to src/sql/workbench/parts/profiler/browser/profilerFilterDialog.ts index d8bb9f28ca..5d7093d2f8 100644 --- a/src/sql/parts/profiler/dialog/profilerFilterDialog.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerFilterDialog.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/profilerFilterDialog'; import { Button } from 'sql/base/browser/ui/button/button'; import { Modal } from 'sql/workbench/browser/modal/modal'; @@ -15,7 +14,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { localize } from 'vs/nls'; -import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox'; import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler'; diff --git a/src/sql/parts/profiler/editor/controller/profilerFindWidget.ts b/src/sql/workbench/parts/profiler/browser/profilerFindWidget.ts similarity index 93% rename from src/sql/parts/profiler/editor/controller/profilerFindWidget.ts rename to src/sql/workbench/parts/profiler/browser/profilerFindWidget.ts index 3d0b259293..9fbede46b0 100644 --- a/src/sql/parts/profiler/editor/controller/profilerFindWidget.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerFindWidget.ts @@ -3,10 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; - -import 'vs/css!vs/editor/contrib/find/findWidget'; - import * as nls from 'vs/nls'; import { onUnexpectedError } from 'vs/base/common/errors'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; @@ -25,9 +21,8 @@ import { IOverlayWidget, IOverlayWidgetPosition, OverlayWidgetPositionPreference import { FIND_IDS, CONTEXT_FIND_INPUT_FOCUSED } from 'vs/editor/contrib/find/findModel'; import { FindReplaceState, FindReplaceStateChangedEvent } from 'vs/editor/contrib/find/findState'; import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { ITheme, registerThemingParticipant, IThemeService } from 'vs/platform/theme/common/themeService'; -import { Color } from 'vs/base/common/color'; -import { editorFindRangeHighlight, editorFindMatch, editorFindMatchHighlight, activeContrastBorder, contrastBorder, inputBackground, editorWidgetBackground, inputActiveOptionBorder, widgetShadow, inputForeground, inputBorder, inputValidationInfoBackground, inputValidationInfoBorder, inputValidationWarningBackground, inputValidationWarningBorder, inputValidationErrorBackground, inputValidationErrorBorder, errorForeground } from 'vs/platform/theme/common/colorRegistry'; +import { ITheme, IThemeService } from 'vs/platform/theme/common/themeService'; +import * as colors from 'vs/platform/theme/common/colorRegistry'; import { IEditorAction } from 'vs/editor/common/editorCommon'; import { IDisposable } from 'vs/base/common/lifecycle'; @@ -295,16 +290,16 @@ export class FindWidget extends Widget implements IOverlayWidget, IHorizontalSas private _applyTheme(theme: ITheme) { let inputStyles: IFindInputStyles = { - inputActiveOptionBorder: theme.getColor(inputActiveOptionBorder), - inputBackground: theme.getColor(inputBackground), - inputForeground: theme.getColor(inputForeground), - inputBorder: theme.getColor(inputBorder), - inputValidationInfoBackground: theme.getColor(inputValidationInfoBackground), - inputValidationInfoBorder: theme.getColor(inputValidationInfoBorder), - inputValidationWarningBackground: theme.getColor(inputValidationWarningBackground), - inputValidationWarningBorder: theme.getColor(inputValidationWarningBorder), - inputValidationErrorBackground: theme.getColor(inputValidationErrorBackground), - inputValidationErrorBorder: theme.getColor(inputValidationErrorBorder) + inputActiveOptionBorder: theme.getColor(colors.inputActiveOptionBorder), + inputBackground: theme.getColor(colors.inputBackground), + inputForeground: theme.getColor(colors.inputForeground), + inputBorder: theme.getColor(colors.inputBorder), + inputValidationInfoBackground: theme.getColor(colors.inputValidationInfoBackground), + inputValidationInfoBorder: theme.getColor(colors.inputValidationInfoBorder), + inputValidationWarningBackground: theme.getColor(colors.inputValidationWarningBackground), + inputValidationWarningBorder: theme.getColor(colors.inputValidationWarningBorder), + inputValidationErrorBackground: theme.getColor(colors.inputValidationErrorBackground), + inputValidationErrorBorder: theme.getColor(colors.inputValidationErrorBorder) }; this._findInput.style(inputStyles); } diff --git a/src/sql/parts/profiler/editor/profilerInput.ts b/src/sql/workbench/parts/profiler/browser/profilerInput.ts similarity index 98% rename from src/sql/parts/profiler/editor/profilerInput.ts rename to src/sql/workbench/parts/profiler/browser/profilerInput.ts index 62ec803c92..fd4930fe4d 100644 --- a/src/sql/parts/profiler/editor/profilerInput.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerInput.ts @@ -5,7 +5,7 @@ import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { IProfilerSession, IProfilerService, ProfilerSessionID, IProfilerViewTemplate, ProfilerFilter } from 'sql/workbench/services/profiler/common/interfaces'; -import { ProfilerState } from './profilerState'; +import { ProfilerState } from 'sql/workbench/parts/profiler/common/profilerState'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as azdata from 'azdata'; @@ -21,7 +21,7 @@ import { IDialogService } from 'vs/platform/dialogs/common/dialogs'; import * as types from 'vs/base/common/types'; import { URI } from 'vs/base/common/uri'; import Severity from 'vs/base/common/severity'; -import { FilterData } from 'sql/parts/profiler/service/profilerFilter'; +import { FilterData } from 'sql/workbench/services/profiler/common/profilerFilter'; export class ProfilerInput extends EditorInput implements IProfilerSession { diff --git a/src/sql/parts/profiler/editor/profilerResourceEditor.ts b/src/sql/workbench/parts/profiler/browser/profilerResourceEditor.ts similarity index 100% rename from src/sql/parts/profiler/editor/profilerResourceEditor.ts rename to src/sql/workbench/parts/profiler/browser/profilerResourceEditor.ts diff --git a/src/sql/parts/profiler/editor/controller/profilerTableEditor.ts b/src/sql/workbench/parts/profiler/browser/profilerTableEditor.ts similarity index 95% rename from src/sql/parts/profiler/editor/controller/profilerTableEditor.ts rename to src/sql/workbench/parts/profiler/browser/profilerTableEditor.ts index 4e5bf3d8fc..25cf9f0768 100644 --- a/src/sql/parts/profiler/editor/controller/profilerTableEditor.ts +++ b/src/sql/workbench/parts/profiler/browser/profilerTableEditor.ts @@ -3,14 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IProfilerController } from './interfaces'; -import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; +import { IProfilerController } from 'sql/workbench/parts/profiler/common/interfaces'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import { Table } from 'sql/base/browser/ui/table/table'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { RowSelectionModel } from 'sql/base/browser/ui/table/plugins/rowSelectionModel.plugin'; -import { IProfilerStateChangedEvent } from 'sql/parts/profiler/editor/profilerState'; -import { FindWidget, ITableController, IConfigurationChangedEvent, ACTION_IDS } from './profilerFindWidget'; -import { ProfilerFindNext, ProfilerFindPrevious } from 'sql/parts/profiler/contrib/profilerActions'; +import { IProfilerStateChangedEvent } from 'sql/workbench/parts/profiler/common/profilerState'; +import { FindWidget, ITableController, IConfigurationChangedEvent, ACTION_IDS, PROFILER_MAX_MATCHES } from 'sql/workbench/parts/profiler/browser/profilerFindWidget'; +import { ProfilerFindNext, ProfilerFindPrevious } from 'sql/workbench/parts/profiler/browser/profilerActions'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { IDisposable } from 'vs/base/common/lifecycle'; @@ -26,7 +26,6 @@ import { Event, Emitter } from 'vs/base/common/event'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { Dimension } from 'vs/base/browser/dom'; import { textFormatter, slickGridDataItemColumnValueExtractor } from 'sql/base/browser/ui/table/formatters'; -import { PROFILER_MAX_MATCHES } from 'sql/parts/profiler/editor/controller/profilerFindWidget'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { IStatusbarService, StatusbarAlignment } from 'vs/platform/statusbar/common/statusbar'; import { localize } from 'vs/nls'; diff --git a/src/sql/parts/profiler/editor/interfaces.ts b/src/sql/workbench/parts/profiler/common/interfaces.ts similarity index 87% rename from src/sql/parts/profiler/editor/interfaces.ts rename to src/sql/workbench/parts/profiler/common/interfaces.ts index e6857d0744..fe5473293b 100644 --- a/src/sql/parts/profiler/editor/interfaces.ts +++ b/src/sql/workbench/parts/profiler/common/interfaces.ts @@ -5,6 +5,11 @@ import { RawContextKey } from 'vs/platform/contextkey/common/contextkey'; +export interface IProfilerController { + findNext(): void; + findPrevious(): void; +} + export const CONTEXT_PROFILER_EDITOR = new RawContextKey('inProfilerTableEditor', false); export const PROFILER_TABLE_COMMAND_SEARCH = 'profiler.table.action.search'; diff --git a/src/sql/parts/profiler/editor/profilerState.ts b/src/sql/workbench/parts/profiler/common/profilerState.ts similarity index 99% rename from src/sql/parts/profiler/editor/profilerState.ts rename to src/sql/workbench/parts/profiler/common/profilerState.ts index 336f32451a..a1ba1031de 100644 --- a/src/sql/parts/profiler/editor/profilerState.ts +++ b/src/sql/workbench/parts/profiler/common/profilerState.ts @@ -2,7 +2,6 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -'use strict'; import { EventEmitter } from 'sql/base/common/eventEmitter'; import { IDisposable } from 'vs/base/common/lifecycle'; diff --git a/src/sql/workbench/parts/queryPlan/electron-browser/media/qp.css b/src/sql/workbench/parts/queryPlan/electron-browser/media/qp.css index ae56f03dec..a92b99af25 100644 --- a/src/sql/workbench/parts/queryPlan/electron-browser/media/qp.css +++ b/src/sql/workbench/parts/queryPlan/electron-browser/media/qp.css @@ -1,4 +1,4 @@ -/*--------------------------------------------------------------------------------------------- +/*--------------------------------------------------------------------------------------------- * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ diff --git a/src/sql/parts/disasterRecovery/restore/media/restoreDialog.css b/src/sql/workbench/parts/restore/browser/media/restoreDialog.css similarity index 100% rename from src/sql/parts/disasterRecovery/restore/media/restoreDialog.css rename to src/sql/workbench/parts/restore/browser/media/restoreDialog.css diff --git a/src/sql/parts/disasterRecovery/restore/restoreDialog.ts b/src/sql/workbench/parts/restore/browser/restoreDialog.ts similarity index 99% rename from src/sql/parts/disasterRecovery/restore/restoreDialog.ts rename to src/sql/workbench/parts/restore/browser/restoreDialog.ts index 3c73daf600..583d965458 100644 --- a/src/sql/parts/disasterRecovery/restore/restoreDialog.ts +++ b/src/sql/workbench/parts/restore/browser/restoreDialog.ts @@ -34,8 +34,8 @@ import * as DialogHelper from 'sql/workbench/browser/modal/dialogHelper'; import { Modal } from 'sql/workbench/browser/modal/modal'; import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachInputBoxStyler, attachSelectBoxStyler, attachEditableDropdownStyler, attachCheckboxStyler } from 'sql/platform/theme/common/styler'; import * as TelemetryKeys from 'sql/platform/telemetry/telemetryKeys'; -import * as BackupConstants from 'sql/parts/disasterRecovery/backup/constants'; -import { RestoreViewModel, RestoreOptionParam, SouceDatabaseNamesParam } from 'sql/parts/disasterRecovery/restore/restoreViewModel'; +import * as BackupConstants from 'sql/workbench/parts/backup/common/constants'; +import { RestoreViewModel, RestoreOptionParam, SouceDatabaseNamesParam } from 'sql/workbench/parts/restore/browser/restoreViewModel'; import * as FileValidationConstants from 'sql/workbench/services/fileBrowser/common/fileValidationServiceConstants'; import { Dropdown } from 'sql/base/browser/ui/editableDropdown/dropdown'; import { TabbedPanel, PanelTabIdentifier } from 'sql/base/browser/ui/panel/panel'; diff --git a/src/sql/parts/disasterRecovery/restore/restoreViewModel.ts b/src/sql/workbench/parts/restore/browser/restoreViewModel.ts similarity index 100% rename from src/sql/parts/disasterRecovery/restore/restoreViewModel.ts rename to src/sql/workbench/parts/restore/browser/restoreViewModel.ts diff --git a/src/sql/workbench/services/backup/browser/backupUiService.ts b/src/sql/workbench/services/backup/browser/backupUiService.ts index 8258d22be5..84dcd4caaa 100644 --- a/src/sql/workbench/services/backup/browser/backupUiService.ts +++ b/src/sql/workbench/services/backup/browser/backupUiService.ts @@ -15,7 +15,7 @@ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as ConnectionUtils from 'sql/platform/connection/common/utils'; import { ProviderConnectionInfo } from 'sql/platform/connection/common/providerConnectionInfo'; import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; -import { BackupDialog } from 'sql/parts/disasterRecovery/backup/backupDialog'; +import { BackupDialog } from 'sql/workbench/parts/backup/electron-browser/backupDialog'; import { OptionsDialog } from 'sql/workbench/browser/modal/optionsDialog'; import { IBackupService, TaskExecutionMode } from 'sql/platform/backup/common/backupService'; import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; diff --git a/src/sql/workbench/services/profiler/common/interfaces.ts b/src/sql/workbench/services/profiler/common/interfaces.ts index 094d7b48ed..e6991acab6 100644 --- a/src/sql/workbench/services/profiler/common/interfaces.ts +++ b/src/sql/workbench/services/profiler/common/interfaces.ts @@ -4,11 +4,11 @@ *--------------------------------------------------------------------------------------------*/ import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import * as azdata from 'azdata'; -import { INewProfilerState } from 'sql/parts/profiler/editor/profilerState'; +import { INewProfilerState } from 'sql/workbench/parts/profiler/common/profilerState'; const PROFILER_SERVICE_ID = 'profilerService'; export const IProfilerService = createDecorator(PROFILER_SERVICE_ID); diff --git a/src/sql/parts/profiler/service/profilerFilter.ts b/src/sql/workbench/services/profiler/common/profilerFilter.ts similarity index 100% rename from src/sql/parts/profiler/service/profilerFilter.ts rename to src/sql/workbench/services/profiler/common/profilerFilter.ts diff --git a/src/sql/workbench/services/profiler/common/profilerService.ts b/src/sql/workbench/services/profiler/common/profilerService.ts index c28bef16eb..86ee4527a1 100644 --- a/src/sql/workbench/services/profiler/common/profilerService.ts +++ b/src/sql/workbench/services/profiler/common/profilerService.ts @@ -9,8 +9,8 @@ import { PROFILER_SETTINGS, IProfilerSettings } from './interfaces'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; -import { ProfilerColumnEditorDialog } from 'sql/parts/profiler/dialog/profilerColumnEditorDialog'; +import { ProfilerInput } from 'sql/workbench/parts/profiler/browser/profilerInput'; +import { ProfilerColumnEditorDialog } from 'sql/workbench/parts/profiler/browser/profilerColumnEditorDialog'; import * as azdata from 'azdata'; @@ -20,7 +20,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati import { ICommandService } from 'vs/platform/commands/common/commands'; import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; import { Memento } from 'vs/workbench/common/memento'; -import { ProfilerFilterDialog } from 'sql/parts/profiler/dialog/profilerFilterDialog'; +import { ProfilerFilterDialog } from 'sql/workbench/parts/profiler/browser/profilerFilterDialog'; class TwoWayMap { private forwardMap: Map; diff --git a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts index 1bd546a094..7af425697b 100644 --- a/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts +++ b/src/sql/workbench/services/queryEditor/browser/queryEditorService.ts @@ -5,11 +5,11 @@ import { QueryResultsInput } from 'sql/parts/query/common/queryResultsInput'; import { QueryInput } from 'sql/parts/query/common/queryInput'; -import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; +import { EditDataInput } from 'sql/workbench/parts/editData/common/editDataInput'; import { IConnectableInput, IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IQueryEditorService, IQueryEditorOptions } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { QueryPlanInput } from 'sql/workbench/parts/queryPlan/common/queryPlanInput'; -import { sqlModeId, untitledFilePrefix, getSupportedInputResource } from 'sql/parts/common/customInputConverter'; +import { sqlModeId, untitledFilePrefix, getSupportedInputResource } from 'sql/workbench/common/customInputConverter'; import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IMode } from 'vs/editor/common/modes'; @@ -24,7 +24,7 @@ import paths = require('vs/base/common/extpath'); import { isLinux } from 'vs/base/common/platform'; import { Schemas } from 'vs/base/common/network'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { EditDataResultsInput } from 'sql/parts/editData/common/editDataResultsInput'; +import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput'; import { IEditorInput, IEditor } from 'vs/workbench/common/editor'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; import { ILanguageSelection } from 'vs/editor/common/services/modeService'; diff --git a/src/sqltest/parts/disasterRecovery/restoreViewModel.test.ts b/src/sqltest/parts/disasterRecovery/restoreViewModel.test.ts index 86b3a8a491..afe020616a 100644 --- a/src/sqltest/parts/disasterRecovery/restoreViewModel.test.ts +++ b/src/sqltest/parts/disasterRecovery/restoreViewModel.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as azdata from 'azdata'; import * as assert from 'assert'; -import { RestoreViewModel } from 'sql/parts/disasterRecovery/restore/restoreViewModel'; +import { RestoreViewModel } from 'sql/workbench/parts/restore/browser/restoreViewModel'; import { ServiceOptionType } from 'sql/workbench/api/common/sqlExtHostTypes'; suite('Restore Dialog view model tests', () => { diff --git a/src/sqltest/parts/modelComponents/componentBase.test.ts b/src/sqltest/parts/modelComponents/componentBase.test.ts index 5c419f9abe..441a665049 100644 --- a/src/sqltest/parts/modelComponents/componentBase.test.ts +++ b/src/sqltest/parts/modelComponents/componentBase.test.ts @@ -6,9 +6,9 @@ 'use strict'; import * as assert from 'assert'; -import { ComponentBase, ContainerBase, ItemDescriptor } from 'sql/parts/modelComponents/componentBase'; -import { IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; -import { ModelStore } from 'sql/parts/modelComponents/modelStore'; +import { ComponentBase, ContainerBase, ItemDescriptor } from 'sql/workbench/electron-browser/modelComponents/componentBase'; +import { IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/workbench/electron-browser/modelComponents/interfaces'; +import { ModelStore } from 'sql/workbench/electron-browser/modelComponents/modelStore'; import { ChangeDetectorRef } from '@angular/core'; diff --git a/src/sqltest/parts/modelComponents/table.component.test.ts b/src/sqltest/parts/modelComponents/table.component.test.ts index e1508e0294..dd013f567d 100644 --- a/src/sqltest/parts/modelComponents/table.component.test.ts +++ b/src/sqltest/parts/modelComponents/table.component.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as assert from 'assert'; -import TableComponent from 'sql/parts/modelComponents/table.component'; +import TableComponent from 'sql/workbench/electron-browser/modelComponents/table.component'; suite('TableComponent Tests', () => { diff --git a/src/sqltest/parts/profiler/service/profilerFilter.test.ts b/src/sqltest/parts/profiler/service/profilerFilter.test.ts index 90122df023..32c337ab5a 100644 --- a/src/sqltest/parts/profiler/service/profilerFilter.test.ts +++ b/src/sqltest/parts/profiler/service/profilerFilter.test.ts @@ -6,7 +6,7 @@ 'use strict'; import * as assert from 'assert'; -import { FilterData } from 'sql/parts/profiler/service/profilerFilter'; +import { FilterData } from 'sql/workbench/services/profiler/common/profilerFilter'; import { ProfilerFilterClauseOperator, ProfilerFilter } from 'sql/workbench/services/profiler/common/interfaces'; const property1 = 'property1'; diff --git a/src/sqltest/workbench/api/extHostModelView.test.ts b/src/sqltest/workbench/api/extHostModelView.test.ts index 6884ce3df2..76947099f3 100644 --- a/src/sqltest/workbench/api/extHostModelView.test.ts +++ b/src/sqltest/workbench/api/extHostModelView.test.ts @@ -12,7 +12,7 @@ import { ExtHostModelView } from 'sql/workbench/api/node/extHostModelView'; import { MainThreadModelViewShape } from 'sql/workbench/api/node/sqlExtHost.protocol'; import { IMainContext } from 'vs/workbench/api/common/extHost.protocol'; import { IComponentShape, IItemConfig, ComponentEventType, IComponentEventArgs, ModelComponentTypes } from 'sql/workbench/api/common/sqlExtHostTypes'; -import { TitledFormItemLayout } from 'sql/parts/modelComponents/formContainer.component'; +import { TitledFormItemLayout } from 'sql/workbench/electron-browser/modelComponents/formContainer.component'; interface InternalItemConfig { toIItemConfig(): IItemConfig; diff --git a/src/vs/code/electron-browser/workbench/workbench.html b/src/vs/code/electron-browser/workbench/workbench.html index 94ca17281c..54e63bdaaa 100644 --- a/src/vs/code/electron-browser/workbench/workbench.html +++ b/src/vs/code/electron-browser/workbench/workbench.html @@ -3,7 +3,8 @@ - + + diff --git a/src/vs/workbench/browser/parts/editor/editorPart.ts b/src/vs/workbench/browser/parts/editor/editorPart.ts index 4b772bc084..1fd29a875a 100644 --- a/src/vs/workbench/browser/parts/editor/editorPart.ts +++ b/src/vs/workbench/browser/parts/editor/editorPart.ts @@ -33,7 +33,7 @@ import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/bro import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; // {{SQL CARBON EDIT}} -import { convertEditorInput } from 'sql/parts/common/customInputConverter'; +import { convertEditorInput } from 'sql/workbench/common/customInputConverter'; interface IEditorPartUIState { diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts index 0e56544f05..3151b9d913 100644 --- a/src/vs/workbench/common/editor/editorGroup.ts +++ b/src/vs/workbench/common/editor/editorGroup.ts @@ -16,7 +16,7 @@ import { coalesce } from 'vs/base/common/arrays'; // {{SQL CARBON EDIT}} import { QueryInput } from 'sql/parts/query/common/queryInput'; import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorInput'; -import * as CustomInputConverter from 'sql/parts/common/customInputConverter'; +import * as CustomInputConverter from 'sql/workbench/common/customInputConverter'; import { NotebookInput } from 'sql/workbench/parts/notebook/notebookInput'; const EditorOpenPositioning = { diff --git a/src/vs/workbench/services/editor/browser/editorService.ts b/src/vs/workbench/services/editor/browser/editorService.ts index c94fca9fcd..95766b74af 100644 --- a/src/vs/workbench/services/editor/browser/editorService.ts +++ b/src/vs/workbench/services/editor/browser/editorService.ts @@ -30,7 +30,7 @@ import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; import { withNullAsUndefined, withUndefinedAsNull } from 'vs/base/common/types'; //{{SQL CARBON EDIT}} -import { convertEditorInput, getFileMode } from 'sql/parts/common/customInputConverter'; +import { convertEditorInput, getFileMode } from 'sql/workbench/common/customInputConverter'; //{{SQL CARBON EDIT}} - End type ICachedEditorInput = ResourceEditorInput | IFileEditorInput | DataUriEditorInput; diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 1420d6891e..8956f33d7e 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -453,8 +453,8 @@ import 'sql/workbench/api/node/sqlExtHost.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/workbench/parts/profiler/browser/profiler.contribution'; +import 'sql/workbench/parts/profiler/browser/profilerActions.contribution'; import 'sql/workbench/parts/objectExplorer/common/serverGroup.contribution'; import 'sql/platform/accounts/browser/accountManagement.contribution'; @@ -479,9 +479,9 @@ import 'sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.contribution'; import 'sql/workbench/parts/dashboard/widgets/webview/webviewWidget.contribution'; import 'sql/workbench/parts/dashboard/dashboardConfig.contribution'; /* Model-based Views */ -import 'sql/parts/modelComponents/components.contribution'; +import 'sql/workbench/electron-browser/modelComponents/components.contribution'; /* View Model Editor */ -import 'sql/parts/modelComponents/modelEditor/modelViewEditor.contribution'; +import 'sql/workbench/electron-browser/modelComponents/modelViewEditor.contribution'; /* Notebook Editor */ import 'sql/workbench/parts/notebook/notebook.contribution'; /* Containers */