diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js index d607d29e3c..b9e4f22cf0 100644 --- a/build/gulpfile.vscode.js +++ b/build/gulpfile.vscode.js @@ -101,7 +101,7 @@ const vscodeResources = [ 'out-build/sql/parts/admin/**/*.html', 'out-build/sql/parts/connection/connectionDialog/media/*.{gif,png,svg}', 'out-build/sql/parts/common/dblist/**/*.html', - 'out-build/sql/parts/dashboard/**/*.html', + 'out-build/sql/workbench/parts/dashboard/**/*.html', 'out-build/sql/parts/disasterRecovery/**/*.html', 'out-build/sql/parts/common/modal/media/**', 'out-build/sql/parts/grid/load/lib/**', diff --git a/src/sql/parts/connection/common/connection.contribution.ts b/src/sql/parts/connection/common/connection.contribution.ts index dc207fdd54..c106696765 100644 --- a/src/sql/parts/connection/common/connection.contribution.ts +++ b/src/sql/parts/connection/common/connection.contribution.ts @@ -7,8 +7,8 @@ import { EditorDescriptor, IEditorRegistry, Extensions as EditorExtensions } fro import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry'; import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'; import { Registry } from 'vs/platform/registry/common/platform'; -import { DashboardEditor } from 'sql/parts/dashboard/dashboardEditor'; -import { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; +import { DashboardEditor } from 'sql/workbench/parts/dashboard/dashboardEditor'; +import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; import { AddServerGroupAction, AddServerAction } from 'sql/parts/objectExplorer/viewlet/connectionTreeAction'; import { ClearRecentConnectionsAction, GetCurrentConnectionStringAction } from 'sql/parts/connection/common/connectionActions'; diff --git a/src/sql/parts/connection/common/connectionActions.ts b/src/sql/parts/connection/common/connectionActions.ts index 378abfc8b9..07c976bf77 100644 --- a/src/sql/parts/connection/common/connectionActions.ts +++ b/src/sql/parts/connection/common/connectionActions.ts @@ -14,7 +14,7 @@ import { IDialogService, IConfirmation, IConfirmationResult } from 'vs/platform/ 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 { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; +import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService'; import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; diff --git a/src/sql/parts/dashboard/containers/dashboardGridContainer.component.html b/src/sql/parts/dashboard/containers/dashboardGridContainer.component.html deleted file mode 100644 index 80823e57f4..0000000000 --- a/src/sql/parts/dashboard/containers/dashboardGridContainer.component.html +++ /dev/null @@ -1,25 +0,0 @@ - -
- - - - - - - - -
- - - - - - - -
-
diff --git a/src/sql/parts/extensions/sqlExtensionsHelper.ts b/src/sql/parts/extensions/sqlExtensionsHelper.ts index 24bd72a39b..ea53ed0aa2 100644 --- a/src/sql/parts/extensions/sqlExtensionsHelper.ts +++ b/src/sql/parts/extensions/sqlExtensionsHelper.ts @@ -6,8 +6,8 @@ 'use strict'; import { append, $ } from 'vs/base/browser/dom'; -import { IInsightTypeContrib } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { IDashboardTabContrib } from 'sql/parts/dashboard/common/dashboardTab.contribution'; +import { IInsightTypeContrib } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; +import { IDashboardTabContrib } from 'sql/workbench/parts/dashboard/common/dashboardTab.contribution'; import { localize } from 'vs/nls'; import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; diff --git a/src/sql/parts/jobManagement/agent/agentView.component.ts b/src/sql/parts/jobManagement/agent/agentView.component.ts index 65a904f5b5..38e199fc32 100644 --- a/src/sql/parts/jobManagement/agent/agentView.component.ts +++ b/src/sql/parts/jobManagement/agent/agentView.component.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import 'vs/css!../common/media/jobs'; -import 'sql/parts/dashboard/common/dashboardPanelStyles'; +import 'sql/workbench/parts/dashboard/common/dashboardPanelStyles'; import * as nls from 'vs/nls'; import { Component, Inject, forwardRef, ChangeDetectorRef, ViewChild, Injectable } from '@angular/core'; diff --git a/src/sql/parts/modelComponents/card.component.ts b/src/sql/parts/modelComponents/card.component.ts index 279a268f8f..6255380961 100644 --- a/src/sql/parts/modelComponents/card.component.ts +++ b/src/sql/parts/modelComponents/card.component.ts @@ -15,7 +15,7 @@ import { ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeServic import * as colors from 'vs/platform/theme/common/colorRegistry'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +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 { StatusIndicator, CardProperties, ActionDescriptor } from 'sql/workbench/api/common/sqlExtHostTypes'; diff --git a/src/sql/parts/modelComponents/divContainer.component.ts b/src/sql/parts/modelComponents/divContainer.component.ts index a114771636..02113177c4 100644 --- a/src/sql/parts/modelComponents/divContainer.component.ts +++ b/src/sql/parts/modelComponents/divContainer.component.ts @@ -12,7 +12,7 @@ import { import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import * as azdata from 'azdata'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +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'; diff --git a/src/sql/parts/modelComponents/flexContainer.component.ts b/src/sql/parts/modelComponents/flexContainer.component.ts index 6f1adab85b..6a4848f0e0 100644 --- a/src/sql/parts/modelComponents/flexContainer.component.ts +++ b/src/sql/parts/modelComponents/flexContainer.component.ts @@ -12,7 +12,7 @@ import { import { IComponent, IComponentDescriptor, IModelStore } from 'sql/parts/modelComponents/interfaces'; import { FlexLayout, FlexItemLayout } from 'azdata'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +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'; diff --git a/src/sql/parts/modelComponents/formContainer.component.ts b/src/sql/parts/modelComponents/formContainer.component.ts index 6f5fd6a7df..7fac83386d 100644 --- a/src/sql/parts/modelComponents/formContainer.component.ts +++ b/src/sql/parts/modelComponents/formContainer.component.ts @@ -13,7 +13,7 @@ import { import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { FormLayout, FormItemLayout } from 'azdata'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +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/services/common/commonServiceInterface.service'; diff --git a/src/sql/parts/modelComponents/groupContainer.component.ts b/src/sql/parts/modelComponents/groupContainer.component.ts index 52d46c6e1a..0808425223 100644 --- a/src/sql/parts/modelComponents/groupContainer.component.ts +++ b/src/sql/parts/modelComponents/groupContainer.component.ts @@ -12,7 +12,7 @@ import { import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces'; import { GroupLayout, GroupItemLayout } from 'azdata'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +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/services/common/commonServiceInterface.service'; diff --git a/src/sql/parts/modelComponents/modelComponentWrapper.component.ts b/src/sql/parts/modelComponents/modelComponentWrapper.component.ts index f8d9e4e434..ddc8825f32 100644 --- a/src/sql/parts/modelComponents/modelComponentWrapper.component.ts +++ b/src/sql/parts/modelComponents/modelComponentWrapper.component.ts @@ -9,7 +9,7 @@ import { ElementRef, OnInit, ChangeDetectorRef, ReflectiveInjector, Injector, ComponentRef } from '@angular/core'; -import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { error } from 'sql/base/common/log'; import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IComponent, IComponentConfig, IComponentDescriptor, IModelStore, COMPONENT_CONFIG } from './interfaces'; @@ -167,4 +167,4 @@ export class ModelComponentWrapper extends AngularDisposable implements OnInit { } } -} \ No newline at end of file +} diff --git a/src/sql/parts/notebook/cellToggleMoreActions.ts b/src/sql/parts/notebook/cellToggleMoreActions.ts index a1e03b195d..5cc52a363a 100644 --- a/src/sql/parts/notebook/cellToggleMoreActions.ts +++ b/src/sql/parts/notebook/cellToggleMoreActions.ts @@ -15,7 +15,7 @@ import * as DOM from 'vs/base/browser/dom'; import { ICellModel } from 'sql/parts/notebook/models/modelInterfaces'; import { CellContext, CellActionBase } from 'sql/parts/notebook/cellViews/codeActions'; import { NotebookModel } from 'sql/parts/notebook/models/notebookModel'; -import { ToggleMoreWidgetAction } from 'sql/parts/dashboard/common/actions'; +import { ToggleMoreWidgetAction } from 'sql/workbench/parts/dashboard/common/actions'; import { CellTypes, CellType } from 'sql/parts/notebook/models/contracts'; import { CellModel } from 'sql/parts/notebook/models/cell'; diff --git a/src/sql/parts/notebook/notebook.module.ts b/src/sql/parts/notebook/notebook.module.ts index ac87813e23..f22413bd89 100644 --- a/src/sql/parts/notebook/notebook.module.ts +++ b/src/sql/parts/notebook/notebook.module.ts @@ -11,7 +11,7 @@ import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; -import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; diff --git a/src/sql/parts/query/editor/charting/actions.ts b/src/sql/parts/query/editor/charting/actions.ts index e0a79fa4d1..52aa7cce88 100644 --- a/src/sql/parts/query/editor/charting/actions.ts +++ b/src/sql/parts/query/editor/charting/actions.ts @@ -9,7 +9,7 @@ import { IInsightOptions, IInsight } from './insights/interfaces'; import { Graph } from './insights/graphInsight'; import { QueryEditor } from 'sql/parts/query/editor/queryEditor'; import { IClipboardService } from 'sql/platform/clipboard/common/clipboardService'; -import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { resolveCurrentDirectory, getRootPath } from 'sql/platform/node/pathUtilities'; import { localize } from 'vs/nls'; diff --git a/src/sql/parts/query/editor/charting/chartOptions.ts b/src/sql/parts/query/editor/charting/chartOptions.ts index 104b6b4f5f..ca10b7d3b5 100644 --- a/src/sql/parts/query/editor/charting/chartOptions.ts +++ b/src/sql/parts/query/editor/charting/chartOptions.ts @@ -10,7 +10,7 @@ import { Registry } from 'vs/platform/registry/common/platform'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { InsightType, IInsightOptions } from './insights/interfaces'; -import { DataDirection, ChartType, LegendPosition, DataType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; const insightRegistry = Registry.as(Extensions.InsightContribution); diff --git a/src/sql/parts/query/editor/charting/chartView.ts b/src/sql/parts/query/editor/charting/chartView.ts index b3df59c220..0c9c5d29ea 100644 --- a/src/sql/parts/query/editor/charting/chartView.ts +++ b/src/sql/parts/query/editor/charting/chartView.ts @@ -10,14 +10,14 @@ import 'vs/css!./chartView'; import { IPanelView } from 'sql/base/browser/ui/panel/panel'; import { Insight } from './insights/insight'; import QueryRunner from 'sql/platform/query/common/queryRunner'; -import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { ChartOptions, IChartOption, ControlType } from './chartOptions'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox'; import { IInsightOptions } from './insights/interfaces'; import { CopyAction, SaveImageAction, CreateInsightAction, IChartActionContext } from './actions'; import { Taskbar } from 'sql/base/browser/ui/taskbar/taskbar'; -import { ChartType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import { Registry } from 'vs/platform/registry/common/platform'; import * as DOM from 'vs/base/browser/dom'; import { SelectBox } from 'vs/base/browser/ui/selectBox/selectBox'; diff --git a/src/sql/parts/query/editor/charting/insights/countInsight.ts b/src/sql/parts/query/editor/charting/insights/countInsight.ts index 89d7bf4745..f21a7edc1b 100644 --- a/src/sql/parts/query/editor/charting/insights/countInsight.ts +++ b/src/sql/parts/query/editor/charting/insights/countInsight.ts @@ -6,7 +6,7 @@ import 'vs/css!./countInsight'; import { IInsight, InsightType } from './interfaces'; -import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { $, clearNode } from 'vs/base/browser/dom'; diff --git a/src/sql/parts/query/editor/charting/insights/graphInsight.ts b/src/sql/parts/query/editor/charting/insights/graphInsight.ts index d8cbe9e02c..398e7ee9fd 100644 --- a/src/sql/parts/query/editor/charting/insights/graphInsight.ts +++ b/src/sql/parts/query/editor/charting/insights/graphInsight.ts @@ -13,9 +13,9 @@ import * as colors from 'vs/platform/theme/common/colorRegistry'; import { editorLineNumbers } from 'vs/editor/common/view/editorColorRegistry'; import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService'; -import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { IInsightOptions, IInsight } from './interfaces'; -import { ChartType, DataDirection, LegendPosition, DataType, IPointDataSet, customMixin } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { ChartType, DataDirection, LegendPosition, DataType, IPointDataSet, customMixin } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; const noneLineGraphs = [ChartType.Doughnut, ChartType.Pie]; diff --git a/src/sql/parts/query/editor/charting/insights/imageInsight.ts b/src/sql/parts/query/editor/charting/insights/imageInsight.ts index e295759ed6..266b7874b9 100644 --- a/src/sql/parts/query/editor/charting/insights/imageInsight.ts +++ b/src/sql/parts/query/editor/charting/insights/imageInsight.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IInsight, IInsightOptions, InsightType } from './interfaces'; -import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { $ } from 'vs/base/browser/dom'; import { mixin } from 'vs/base/common/objects'; diff --git a/src/sql/parts/query/editor/charting/insights/insight.ts b/src/sql/parts/query/editor/charting/insights/insight.ts index e19c39788e..9f0a02faf6 100644 --- a/src/sql/parts/query/editor/charting/insights/insight.ts +++ b/src/sql/parts/query/editor/charting/insights/insight.ts @@ -6,8 +6,8 @@ 'use strict'; import { Graph } from './graphInsight'; -import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { DataDirection, ChartType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; +import { DataDirection, ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import { ImageInsight } from './imageInsight'; import { TableInsight } from './tableInsight'; import { IInsightOptions, IInsight, InsightType, IInsightCtor } from './interfaces'; diff --git a/src/sql/parts/query/editor/charting/insights/interfaces.ts b/src/sql/parts/query/editor/charting/insights/interfaces.ts index 741fc4fd2c..d4229faa4a 100644 --- a/src/sql/parts/query/editor/charting/insights/interfaces.ts +++ b/src/sql/parts/query/editor/charting/insights/interfaces.ts @@ -6,8 +6,8 @@ 'use strict'; import { Dimension } from 'vs/base/browser/dom'; -import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { DataDirection, ChartType, LegendPosition, DataType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; +import { DataDirection, ChartType, LegendPosition, DataType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; export interface IInsightOptions { type: InsightType | ChartType; diff --git a/src/sql/parts/query/editor/charting/insights/tableInsight.ts b/src/sql/parts/query/editor/charting/insights/tableInsight.ts index f55b4bdefb..9b6b21b05f 100644 --- a/src/sql/parts/query/editor/charting/insights/tableInsight.ts +++ b/src/sql/parts/query/editor/charting/insights/tableInsight.ts @@ -6,7 +6,7 @@ 'use strict'; import { IInsight, InsightType } from './interfaces'; -import { IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { Table } from 'sql/base/browser/ui/table/table'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; diff --git a/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts b/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts index 7b351a05d4..d88295dc93 100644 --- a/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts +++ b/src/sql/parts/query/modelViewTab/queryModelViewTab.module.ts @@ -15,7 +15,7 @@ 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 { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; diff --git a/src/sql/platform/connection/common/connectionManagementService.ts b/src/sql/platform/connection/common/connectionManagementService.ts index 24bbb082bc..14a2c529dc 100644 --- a/src/sql/platform/connection/common/connectionManagementService.ts +++ b/src/sql/platform/connection/common/connectionManagementService.ts @@ -20,7 +20,7 @@ import { ICapabilitiesService } from 'sql/platform/capabilities/common/capabilit import { ICredentialsService } from 'sql/platform/credentials/common/credentialsService'; import * as ConnectionContracts from 'sql/parts/connection/common/connection'; import { ConnectionStatusManager } from 'sql/platform/connection/common/connectionStatusManager'; -import { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; +import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; import { ConnectionGlobalStatus } from 'sql/parts/connection/common/connectionGlobalStatus'; import { ConnectionStatusbarItem } from 'sql/parts/connection/common/connectionStatus'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; diff --git a/src/sql/platform/dashboard/common/dashboardContainerRegistry.ts b/src/sql/platform/dashboard/common/dashboardContainerRegistry.ts index 313635a53e..820e9c5e8a 100644 --- a/src/sql/platform/dashboard/common/dashboardContainerRegistry.ts +++ b/src/sql/platform/dashboard/common/dashboardContainerRegistry.ts @@ -8,7 +8,7 @@ import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema'; import { Extensions as ConfigurationExtension } from 'vs/platform/configuration/common/configurationRegistry'; import { deepClone } from 'vs/base/common/objects'; -import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; +import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; export const Extensions = { dashboardContainerContributions: 'dashboard.contributions.container' @@ -89,4 +89,4 @@ export function registerNavSectionContainerType(id: string, schema: IJSONSchema) export function generateNavSectionContainerTypeSchemaProperties(): IJSONSchemaMap { return dashboardContainerRegistry.navSectionContainerTypeSchemaProperties; -} \ No newline at end of file +} diff --git a/src/sql/platform/dashboard/common/dashboardRegistry.ts b/src/sql/platform/dashboard/common/dashboardRegistry.ts index 4cfb6c2a58..5d25fd68fa 100644 --- a/src/sql/platform/dashboard/common/dashboardRegistry.ts +++ b/src/sql/platform/dashboard/common/dashboardRegistry.ts @@ -9,10 +9,10 @@ import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; -import { ProviderProperties } from 'sql/parts/dashboard/widgets/properties/propertiesWidget.component'; -import { DATABASE_DASHBOARD_TABS } from 'sql/parts/dashboard/pages/databaseDashboardPage.contribution'; -import { SERVER_DASHBOARD_TABS, SERVER_DASHBOARD_PROPERTIES } from 'sql/parts/dashboard/pages/serverDashboardPage.contribution'; -import { DASHBOARD_CONFIG_ID, DASHBOARD_TABS_KEY_PROPERTY } from 'sql/parts/dashboard/pages/dashboardPageContribution'; +import { ProviderProperties } from 'sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component'; +import { DATABASE_DASHBOARD_TABS } from 'sql/workbench/parts/dashboard/pages/databaseDashboardPage.contribution'; +import { SERVER_DASHBOARD_TABS, SERVER_DASHBOARD_PROPERTIES } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution'; +import { DASHBOARD_CONFIG_ID, DASHBOARD_TABS_KEY_PROPERTY } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution'; export const Extensions = { DashboardContributions: 'dashboard.contributions' diff --git a/src/sql/platform/dashboard/common/insightRegistry.ts b/src/sql/platform/dashboard/common/insightRegistry.ts index 530079549a..bea82df944 100644 --- a/src/sql/platform/dashboard/common/insightRegistry.ts +++ b/src/sql/platform/dashboard/common/insightRegistry.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ import { Type } from '@angular/core'; -import { IInsightsConfig, IInsightsView } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfig, IInsightsView } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import * as platform from 'vs/platform/registry/common/platform'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; diff --git a/src/sql/platform/dashboard/common/widgetRegistry.ts b/src/sql/platform/dashboard/common/widgetRegistry.ts index a6bcf63aa7..1705297580 100644 --- a/src/sql/platform/dashboard/common/widgetRegistry.ts +++ b/src/sql/platform/dashboard/common/widgetRegistry.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 { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import * as platform from 'vs/platform/registry/common/platform'; import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema'; @@ -112,4 +112,4 @@ export function registerDashboardWidget(id: string, description: string, schema: export function registerNonCustomDashboardWidget(id: string, description: string, val: IInsightsConfig): WidgetIdentifier { return dashboardWidgetRegistry.registerNonCustomDashboardWidget(id, description, val); -} \ No newline at end of file +} diff --git a/src/sql/platform/dialog/dialog.module.ts b/src/sql/platform/dialog/dialog.module.ts index 329525ade1..ade913d5f8 100644 --- a/src/sql/platform/dialog/dialog.module.ts +++ b/src/sql/platform/dialog/dialog.module.ts @@ -17,7 +17,7 @@ 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 { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; diff --git a/src/sql/workbench/common/actions.ts b/src/sql/workbench/common/actions.ts index 11c414f2bd..9cf5bf9777 100644 --- a/src/sql/workbench/common/actions.ts +++ b/src/sql/workbench/common/actions.ts @@ -7,7 +7,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/con import * as TaskUtilities from 'sql/workbench/common/taskUtilities'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { IScriptingService } from 'sql/platform/scripting/common/scriptingService'; import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService'; import { IAngularEventingService, AngularEventType } from 'sql/platform/angularEventing/common/angularEventingService'; diff --git a/src/sql/workbench/common/taskUtilities.ts b/src/sql/workbench/common/taskUtilities.ts index 54212bb0f4..7803214dab 100644 --- a/src/sql/workbench/common/taskUtilities.ts +++ b/src/sql/workbench/common/taskUtilities.ts @@ -17,12 +17,12 @@ import { IScriptingService } from 'sql/platform/scripting/common/scriptingServic import { EditDataInput } from 'sql/parts/editData/common/editDataInput'; import { IAdminService } from 'sql/workbench/services/admin/common/adminService'; import { IRestoreDialogController } from 'sql/platform/restore/common/restoreService'; -import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import { IObjectExplorerService } from 'sql/workbench/services/objectExplorer/common/objectExplorerService'; import { QueryInput } from 'sql/parts/query/common/queryInput'; -import { DashboardInput } from 'sql/parts/dashboard/dashboardInput'; +import { DashboardInput } from 'sql/workbench/parts/dashboard/dashboardInput'; import { ProfilerInput } from 'sql/parts/profiler/editor/profilerInput'; import { IErrorMessageService } from 'sql/platform/errorMessage/common/errorMessageService'; import { IBackupUiService } from 'sql/workbench/services/backup/common/backupUiService'; diff --git a/src/sql/parts/dashboard/common/actions.ts b/src/sql/workbench/parts/dashboard/common/actions.ts similarity index 97% rename from src/sql/parts/dashboard/common/actions.ts rename to src/sql/workbench/parts/dashboard/common/actions.ts index 2af82e98a8..3a1732b5e0 100644 --- a/src/sql/parts/dashboard/common/actions.ts +++ b/src/sql/workbench/parts/dashboard/common/actions.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 { Action, IAction } from 'vs/base/common/actions'; import * as nls from 'vs/nls'; import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; @@ -182,16 +183,16 @@ export class AddFeatureTabAction extends Action { private handleDashboardEvent(event: IAngularEvent): void { switch (event.event) { case AngularEventType.NEW_TABS: - let openedTabs = event.payload.dashboardTabs; + const openedTabs = event.payload.dashboardTabs; openedTabs.forEach(tab => { - let existedTab = this._openedTabs.find(i => i === tab); + const existedTab = this._openedTabs.find(i => i === tab); if (!existedTab) { this._openedTabs.push(tab); } }); break; case AngularEventType.CLOSE_TAB: - let index = this._openedTabs.findIndex(i => i.id === event.payload.id); + const index = this._openedTabs.findIndex(i => i.id === event.payload.id); this._openedTabs.splice(index, 1); break; } diff --git a/src/sql/parts/dashboard/common/componentHost.directive.ts b/src/sql/workbench/parts/dashboard/common/componentHost.directive.ts similarity index 100% rename from src/sql/parts/dashboard/common/componentHost.directive.ts rename to src/sql/workbench/parts/dashboard/common/componentHost.directive.ts diff --git a/src/sql/parts/dashboard/common/dashboardHelper.ts b/src/sql/workbench/parts/dashboard/common/dashboardHelper.ts similarity index 68% rename from src/sql/parts/dashboard/common/dashboardHelper.ts rename to src/sql/workbench/parts/dashboard/common/dashboardHelper.ts index 3583220c61..8cd048e3bf 100644 --- a/src/sql/parts/dashboard/common/dashboardHelper.ts +++ b/src/sql/workbench/parts/dashboard/common/dashboardHelper.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 * as types from 'vs/base/common/types'; import { generateUuid } from 'vs/base/common/uuid'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -9,16 +10,16 @@ import * as nls from 'vs/nls'; import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { error } from 'sql/base/common/log'; -import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; +import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; -import { WIDGETS_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution'; -import { WEBVIEW_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWebviewContainer.contribution'; -import { MODELVIEW_CONTAINER } from 'sql/parts/dashboard/containers/dashboardModelViewContainer.contribution'; -import { CONTROLHOST_CONTAINER } from 'sql/parts/dashboard/containers/dashboardControlHostContainer.contribution'; -import { NAV_SECTION } from 'sql/parts/dashboard/containers/dashboardNavSection.contribution'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; +import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution'; +import { WEBVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.contribution'; +import { MODELVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.contribution'; +import { CONTROLHOST_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.contribution'; +import { NAV_SECTION } from 'sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution'; import { IDashboardContainerRegistry, Extensions as DashboardContainerExtensions } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; import { SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; import * as Constants from 'sql/platform/connection/common/constants'; @@ -33,31 +34,6 @@ const containerTypes = [ NAV_SECTION ]; - -/** - * @returns whether the provided parameter is a JavaScript Array and each element in the array is a number. - */ -function isNumberArray(value: any): value is number[] { - return types.isArray(value) && (value).every(elem => types.isNumber(elem)); -} - -/** - * Does a compare against the val passed in and the compare string - * @param val string or array of strings to compare the compare value to; if array, it will compare each val in the array - * @param compare value to compare to - */ -function stringOrStringArrayCompare(val: string | Array, compare: string): boolean { - if (types.isUndefinedOrNull(val)) { - return true; - } else if (types.isString(val)) { - return val === compare; - } else if (types.isStringArray(val)) { - return val.some(item => item === compare); - } else { - return false; - } -} - /** * Validates configs to make sure nothing will error out and returns the modified widgets * @param config Array of widgets to validate @@ -88,11 +64,11 @@ export function validateGridConfig(config: WidgetConfig[], originalConfig: Widge } export function initExtensionConfigs(configurations: WidgetConfig[]): Array { - let widgetRegistry = Registry.as(Extensions.InsightContribution); + const widgetRegistry = Registry.as(Extensions.InsightContribution); return configurations.map((config) => { if (config.widget && Object.keys(config.widget).length === 1) { - let key = Object.keys(config.widget)[0]; - let insightConfig = widgetRegistry.getRegisteredExtensionInsights(key); + const key = Object.keys(config.widget)[0]; + const insightConfig = widgetRegistry.getRegisteredExtensionInsights(key); if (insightConfig !== undefined) { // Setup the default properties for this extension if needed if (!config.when && insightConfig.when) { @@ -121,7 +97,7 @@ export function initExtensionConfigs(configurations: WidgetConfig[]): Array(config: WidgetConfig[], collection: T): Array { - let provider = collection.connectionManagementService.connectionInfo.providerId; + const provider = collection.connectionManagementService.connectionInfo.providerId; return config.map((item) => { if (item.provider === undefined) { item.provider = provider; @@ -135,9 +111,9 @@ export function addProvider(config: WidgetConfig[], collection: DashboardServiceInterface): Array { - let connectionInfo: ConnectionManagementInfo = collection.connectionManagementService.connectionInfo; + const connectionInfo: ConnectionManagementInfo = collection.connectionManagementService.connectionInfo; if (connectionInfo.serverInfo) { - let edition = connectionInfo.serverInfo.engineEditionId; + const edition = connectionInfo.serverInfo.engineEditionId; return config.map((item) => { if (item.edition === undefined) { item.edition = edition; @@ -184,10 +160,10 @@ export function filterConfigs(Constants.connectionProviderContextKey); + const connectionProvider = contextKeyService.getContextKeyValue(Constants.connectionProviderContextKey); if (connectionProvider) { - let providers = (provider instanceof Array) ? provider : [provider]; - let matchingProvider = providers.find((p) => p === connectionProvider || p === Constants.anyProviderName); + const providers = (provider instanceof Array) ? provider : [provider]; + const matchingProvider = providers.find((p) => p === connectionProvider || p === Constants.anyProviderName); isCompatible = (matchingProvider !== undefined); } // Else there's no connection context so skip the check return isCompatible; @@ -198,17 +174,17 @@ function hasCompatibleProvider(provider: string | string[], contextKeyService: I * @param container dashboard container */ export function getDashboardContainer(container: object): { result: boolean, message: string, container: object } { - let key = Object.keys(container)[0]; - let containerTypeFound = containerTypes.find(c => (c === key)); + const key = Object.keys(container)[0]; + const containerTypeFound = containerTypes.find(c => (c === key)); if (!containerTypeFound) { - let dashboardContainer = dashboardcontainerRegistry.getRegisteredContainer(key); + const dashboardContainer = dashboardcontainerRegistry.getRegisteredContainer(key); if (!dashboardContainer) { - let errorMessage = nls.localize('unknownDashboardContainerError', '{0} is an unknown container.', key); + const errorMessage = nls.localize('unknownDashboardContainerError', '{0} is an unknown container.', key); error(errorMessage); - return { result: false, message: errorMessage, container: null }; + return { result: false, message: errorMessage, container: undefined }; } else { container = dashboardContainer.container; } } - return { result: true, message: null, container: container }; -} \ No newline at end of file + return { result: true, message: undefined, container: container }; +} diff --git a/src/sql/parts/dashboard/common/dashboardPage.component.html b/src/sql/workbench/parts/dashboard/common/dashboardPage.component.html similarity index 86% rename from src/sql/parts/dashboard/common/dashboardPage.component.html rename to src/sql/workbench/parts/dashboard/common/dashboardPage.component.html index e395408a87..3b4c4ea82a 100644 --- a/src/sql/parts/dashboard/common/dashboardPage.component.html +++ b/src/sql/workbench/parts/dashboard/common/dashboardPage.component.html @@ -4,10 +4,13 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ --> - - + + - + @@ -27,4 +30,4 @@ - + \ No newline at end of file diff --git a/src/sql/parts/dashboard/common/dashboardPage.component.ts b/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts similarity index 79% rename from src/sql/parts/dashboard/common/dashboardPage.component.ts rename to src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts index 19bbb8b106..93ca0f1c1d 100644 --- a/src/sql/parts/dashboard/common/dashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/common/dashboardPage.component.ts @@ -3,24 +3,24 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/parts/dashboard/common/dashboardPage'; -import 'sql/parts/dashboard/common/dashboardPanelStyles'; +import 'vs/css!sql/workbench/parts/dashboard/common/dashboardPage'; +import 'sql/workbench/parts/dashboard/common/dashboardPanelStyles'; import { Component, Inject, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, ChangeDetectorRef } from '@angular/core'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; -import { WidgetConfig, TabConfig, TabSettingConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { IPropertiesConfig } from 'sql/parts/dashboard/pages/serverDashboardPage.contribution'; +import { WidgetConfig, TabConfig, TabSettingConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { IPropertiesConfig } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution'; import { PanelComponent } from 'sql/base/browser/ui/panel/panel.component'; import { IDashboardRegistry, Extensions as DashboardExtensions, IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { PinUnpinTabAction, AddFeatureTabAction } from './actions'; import { TabComponent, TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; -import { DashboardTab, IConfigModifierCollection } from 'sql/parts/dashboard/common/interfaces'; -import * as dashboardHelper from 'sql/parts/dashboard/common/dashboardHelper'; -import { WIDGETS_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution'; +import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/common/interfaces'; +import * as dashboardHelper from 'sql/workbench/parts/dashboard/common/dashboardHelper'; +import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution'; import { AngularDisposable } from 'sql/base/node/lifecycle'; import * as Constants from 'sql/platform/connection/common/constants'; @@ -41,7 +41,7 @@ const dashboardRegistry = Registry.as(DashboardExtensions.Da @Component({ selector: 'dashboard-page', - templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/common/dashboardPage.component.html')) + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/common/dashboardPage.component.html')) }) export abstract class DashboardPage extends AngularDisposable implements IConfigModifierCollection { @@ -140,7 +140,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig allTabs = this.setAndRemoveHomeTab(allTabs, homeWidgets); // If preview features are disabled only show the home tab - let extensionTabsEnabled = this.configurationService.getValue('workbench')['enablePreviewFeatures']; + const extensionTabsEnabled = this.configurationService.getValue('workbench')['enablePreviewFeatures']; if (!extensionTabsEnabled) { allTabs = []; } @@ -148,18 +148,18 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig // Load tab setting configs this._tabSettingConfigs = this.dashboardService.getSettings>([this.context, 'tabs'].join('.')); - let pinnedDashboardTabs: IDashboardTab[] = []; - let alwaysShowTabs = allTabs.filter(tab => tab.alwaysShow); + const pinnedDashboardTabs: IDashboardTab[] = []; + const alwaysShowTabs = allTabs.filter(tab => tab.alwaysShow); this._tabSettingConfigs.forEach(config => { if (config.tabId && types.isBoolean(config.isPinned)) { - let tab = allTabs.find(i => i.id === config.tabId); + const tab = allTabs.find(i => i.id === config.tabId); if (tab) { if (config.isPinned) { pinnedDashboardTabs.push(tab); } else { // overwrite always show if specify in user settings - let index = alwaysShowTabs.findIndex(i => i.id === tab.id); + const index = alwaysShowTabs.findIndex(i => i.id === tab.id); alwaysShowTabs.splice(index, 1); } } @@ -170,9 +170,9 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig this.loadNewTabs(alwaysShowTabs); // Set panel actions - let openedTabs = [...pinnedDashboardTabs, ...alwaysShowTabs]; + const openedTabs = [...pinnedDashboardTabs, ...alwaysShowTabs]; if (extensionTabsEnabled) { - let addNewTabAction = this.instantiationService.createInstance(AddFeatureTabAction, allTabs, openedTabs, this.dashboardService.getUnderlyingUri()); + const addNewTabAction = this.instantiationService.createInstance(AddFeatureTabAction, allTabs, openedTabs, this.dashboardService.getUnderlyingUri()); this._tabsDispose.push(addNewTabAction); this.panelActions = [addNewTabAction]; } else { @@ -181,7 +181,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig this._cd.detectChanges(); this._tabsDispose.push(this.dashboardService.onPinUnpinTab(e => { - let tabConfig = this._tabSettingConfigs.find(i => i.tabId === e.tabId); + const tabConfig = this._tabSettingConfigs.find(i => i.tabId === e.tabId); if (tabConfig) { tabConfig.isPinned = e.isPinned; } else { @@ -196,7 +196,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig } private setAndRemoveHomeTab(allTabs: IDashboardTab[], homeWidgets: WidgetConfig[]): IDashboardTab[] { - let homeTabConfig: TabConfig = { + const homeTabConfig: TabConfig = { id: 'homeTab', provider: Constants.anyProviderName, publisher: undefined, @@ -209,11 +209,11 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig actions: [] }; - let homeTabIndex = allTabs.findIndex((tab) => tab.isHomeTab === true); + const homeTabIndex = allTabs.findIndex((tab) => tab.isHomeTab === true); if (homeTabIndex !== undefined && homeTabIndex > -1) { // Have a tab: get its information and copy over to the home tab definition - let homeTab = allTabs.splice(homeTabIndex, 1)[0]; - let tabConfig = this.initTabComponents(homeTab); + const homeTab = allTabs.splice(homeTabIndex, 1)[0]; + const tabConfig = this.initTabComponents(homeTab); homeTabConfig.id = tabConfig.id; homeTabConfig.container = tabConfig.container; } @@ -222,17 +222,17 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig } private rewriteConfig(): void { - let writeableConfig = objects.deepClone(this._tabSettingConfigs); + const writeableConfig = objects.deepClone(this._tabSettingConfigs); - let target: ConfigurationTarget = ConfigurationTarget.USER; + const target: ConfigurationTarget = ConfigurationTarget.USER; this.dashboardService.writeSettings([this.context, 'tabs'].join('.'), writeableConfig, target); } private loadNewTabs(dashboardTabs: IDashboardTab[], openLastTab: boolean = false) { if (dashboardTabs && dashboardTabs.length > 0) { - let selectedTabs = dashboardTabs.map(v => this.initTabComponents(v)).map(v => { - let actions = []; - let tabSettingConfig = this._tabSettingConfigs.find(i => i.tabId === v.id); + const selectedTabs = dashboardTabs.map(v => this.initTabComponents(v)).map(v => { + const actions = []; + const tabSettingConfig = this._tabSettingConfigs.find(i => i.tabId === v.id); let isPinned = false; if (tabSettingConfig) { isPinned = tabSettingConfig.isPinned; @@ -241,7 +241,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig } actions.push(this.instantiationService.createInstance(PinUnpinTabAction, v.id, this.dashboardService.getUnderlyingUri(), isPinned)); - let config = v as TabConfig; + const config = v as TabConfig; config.context = this.context; config.editable = false; config.canClose = true; @@ -253,7 +253,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig if (openLastTab) { // put this immediately on the stack so that is ran *after* the tab is rendered setTimeout(() => { - let selectedLastTab = selectedTabs.pop(); + const selectedLastTab = selectedTabs.pop(); this._panel.selectTab(selectedLastTab.id); }); } @@ -261,11 +261,11 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig } private initTabComponents(value: IDashboardTab): { id: string; title: string; container: object; alwaysShow: boolean; } { - let containerResult = dashboardHelper.getDashboardContainer(value.container); + const containerResult = dashboardHelper.getDashboardContainer(value.container); if (!containerResult.result) { return { id: value.id, title: value.title, container: { 'error-container': undefined }, alwaysShow: value.alwaysShow }; } - let key = Object.keys(containerResult.container)[0]; + const key = Object.keys(containerResult.container)[0]; if (key === WIDGETS_CONTAINER || key === GRID_CONTAINER) { let configs = Object.values(containerResult.container)[0]; this._configModifiers.forEach(cb => { @@ -284,12 +284,12 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig return { id: value.id, title: value.title, container: containerResult.container, alwaysShow: value.alwaysShow }; } - private getContentType(tab: TabConfig): string { + protected getContentType(tab: TabConfig): string { return tab.container ? Object.keys(tab.container)[0] : ''; } private addNewTab(tab: TabConfig): void { - let existedTab = this.tabs.find(i => i.id === tab.id); + const existedTab = this.tabs.find(i => i.id === tab.id); if (!existedTab) { this.tabs.push(tab); this._cd.detectChanges(); @@ -297,7 +297,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig } private getProperties(): Array { - let properties = this.dashboardService.getSettings([this.context, 'properties'].join('.')); + const properties = this.dashboardService.getSettings([this.context, 'properties'].join('.')); this._propertiesConfigLocation = 'default'; if (types.isUndefinedOrNull(properties)) { return [this.propertiesWidget]; @@ -307,7 +307,7 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig return [this.propertiesWidget]; } else if (types.isArray(properties)) { return properties.map((item) => { - let retVal = Object.assign({}, this.propertiesWidget); + const retVal = Object.assign({}, this.propertiesWidget); retVal.edition = item.edition; retVal.provider = item.provider; retVal.widget = { 'properties-widget': { properties: item.properties } }; @@ -340,13 +340,13 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig public handleTabChange(tab: TabComponent): void { this._cd.detectChanges(); - let localtab = this._tabs.find(i => i.id === tab.identifier); + const localtab = this._tabs.find(i => i.id === tab.identifier); this._editEnabled.fire(localtab.editable); this._cd.detectChanges(); } public handleTabClose(tab: TabComponent): void { - let index = this.tabs.findIndex(i => i.id === tab.identifier); + const index = this.tabs.findIndex(i => i.id === tab.identifier); this.tabs.splice(index, 1); this.angularEventingService.sendAngularEvent(this.dashboardService.getUnderlyingUri(), AngularEventType.CLOSE_TAB, { id: tab.identifier }); } diff --git a/src/sql/parts/dashboard/common/dashboardPage.css b/src/sql/workbench/parts/dashboard/common/dashboardPage.css similarity index 100% rename from src/sql/parts/dashboard/common/dashboardPage.css rename to src/sql/workbench/parts/dashboard/common/dashboardPage.css diff --git a/src/sql/parts/dashboard/common/dashboardPanel.css b/src/sql/workbench/parts/dashboard/common/dashboardPanel.css similarity index 100% rename from src/sql/parts/dashboard/common/dashboardPanel.css rename to src/sql/workbench/parts/dashboard/common/dashboardPanel.css diff --git a/src/sql/parts/dashboard/common/dashboardPanelStyles.ts b/src/sql/workbench/parts/dashboard/common/dashboardPanelStyles.ts similarity index 99% rename from src/sql/parts/dashboard/common/dashboardPanelStyles.ts rename to src/sql/workbench/parts/dashboard/common/dashboardPanelStyles.ts index e794bee450..77a375ba56 100644 --- a/src/sql/parts/dashboard/common/dashboardPanelStyles.ts +++ b/src/sql/workbench/parts/dashboard/common/dashboardPanelStyles.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 'vs/css!./dashboardPanel'; import { registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; diff --git a/src/sql/parts/dashboard/common/dashboardTab.contribution.ts b/src/sql/workbench/parts/dashboard/common/dashboardTab.contribution.ts similarity index 91% rename from src/sql/parts/dashboard/common/dashboardTab.contribution.ts rename to src/sql/workbench/parts/dashboard/common/dashboardTab.contribution.ts index ada6426844..af06d7cc14 100644 --- a/src/sql/parts/dashboard/common/dashboardTab.contribution.ts +++ b/src/sql/workbench/parts/dashboard/common/dashboardTab.contribution.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 { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { localize } from 'vs/nls'; @@ -10,9 +11,9 @@ import * as types from 'vs/base/common/types'; import * as Constants from 'sql/platform/connection/common/constants'; import { registerTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { generateContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; -import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/parts/dashboard/containers/dashboardNavSection.contribution'; -import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution'; +import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution'; +import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution'; export interface IDashboardTabContrib { id: string; @@ -85,7 +86,7 @@ ExtensionsRegistry.registerExtensionPoint(value)) { - for (let command of value) { + for (const command of value) { handleCommand(command, extension); } } else { diff --git a/src/sql/parts/dashboard/common/dashboardWidget.ts b/src/sql/workbench/parts/dashboard/common/dashboardWidget.ts similarity index 99% rename from src/sql/parts/dashboard/common/dashboardWidget.ts rename to src/sql/workbench/parts/dashboard/common/dashboardWidget.ts index e51719b3df..82cde59ca4 100644 --- a/src/sql/parts/dashboard/common/dashboardWidget.ts +++ b/src/sql/workbench/parts/dashboard/common/dashboardWidget.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 { InjectionToken, OnDestroy } from '@angular/core'; import { NgGridItemConfig } from 'angular2-grid'; import { Action } from 'vs/base/common/actions'; diff --git a/src/sql/parts/dashboard/common/interfaces.ts b/src/sql/workbench/parts/dashboard/common/interfaces.ts similarity index 100% rename from src/sql/parts/dashboard/common/interfaces.ts rename to src/sql/workbench/parts/dashboard/common/interfaces.ts diff --git a/src/sql/parts/dashboard/containers/dashboardContainer.contribution.ts b/src/sql/workbench/parts/dashboard/containers/dashboardContainer.contribution.ts similarity index 83% rename from src/sql/parts/dashboard/containers/dashboardContainer.contribution.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardContainer.contribution.ts index 00d290a0d3..1ceb9c34bb 100644 --- a/src/sql/parts/dashboard/containers/dashboardContainer.contribution.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardContainer.contribution.ts @@ -2,18 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { localize } from 'vs/nls'; -import { join } from 'path'; -import { createCSSRule } from 'vs/base/browser/dom'; -import { URI } from 'vs/base/common/uri'; import { registerContainer, generateContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; -import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/parts/dashboard/containers/dashboardNavSection.contribution'; -import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution'; -import { WEBVIEW_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWebviewContainer.contribution'; +import { NAV_SECTION, validateNavSectionContributionAndRegisterIcon } from 'sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution'; +import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution'; +import { WEBVIEW_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.contribution'; const containerTypes = [ WIDGETS_CONTAINER, @@ -58,7 +56,7 @@ const containerContributionSchema: IJSONSchema = { ExtensionsRegistry.registerExtensionPoint({ extensionPoint: 'dashboard.containers', jsonSchema: containerContributionSchema }).setHandler(extensions => { function handleCommand(dashboardContainer: IDashboardContainerContrib, extension: IExtensionPointUser) { - let { id, container } = dashboardContainer; + const { id, container } = dashboardContainer; if (!id) { extension.collector.error(localize('dashboardContainer.contribution.noIdError', 'No id in dashboard container specified for extension.')); return; @@ -74,10 +72,10 @@ ExtensionsRegistry.registerExtensionPoint (c === containerkey)); + const containerTypeFound = containerTypes.find(c => (c === containerkey)); if (!containerTypeFound) { extension.collector.error(localize('dashboardTab.contribution.unKnownContainerType', 'Unknown container type defines in dashboard container for extension.')); return; @@ -100,10 +98,10 @@ ExtensionsRegistry.registerExtensionPoint(value)) { - for (let command of value) { + for (const command of value) { handleCommand(command, extension); } } else { diff --git a/src/sql/parts/dashboard/containers/dashboardControlHostContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.component.ts similarity index 84% rename from src/sql/parts/dashboard/containers/dashboardControlHostContainer.component.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.component.ts index 9436458b97..8bbdf9226c 100644 --- a/src/sql/parts/dashboard/containers/dashboardControlHostContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.component.ts @@ -2,15 +2,16 @@ * 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!./dashboardControlHostContainer'; import { Component, forwardRef, Input, AfterContentInit, ViewChild, OnChanges } from '@angular/core'; import { Event, Emitter } from 'vs/base/common/event'; -import { DashboardTab } from 'sql/parts/dashboard/common/interfaces'; -import { TabConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { ControlHostContent } from 'sql/parts/dashboard/contents/controlHostContent.component'; +import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; +import { TabConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { ControlHostContent } from 'sql/workbench/parts/dashboard/contents/controlHostContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; @Component({ @@ -38,7 +39,7 @@ export class DashboardControlHostContainer extends DashboardTab implements After this._onResize.fire(); })); - let container = this.tab.container; + const container = this.tab.container; if (container['controlhost-container'] && container['controlhost-container'].type) { this._hostContent.setControlType(container['controlhost-container'].type); } diff --git a/src/sql/parts/dashboard/containers/dashboardControlHostContainer.contribution.ts b/src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.contribution.ts similarity index 99% rename from src/sql/parts/dashboard/containers/dashboardControlHostContainer.contribution.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.contribution.ts index 90b2a24e3d..398d4ccca8 100644 --- a/src/sql/parts/dashboard/containers/dashboardControlHostContainer.contribution.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.contribution.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 { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; diff --git a/src/sql/parts/dashboard/containers/dashboardControlHostContainer.css b/src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.css similarity index 100% rename from src/sql/parts/dashboard/containers/dashboardControlHostContainer.css rename to src/sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.css diff --git a/src/sql/parts/dashboard/containers/dashboardErrorContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardErrorContainer.component.ts similarity index 87% rename from src/sql/parts/dashboard/containers/dashboardErrorContainer.component.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardErrorContainer.component.ts index 07eb712b30..9a9a869e3a 100644 --- a/src/sql/parts/dashboard/containers/dashboardErrorContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardErrorContainer.component.ts @@ -7,8 +7,8 @@ import 'vs/css!./dashboardErrorContainer'; import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ChangeDetectorRef, AfterViewInit } from '@angular/core'; -import { TabConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardTab } from 'sql/parts/dashboard/common/interfaces'; +import { TabConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Event, Emitter } from 'vs/base/common/event'; @@ -39,7 +39,7 @@ export class DashboardErrorContainer extends DashboardTab implements AfterViewIn } ngAfterViewInit() { - let errorMessage = this._errorMessageContainer.nativeElement as HTMLElement; + const errorMessage = this._errorMessageContainer.nativeElement as HTMLElement; errorMessage.innerText = nls.localize('dashboardNavSection_loadTabError', 'The "{0}" section has invalid content. Please contact extension owner.', this.tab.title); } diff --git a/src/sql/parts/dashboard/containers/dashboardErrorContainer.css b/src/sql/workbench/parts/dashboard/containers/dashboardErrorContainer.css similarity index 100% rename from src/sql/parts/dashboard/containers/dashboardErrorContainer.css rename to src/sql/workbench/parts/dashboard/containers/dashboardErrorContainer.css diff --git a/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.html b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.html new file mode 100644 index 0000000000..424f01c43c --- /dev/null +++ b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.html @@ -0,0 +1,28 @@ + +
+ + + + + + + + +
+ + + + + + + +
+
\ No newline at end of file diff --git a/src/sql/parts/dashboard/containers/dashboardGridContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts similarity index 79% rename from src/sql/parts/dashboard/containers/dashboardGridContainer.component.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts index fd9e513c76..2ee415f0d6 100644 --- a/src/sql/parts/dashboard/containers/dashboardGridContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.ts @@ -8,10 +8,10 @@ import 'vs/css!./dashboardGridContainer'; import { Component, Inject, Input, forwardRef, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef } from '@angular/core'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { TabConfig, WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardWidgetWrapper } from 'sql/parts/dashboard/contents/dashboardWidgetWrapper.component'; -import { DashboardTab } from 'sql/parts/dashboard/common/interfaces'; -import { WebviewContent } from 'sql/parts/dashboard/contents/webviewContent.component'; +import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component'; +import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; +import { WebviewContent } from 'sql/workbench/parts/dashboard/contents/webviewContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Event, Emitter } from 'vs/base/common/event'; @@ -35,7 +35,7 @@ export interface GridWebviewConfig extends GridCellConfig { @Component({ selector: 'dashboard-grid-container', - templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/containers/dashboardGridContainer.component.html')), + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/containers/dashboardGridContainer.component.html')), providers: [{ provide: TabChild, useExisting: forwardRef(() => DashboardGridContainer) }] }) export class DashboardGridContainer extends DashboardTab implements OnDestroy { @@ -52,14 +52,14 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy { protected cols: number[]; protected getContent(row: number, col: number): GridCellConfig { - let widget = this._contents.filter(w => w.row === row && w.col === col); + const widget = this._contents.filter(w => w.row === row && w.col === col); return widget ? widget[0] : undefined; } protected getWidgetContent(row: number, col: number): GridWidgetConfig { - let content = this.getContent(row, col); + const content = this.getContent(row, col); if (content) { - let widgetConfig = content; + const widgetConfig = content; if (widgetConfig && widgetConfig.widget) { return widgetConfig; } @@ -68,9 +68,9 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy { } protected getWebviewContent(row: number, col: number): GridWebviewConfig { - let content = this.getContent(row, col); + const content = this.getContent(row, col); if (content) { - let webviewConfig = content; + const webviewConfig = content; if (webviewConfig && webviewConfig.webview) { return webviewConfig; } @@ -80,17 +80,17 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy { protected isWidget(row: number, col: number): boolean { - let widgetConfig = this.getWidgetContent(row, col); + const widgetConfig = this.getWidgetContent(row, col); return widgetConfig !== undefined; } protected isWebview(row: number, col: number): boolean { - let webview = this.getWebviewContent(row, col); + const webview = this.getWebviewContent(row, col); return webview !== undefined; } protected getWebviewId(row: number, col: number): string { - let widgetConfig = this.getWebviewContent(row, col); + const widgetConfig = this.getWebviewContent(row, col); if (widgetConfig && widgetConfig.webview) { return widgetConfig.webview.id; } @@ -98,7 +98,7 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy { } protected getColspan(row: number, col: number): string { - let content = this.getContent(row, col); + const content = this.getContent(row, col); let colspan: string = '1'; if (content && content.colspan) { colspan = this.convertToNumber(content.colspan, this.cols.length).toString(); @@ -107,7 +107,7 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy { } protected getRowspan(row: number, col: number): string { - let content = this.getContent(row, col); + const content = this.getContent(row, col); if (content && (content.rowspan)) { return this.convertToNumber(content.rowspan, this.rows.length).toString(); } else { @@ -116,17 +116,15 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy { } protected getWidgetWidth(row: number, col: number): string { - let content = this.getContent(row, col); - let colspan = this.getColspan(row, col); - let columnCount = this.convertToNumber(colspan, this.cols.length); + const colspan = this.getColspan(row, col); + const columnCount = this.convertToNumber(colspan, this.cols.length); return columnCount * this.cellWidth + 'px'; } protected getWidgetHeight(row: number, col: number): string { - let content = this.getContent(row, col); - let rowspan = this.getRowspan(row, col); - let rowCount = this.convertToNumber(rowspan, this.rows.length); + const rowspan = this.getRowspan(row, col); + const rowCount = this.convertToNumber(rowspan, this.rows.length); return rowCount * this.cellHeight + 'px'; } @@ -181,7 +179,7 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy { } private createIndexes(indexes: number[]) { - let max = Math.max(...indexes) + 1; + const max = Math.max(...indexes) + 1; return Array(max).fill(0).map((x, i) => i); } diff --git a/src/sql/parts/dashboard/containers/dashboardGridContainer.contribution.ts b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution.ts similarity index 85% rename from src/sql/parts/dashboard/containers/dashboardGridContainer.contribution.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution.ts index 89600c3211..02fb3b3a63 100644 --- a/src/sql/parts/dashboard/containers/dashboardGridContainer.contribution.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution.ts @@ -2,11 +2,12 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { generateDashboardGridLayoutSchema } from 'sql/parts/dashboard/pages/dashboardPageContribution'; +import { generateDashboardGridLayoutSchema } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution'; import { registerContainerType, registerNavSectionContainerType } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; export const GRID_CONTAINER = 'grid-container'; @@ -23,8 +24,8 @@ registerNavSectionContainerType(GRID_CONTAINER, gridContainersSchema); export function validateGridContainerContribution(extension: IExtensionPointUser, gridConfigs: object[]): boolean { let result = true; gridConfigs.forEach(widgetConfig => { - let allKeys = Object.keys(widgetConfig); - let widgetOrWebviewKey = allKeys.find(key => key === 'widget' || key === 'webview'); + const allKeys = Object.keys(widgetConfig); + const widgetOrWebviewKey = allKeys.find(key => key === 'widget' || key === 'webview'); if (!widgetOrWebviewKey) { result = false; extension.collector.error(nls.localize('gridContainer.invalidInputs', 'widgets or webviews are expected inside widgets-container for extension.')); diff --git a/src/sql/parts/dashboard/containers/dashboardGridContainer.css b/src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.css similarity index 100% rename from src/sql/parts/dashboard/containers/dashboardGridContainer.css rename to src/sql/workbench/parts/dashboard/containers/dashboardGridContainer.css diff --git a/src/sql/parts/dashboard/containers/dashboardHomeContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts similarity index 85% rename from src/sql/parts/dashboard/containers/dashboardHomeContainer.component.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts index 6838bc7ee4..7e5e9029c1 100644 --- a/src/sql/parts/dashboard/containers/dashboardHomeContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.component.ts @@ -7,12 +7,12 @@ import 'vs/css!./dashboardHomeContainer'; import { Component, forwardRef, Input, ChangeDetectorRef, Inject, ViewChild, ContentChild } from '@angular/core'; -import { DashboardWidgetContainer } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.component'; -import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +import { DashboardWidgetContainer } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component'; +import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { AngularEventType, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; -import { DashboardWidgetWrapper } from 'sql/parts/dashboard/contents/dashboardWidgetWrapper.component'; +import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component'; import { ScrollableDirective } from 'sql/base/browser/ui/scrollable/scrollable.directive'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; @@ -51,7 +51,7 @@ export class DashboardHomeContainer extends DashboardWidgetContainer { } ngAfterContentInit() { - let collapsedVal = this.dashboardService.getSettings(`${this.properties.context}.properties`); + const collapsedVal = this.dashboardService.getSettings(`${this.properties.context}.properties`); if (collapsedVal === 'collapsed') { this._propertiesClass.collapsed = true; } diff --git a/src/sql/parts/dashboard/containers/dashboardHomeContainer.css b/src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.css similarity index 100% rename from src/sql/parts/dashboard/containers/dashboardHomeContainer.css rename to src/sql/workbench/parts/dashboard/containers/dashboardHomeContainer.css diff --git a/src/sql/parts/dashboard/containers/dashboardModelViewContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts similarity index 90% rename from src/sql/parts/dashboard/containers/dashboardModelViewContainer.component.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts index ac32f04644..2f0e0bb966 100644 --- a/src/sql/parts/dashboard/containers/dashboardModelViewContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component.ts @@ -2,14 +2,15 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import 'vs/css!./dashboardWebviewContainer'; import { Component, forwardRef, Input, AfterContentInit, ViewChild } from '@angular/core'; import { Event, Emitter } from 'vs/base/common/event'; -import { DashboardTab } from 'sql/parts/dashboard/common/interfaces'; -import { TabConfig } from 'sql/parts/dashboard/common/dashboardWidget'; +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 { TabChild } from 'sql/base/browser/ui/panel/tab.component'; diff --git a/src/sql/parts/dashboard/containers/dashboardModelViewContainer.contribution.ts b/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.contribution.ts similarity index 99% rename from src/sql/parts/dashboard/containers/dashboardModelViewContainer.contribution.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.contribution.ts index abfa3b66cc..8356791a07 100644 --- a/src/sql/parts/dashboard/containers/dashboardModelViewContainer.contribution.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.contribution.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 { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; diff --git a/src/sql/parts/dashboard/containers/dashboardModelViewContainer.css b/src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.css similarity index 100% rename from src/sql/parts/dashboard/containers/dashboardModelViewContainer.css rename to src/sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.css diff --git a/src/sql/parts/dashboard/containers/dashboardNavSection.component.html b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.html similarity index 100% rename from src/sql/parts/dashboard/containers/dashboardNavSection.component.html rename to src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.html diff --git a/src/sql/parts/dashboard/containers/dashboardNavSection.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts similarity index 82% rename from src/sql/parts/dashboard/containers/dashboardNavSection.component.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts index 7cdeda2687..ab337097c9 100644 --- a/src/sql/parts/dashboard/containers/dashboardNavSection.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.component.ts @@ -8,22 +8,21 @@ import 'vs/css!./dashboardNavSection'; import { Component, Inject, Input, forwardRef, ViewChild, ElementRef, ViewChildren, QueryList, OnDestroy, ChangeDetectorRef, OnChanges, AfterContentInit } from '@angular/core'; import { CommonServiceInterface, SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; -import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/parts/dashboard/common/dashboardWidget'; +import { WidgetConfig, TabConfig, NavSectionConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { PanelComponent, IPanelOptions, NavigationBarLayout } from 'sql/base/browser/ui/panel/panel.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; -import { DashboardTab, IConfigModifierCollection } from 'sql/parts/dashboard/common/interfaces'; -import { WIDGETS_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution'; -import * as dashboardHelper from 'sql/parts/dashboard/common/dashboardHelper'; +import { DashboardTab, IConfigModifierCollection } from 'sql/workbench/parts/dashboard/common/interfaces'; +import { WIDGETS_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution'; +import * as dashboardHelper from 'sql/workbench/parts/dashboard/common/dashboardHelper'; import { Event, Emitter } from 'vs/base/common/event'; -import * as nls from 'vs/nls'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @Component({ selector: 'dashboard-nav-section', providers: [{ provide: TabChild, useExisting: forwardRef(() => DashboardNavSection) }], - templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/containers/dashboardNavSection.component.html')) + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/containers/dashboardNavSection.component.html')) }) export class DashboardNavSection extends DashboardTab implements OnDestroy, OnChanges, AfterContentInit, IConfigModifierCollection { @Input() private tab: TabConfig; @@ -91,14 +90,13 @@ export class DashboardNavSection extends DashboardTab implements OnDestroy, OnCh private loadNewTabs(dashboardTabs: NavSectionConfig[]) { if (dashboardTabs && dashboardTabs.length > 0) { - let selectedTabs = dashboardTabs.map(v => { - - let containerResult = dashboardHelper.getDashboardContainer(v.container); + dashboardTabs.map(v => { + const containerResult = dashboardHelper.getDashboardContainer(v.container); if (!containerResult.result) { return { id: v.id, title: v.title, container: { 'error-container': undefined } }; } - let key = Object.keys(containerResult.container)[0]; + const key = Object.keys(containerResult.container)[0]; if (key === WIDGETS_CONTAINER || key === GRID_CONTAINER) { let configs = Object.values(containerResult.container)[0]; this._configModifiers.forEach(cb => { @@ -116,7 +114,7 @@ export class DashboardNavSection extends DashboardTab implements OnDestroy, OnCh } return { id: v.id, title: v.title, container: containerResult.container, iconClass: v.iconClass }; }).map(v => { - let config = v as TabConfig; + const config = v as TabConfig; config.context = this.tab.context; config.editable = false; config.canClose = false; @@ -127,14 +125,14 @@ export class DashboardNavSection extends DashboardTab implements OnDestroy, OnCh } private addNewTab(tab: TabConfig): void { - let existedTab = this.tabs.find(i => i.id === tab.id); + const existedTab = this.tabs.find(i => i.id === tab.id); if (!existedTab) { this.tabs.push(tab); this._cd.detectChanges(); } } - private getContentType(tab: TabConfig): string { + protected getContentType(tab: TabConfig): string { return tab.container ? Object.keys(tab.container)[0] : ''; } @@ -147,8 +145,8 @@ export class DashboardNavSection extends DashboardTab implements OnDestroy, OnCh } public layout() { - let activeTabId = this._panel.getActiveTab; - let localtab = this._tabs.find(i => i.id === activeTabId); + const activeTabId = this._panel.getActiveTab; + const localtab = this._tabs.find(i => i.id === activeTabId); this._cd.detectChanges(); localtab.layout(); } diff --git a/src/sql/parts/dashboard/containers/dashboardNavSection.contribution.ts b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution.ts similarity index 92% rename from src/sql/parts/dashboard/containers/dashboardNavSection.contribution.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution.ts index a05e5e1166..9fbf4aed64 100644 --- a/src/sql/parts/dashboard/containers/dashboardNavSection.contribution.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution.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 { IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; @@ -10,10 +11,10 @@ import { createCSSRule } from 'vs/base/browser/dom'; import { URI } from 'vs/base/common/uri'; import { IdGenerator } from 'vs/base/common/idGenerator'; -import { NavSectionConfig, IUserFriendlyIcon } from 'sql/parts/dashboard/common/dashboardWidget'; +import { NavSectionConfig, IUserFriendlyIcon } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { registerContainerType, generateNavSectionContainerTypeSchemaProperties } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; -import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution'; -import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/parts/dashboard/containers/dashboardGridContainer.contribution'; +import { WIDGETS_CONTAINER, validateWidgetContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution'; +import { GRID_CONTAINER, validateGridContainerContribution } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution'; export const NAV_SECTION = 'nav-section'; @@ -55,7 +56,7 @@ const navSectionContainerSchema: IJSONSchema = { } }; -let NavSectionSchema: IJSONSchema = { +const NavSectionSchema: IJSONSchema = { type: 'array', description: nls.localize('dashboard.container.left-nav-bar', "The list of dashboard containers that will be displayed in this navigation section."), items: navSectionContainerSchema @@ -117,8 +118,8 @@ export function validateNavSectionContributionAndRegisterIcon(extension: IExtens section.iconClass = createCSSRuleForIcon(section.icon, extension); } - let containerKey = Object.keys(section.container)[0]; - let containerValue = Object.values(section.container)[0]; + const containerKey = Object.keys(section.container)[0]; + const containerValue = Object.values(section.container)[0]; switch (containerKey) { case WIDGETS_CONTAINER: @@ -135,4 +136,4 @@ export function validateNavSectionContributionAndRegisterIcon(extension: IExtens }); return result; -} \ No newline at end of file +} diff --git a/src/sql/parts/dashboard/containers/dashboardNavSection.css b/src/sql/workbench/parts/dashboard/containers/dashboardNavSection.css similarity index 100% rename from src/sql/parts/dashboard/containers/dashboardNavSection.css rename to src/sql/workbench/parts/dashboard/containers/dashboardNavSection.css diff --git a/src/sql/parts/dashboard/containers/dashboardWebviewContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.component.ts similarity index 85% rename from src/sql/parts/dashboard/containers/dashboardWebviewContainer.component.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.component.ts index dc19c04ae6..03399ed1cc 100644 --- a/src/sql/parts/dashboard/containers/dashboardWebviewContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.component.ts @@ -2,15 +2,16 @@ * 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!./dashboardWebviewContainer'; import { Component, forwardRef, Input, AfterContentInit, ViewChild } from '@angular/core'; import { Event, Emitter } from 'vs/base/common/event'; -import { DashboardTab } from 'sql/parts/dashboard/common/interfaces'; -import { TabConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { WebviewContent } from 'sql/parts/dashboard/contents/webviewContent.component'; +import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; +import { TabConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { WebviewContent } from 'sql/workbench/parts/dashboard/contents/webviewContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; @Component({ diff --git a/src/sql/parts/dashboard/containers/dashboardWebviewContainer.contribution.ts b/src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.contribution.ts similarity index 99% rename from src/sql/parts/dashboard/containers/dashboardWebviewContainer.contribution.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.contribution.ts index 86d1366c3b..9992519e66 100644 --- a/src/sql/parts/dashboard/containers/dashboardWebviewContainer.contribution.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.contribution.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 { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; diff --git a/src/sql/parts/dashboard/containers/dashboardWebviewContainer.css b/src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.css similarity index 100% rename from src/sql/parts/dashboard/containers/dashboardWebviewContainer.css rename to src/sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.css diff --git a/src/sql/parts/dashboard/containers/dashboardWidgetContainer.component.ts b/src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component.ts similarity index 88% rename from src/sql/parts/dashboard/containers/dashboardWidgetContainer.component.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component.ts index ff3c99d1fa..d5fa78aa4f 100644 --- a/src/sql/parts/dashboard/containers/dashboardWidgetContainer.component.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component.ts @@ -7,9 +7,9 @@ import 'vs/css!./dashboardWidgetContainer'; import { Component, Inject, Input, forwardRef, ViewChild, OnDestroy, ChangeDetectorRef, AfterContentInit } from '@angular/core'; -import { TabConfig, WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardTab } from 'sql/parts/dashboard/common/interfaces'; -import { WidgetContent } from 'sql/parts/dashboard/contents/widgetContent.component'; +import { TabConfig, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { DashboardTab } from 'sql/workbench/parts/dashboard/common/interfaces'; +import { WidgetContent } from 'sql/workbench/parts/dashboard/contents/widgetContent.component'; import { TabChild } from 'sql/base/browser/ui/panel/tab.component'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/parts/dashboard/containers/dashboardWidgetContainer.contribution.ts b/src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution.ts similarity index 84% rename from src/sql/parts/dashboard/containers/dashboardWidgetContainer.contribution.ts rename to src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution.ts index 0b0c6a33dd..ab7a3cf9e2 100644 --- a/src/sql/parts/dashboard/containers/dashboardWidgetContainer.contribution.ts +++ b/src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution.ts @@ -2,13 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { IExtensionPointUser } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { generateDashboardWidgetSchema } from 'sql/parts/dashboard/pages/dashboardPageContribution'; +import { generateDashboardWidgetSchema } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution'; import { registerContainerType, registerNavSectionContainerType } from 'sql/platform/dashboard/common/dashboardContainerRegistry'; -import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; export const WIDGETS_CONTAINER = 'widgets-container'; @@ -24,12 +24,12 @@ registerNavSectionContainerType(WIDGETS_CONTAINER, widgetsSchema); export function validateWidgetContainerContribution(extension: IExtensionPointUser, WidgetConfigs: object[]): boolean { let result = true; WidgetConfigs.forEach(widgetConfig => { - let allKeys = Object.keys(widgetConfig); - let widgetKey = allKeys.find(key => key === 'widget'); + const allKeys = Object.keys(widgetConfig); + const widgetKey = allKeys.find(key => key === 'widget'); if (!widgetKey) { result = false; extension.collector.error(nls.localize('widgetContainer.invalidInputs', 'The list of widgets is expected inside widgets-container for extension.')); } }); return result; -} \ No newline at end of file +} diff --git a/src/sql/parts/dashboard/containers/dashboardWidgetContainer.css b/src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.css similarity index 100% rename from src/sql/parts/dashboard/containers/dashboardWidgetContainer.css rename to src/sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.css diff --git a/src/sql/parts/dashboard/contents/controlHostContent.component.html b/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.html similarity index 100% rename from src/sql/parts/dashboard/contents/controlHostContent.component.html rename to src/sql/workbench/parts/dashboard/contents/controlHostContent.component.html diff --git a/src/sql/parts/dashboard/contents/controlHostContent.component.ts b/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts similarity index 85% rename from src/sql/parts/dashboard/contents/controlHostContent.component.ts rename to src/sql/workbench/parts/dashboard/contents/controlHostContent.component.ts index 3f12cbd4fb..6900b30059 100644 --- a/src/sql/parts/dashboard/contents/controlHostContent.component.ts +++ b/src/sql/workbench/parts/dashboard/contents/controlHostContent.component.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 'vs/css!./controlHostContent'; import { Component, forwardRef, Input, OnInit, Inject, ChangeDetectorRef, ElementRef, ViewChild } from '@angular/core'; @@ -12,10 +13,10 @@ import { CommonServiceInterface } from 'sql/services/common/commonServiceInterfa import * as azdata from 'azdata'; import { memoize } from 'vs/base/common/decorators'; -import { AgentViewComponent } from '../../jobManagement/agent/agentView.component'; +import { AgentViewComponent } from '../../../../parts/jobManagement/agent/agentView.component'; @Component({ - templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/contents/controlHostContent.component.html')), + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/contents/controlHostContent.component.html')), selector: 'controlhost-content' }) export class ControlHostContent { @@ -49,8 +50,8 @@ export class ControlHostContent { @memoize public get connection(): azdata.connection.Connection { - let currentConnection = this._dashboardService.connectionManagementService.connectionInfo.connectionProfile; - let connection: azdata.connection.Connection = { + const currentConnection = this._dashboardService.connectionManagementService.connectionInfo.connectionProfile; + const connection: azdata.connection.Connection = { providerName: currentConnection.providerName, connectionId: currentConnection.id, options: currentConnection.options diff --git a/src/sql/parts/dashboard/contents/controlHostContent.css b/src/sql/workbench/parts/dashboard/contents/controlHostContent.css similarity index 100% rename from src/sql/parts/dashboard/contents/controlHostContent.css rename to src/sql/workbench/parts/dashboard/contents/controlHostContent.css diff --git a/src/sql/parts/dashboard/contents/dashboardWidgetWrapper.component.html b/src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.html similarity index 100% rename from src/sql/parts/dashboard/contents/dashboardWidgetWrapper.component.html rename to src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.html diff --git a/src/sql/parts/dashboard/contents/dashboardWidgetWrapper.component.ts b/src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.ts similarity index 80% rename from src/sql/parts/dashboard/contents/dashboardWidgetWrapper.component.ts rename to src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.ts index 5175c7b95c..8b2da5f525 100644 --- a/src/sql/parts/dashboard/contents/dashboardWidgetWrapper.component.ts +++ b/src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.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 'vs/css!sql/media/icons/common-icons'; import 'vs/css!./dashboardWidgetWrapper'; @@ -10,19 +11,19 @@ import { ElementRef, OnInit, ChangeDetectorRef, ReflectiveInjector, Injector, Type, ComponentRef } from '@angular/core'; -import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; -import { WidgetConfig, WIDGET_CONFIG, IDashboardWidget } from 'sql/parts/dashboard/common/dashboardWidget'; +import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; +import { WidgetConfig, WIDGET_CONFIG, IDashboardWidget } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { error } from 'sql/base/common/log'; -import { RefreshWidgetAction, ToggleMoreWidgetAction, DeleteWidgetAction, CollapseWidgetAction } from 'sql/parts/dashboard/common/actions'; +import { RefreshWidgetAction, ToggleMoreWidgetAction, DeleteWidgetAction, CollapseWidgetAction } from 'sql/workbench/parts/dashboard/common/actions'; import { AngularDisposable } from 'sql/base/node/lifecycle'; /* Widgets */ -import { PropertiesWidgetComponent } from 'sql/parts/dashboard/widgets/properties/propertiesWidget.component'; -import { ExplorerWidget } from 'sql/parts/dashboard/widgets/explorer/explorerWidget.component'; -import { TasksWidget } from 'sql/parts/dashboard/widgets/tasks/tasksWidget.component'; -import { InsightsWidget } from 'sql/parts/dashboard/widgets/insights/insightsWidget.component'; -import { WebviewWidget } from 'sql/parts/dashboard/widgets/webview/webviewWidget.component'; +import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component'; +import { ExplorerWidget } from 'sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component'; +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 { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; @@ -46,7 +47,7 @@ const componentMap: { [x: string]: Type } = { @Component({ selector: 'dashboard-widget-wrapper', - templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/contents/dashboardWidgetWrapper.component.html')) + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component.html')) }) export class DashboardWidgetWrapper extends AngularDisposable implements OnInit { @Input() private _config: WidgetConfig; @@ -97,9 +98,8 @@ export class DashboardWidgetWrapper extends AngularDisposable implements OnInit } ngOnInit() { - let self = this; - this._register(self.themeService.onDidColorThemeChange((event: IColorTheme) => { - self.updateTheme(event); + this._register(this.themeService.onDidColorThemeChange((event: IColorTheme) => { + this.updateTheme(event); })); } @@ -149,8 +149,8 @@ export class DashboardWidgetWrapper extends AngularDisposable implements OnInit error('Exactly 1 widget must be defined per space'); return; } - let key = Object.keys(this._config.widget)[0]; - let selector = this.getOrCreateSelector(key); + const key = Object.keys(this._config.widget)[0]; + const selector = this.getOrCreateSelector(key); if (selector === undefined) { error('Could not find selector', key); return; @@ -158,23 +158,23 @@ export class DashboardWidgetWrapper extends AngularDisposable implements OnInit // If _config.name is not set, set it to _config.widget.name if (!this._config.name) { - let widget = Object.values(this._config.widget)[0]; + const widget = Object.values(this._config.widget)[0]; if (widget.name) { this._config.name = widget.name; } } - let componentFactory = this._componentFactoryResolver.resolveComponentFactory(selector); + const componentFactory = this._componentFactoryResolver.resolveComponentFactory(selector); - let viewContainerRef = this.componentHost.viewContainerRef; + const viewContainerRef = this.componentHost.viewContainerRef; viewContainerRef.clear(); - let injector = ReflectiveInjector.resolveAndCreate([{ provide: WIDGET_CONFIG, useValue: this._config }], this._injector); + const injector = ReflectiveInjector.resolveAndCreate([{ provide: WIDGET_CONFIG, useValue: this._config }], this._injector); let componentRef: ComponentRef; try { componentRef = viewContainerRef.createComponent(componentFactory, 0, injector); this._component = componentRef.instance; - let actions = componentRef.instance.actions; + const actions = componentRef.instance.actions; if (componentRef.instance.refresh) { actions.push(new RefreshWidgetAction(this.refresh, this)); } @@ -186,7 +186,7 @@ export class DashboardWidgetWrapper extends AngularDisposable implements OnInit error('Error rendering widget', key, e); return; } - let el = componentRef.location.nativeElement; + const el = componentRef.location.nativeElement; // set widget styles to conform to its box el.style.overflow = 'hidden'; @@ -207,8 +207,8 @@ export class DashboardWidgetWrapper extends AngularDisposable implements OnInit let selector = componentMap[key]; if (selector === undefined) { // Load the widget from the registry - let widgetRegistry = Registry.as(Extensions.InsightContribution); - let insightConfig = widgetRegistry.getRegisteredExtensionInsights(key); + const widgetRegistry = Registry.as(Extensions.InsightContribution); + const insightConfig = widgetRegistry.getRegisteredExtensionInsights(key); if (insightConfig === undefined) { return undefined; } @@ -221,12 +221,12 @@ export class DashboardWidgetWrapper extends AngularDisposable implements OnInit } private updateTheme(theme: IColorTheme): void { - let el = this._ref.nativeElement; - let headerEl: HTMLElement = this.header.nativeElement; + const el = this._ref.nativeElement; + const headerEl: HTMLElement = this.header.nativeElement; let borderColor = theme.getColor(themeColors.SIDE_BAR_BACKGROUND, true); let backgroundColor = theme.getColor(colors.editorBackground, true); - let foregroundColor = theme.getColor(themeColors.SIDE_BAR_FOREGROUND, true); - let border = theme.getColor(colors.contrastBorder, true); + const foregroundColor = theme.getColor(themeColors.SIDE_BAR_FOREGROUND, true); + const border = theme.getColor(colors.contrastBorder, true); if (this._config.background_color) { backgroundColor = theme.getColor(this._config.background_color); @@ -273,4 +273,4 @@ export class DashboardWidgetWrapper extends AngularDisposable implements OnInit headerEl.style.padding = this._config.padding; } } -} \ No newline at end of file +} diff --git a/src/sql/parts/dashboard/contents/dashboardWidgetWrapper.css b/src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.css similarity index 100% rename from src/sql/parts/dashboard/contents/dashboardWidgetWrapper.css rename to src/sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.css diff --git a/src/sql/parts/dashboard/contents/webviewContent.component.ts b/src/sql/workbench/parts/dashboard/contents/webviewContent.component.ts similarity index 88% rename from src/sql/parts/dashboard/contents/webviewContent.component.ts rename to src/sql/workbench/parts/dashboard/contents/webviewContent.component.ts index 226e4c6df1..57a305c759 100644 --- a/src/sql/parts/dashboard/contents/webviewContent.component.ts +++ b/src/sql/workbench/parts/dashboard/contents/webviewContent.component.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 'vs/css!./webviewContent'; import { Component, forwardRef, Input, OnInit, Inject, ElementRef } from '@angular/core'; @@ -11,16 +12,13 @@ import { IDisposable } from 'vs/base/common/lifecycle'; import { addDisposableListener, EventType } from 'vs/base/browser/dom'; import { memoize } from 'vs/base/common/decorators'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { IContextViewService } from 'vs/platform/contextview/browser/contextView'; -import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import * as azdata from 'azdata'; -import { IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { WebviewElement } from 'vs/workbench/contrib/webview/electron-browser/webviewElement'; import { IWorkbenchLayoutService, Parts } from 'vs/workbench/services/layout/browser/layoutService'; @@ -69,8 +67,8 @@ export class WebviewContent extends AngularDisposable implements OnInit, IDashbo @memoize public get connection(): azdata.connection.Connection { - let currentConnection = this._dashboardService.connectionManagementService.connectionInfo.connectionProfile; - let connection: azdata.connection.Connection = { + const currentConnection = this._dashboardService.connectionManagementService.connectionInfo.connectionProfile; + const connection: azdata.connection.Connection = { providerName: currentConnection.providerName, connectionId: currentConnection.id, options: currentConnection.options diff --git a/src/sql/parts/dashboard/contents/webviewContent.css b/src/sql/workbench/parts/dashboard/contents/webviewContent.css similarity index 100% rename from src/sql/parts/dashboard/contents/webviewContent.css rename to src/sql/workbench/parts/dashboard/contents/webviewContent.css diff --git a/src/sql/parts/dashboard/contents/widgetContent.component.html b/src/sql/workbench/parts/dashboard/contents/widgetContent.component.html similarity index 100% rename from src/sql/parts/dashboard/contents/widgetContent.component.html rename to src/sql/workbench/parts/dashboard/contents/widgetContent.component.html diff --git a/src/sql/parts/dashboard/contents/widgetContent.component.ts b/src/sql/workbench/parts/dashboard/contents/widgetContent.component.ts similarity index 88% rename from src/sql/parts/dashboard/contents/widgetContent.component.ts rename to src/sql/workbench/parts/dashboard/contents/widgetContent.component.ts index 8a0d9c6a0d..02e7984fc7 100644 --- a/src/sql/parts/dashboard/contents/widgetContent.component.ts +++ b/src/sql/workbench/parts/dashboard/contents/widgetContent.component.ts @@ -8,10 +8,10 @@ import 'vs/css!./widgetContent'; import { Component, Inject, Input, forwardRef, ViewChild, ViewChildren, QueryList, ChangeDetectorRef, ElementRef, AfterViewInit } from '@angular/core'; import { NgGridConfig, NgGrid, NgGridItem } from 'angular2-grid'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardWidgetWrapper } from 'sql/parts/dashboard/contents/dashboardWidgetWrapper.component'; +import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component'; import { subscriptionToDisposable, AngularDisposable } from 'sql/base/node/lifecycle'; import { IDisposable } from 'vs/base/common/lifecycle'; @@ -69,7 +69,7 @@ function configSorter(a, b): number { @Component({ selector: 'widget-content', - templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/contents/widgetContent.component.html')) + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/contents/widgetContent.component.html')) }) export class WidgetContent extends AngularDisposable implements AfterViewInit { @Input() private widgets: WidgetConfig[]; @@ -125,8 +125,8 @@ export class WidgetContent extends AngularDisposable implements AfterViewInit { ngAfterViewInit() { if (this.scrollContent) { - let container = this._scrollContainer.nativeElement as HTMLElement; - let scrollable = this._scrollable.nativeElement as HTMLElement; + const container = this._scrollContainer.nativeElement as HTMLElement; + const scrollable = this._scrollable.nativeElement as HTMLElement; container.removeChild(scrollable); this._scrollableElement = new ScrollableElement(scrollable, { @@ -140,7 +140,7 @@ export class WidgetContent extends AngularDisposable implements AfterViewInit { }); container.appendChild(this._scrollableElement.getDomNode()); - let initalHeight = getContentHeight(scrollable); + const initalHeight = getContentHeight(scrollable); this._scrollableElement.setScrollDimensions({ scrollHeight: getContentHeight(scrollable), height: getContentHeight(container) @@ -152,7 +152,7 @@ export class WidgetContent extends AngularDisposable implements AfterViewInit { // unforunately because of angular rendering behavior we need to do a double check to make sure nothing changed after this point setTimeout(() => { - let currentheight = getContentHeight(scrollable); + const currentheight = getContentHeight(scrollable); if (initalHeight !== currentheight) { this._scrollableElement.setScrollDimensions({ scrollHeight: currentheight, @@ -176,8 +176,8 @@ export class WidgetContent extends AngularDisposable implements AfterViewInit { } private resetScrollDimensions() { - let container = this._scrollContainer.nativeElement as HTMLElement; - let scrollable = this._scrollable.nativeElement as HTMLElement; + const container = this._scrollContainer.nativeElement as HTMLElement; + const scrollable = this._scrollable.nativeElement as HTMLElement; this._scrollableElement.setScrollDimensions({ scrollHeight: getContentHeight(scrollable), @@ -219,8 +219,8 @@ export class WidgetContent extends AngularDisposable implements AfterViewInit { })); this._editDispose.push(subscriptionToDisposable(this._grid.onResizeStop.subscribe((e: NgGridItem) => { this._onResize.fire(); - let event = e.getEventOutput(); - let config = this.originalConfig.find(i => i.id === event.payload.id); + const event = e.getEventOutput(); + const config = this.originalConfig.find(i => i.id === event.payload.id); if (!config.gridItemConfig) { config.gridItemConfig = {}; @@ -228,7 +228,7 @@ export class WidgetContent extends AngularDisposable implements AfterViewInit { config.gridItemConfig.sizex = e.sizex; config.gridItemConfig.sizey = e.sizey; - let component = this._widgets.find(i => i.id === event.payload.id); + const component = this._widgets.find(i => i.id === event.payload.id); component.layout(); this._rewriteConfig(); @@ -236,9 +236,9 @@ export class WidgetContent extends AngularDisposable implements AfterViewInit { }))); this._editDispose.push(subscriptionToDisposable(this._grid.onDragStop.subscribe((e: NgGridItem) => { this._onResize.fire(); - let event = e.getEventOutput(); + const event = e.getEventOutput(); this._items.forEach(i => { - let config = this.originalConfig.find(j => j.id === i.getEventOutput().payload.id); + const config = this.originalConfig.find(j => j.id === i.getEventOutput().payload.id); if ((config.gridItemConfig && config.gridItemConfig.col) || config.id === event.payload.id) { if (!config.gridItemConfig) { config.gridItemConfig = {}; @@ -261,12 +261,12 @@ export class WidgetContent extends AngularDisposable implements AfterViewInit { } private _rewriteConfig(): void { - let writeableConfig = objects.deepClone(this.originalConfig); + const writeableConfig = objects.deepClone(this.originalConfig); writeableConfig.forEach(i => { delete i.id; }); - let target: ConfigurationTarget = ConfigurationTarget.USER; + const target: ConfigurationTarget = ConfigurationTarget.USER; this.dashboardService.writeSettings([this.context, 'widgets'].join('.'), writeableConfig, target); } } diff --git a/src/sql/parts/dashboard/contents/widgetContent.css b/src/sql/workbench/parts/dashboard/contents/widgetContent.css similarity index 100% rename from src/sql/parts/dashboard/contents/widgetContent.css rename to src/sql/workbench/parts/dashboard/contents/widgetContent.css diff --git a/src/sql/parts/dashboard/dashboard.component.html b/src/sql/workbench/parts/dashboard/dashboard.component.html similarity index 100% rename from src/sql/parts/dashboard/dashboard.component.html rename to src/sql/workbench/parts/dashboard/dashboard.component.html diff --git a/src/sql/parts/dashboard/dashboard.component.ts b/src/sql/workbench/parts/dashboard/dashboard.component.ts similarity index 90% rename from src/sql/parts/dashboard/dashboard.component.ts rename to src/sql/workbench/parts/dashboard/dashboard.component.ts index d25b9f3f76..40058d5066 100644 --- a/src/sql/parts/dashboard/dashboard.component.ts +++ b/src/sql/workbench/parts/dashboard/dashboard.component.ts @@ -11,8 +11,8 @@ import { Router } from '@angular/router'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import * as Utils from 'sql/platform/connection/common/utils'; -import { RefreshWidgetAction, EditDashboardAction } from 'sql/parts/dashboard/common/actions'; -import { DashboardPage } from 'sql/parts/dashboard/common/dashboardPage.component'; +import { RefreshWidgetAction, EditDashboardAction } from 'sql/workbench/parts/dashboard/common/actions'; +import { DashboardPage } from 'sql/workbench/parts/dashboard/common/dashboardPage.component'; import { AngularDisposable } from 'sql/base/node/lifecycle'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; @@ -47,7 +47,7 @@ export class DashboardComponent extends AngularDisposable implements OnInit { ngOnInit() { this._register(this.themeService.onDidColorThemeChange(this.updateTheme, this)); this.updateTheme(this.themeService.getColorTheme()); - let profile: IConnectionProfile = this._bootstrapService.getOriginalConnectionProfile(); + const profile: IConnectionProfile = this._bootstrapService.getOriginalConnectionProfile(); this.actionbar = new ActionBar(this.actionbarContainer.nativeElement); this.actionbar.push(new RefreshWidgetAction(this.refresh, this), { icon: true, @@ -65,7 +65,7 @@ export class DashboardComponent extends AngularDisposable implements OnInit { } private updateTheme(theme: IColorTheme): void { - let headerEl = this.header.nativeElement; + const headerEl = this.header.nativeElement; headerEl.style.borderBottomColor = theme.getColor(themeColors.SIDE_BAR_BACKGROUND, true).toString(); headerEl.style.borderBottomWidth = '1px'; headerEl.style.borderBottomStyle = 'solid'; diff --git a/src/sql/parts/dashboard/dashboard.css b/src/sql/workbench/parts/dashboard/dashboard.css similarity index 100% rename from src/sql/parts/dashboard/dashboard.css rename to src/sql/workbench/parts/dashboard/dashboard.css diff --git a/src/sql/parts/dashboard/dashboard.module.ts b/src/sql/workbench/parts/dashboard/dashboard.module.ts similarity index 67% rename from src/sql/parts/dashboard/dashboard.module.ts rename to src/sql/workbench/parts/dashboard/dashboard.module.ts index 82603a8e3e..2b64b1f470 100644 --- a/src/sql/parts/dashboard/dashboard.module.ts +++ b/src/sql/workbench/parts/dashboard/dashboard.module.ts @@ -24,31 +24,31 @@ import * as TelemetryUtils from 'sql/common/telemetryUtilities'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; /* Services */ -import { BreadcrumbService } from 'sql/parts/dashboard/services/breadcrumb.service'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +import { BreadcrumbService } from 'sql/workbench/parts/dashboard/services/breadcrumb.service'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; /* Directives */ -import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; /* Base Components */ -import { DashboardComponent } from 'sql/parts/dashboard/dashboard.component'; -import { DashboardWidgetWrapper } from 'sql/parts/dashboard/contents/dashboardWidgetWrapper.component'; -import { DashboardWidgetContainer } from 'sql/parts/dashboard/containers/dashboardWidgetContainer.component'; -import { DashboardGridContainer } from 'sql/parts/dashboard/containers/dashboardGridContainer.component'; -import { DashboardWebviewContainer } from 'sql/parts/dashboard/containers/dashboardWebviewContainer.component'; -import { DashboardModelViewContainer } from 'sql/parts/dashboard/containers/dashboardModelViewContainer.component'; -import { DashboardErrorContainer } from 'sql/parts/dashboard/containers/dashboardErrorContainer.component'; -import { DashboardNavSection } from 'sql/parts/dashboard/containers/dashboardNavSection.component'; -import { WidgetContent } from 'sql/parts/dashboard/contents/widgetContent.component'; +import { DashboardComponent } from 'sql/workbench/parts/dashboard/dashboard.component'; +import { DashboardWidgetWrapper } from 'sql/workbench/parts/dashboard/contents/dashboardWidgetWrapper.component'; +import { DashboardWidgetContainer } from 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.component'; +import { DashboardGridContainer } from 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.component'; +import { DashboardWebviewContainer } from 'sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.component'; +import { DashboardModelViewContainer } from 'sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.component'; +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 { WebviewContent } from 'sql/parts/dashboard/contents/webviewContent.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/parts/dashboard/containers/dashboardHomeContainer.component'; -import { ControlHostContent } from 'sql/parts/dashboard/contents/controlHostContent.component'; -import { DashboardControlHostContainer } from 'sql/parts/dashboard/containers/dashboardControlHostContainer.component'; +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'; @@ -61,11 +61,11 @@ import { EditableDropDown } from 'sql/base/browser/ui/editableDropdown/editableD import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component'; import LoadingSpinner from 'sql/parts/modelComponents/loadingSpinner.component'; -let baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWidgetWrapper, DashboardWebviewContainer, +const baseComponents = [DashboardHomeContainer, DashboardComponent, DashboardWidgetWrapper, DashboardWebviewContainer, DashboardWidgetContainer, DashboardGridContainer, DashboardErrorContainer, DashboardNavSection, ModelViewContent, WebviewContent, WidgetContent, ComponentHostDirective, BreadcrumbComponent, ControlHostContent, DashboardControlHostContainer, JobsViewComponent, AgentViewComponent, JobHistoryComponent, JobStepsViewComponent, AlertsViewComponent, ProxiesViewComponent, OperatorsViewComponent, - DashboardModelViewContainer, ModelComponentWrapper, Checkbox, EditableDropDown, SelectBox, InputBox, LoadingSpinner ]; + DashboardModelViewContainer, ModelComponentWrapper, Checkbox, EditableDropDown, SelectBox, InputBox, LoadingSpinner]; /* Panel */ import { PanelModule } from 'sql/base/browser/ui/panel/panel.module'; @@ -73,21 +73,21 @@ import { PanelModule } from 'sql/base/browser/ui/panel/panel.module'; import { ScrollableModule } from 'sql/base/browser/ui/scrollable/scrollable.module'; /* Pages */ -import { ServerDashboardPage } from 'sql/parts/dashboard/pages/serverDashboardPage.component'; -import { DatabaseDashboardPage } from 'sql/parts/dashboard/pages/databaseDashboardPage.component'; +import { ServerDashboardPage } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.component'; +import { DatabaseDashboardPage } from 'sql/workbench/parts/dashboard/pages/databaseDashboardPage.component'; -let pageComponents = [ServerDashboardPage, DatabaseDashboardPage]; +const pageComponents = [ServerDashboardPage, DatabaseDashboardPage]; /* Widget Components */ -import { PropertiesWidgetComponent } from 'sql/parts/dashboard/widgets/properties/propertiesWidget.component'; -import { ExplorerWidget } from 'sql/parts/dashboard/widgets/explorer/explorerWidget.component'; -import { TasksWidget } from 'sql/parts/dashboard/widgets/tasks/tasksWidget.component'; -import { InsightsWidget } from 'sql/parts/dashboard/widgets/insights/insightsWidget.component'; -import { WebviewWidget } from 'sql/parts/dashboard/widgets/webview/webviewWidget.component'; +import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component'; +import { ExplorerWidget } from 'sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component'; +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 { IInstantiationService, _util } from 'vs/platform/instantiation/common/instantiation'; -let widgetComponents = [ +const widgetComponents = [ PropertiesWidgetComponent, ExplorerWidget, TasksWidget, @@ -96,10 +96,10 @@ let widgetComponents = [ ]; /* Insights */ -let insightComponents = Registry.as(Extensions.InsightContribution).getAllCtors(); +const insightComponents = Registry.as(Extensions.InsightContribution).getAllCtors(); /* Model-backed components */ -let extensionComponents = Registry.as(ComponentExtensions.ComponentContribution).getAllCtors(); +const extensionComponents = Registry.as(ComponentExtensions.ComponentContribution).getAllCtors(); // Setup routes for various child components const appRoutes: Routes = [ diff --git a/src/sql/parts/dashboard/dashboardConfig.contribution.ts b/src/sql/workbench/parts/dashboard/dashboardConfig.contribution.ts similarity index 83% rename from src/sql/parts/dashboard/dashboardConfig.contribution.ts rename to src/sql/workbench/parts/dashboard/dashboardConfig.contribution.ts index 07a10ef677..1ad4300d22 100644 --- a/src/sql/parts/dashboard/dashboardConfig.contribution.ts +++ b/src/sql/workbench/parts/dashboard/dashboardConfig.contribution.ts @@ -2,11 +2,12 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { Registry } from 'vs/platform/registry/common/platform'; import { IConfigurationRegistry, Extensions, IConfigurationNode } from 'vs/platform/configuration/common/configurationRegistry'; -import { DASHBOARD_CONFIG_ID } from 'sql/parts/dashboard/pages/dashboardPageContribution'; -import { DATABASE_DASHBOARD_SETTING, DATABASE_DASHBOARD_PROPERTIES, DATABASE_DASHBOARD_TABS, databaseDashboardSettingSchema, databaseDashboardPropertiesSchema, databaseDashboardTabsSchema } from 'sql/parts/dashboard/pages/databaseDashboardPage.contribution'; -import { SERVER_DASHBOARD_SETTING, SERVER_DASHBOARD_PROPERTIES, SERVER_DASHBOARD_TABS, serverDashboardSettingSchema, serverDashboardPropertiesSchema, serverDashboardTabsSchema } from 'sql/parts/dashboard/pages/serverDashboardPage.contribution'; +import { DASHBOARD_CONFIG_ID } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution'; +import { DATABASE_DASHBOARD_SETTING, DATABASE_DASHBOARD_PROPERTIES, DATABASE_DASHBOARD_TABS, databaseDashboardSettingSchema, databaseDashboardPropertiesSchema, databaseDashboardTabsSchema } from 'sql/workbench/parts/dashboard/pages/databaseDashboardPage.contribution'; +import { SERVER_DASHBOARD_SETTING, SERVER_DASHBOARD_PROPERTIES, SERVER_DASHBOARD_TABS, serverDashboardSettingSchema, serverDashboardPropertiesSchema, serverDashboardTabsSchema } from 'sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution'; const configurationRegistry = Registry.as(Extensions.Configuration); const dashboardConfig: IConfigurationNode = { diff --git a/src/sql/parts/dashboard/dashboardEditor.ts b/src/sql/workbench/parts/dashboard/dashboardEditor.ts similarity index 89% rename from src/sql/parts/dashboard/dashboardEditor.ts rename to src/sql/workbench/parts/dashboard/dashboardEditor.ts index 3ac1c3e253..edc9008262 100644 --- a/src/sql/parts/dashboard/dashboardEditor.ts +++ b/src/sql/workbench/parts/dashboard/dashboardEditor.ts @@ -15,7 +15,7 @@ import { DashboardInput } from './dashboardInput'; import { DashboardModule } from './dashboard.module'; import { bootstrapAngular } from 'sql/services/bootstrap/bootstrapService'; import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams'; -import { DASHBOARD_SELECTOR } from 'sql/parts/dashboard/dashboard.component'; +import { DASHBOARD_SELECTOR } from 'sql/workbench/parts/dashboard/dashboard.component'; import { ConnectionContextKey } from 'sql/parts/connection/common/connectionContextKey'; import { IDashboardService } from 'sql/platform/dashboard/browser/dashboardService'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; @@ -64,7 +64,7 @@ export class DashboardEditor extends BaseEditor { } else { profile = this.input.connectionProfile; } - let serverInfo = this._connMan.getConnectionInfo(this.input.uri).serverInfo; + const serverInfo = this._connMan.getConnectionInfo(this.input.uri).serverInfo; this._dashboardService.changeToDashboard({ profile, serverInfo }); } @@ -88,7 +88,7 @@ export class DashboardEditor extends BaseEditor { $(parentElement).clearChildren(); if (!input.hasBootstrapped) { - let container = DOM.$('.dashboardEditor'); + const container = DOM.$('.dashboardEditor'); container.style.height = '100%'; this._dashboardContainer = DOM.append(parentElement, container); this.input.container = this._dashboardContainer; @@ -110,13 +110,13 @@ export class DashboardEditor extends BaseEditor { } else { profile = this.input.connectionProfile; } - let serverInfo = this._connMan.getConnectionInfo(this.input.uri).serverInfo; + const serverInfo = this._connMan.getConnectionInfo(this.input.uri).serverInfo; this._dashboardService.changeToDashboard({ profile, serverInfo }); - let scopedContextService = this._contextKeyService.createScoped(input.container); - let connectionContextKey = new ConnectionContextKey(scopedContextService); + const scopedContextService = this._contextKeyService.createScoped(input.container); + const connectionContextKey = new ConnectionContextKey(scopedContextService); connectionContextKey.set(input.connectionProfile); - let params: IDashboardComponentParams = { + const params: IDashboardComponentParams = { connection: input.connectionProfile, ownerUri: input.uri, scopedContextService, @@ -125,7 +125,7 @@ export class DashboardEditor extends BaseEditor { input.hasBootstrapped = true; - let uniqueSelector = bootstrapAngular(this.instantiationService, + const uniqueSelector = bootstrapAngular(this.instantiationService, DashboardModule, this._dashboardContainer, DASHBOARD_SELECTOR, diff --git a/src/sql/parts/dashboard/dashboardInput.ts b/src/sql/workbench/parts/dashboard/dashboardInput.ts similarity index 97% rename from src/sql/parts/dashboard/dashboardInput.ts rename to src/sql/workbench/parts/dashboard/dashboardInput.ts index 62ffe5c80c..db421c2c5f 100644 --- a/src/sql/parts/dashboard/dashboardInput.ts +++ b/src/sql/workbench/parts/dashboard/dashboardInput.ts @@ -51,7 +51,7 @@ export class DashboardInput extends EditorInput { this._initializedPromise = _connectionService.connectIfNotConnected(_connectionProfile, 'dashboard').then( u => { this._uri = u; - let info = this._connectionService.getConnectionInfo(u); + const info = this._connectionService.getConnectionInfo(u); if (info) { this._onConnectionChanged = this._connectionService.onConnectionChanged(e => { if (e.connectionUri === u) { @@ -115,7 +115,7 @@ export class DashboardInput extends EditorInput { return; } - let parentNode = this._parentContainer.parentNode; + const parentNode = this._parentContainer.parentNode; if (parentNode) { parentNode.removeChild(this._parentContainer); this._parentContainer = null; diff --git a/src/sql/parts/dashboard/pages/dashboardPageContribution.ts b/src/sql/workbench/parts/dashboard/pages/dashboardPageContribution.ts similarity index 89% rename from src/sql/parts/dashboard/pages/dashboardPageContribution.ts rename to src/sql/workbench/parts/dashboard/pages/dashboardPageContribution.ts index 0e446c9c01..2cf1e191ab 100644 --- a/src/sql/parts/dashboard/pages/dashboardPageContribution.ts +++ b/src/sql/workbench/parts/dashboard/pages/dashboardPageContribution.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 { Extensions, IDashboardWidgetRegistry } from 'sql/platform/dashboard/common/widgetRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -14,7 +15,7 @@ let widgetRegistry = Registry.as(Extensions.DashboardW export function generateDashboardWidgetSchema(type?: 'database' | 'server', extension?: boolean): IJSONSchema { let schemas; if (extension) { - let extensionSchemas = type === 'server' ? widgetRegistry.serverWidgetSchema.extensionProperties : type === 'database' ? widgetRegistry.databaseWidgetSchema.extensionProperties : widgetRegistry.allSchema.extensionProperties; + const extensionSchemas = type === 'server' ? widgetRegistry.serverWidgetSchema.extensionProperties : type === 'database' ? widgetRegistry.databaseWidgetSchema.extensionProperties : widgetRegistry.allSchema.extensionProperties; schemas = type === 'server' ? widgetRegistry.serverWidgetSchema.properties : type === 'database' ? widgetRegistry.databaseWidgetSchema.properties : widgetRegistry.allSchema.properties; schemas = mixin(schemas, extensionSchemas, true); } else { @@ -64,7 +65,7 @@ export function generateDashboardWidgetSchema(type?: 'database' | 'server', exte export function generateDashboardGridLayoutSchema(type?: 'database' | 'server', extension?: boolean): IJSONSchema { let schemas; if (extension) { - let extensionSchemas = type === 'server' ? widgetRegistry.serverWidgetSchema.extensionProperties : type === 'database' ? widgetRegistry.databaseWidgetSchema.extensionProperties : widgetRegistry.allSchema.extensionProperties; + const extensionSchemas = type === 'server' ? widgetRegistry.serverWidgetSchema.extensionProperties : type === 'database' ? widgetRegistry.databaseWidgetSchema.extensionProperties : widgetRegistry.allSchema.extensionProperties; schemas = type === 'server' ? widgetRegistry.serverWidgetSchema.properties : type === 'database' ? widgetRegistry.databaseWidgetSchema.properties : widgetRegistry.allSchema.properties; schemas = mixin(schemas, extensionSchemas, true); } else { diff --git a/src/sql/parts/dashboard/pages/databaseDashboardPage.component.ts b/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts similarity index 86% rename from src/sql/parts/dashboard/pages/databaseDashboardPage.component.ts rename to src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts index bb72b73f1b..6ad3be8985 100644 --- a/src/sql/parts/dashboard/pages/databaseDashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.component.ts @@ -5,11 +5,11 @@ import { OnInit, Inject, forwardRef, ChangeDetectorRef, ElementRef } from '@angular/core'; -import { DashboardPage } from 'sql/parts/dashboard/common/dashboardPage.component'; -import { BreadcrumbClass } from 'sql/parts/dashboard/services/breadcrumb.service'; +import { DashboardPage } from 'sql/workbench/parts/dashboard/common/dashboardPage.component'; +import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/services/breadcrumb.service'; import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; -import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; +import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; diff --git a/src/sql/parts/dashboard/pages/databaseDashboardPage.contribution.ts b/src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.contribution.ts similarity index 100% rename from src/sql/parts/dashboard/pages/databaseDashboardPage.contribution.ts rename to src/sql/workbench/parts/dashboard/pages/databaseDashboardPage.contribution.ts diff --git a/src/sql/parts/dashboard/pages/serverDashboardPage.component.ts b/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts similarity index 86% rename from src/sql/parts/dashboard/pages/serverDashboardPage.component.ts rename to src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts index 5ff606a26c..daef802885 100644 --- a/src/sql/parts/dashboard/pages/serverDashboardPage.component.ts +++ b/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.component.ts @@ -5,11 +5,11 @@ import { OnInit, Inject, forwardRef, ChangeDetectorRef, ElementRef } from '@angular/core'; -import { DashboardPage } from 'sql/parts/dashboard/common/dashboardPage.component'; -import { BreadcrumbClass } from 'sql/parts/dashboard/services/breadcrumb.service'; +import { DashboardPage } from 'sql/workbench/parts/dashboard/common/dashboardPage.component'; +import { BreadcrumbClass } from 'sql/workbench/parts/dashboard/services/breadcrumb.service'; import { IBreadcrumbService } from 'sql/base/browser/ui/breadcrumb/interfaces'; -import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; @@ -50,7 +50,7 @@ export class ServerDashboardPage extends DashboardPage implements OnInit { super(dashboardService, el, _cd, instantiationService, notificationService, angularEventingService, configurationService); // special-case handling for MSSQL data provider - let connInfo = this.dashboardService.connectionManagementService.connectionInfo; + const connInfo = this.dashboardService.connectionManagementService.connectionInfo; if (connInfo && connInfo.providerId === 'MSSQL') { // revert back to default database this._letDashboardPromise = this.dashboardService.connectionManagementService.changeDatabase('master').then(); diff --git a/src/sql/parts/dashboard/pages/serverDashboardPage.contribution.ts b/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution.ts similarity index 95% rename from src/sql/parts/dashboard/pages/serverDashboardPage.contribution.ts rename to src/sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution.ts index 345b4f3a6c..b23935f92f 100644 --- a/src/sql/parts/dashboard/pages/serverDashboardPage.contribution.ts +++ b/src/sql/workbench/parts/dashboard/pages/serverDashboardPage.contribution.ts @@ -2,9 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -import { generateDashboardWidgetSchema, generateDashboardTabSchema } from 'sql/parts/dashboard/pages/dashboardPageContribution'; +import { generateDashboardWidgetSchema, generateDashboardTabSchema } from 'sql/workbench/parts/dashboard/pages/dashboardPageContribution'; export interface IPropertiesConfig { edition: number | Array; @@ -73,7 +74,7 @@ export const serverDashboardPropertiesSchema: IJSONSchema = { ] }; -let defaultVal = [ +const defaultVal = [ { name: 'Tasks', widget: { @@ -122,4 +123,4 @@ export const serverDashboardTabsSchema: IJSONSchema = { export const SERVER_DASHBOARD_SETTING = 'dashboard.server.widgets'; export const SERVER_DASHBOARD_PROPERTIES = 'dashboard.server.properties'; -export const SERVER_DASHBOARD_TABS = 'dashboard.server.tabs'; \ No newline at end of file +export const SERVER_DASHBOARD_TABS = 'dashboard.server.tabs'; diff --git a/src/sql/parts/dashboard/services/breadcrumb.service.ts b/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts similarity index 89% rename from src/sql/parts/dashboard/services/breadcrumb.service.ts rename to src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts index a095becc8d..b571d65d58 100644 --- a/src/sql/parts/dashboard/services/breadcrumb.service.ts +++ b/src/sql/workbench/parts/dashboard/services/breadcrumb.service.ts @@ -24,7 +24,7 @@ export class BreadcrumbService implements IBreadcrumbService { private itemBreadcrums: MenuItem[]; private _currentPage: BreadcrumbClass; - constructor( @Inject(forwardRef(() => CommonServiceInterface)) private commonService: DashboardServiceInterface) { + constructor(@Inject(forwardRef(() => CommonServiceInterface)) private commonService: DashboardServiceInterface) { this.commonService.onUpdatePage(() => { this.setBreadcrumbs(this._currentPage); }); @@ -34,13 +34,13 @@ export class BreadcrumbService implements IBreadcrumbService { public setBreadcrumbs(page: BreadcrumbClass) { this._currentPage = page; this.itemBreadcrums = []; - let refList: MenuItem[] = this.getBreadcrumbsLink(page); + const refList: MenuItem[] = this.getBreadcrumbsLink(page); this.breadcrumbItem.next(refList); } private getBreadcrumbsLink(page: BreadcrumbClass): MenuItem[] { this.itemBreadcrums = []; - let profile = this.commonService.connectionManagementService.connectionInfo.connectionProfile; + const profile = this.commonService.connectionManagementService.connectionInfo.connectionProfile; this.itemBreadcrums.push({ label: nls.localize('homeCrumb', 'Home') }); switch (page) { case BreadcrumbClass.DatabasePage: diff --git a/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts b/src/sql/workbench/parts/dashboard/services/dashboardServiceInterface.service.ts similarity index 98% rename from src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts rename to src/sql/workbench/parts/dashboard/services/dashboardServiceInterface.service.ts index 12ecf0dc8a..90ea6405fe 100644 --- a/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts +++ b/src/sql/workbench/parts/dashboard/services/dashboardServiceInterface.service.ts @@ -17,7 +17,7 @@ import { IQueryManagementService } from 'sql/platform/query/common/queryManageme import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/platform/angularEventing/common/angularEventingService'; import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; -import { TabSettingConfig } from 'sql/parts/dashboard/common/dashboardWidget'; +import { TabSettingConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; /* VS imports */ diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerTree.ts similarity index 96% rename from src/sql/parts/dashboard/widgets/explorer/explorerTree.ts rename to src/sql/workbench/parts/dashboard/widgets/explorer/explorerTree.ts index 1790696a25..26aba36397 100644 --- a/src/sql/parts/dashboard/widgets/explorer/explorerTree.ts +++ b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerTree.ts @@ -79,7 +79,7 @@ export class ObjectMetadataWrapper implements ObjectMetadata { // otherwise compare the schema } else { - let schemaCompare: number = metadata1.schema && metadata2.schema + const schemaCompare: number = metadata1.schema && metadata2.schema ? metadata1.schema.localeCompare(metadata2.schema) // schemas are not expected to be undefined, but if they are then compare using object names : 0; @@ -172,7 +172,7 @@ export class ExplorerController extends TreeDefaults.DefaultController { } protected onEnter(tree: tree.ITree, event: IKeyboardEvent): boolean { - let result = super.onEnter(tree, event); + const result = super.onEnter(tree, event); if (result) { const focus = tree.getFocus(); if (focus && !(focus instanceof ObjectMetadataWrapper)) { @@ -251,8 +251,8 @@ export class ExplorerRenderer implements tree.IRenderer { } public renderTemplate(tree: tree.ITree, templateId: string, container: HTMLElement): IListTemplate { - let row = $('.list-row'); - let label = $('.label'); + const row = $('.list-row'); + const label = $('.label'); let icon: HTMLElement; if (templateId === TEMPLATEIDS.object) { @@ -313,7 +313,7 @@ export class ExplorerFilter implements tree.IFilter { if (!this._filterString) { return true; } - let filterString = this._filterString.trim().toLowerCase(); + const filterString = this._filterString.trim().toLowerCase(); return element.databaseName.toLowerCase().includes(filterString); } @@ -330,7 +330,7 @@ export class ExplorerFilter implements tree.IFilter { let metadataType: MetadataType; if (filterString.includes(':')) { - let filterArray = filterString.split(':'); + const filterArray = filterString.split(':'); if (filterArray.length > 2) { filterString = filterArray.slice(1, filterArray.length - 1).join(':'); @@ -371,7 +371,7 @@ export class ExplorerFilter implements tree.IFilter { } function getExplorerActions(element: TreeResource, instantiationService: IInstantiationService, capabilitiesService: ICapabilitiesService, info: ConnectionManagementInfo): IAction[] { - let actions: IAction[] = []; + const actions: IAction[] = []; if (element instanceof ObjectMetadataWrapper) { if (element.metadataType === MetadataType.View || element.metadataType === MetadataType.Table) { @@ -430,7 +430,7 @@ class ExplorerScriptSelectAction extends ScriptSelectAction { } public run(actionContext: BaseActionContext): Promise { - let promise = super.run(actionContext); + const promise = super.run(actionContext); this.progressService.showWhile(promise); return promise; } @@ -449,7 +449,7 @@ class ExplorerScriptCreateAction extends ScriptCreateAction { } public run(actionContext: BaseActionContext): Promise { - let promise = super.run(actionContext); + const promise = super.run(actionContext); this.progressService.showWhile(promise); return promise; } @@ -468,7 +468,7 @@ class ExplorerScriptAlterAction extends ScriptAlterAction { } public run(actionContext: BaseActionContext): Promise { - let promise = super.run(actionContext); + const promise = super.run(actionContext); this.progressService.showWhile(promise); return promise; } @@ -487,7 +487,7 @@ class ExplorerScriptExecuteAction extends ScriptExecuteAction { } public run(actionContext: BaseActionContext): Promise { - let promise = super.run(actionContext); + const promise = super.run(actionContext); this.progressService.showWhile(promise); return promise; } @@ -504,7 +504,7 @@ class ExplorerManageAction extends ManageAction { } public run(actionContext: ManageActionContext): Promise { - let promise = super.run(actionContext); + const promise = super.run(actionContext); this._progressService.showWhile(promise); return promise; } diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.html b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.html similarity index 100% rename from src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.html rename to src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.html diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.ts similarity index 88% rename from src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts rename to src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.ts index cb2cb27b50..aa677824eb 100644 --- a/src/sql/parts/dashboard/widgets/explorer/explorerWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.ts @@ -10,7 +10,7 @@ import 'vs/css!./media/explorerWidget'; import { Component, Inject, forwardRef, ChangeDetectorRef, OnInit, ViewChild, ElementRef } from '@angular/core'; import { Router } from '@angular/router'; -import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/parts/dashboard/common/dashboardWidget'; +import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { ExplorerFilter, ExplorerRenderer, ExplorerDataSource, ExplorerController, ObjectMetadataWrapper, ExplorerModel } from './explorerTree'; @@ -31,7 +31,7 @@ import { ScrollbarVisibility } from 'vs/base/common/scrollable'; @Component({ selector: 'explorer-widget', - templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/widgets/explorer/explorerWidget.component.html')) + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.component.html')) }) export class ExplorerWidget extends DashboardWidget implements IDashboardWidget, OnInit { private _input: InputBox; @@ -75,9 +75,9 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget, ngOnInit() { this._inited = true; - let placeholderLabel = this._config.context === 'database' ? nls.localize('seachObjects', 'Search by name of type (a:, t:, v:, f:, or sp:)') : nls.localize('searchDatabases', 'Search databases'); + const placeholderLabel = this._config.context === 'database' ? nls.localize('seachObjects', 'Search by name of type (a:, t:, v:, f:, or sp:)') : nls.localize('searchDatabases', 'Search databases'); - let inputOptions: IInputOptions = { + const inputOptions: IInputOptions = { placeholder: placeholderLabel, ariaLabel: placeholderLabel }; @@ -106,7 +106,7 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget, this._register(toDisposableSubscription(this._bootstrap.metadataService.metadata.subscribe( data => { if (data) { - let objectData = ObjectMetadataWrapper.createFromObjectMetadata(data.objectMetadata); + const objectData = ObjectMetadataWrapper.createFromObjectMetadata(data.objectMetadata); objectData.sort(ObjectMetadataWrapper.sort); this._treeDataSource.data = objectData; this._tree.setInput(new ExplorerModel()); @@ -117,13 +117,13 @@ export class ExplorerWidget extends DashboardWidget implements IDashboardWidget, } ))); } else { - let currentProfile = this._bootstrap.connectionManagementService.connectionInfo.connectionProfile; + const currentProfile = this._bootstrap.connectionManagementService.connectionInfo.connectionProfile; this._register(toDisposableSubscription(this._bootstrap.metadataService.databaseNames.subscribe( data => { // Handle the case where there is no metadata service data = data || []; - let profileData = data.map(d => { - let profile = new ConnectionProfile(this.capabilitiesService, currentProfile); + const profileData = data.map(d => { + const profile = new ConnectionProfile(this.capabilitiesService, currentProfile); profile.databaseName = d; return profile; }); diff --git a/src/sql/parts/dashboard/widgets/explorer/explorerWidget.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.contribution.ts similarity index 83% rename from src/sql/parts/dashboard/widgets/explorer/explorerWidget.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.contribution.ts index 3240f9c3bd..d8ab5ed96b 100644 --- a/src/sql/parts/dashboard/widgets/explorer/explorerWidget.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.contribution.ts @@ -6,7 +6,7 @@ import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerDashboardWidget } from 'sql/platform/dashboard/common/widgetRegistry'; -let explorerSchema: IJSONSchema = { +const explorerSchema: IJSONSchema = { type: 'object', }; diff --git a/src/sql/parts/dashboard/widgets/explorer/media/explorerWidget.css b/src/sql/workbench/parts/dashboard/widgets/explorer/media/explorerWidget.css similarity index 100% rename from src/sql/parts/dashboard/widgets/explorer/media/explorerWidget.css rename to src/sql/workbench/parts/dashboard/widgets/explorer/media/explorerWidget.css diff --git a/src/sql/parts/dashboard/widgets/insights/actions.ts b/src/sql/workbench/parts/dashboard/widgets/insights/actions.ts similarity index 99% rename from src/sql/parts/dashboard/widgets/insights/actions.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/actions.ts index 54c8e6303d..32c466b844 100644 --- a/src/sql/parts/dashboard/widgets/insights/actions.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/actions.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 { Action } from 'vs/base/common/actions'; import * as nls from 'vs/nls'; diff --git a/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component.ts similarity index 91% rename from src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component.ts index a0862a5f83..99ab98e20e 100644 --- a/src/sql/parts/dashboard/widgets/insights/insightsWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.component.ts @@ -2,15 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { Component, Inject, forwardRef, AfterContentInit, ComponentFactoryResolver, ViewChild, ChangeDetectorRef, Injector } from '@angular/core'; import { Observable } from 'rxjs/Observable'; -import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; +import { DashboardWidget, IDashboardWidget, WIDGET_CONFIG, WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; +import { ComponentHostDirective } from 'sql/workbench/parts/dashboard/common/componentHost.directive'; import { InsightAction, InsightActionContext } from 'sql/workbench/common/actions'; import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; import { IInsightsConfig, IInsightsView } from './interfaces'; @@ -85,9 +86,9 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget, this._parseConfig().then(() => { if (!this._checkStorage()) { - let promise = this._runQuery(); + const promise = this._runQuery(); this.queryObv = Observable.fromPromise(promise); - let cancelablePromise = createCancelablePromise(() => { + const cancelablePromise = createCancelablePromise(() => { return promise.then( result => { this._loading = false; @@ -150,7 +151,7 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget, } get actions(): Array { - let actions: Array = []; + const actions: Array = []; if (this.insightConfig.details && (this.insightConfig.details.query || this.insightConfig.details.queryFile)) { actions.push(this.instantiationService.createInstance(InsightAction, InsightAction.ID, InsightAction.LABEL)); } @@ -167,8 +168,8 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget, private _storeResult(result: SimpleExecuteResult): SimpleExecuteResult { if (this.insightConfig.cacheId) { - let currentTime = new Date(); - let store: IStorageResult = { + const currentTime = new Date(); + const store: IStorageResult = { date: currentTime.toString(), results: result }; @@ -181,10 +182,10 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget, private _checkStorage(): boolean { if (this.insightConfig.cacheId) { - let storage = this.storageService.get(this._getStorageKey(), StorageScope.GLOBAL); + const storage = this.storageService.get(this._getStorageKey(), StorageScope.GLOBAL); if (storage) { - let storedResult: IStorageResult = JSON.parse(storage); - let date = new Date(storedResult.date); + const storedResult: IStorageResult = JSON.parse(storage); + const date = new Date(storedResult.date); this.lastUpdated = nls.localize('insights.lastUpdated', "Last Updated: {0} {1}", date.toLocaleTimeString(), date.toLocaleDateString()); this._loading = false; if (this._init) { @@ -235,10 +236,10 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget, return; } - let componentFactory = this._componentFactoryResolver.resolveComponentFactory(insightRegistry.getCtorFromId(this._typeKey)); + const componentFactory = this._componentFactoryResolver.resolveComponentFactory(insightRegistry.getCtorFromId(this._typeKey)); - let componentRef = this.componentHost.viewContainerRef.createComponent(componentFactory, 0, this._injector); - let componentInstance = componentRef.instance; + const componentRef = this.componentHost.viewContainerRef.createComponent(componentFactory, 0, this._injector); + const componentInstance = componentRef.instance; // check if the setter is defined if (componentInstance.setConfig) { @@ -289,7 +290,7 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget, // When the editor.accessibilitySupport setting is on, we will force the chart type to be table. // so that the information is accessible to the user. // count chart type is already a text based chart, we don't have to apply this rule for it. - let isAccessibilitySupportOn = this._configurationService.getValue('editor.accessibilitySupport') === 'on'; + const isAccessibilitySupportOn = this._configurationService.getValue('editor.accessibilitySupport') === 'on'; if (isAccessibilitySupportOn && this._typeKey !== 'count') { this._typeKey = 'table'; } @@ -297,7 +298,7 @@ export class InsightsWidget extends DashboardWidget implements IDashboardWidget, if (types.isStringArray(this.insightConfig.query)) { this.insightConfig.query = this.insightConfig.query.join(' '); } else if (this.insightConfig.queryFile) { - let filePath = await resolveQueryFilePath(this.insightConfig.queryFile, + const filePath = await resolveQueryFilePath(this.insightConfig.queryFile, this._workspaceContextService, this._configurationResolverService); diff --git a/src/sql/parts/dashboard/widgets/insights/insightsWidget.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.contribution.ts similarity index 88% rename from src/sql/parts/dashboard/widgets/insights/insightsWidget.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.contribution.ts index c64cf0ac50..8fb641742d 100644 --- a/src/sql/parts/dashboard/widgets/insights/insightsWidget.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/insightsWidget.contribution.ts @@ -2,19 +2,19 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { join } from 'path'; import { registerDashboardWidget, registerNonCustomDashboardWidget } from 'sql/platform/dashboard/common/widgetRegistry'; import { Extensions as InsightExtensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; -import { IInsightsConfig, IInsightTypeContrib } from './interfaces'; -import { insightsContribution, insightsSchema } from 'sql/parts/dashboard/widgets/insights/insightsWidgetSchemas'; +import { IInsightTypeContrib } from './interfaces'; +import { insightsContribution, insightsSchema } from 'sql/workbench/parts/dashboard/widgets/insights/insightsWidgetSchemas'; import { IExtensionPointUser, ExtensionsRegistry } from 'vs/workbench/services/extensions/common/extensionsRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; const insightRegistry = Registry.as(InsightExtensions.InsightContribution); - registerDashboardWidget('insights-widget', '', insightsSchema); ExtensionsRegistry.registerExtensionPoint({ extensionPoint: 'dashboard.insights', jsonSchema: insightsContribution }).setHandler(extensions => { @@ -33,14 +33,14 @@ ExtensionsRegistry.registerExtensionPoint(value)) { - for (let command of value) { + for (const command of value) { handleCommand(command, extension); } } else { handleCommand(value, extension); } } -}); \ No newline at end of file +}); diff --git a/src/sql/parts/dashboard/widgets/insights/insightsWidgetSchemas.ts b/src/sql/workbench/parts/dashboard/widgets/insights/insightsWidgetSchemas.ts similarity index 100% rename from src/sql/parts/dashboard/widgets/insights/insightsWidgetSchemas.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/insightsWidgetSchemas.ts diff --git a/src/sql/parts/dashboard/widgets/insights/interfaces.ts b/src/sql/workbench/parts/dashboard/widgets/insights/interfaces.ts similarity index 100% rename from src/sql/parts/dashboard/widgets/insights/interfaces.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/interfaces.ts diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.component.ts similarity index 92% rename from src/sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.component.ts index e6bc75638f..a21b96a3b7 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.component.ts @@ -2,15 +2,16 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, ViewChild } from '@angular/core'; import { BaseChartDirective } from 'ng2-charts'; import * as TelemetryKeys from 'sql/common/telemetryKeys'; import * as TelemetryUtils from 'sql/common/telemetryUtilities'; -import { IInsightsView, IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsView, IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { memoize, unmemoize } from 'sql/base/common/decorators'; import { mixin } from 'sql/base/common/objects'; -import { LegendPosition, ChartType, defaultChartConfig, IChartConfig, IDataSet, IPointDataSet } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { LegendPosition, ChartType, defaultChartConfig, IChartConfig, IDataSet, IPointDataSet } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as types from 'vs/base/common/types'; @@ -19,7 +20,7 @@ import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/theme import * as nls from 'vs/nls'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; -declare var Chart: any; +declare const Chart: any; @Component({ template: `
@@ -93,12 +94,12 @@ export abstract class ChartInsight extends Disposable implements IInsightsView { } protected updateTheme(e: IColorTheme): void { - let foregroundColor = e.getColor(colors.editorForeground); - let foreground = foregroundColor ? foregroundColor.toString() : null; - let backgroundColor = e.getColor(colors.editorBackground); - let background = backgroundColor ? backgroundColor.toString() : null; + const foregroundColor = e.getColor(colors.editorForeground); + const foreground = foregroundColor ? foregroundColor.toString() : null; + const backgroundColor = e.getColor(colors.editorBackground); + const background = backgroundColor ? backgroundColor.toString() : null; - let options = { + const options = { legend: { labels: { fontColor: foreground @@ -184,7 +185,7 @@ export abstract class ChartInsight extends Disposable implements IInsightsView { } /* Typescript does not allow you to access getters/setters for super classes. - This is a workaround that allows us to still call base getter */ + his is a workaround that allows us to still call base getter */ @memoize protected getChartData(): Array { if (this._config.dataDirection === 'horizontal') { @@ -247,10 +248,10 @@ export abstract class ChartInsight extends Disposable implements IInsightsView { @memoize private get colors(): { backgroundColor: string[] }[] { if (this._config && this._config.colorMap) { - let backgroundColor = this.labels.map((item) => { + const backgroundColor = this.labels.map((item) => { return this._config.colorMap[item]; }); - let colorsMap = { backgroundColor }; + const colorsMap = { backgroundColor }; return [colorsMap]; } else { return undefined; @@ -258,7 +259,7 @@ export abstract class ChartInsight extends Disposable implements IInsightsView { } public set legendPosition(input: LegendPosition) { - let options = { + const options = { legend: { display: true, position: 'top' diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution.ts similarity index 99% rename from src/sql/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution.ts index 9f5e8f9497..cf6161a091 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution.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 { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/interfaces.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces.ts similarity index 100% rename from src/sql/parts/dashboard/widgets/insights/views/charts/interfaces.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces.ts diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts similarity index 84% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts index dd93385d0a..fc6281926b 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.component.ts @@ -3,9 +3,9 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ChartInsight } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component'; +import { ChartInsight } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.component'; import { mixin } from 'sql/base/common/objects'; -import { ChartType, IChartConfig, customMixin } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { ChartType, IChartConfig, customMixin } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import { IColorTheme, IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import * as colors from 'vs/platform/theme/common/colorRegistry'; @@ -37,7 +37,7 @@ export default class BarChart extends ChartInsight { public setConfig(config: IBarChartConfig): void { let options = {}; if (config.xAxisMax) { - let opts = { + const opts = { scales: { xAxes: [{ display: true, @@ -51,7 +51,7 @@ export default class BarChart extends ChartInsight { } if (config.xAxisMin) { - let opts = { + const opts = { scales: { xAxes: [{ display: true, @@ -65,7 +65,7 @@ export default class BarChart extends ChartInsight { } if (config.xAxisLabel) { - let opts = { + const opts = { scales: { xAxes: [{ display: true, @@ -80,7 +80,7 @@ export default class BarChart extends ChartInsight { } if (config.yAxisMax) { - let opts = { + const opts = { scales: { yAxes: [{ display: true, @@ -94,7 +94,7 @@ export default class BarChart extends ChartInsight { } if (config.yAxisMin) { - let opts = { + const opts = { scales: { yAxes: [{ display: true, @@ -108,7 +108,7 @@ export default class BarChart extends ChartInsight { } if (config.yAxisLabel) { - let opts = { + const opts = { scales: { yAxes: [{ display: true, @@ -128,11 +128,11 @@ export default class BarChart extends ChartInsight { protected updateTheme(e: IColorTheme): void { super.updateTheme(e); - let foregroundColor = e.getColor(colors.editorForeground); - let foreground = foregroundColor ? foregroundColor.toString() : null; - let gridLinesColor = e.getColor(editorLineNumbers); - let gridLines = gridLinesColor ? gridLinesColor.toString() : null; - let options = { + const foregroundColor = e.getColor(colors.editorForeground); + const foreground = foregroundColor ? foregroundColor.toString() : null; + const gridLinesColor = e.getColor(editorLineNumbers); + const gridLines = gridLinesColor ? gridLinesColor.toString() : null; + const options = { scales: { xAxes: [{ scaleLabel: { diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution.ts similarity index 92% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution.ts index 0427317bd4..f3c50b8234 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution.ts @@ -2,13 +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 { mixin } from 'vs/base/common/objects'; import { clone } from 'sql/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; -import { chartInsightSchema } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution'; +import { chartInsightSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution'; import BarChart from './barChart.component'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.component.ts similarity index 91% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.component.ts index 39a55ad43d..211d0c38b1 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.component.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import PieChart from './pieChart.component'; -import { ChartType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import { ChangeDetectorRef, Inject, forwardRef, ElementRef } from '@angular/core'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution.ts similarity index 87% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution.ts index c8224363f3..69e74063a6 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution.ts @@ -2,11 +2,12 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { clone } from 'sql/base/common/objects'; import { mixin } from 'vs/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; -import { chartInsightSchema } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution'; +import { chartInsightSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution'; import DoughnutChart from './doughnutChart.component'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.component.ts similarity index 91% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.component.ts index 40158748c9..717ee33af2 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.component.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import BarChart from './barChart.component'; -import { ChartType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import { forwardRef, Inject, ChangeDetectorRef, ElementRef } from '@angular/core'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts similarity index 87% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts index 7bbe7c285c..a649a32e8e 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution.ts @@ -2,12 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { clone } from 'sql/base/common/objects'; import { mixin } from 'vs/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; -import { barChartSchema } from 'sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; +import { barChartSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; import HorizontalBarChart from './horizontalBarChart.component'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/lineChart.component.ts similarity index 89% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/lineChart.component.ts index f2b14e8704..aeb26e6c0c 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/lineChart.component.ts @@ -8,7 +8,7 @@ import { mixin } from 'vs/base/common/objects'; import BarChart, { IBarChartConfig } from './barChart.component'; import { memoize, unmemoize } from 'sql/base/common/decorators'; import { clone } from 'sql/base/common/objects'; -import { ChartType, DataType, defaultChartConfig, IDataSet, IPointDataSet } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { ChartType, DataType, defaultChartConfig, IDataSet, IPointDataSet } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import { ChangeDetectorRef, Inject, forwardRef, ElementRef } from '@angular/core'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; @@ -55,10 +55,10 @@ export default class LineChart extends BarChart { @memoize protected getDataAsPoint(): Array { - let dataSetMap: { [label: string]: IPointDataSet } = {}; + const dataSetMap: { [label: string]: IPointDataSet } = {}; this._data.rows.map(row => { if (row && row.length >= 3) { - let legend = row[0]; + const legend = row[0]; if (!dataSetMap[legend]) { dataSetMap[legend] = { label: legend, data: [], fill: false }; } @@ -77,9 +77,9 @@ export default class LineChart extends BarChart { } protected addAxisLabels(): void { - let xLabel = this._config.xAxisLabel || this._data.columns[1] || 'x'; - let yLabel = this._config.yAxisLabel || this._data.columns[2] || 'y'; - let options = { + const xLabel = this._config.xAxisLabel || this._data.columns[1] || 'x'; + const yLabel = this._config.yAxisLabel || this._data.columns[2] || 'y'; + const options = { scales: { xAxes: [{ type: 'linear', diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/lineChart.contribution.ts similarity index 90% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/lineChart.contribution.ts index b317a6f41b..acfe2be676 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/lineChart.contribution.ts @@ -2,13 +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 { mixin } from 'vs/base/common/objects'; import { clone } from 'sql/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; -import { barChartSchema } from 'sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; +import { barChartSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; import LineChart from './lineChart.component'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/pieChart.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/pieChart.component.ts similarity index 83% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/pieChart.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/pieChart.component.ts index 1c619054ad..2c2b61329f 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/pieChart.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/pieChart.component.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ChartInsight } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.component'; -import { ChartType } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { ChartInsight } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.component'; +import { ChartType } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import { ChangeDetectorRef, Inject, forwardRef, ElementRef } from '@angular/core'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/pieChart.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/pieChart.contribution.ts similarity index 86% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/pieChart.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/pieChart.contribution.ts index ade0688c39..e58e5fb207 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/pieChart.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/pieChart.contribution.ts @@ -2,11 +2,12 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { mixin } from 'vs/base/common/objects'; import { clone } from 'sql/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; -import { chartInsightSchema } from 'sql/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution'; +import { chartInsightSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/chartInsight.contribution'; import PieChart from './pieChart.component'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/scatterChart.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/scatterChart.component.ts similarity index 92% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/scatterChart.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/scatterChart.component.ts index 716a574964..f45bd85549 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/scatterChart.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/scatterChart.component.ts @@ -5,7 +5,7 @@ import LineChart, { ILineConfig } from './lineChart.component'; import { clone } from 'sql/base/common/objects'; -import { ChartType, defaultChartConfig } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { ChartType, defaultChartConfig } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import { mixin } from 'vs/base/common/objects'; import { ChangeDetectorRef, Inject, forwardRef, ElementRef } from '@angular/core'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/scatterChart.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/scatterChart.contribution.ts similarity index 86% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/scatterChart.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/scatterChart.contribution.ts index d294c74f63..147d23946b 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/scatterChart.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/scatterChart.contribution.ts @@ -2,12 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { mixin } from 'vs/base/common/objects'; import { clone } from 'sql/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; -import { barChartSchema } from 'sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; +import { barChartSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; import ScatterChart from './scatterChart.component'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.component.ts similarity index 88% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.component.ts index dc191e6359..de85093f27 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.component.ts @@ -5,7 +5,7 @@ import LineChart, { ILineConfig } from './lineChart.component'; import { clone } from 'sql/base/common/objects'; -import { ChartType, defaultChartConfig, IPointDataSet } from 'sql/parts/dashboard/widgets/insights/views/charts/interfaces'; +import { ChartType, defaultChartConfig, IPointDataSet } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/interfaces'; import { mixin } from 'vs/base/common/objects'; import { Color } from 'vs/base/common/color'; @@ -28,10 +28,10 @@ export default class TimeSeriesChart extends LineChart { } protected addAxisLabels(): void { - let xLabel = this._config.xAxisLabel || this.getLabels()[1] || 'x'; - let yLabel = this._config.yAxisLabel || this.getLabels()[2] || 'y'; + const xLabel = this._config.xAxisLabel || this.getLabels()[1] || 'x'; + const yLabel = this._config.yAxisLabel || this.getLabels()[2] || 'y'; - let options = { + const options = { scales: { xAxes: [{ type: 'time', @@ -61,10 +61,10 @@ export default class TimeSeriesChart extends LineChart { } protected getDataAsPoint(): Array { - let dataSetMap: { [label: string]: IPointDataSet } = {}; + const dataSetMap: { [label: string]: IPointDataSet } = {}; this._data.rows.map(row => { if (row && row.length >= 3) { - let legend = row[0]; + const legend = row[0]; if (!dataSetMap[legend]) { dataSetMap[legend] = { label: legend, data: [], fill: false }; } diff --git a/src/sql/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts similarity index 87% rename from src/sql/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts index 8e97e3a9dd..3bc12a9229 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.contribution.ts @@ -2,12 +2,13 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { mixin } from 'vs/base/common/objects'; import { clone } from 'sql/base/common/objects'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; -import { barChartSchema } from 'sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; +import { barChartSchema } from 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; import TimeSeriesChart from './timeSeriesChart.component'; diff --git a/src/sql/parts/dashboard/widgets/insights/views/countInsight.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/countInsight.component.ts similarity index 90% rename from src/sql/parts/dashboard/widgets/insights/views/countInsight.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/countInsight.component.ts index b07b9c4020..a78f5a637a 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/countInsight.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/countInsight.component.ts @@ -2,9 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { Component, Input, Inject, ChangeDetectorRef, forwardRef } from '@angular/core'; -import { IInsightsView, IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsView, IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; @Component({ template: ` diff --git a/src/sql/parts/dashboard/widgets/insights/views/countInsight.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/countInsight.contribution.ts similarity index 95% rename from src/sql/parts/dashboard/widgets/insights/views/countInsight.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/countInsight.contribution.ts index bc47ae3ae2..199bdc0d28 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/countInsight.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/countInsight.contribution.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 { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; import CountInsight from './countInsight.component'; @@ -9,7 +10,7 @@ import CountInsight from './countInsight.component'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -let countInsightSchema: IJSONSchema = { +const countInsightSchema: IJSONSchema = { type: 'null', description: nls.localize('countInsightDescription', 'For each column in a resultset, displays the value in row 0 as a count followed by the column name. Supports "1 Healthy", "3 Unhealthy" for example, where "Healthy" is the column name and 1 is the value in row 1 cell 1') }; diff --git a/src/sql/parts/dashboard/widgets/insights/views/imageInsight.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/imageInsight.component.ts similarity index 87% rename from src/sql/parts/dashboard/widgets/insights/views/imageInsight.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/imageInsight.component.ts index e059831dc3..fdddf8412d 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/imageInsight.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/imageInsight.component.ts @@ -2,9 +2,10 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { Component, Input, Inject, ChangeDetectorRef, forwardRef, ViewChild, OnInit, ElementRef } from '@angular/core'; -import { IInsightsView, IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsView, IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { mixin } from 'vs/base/common/objects'; @@ -36,7 +37,7 @@ export default class ImageInsight implements IInsightsView, OnInit { @Inject(forwardRef(() => ChangeDetectorRef)) private _changeRef: ChangeDetectorRef) { } ngOnInit() { - let size = Math.min(this.container.nativeElement.parentElement.parentElement.offsetHeight, this.container.nativeElement.parentElement.parentElement.offsetWidth); + const size = Math.min(this.container.nativeElement.parentElement.parentElement.offsetHeight, this.container.nativeElement.parentElement.parentElement.offsetWidth); this.image.nativeElement.style.width = size + 'px'; this.image.nativeElement.style.height = size + 'px'; } @@ -47,9 +48,8 @@ export default class ImageInsight implements IInsightsView, OnInit { } @Input() set data(data: IInsightData) { - let self = this; if (data.rows && data.rows.length > 0 && data.rows[0].length > 0) { - self._rawSource = data.rows[0][0]; + this._rawSource = data.rows[0][0]; } else { this._rawSource = ''; } diff --git a/src/sql/parts/dashboard/widgets/insights/views/imageInsight.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/imageInsight.contribution.ts similarity index 96% rename from src/sql/parts/dashboard/widgets/insights/views/imageInsight.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/imageInsight.contribution.ts index d6e0e0836a..19a22df9e1 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/imageInsight.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/imageInsight.contribution.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 { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; import ImageInsight from './imageInsight.component'; @@ -9,7 +10,7 @@ import ImageInsight from './imageInsight.component'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -let imageInsightSchema: IJSONSchema = { +const imageInsightSchema: IJSONSchema = { type: 'object', description: nls.localize('imageInsightDescription', 'Displays an image, for example one returned by an R query using ggplot2'), properties: { diff --git a/src/sql/parts/dashboard/widgets/insights/views/tableInsight.component.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/tableInsight.component.ts similarity index 95% rename from src/sql/parts/dashboard/widgets/insights/views/tableInsight.component.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/tableInsight.component.ts index b0f4e411df..c6b3121ff1 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/tableInsight.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/tableInsight.component.ts @@ -2,13 +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 { Component, Input, Inject, ChangeDetectorRef, forwardRef, ElementRef, OnInit } from '@angular/core'; import { getContentHeight, getContentWidth, Dimension } from 'vs/base/browser/dom'; import { Disposable } from 'vs/base/common/lifecycle'; import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { IInsightsView, IInsightData } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsView, IInsightData } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { Table } from 'sql/base/browser/ui/table/table'; import { TableDataView } from 'sql/base/browser/ui/table/tableDataView'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; @@ -71,7 +72,7 @@ export default class TableInsight extends Disposable implements IInsightsView, O function transformData(rows: string[][], columns: string[]): { [key: string]: string }[] { return rows.map(row => { - let object: { [key: string]: string } = {}; + const object: { [key: string]: string } = {}; row.forEach((val, index) => { object[columns[index]] = val; }); diff --git a/src/sql/parts/dashboard/widgets/insights/views/tableInsight.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/insights/views/tableInsight.contribution.ts similarity index 94% rename from src/sql/parts/dashboard/widgets/insights/views/tableInsight.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/insights/views/tableInsight.contribution.ts index 819f1549be..1e3ad63142 100644 --- a/src/sql/parts/dashboard/widgets/insights/views/tableInsight.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/insights/views/tableInsight.contribution.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 { registerInsight } from 'sql/platform/dashboard/common/insightRegistry'; import TableInsight from './tableInsight.component'; @@ -9,7 +10,7 @@ import TableInsight from './tableInsight.component'; import { IJSONSchema } from 'vs/base/common/jsonSchema'; import * as nls from 'vs/nls'; -let tableInsightSchema: IJSONSchema = { +const tableInsightSchema: IJSONSchema = { type: 'null', description: nls.localize('tableInsightDescription', 'Displays the results in a simple table') }; diff --git a/src/sql/parts/dashboard/widgets/properties/propertiesJson.ts b/src/sql/workbench/parts/dashboard/widgets/properties/propertiesJson.ts similarity index 95% rename from src/sql/parts/dashboard/widgets/properties/propertiesJson.ts rename to src/sql/workbench/parts/dashboard/widgets/properties/propertiesJson.ts index 1b6616f6d4..ce8cc650b0 100644 --- a/src/sql/parts/dashboard/widgets/properties/propertiesJson.ts +++ b/src/sql/workbench/parts/dashboard/widgets/properties/propertiesJson.ts @@ -6,8 +6,8 @@ import { ProviderProperties } from './propertiesWidget.component'; import * as nls from 'vs/nls'; -let azureEditionDisplayName = nls.localize('azureEdition', 'Edition'); -let azureType = nls.localize('azureType', 'Type'); +const azureEditionDisplayName = nls.localize('azureEdition', 'Edition'); +const azureType = nls.localize('azureType', 'Type'); export const properties: Array = [ { diff --git a/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.html b/src/sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.html similarity index 100% rename from src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.html rename to src/sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.html diff --git a/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.ts similarity index 92% rename from src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts rename to src/sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.ts index db36f0b2eb..1c8b0169b3 100644 --- a/src/sql/parts/dashboard/widgets/properties/propertiesWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.ts @@ -5,7 +5,7 @@ import { Component, Inject, forwardRef, ChangeDetectorRef, OnInit, ElementRef, ViewChild } from '@angular/core'; -import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/parts/dashboard/common/dashboardWidget'; +import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import { toDisposableSubscription } from 'sql/base/node/rxjsUtils'; @@ -55,7 +55,7 @@ export interface DisplayProperty { @Component({ selector: 'properties-widget', - templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/widgets/properties/propertiesWidget.component.html')) + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component.html')) }) export class PropertiesWidgetComponent extends DashboardWidget implements IDashboardWidget, OnInit { private _connection: ConnectionManagementInfo; @@ -115,16 +115,16 @@ export class PropertiesWidgetComponent extends DashboardWidget implements IDashb } private parseProperties() { - let provider = this._config.provider; + const provider = this._config.provider; let propertyArray: Array; // if config exists use that, otherwise use default if (this._config.widget['properties-widget'] && this._config.widget['properties-widget'].properties) { - let config = this._config.widget['properties-widget']; + const config = this._config.widget['properties-widget']; propertyArray = config.properties; } else { - let providerProperties = dashboardRegistry.getProperties(provider as string); + const providerProperties = dashboardRegistry.getProperties(provider as string); if (!providerProperties) { this.consoleError('No property definitions found for provider', provider); @@ -141,8 +141,8 @@ export class PropertiesWidgetComponent extends DashboardWidget implements IDashb '. If there are not multiple flavors of this provider, add one flavor without a condition'); return; } else { - let flavorArray = providerProperties.flavors.filter((item) => { - let condition = this._connection.serverInfo[item.condition.field]; + const flavorArray = providerProperties.flavors.filter((item) => { + const condition = this._connection.serverInfo[item.condition.field]; switch (item.condition.operator) { case '==': return condition === item.condition.value; @@ -203,8 +203,8 @@ export class PropertiesWidgetComponent extends DashboardWidget implements IDashb // iterate over properties and display them this.properties = []; for (let i = 0; i < propertyArray.length; i++) { - let property = propertyArray[i]; - let assignProperty = {}; + const property = propertyArray[i]; + const assignProperty = {}; let propertyObject = this.getValueOrDefault(infoObject, property.value, property.default || '--'); // make sure the value we got shouldn't be ignored diff --git a/src/sql/parts/dashboard/widgets/tasks/media/taskWidget.css b/src/sql/workbench/parts/dashboard/widgets/tasks/media/taskWidget.css similarity index 100% rename from src/sql/parts/dashboard/widgets/tasks/media/taskWidget.css rename to src/sql/workbench/parts/dashboard/widgets/tasks/media/taskWidget.css diff --git a/src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.html b/src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.html similarity index 100% rename from src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.html rename to src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.html diff --git a/src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.ts similarity index 93% rename from src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.ts rename to src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.ts index c0a0efc874..3131a16cf5 100644 --- a/src/sql/parts/dashboard/widgets/tasks/tasksWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.ts @@ -10,7 +10,7 @@ import 'vs/css!./media/taskWidget'; import { Component, Inject, forwardRef, ViewChild, OnInit, ElementRef } from '@angular/core'; /* SQL imports */ -import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/parts/dashboard/common/dashboardWidget'; +import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { TaskRegistry } from 'sql/platform/tasks/common/tasks'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; @@ -38,7 +38,7 @@ const selector = 'tasks-widget'; @Component({ selector, - templateUrl: decodeURI(require.toUrl('sql/parts/dashboard/widgets/tasks/tasksWidget.component.html')) + templateUrl: decodeURI(require.toUrl('sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.component.html')) }) export class TasksWidget extends DashboardWidget implements IDashboardWidget, OnInit { private _size: number = 98; @@ -150,13 +150,13 @@ export class TasksWidget extends DashboardWidget implements IDashboardWidget, On } private registerThemeing(theme: ITheme, collector: ICssStyleCollector) { - let contrastBorder = theme.getColor(colors.contrastBorder); - let sideBarColor = theme.getColor(themeColors.SIDE_BAR_BACKGROUND); + const contrastBorder = theme.getColor(colors.contrastBorder); + const sideBarColor = theme.getColor(themeColors.SIDE_BAR_BACKGROUND); if (contrastBorder) { - let contrastBorderString = contrastBorder.toString(); + const contrastBorderString = contrastBorder.toString(); collector.addRule(`tasks-widget .task-tile { border: 1px solid ${contrastBorderString} }`); } else { - let sideBarColorString = sideBarColor.toString(); + const sideBarColorString = sideBarColor.toString(); collector.addRule(`tasks-widget .task-tile { background-color: ${sideBarColorString} }`); } } diff --git a/src/sql/parts/dashboard/widgets/tasks/tasksWidget.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.contribution.ts similarity index 99% rename from src/sql/parts/dashboard/widgets/tasks/tasksWidget.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.contribution.ts index dadcd76065..d3cf1b0676 100644 --- a/src/sql/parts/dashboard/widgets/tasks/tasksWidget.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/tasks/tasksWidget.contribution.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 { registerDashboardWidget } from 'sql/platform/dashboard/common/widgetRegistry'; import { TaskRegistry } from 'sql/platform/tasks/common/tasks'; diff --git a/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts b/src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component.ts similarity index 89% rename from src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts rename to src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component.ts index a4312604d3..bb7fc24d25 100644 --- a/src/sql/parts/dashboard/widgets/webview/webviewWidget.component.ts +++ b/src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.component.ts @@ -3,14 +3,14 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Component, Inject, forwardRef, ChangeDetectorRef, OnInit, ViewChild, ElementRef } from '@angular/core'; +import { Component, Inject, forwardRef, OnInit, ElementRef } from '@angular/core'; import { Event, Emitter } from 'vs/base/common/event'; import { IDisposable } from 'vs/base/common/lifecycle'; import { memoize } from 'vs/base/common/decorators'; -import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +import { DashboardWidget, IDashboardWidget, WidgetConfig, WIDGET_CONFIG } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; import { IDashboardWebview, IDashboardViewService } from 'sql/platform/dashboard/common/dashboardViewService'; @@ -71,8 +71,8 @@ export class WebviewWidget extends DashboardWidget implements IDashboardWidget, @memoize public get connection(): azdata.connection.Connection { - let currentConnection = this._dashboardService.connectionManagementService.connectionInfo.connectionProfile; - let connection: azdata.connection.Connection = { + const currentConnection = this._dashboardService.connectionManagementService.connectionInfo.connectionProfile; + const connection: azdata.connection.Connection = { providerName: currentConnection.providerName, connectionId: currentConnection.id, options: currentConnection.options diff --git a/src/sql/parts/dashboard/widgets/webview/webviewWidget.contribution.ts b/src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.contribution.ts similarity index 94% rename from src/sql/parts/dashboard/widgets/webview/webviewWidget.contribution.ts rename to src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.contribution.ts index dbca3a1597..86d660c831 100644 --- a/src/sql/parts/dashboard/widgets/webview/webviewWidget.contribution.ts +++ b/src/sql/workbench/parts/dashboard/widgets/webview/webviewWidget.contribution.ts @@ -2,10 +2,11 @@ * Copyright (c) Microsoft Corporation. All rights reserved. * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ + import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { registerDashboardWidget } from 'sql/platform/dashboard/common/widgetRegistry'; -let webviewSchema: IJSONSchema = { +const webviewSchema: IJSONSchema = { type: 'object', properties: { id: { diff --git a/src/sql/workbench/services/insights/browser/insightsDialogService.ts b/src/sql/workbench/services/insights/browser/insightsDialogService.ts index aac11b3069..495557beb6 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogService.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogService.ts @@ -7,7 +7,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { InsightsDialogController } from 'sql/workbench/services/insights/node/insightsDialogController'; import { InsightsDialogView } from 'sql/workbench/services/insights/browser/insightsDialogView'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { IInsightsDialogModel, IInsightsDialogService } from 'sql/workbench/services/insights/common/insightsDialogService'; import { InsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogModel'; diff --git a/src/sql/workbench/services/insights/browser/insightsDialogView.ts b/src/sql/workbench/services/insights/browser/insightsDialogView.ts index 37f72e2387..7ac8346312 100644 --- a/src/sql/workbench/services/insights/browser/insightsDialogView.ts +++ b/src/sql/workbench/services/insights/browser/insightsDialogView.ts @@ -7,7 +7,7 @@ import 'vs/css!./media/insightsDialog'; import { Button } from 'sql/base/browser/ui/button/button'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { Modal } from 'sql/workbench/browser/modal/modal'; -import { IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfigDetails } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { attachButtonStyler, attachModalDialogStyler, attachTableStyler, attachPanelStyler } from 'sql/platform/theme/common/styler'; import { TaskRegistry } from 'sql/platform/tasks/common/tasks'; import { ConnectionProfile } from 'sql/platform/connection/common/connectionProfile'; diff --git a/src/sql/workbench/services/insights/common/insightsDialogModel.ts b/src/sql/workbench/services/insights/common/insightsDialogModel.ts index a9f56f7b16..d9cfd21652 100644 --- a/src/sql/workbench/services/insights/common/insightsDialogModel.ts +++ b/src/sql/workbench/services/insights/common/insightsDialogModel.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { IInsightsDialogModel, ListResource } from 'sql/workbench/services/insights/common/insightsDialogService'; -import { IInsightsConfigDetails, IInsightsLabel } from 'sql/parts/dashboard/widgets/insights/interfaces'; -import { Conditional } from 'sql/parts/dashboard/common/interfaces'; +import { IInsightsConfigDetails, IInsightsLabel } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; +import { Conditional } from 'sql/workbench/parts/dashboard/common/interfaces'; import { Event, Emitter } from 'vs/base/common/event'; diff --git a/src/sql/workbench/services/insights/common/insightsDialogService.ts b/src/sql/workbench/services/insights/common/insightsDialogService.ts index bc93aae7d4..486f193f60 100644 --- a/src/sql/workbench/services/insights/common/insightsDialogService.ts +++ b/src/sql/workbench/services/insights/common/insightsDialogService.ts @@ -5,7 +5,7 @@ import { Event } from 'vs/base/common/event'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; -import { IInsightsConfigDetails, IInsightsConfig } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfigDetails, IInsightsConfig } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { BaseActionContext } from 'sql/workbench/common/actions'; diff --git a/src/sql/workbench/services/insights/node/insightsDialogController.ts b/src/sql/workbench/services/insights/node/insightsDialogController.ts index fa099a4102..98d29e7b10 100644 --- a/src/sql/workbench/services/insights/node/insightsDialogController.ts +++ b/src/sql/workbench/services/insights/node/insightsDialogController.ts @@ -5,7 +5,7 @@ import { IConnectionManagementService } from 'sql/platform/connection/common/connectionManagement'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; -import { IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfigDetails } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import QueryRunner, { EventType as QREvents } from 'sql/platform/query/common/queryRunner'; import * as Utils from 'sql/platform/connection/common/utils'; import { IInsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogService'; diff --git a/src/sqltest/parts/dashboard/widgets/explorerWidget.component.test.ts b/src/sqltest/parts/dashboard/widgets/explorerWidget.component.test.ts index b5fd9a95d4..98ee04fca3 100644 --- a/src/sqltest/parts/dashboard/widgets/explorerWidget.component.test.ts +++ b/src/sqltest/parts/dashboard/widgets/explorerWidget.component.test.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { ObjectMetadataWrapper } from 'sql/parts/dashboard/widgets/explorer/explorerTree'; +import { ObjectMetadataWrapper } from 'sql/workbench/parts/dashboard/widgets/explorer/explorerTree'; import { MetadataType } from 'sql/platform/connection/common/connectionManagement'; import * as assert from 'assert'; @@ -56,4 +56,4 @@ suite('Explorer Widget Tests', () => { let expectedList = [testMetadata[1], testMetadata[4], testMetadata[0], testMetadata[2], testMetadata[3]]; expectedList.forEach((expectedWrapper, index) => assert.equal(sortedMetadata[index], expectedWrapper)); }); -}); \ No newline at end of file +}); diff --git a/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts b/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts index bf0254de8d..43cbbd5ddb 100644 --- a/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts +++ b/src/sqltest/parts/dashboard/widgets/propertiesWidget.component.test.ts @@ -7,10 +7,10 @@ import { Observable } from 'rxjs/Observable'; // of is not on Observable by default, need to import it import 'rxjs/add/observable/of'; -import { WidgetConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { DashboardServiceInterface } from 'sql/parts/dashboard/services/dashboardServiceInterface.service'; +import { WidgetConfig } from 'sql/workbench/parts/dashboard/common/dashboardWidget'; +import { DashboardServiceInterface } from 'sql/workbench/parts/dashboard/services/dashboardServiceInterface.service'; import { SingleAdminService, SingleConnectionManagementService } from 'sql/services/common/commonServiceInterface.service'; -import { PropertiesWidgetComponent } from 'sql/parts/dashboard/widgets/properties/propertiesWidget.component'; +import { PropertiesWidgetComponent } from 'sql/workbench/parts/dashboard/widgets/properties/propertiesWidget.component'; import { ConnectionManagementInfo } from 'sql/platform/connection/common/connectionManagementInfo'; import * as TypeMoq from 'typemoq'; diff --git a/src/sqltest/parts/insights/insightsDialogController.test.ts b/src/sqltest/parts/insights/insightsDialogController.test.ts index af0d27672c..b869b0aa98 100644 --- a/src/sqltest/parts/insights/insightsDialogController.test.ts +++ b/src/sqltest/parts/insights/insightsDialogController.test.ts @@ -7,7 +7,7 @@ import { InsightsDialogController } from 'sql/workbench/services/insights/node/i import { InsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogModel'; import QueryRunner, { EventType } from 'sql/platform/query/common/queryRunner'; import { ConnectionManagementService } from 'sql/platform/connection/common/connectionManagementService'; -import { IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsConfigDetails } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { InstantiationService } from 'vs/platform/instantiation/common/instantiationService'; diff --git a/src/sqltest/parts/insights/insightsDialogModel.test.ts b/src/sqltest/parts/insights/insightsDialogModel.test.ts index 92cdef91b6..74e205b8a1 100644 --- a/src/sqltest/parts/insights/insightsDialogModel.test.ts +++ b/src/sqltest/parts/insights/insightsDialogModel.test.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 { IInsightsLabel, IInsightsConfigDetails } from 'sql/parts/dashboard/widgets/insights/interfaces'; +import { IInsightsLabel, IInsightsConfigDetails } from 'sql/workbench/parts/dashboard/widgets/insights/interfaces'; import { InsightsDialogModel } from 'sql/workbench/services/insights/common/insightsDialogModel'; import { isUndefinedOrNull } from 'vs/base/common/types'; @@ -250,4 +250,4 @@ suite('Insights Dialog Model Tests', () => { assert.equal(result[1].stateColor, 'green', 'always Condition did not return val as expected'); assert.equal(result[2].stateColor, 'green', 'always Condition did not return val as expected'); }); -}); \ No newline at end of file +}); diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 15cde4f4d6..a1245fa49f 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -452,24 +452,24 @@ import 'sql/parts/profiler/contrib/profilerActions.contribution'; import 'sql/parts/objectExplorer/serverGroupDialog/serverGroup.contribution'; import 'sql/platform/accounts/browser/accountManagement.contribution'; /* Insights */ -import 'sql/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; -import 'sql/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution'; -import 'sql/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution'; -import 'sql/parts/dashboard/widgets/insights/views/charts/types/lineChart.contribution'; -import 'sql/parts/dashboard/widgets/insights/views/charts/types/pieChart.contribution'; -import 'sql/parts/dashboard/widgets/insights/views/charts/types/scatterChart.contribution'; -import 'sql/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.contribution'; -import 'sql/parts/dashboard/widgets/insights/views/countInsight.contribution'; -import 'sql/parts/dashboard/widgets/insights/views/imageInsight.contribution'; -import 'sql/parts/dashboard/widgets/insights/views/tableInsight.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/barChart.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/doughnutChart.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/horizontalBarChart.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/lineChart.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/pieChart.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/scatterChart.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/charts/types/timeSeriesChart.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/countInsight.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/imageInsight.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/views/tableInsight.contribution'; /* Tasks */ import 'sql/workbench/common/actions.contribution'; /* Widgets */ -import 'sql/parts/dashboard/widgets/insights/insightsWidget.contribution'; -import 'sql/parts/dashboard/widgets/explorer/explorerWidget.contribution'; -import 'sql/parts/dashboard/widgets/tasks/tasksWidget.contribution'; -import 'sql/parts/dashboard/widgets/webview/webviewWidget.contribution'; -import 'sql/parts/dashboard/dashboardConfig.contribution'; +import 'sql/workbench/parts/dashboard/widgets/insights/insightsWidget.contribution'; +import 'sql/workbench/parts/dashboard/widgets/explorer/explorerWidget.contribution'; +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'; /* View Model Editor */ @@ -477,11 +477,11 @@ import 'sql/parts/modelComponents/modelEditor/modelViewEditor.contribution'; /* Notebook Editor */ import 'sql/parts/notebook/notebook.contribution'; /* Containers */ -import 'sql/parts/dashboard/containers/dashboardWebviewContainer.contribution'; -import 'sql/parts/dashboard/containers/dashboardControlHostContainer.contribution'; -import 'sql/parts/dashboard/containers/dashboardGridContainer.contribution'; -import 'sql/parts/dashboard/containers/dashboardWidgetContainer.contribution'; -import 'sql/parts/dashboard/containers/dashboardContainer.contribution'; -import 'sql/parts/dashboard/containers/dashboardNavSection.contribution'; -import 'sql/parts/dashboard/containers/dashboardModelViewContainer.contribution'; -import 'sql/parts/dashboard/common/dashboardTab.contribution'; +import 'sql/workbench/parts/dashboard/containers/dashboardWebviewContainer.contribution'; +import 'sql/workbench/parts/dashboard/containers/dashboardControlHostContainer.contribution'; +import 'sql/workbench/parts/dashboard/containers/dashboardGridContainer.contribution'; +import 'sql/workbench/parts/dashboard/containers/dashboardWidgetContainer.contribution'; +import 'sql/workbench/parts/dashboard/containers/dashboardContainer.contribution'; +import 'sql/workbench/parts/dashboard/containers/dashboardNavSection.contribution'; +import 'sql/workbench/parts/dashboard/containers/dashboardModelViewContainer.contribution'; +import 'sql/workbench/parts/dashboard/common/dashboardTab.contribution';