diff --git a/src/sql/platform/bootstrap/common/bootstrapParams.ts b/src/sql/platform/bootstrap/common/bootstrapParams.ts index 41cca5f0d8..e6192dbb1f 100644 --- a/src/sql/platform/bootstrap/common/bootstrapParams.ts +++ b/src/sql/platform/bootstrap/common/bootstrapParams.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { DataService } from 'sql/workbench/parts/grid/services/dataService'; +import { DataService } from 'sql/workbench/parts/grid/common/dataService'; import { IConnectionProfile } from 'sql/platform/connection/common/interfaces'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; import { ConnectionContextKey } from 'sql/workbench/parts/connection/common/connectionContextKey'; diff --git a/src/sql/platform/query/common/queryModel.ts b/src/sql/platform/query/common/queryModel.ts index cc8fae9c79..65d7d00f2b 100644 --- a/src/sql/platform/query/common/queryModel.ts +++ b/src/sql/platform/query/common/queryModel.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import QueryRunner from 'sql/platform/query/common/queryRunner'; -import { DataService } from 'sql/workbench/parts/grid/services/dataService'; +import { DataService } from 'sql/workbench/parts/grid/common/dataService'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { Event } from 'vs/base/common/event'; import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; diff --git a/src/sql/platform/query/common/queryModelService.ts b/src/sql/platform/query/common/queryModelService.ts index a775bcc69f..30653fe750 100644 --- a/src/sql/platform/query/common/queryModelService.ts +++ b/src/sql/platform/query/common/queryModelService.ts @@ -6,7 +6,7 @@ import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents'; import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants'; import QueryRunner from 'sql/platform/query/common/queryRunner'; -import { DataService } from 'sql/workbench/parts/grid/services/dataService'; +import { DataService } from 'sql/workbench/parts/grid/common/dataService'; import { IQueryModelService, IQueryEvent } from 'sql/platform/query/common/queryModel'; import { QueryInput } from 'sql/workbench/parts/query/common/queryInput'; diff --git a/src/sql/platform/telemetry/adsTelemetryService.ts b/src/sql/platform/telemetry/common/adsTelemetryService.ts similarity index 99% rename from src/sql/platform/telemetry/adsTelemetryService.ts rename to src/sql/platform/telemetry/common/adsTelemetryService.ts index 5c71405800..7eaf5bb7c5 100644 --- a/src/sql/platform/telemetry/adsTelemetryService.ts +++ b/src/sql/platform/telemetry/common/adsTelemetryService.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IAdsTelemetryService, ITelemetryInfo, ITelemetryEvent, ITelemetryConnectionInfo, ITelemetryEventMeasures, ITelemetryEventProperties } from 'sql/platform/telemetry/telemetry'; +import { IAdsTelemetryService, ITelemetryInfo, ITelemetryEvent, ITelemetryConnectionInfo, ITelemetryEventMeasures, ITelemetryEventProperties } from 'sql/platform/telemetry/common/telemetry'; import { ILogService } from 'vs/platform/log/common/log'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; @@ -186,4 +186,4 @@ export class AdsTelemetryService implements IAdsTelemetryService { public sendTelemetryEvent(eventName: string, properties?: ITelemetryEventProperties, measurements?: ITelemetryEventMeasures): void { this.createTelemetryEvent(eventName, properties, measurements).send(); } -} \ No newline at end of file +} diff --git a/src/sql/platform/telemetry/telemetry.ts b/src/sql/platform/telemetry/common/telemetry.ts similarity index 100% rename from src/sql/platform/telemetry/telemetry.ts rename to src/sql/platform/telemetry/common/telemetry.ts diff --git a/src/sql/workbench/common/actions.contribution.ts b/src/sql/workbench/common/actions.contribution.ts index 13f9a7e79e..d3e19c6b43 100644 --- a/src/sql/workbench/common/actions.contribution.ts +++ b/src/sql/workbench/common/actions.contribution.ts @@ -7,10 +7,7 @@ import * as Actions from './actions'; import * as nls from 'vs/nls'; -import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; import { Registry } from 'vs/platform/registry/common/platform'; -import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; -import { ShowCurrentReleaseNotesAction } from 'sql/workbench/update/releaseNotes'; import { IConfigurationRegistry, Extensions as ConfigExtensions } from 'vs/platform/configuration/common/configurationRegistry'; new Actions.BackupAction().registerTask(); @@ -18,10 +15,6 @@ new Actions.RestoreAction().registerTask(); new Actions.NewQueryAction().registerTask(); new Actions.ConfigureDashboardAction().registerTask(); -// add product update and release notes contributions -Registry.as(ActionExtensions.WorkbenchActions) - .registerWorkbenchAction(new SyncActionDescriptor(ShowCurrentReleaseNotesAction, ShowCurrentReleaseNotesAction.ID, ShowCurrentReleaseNotesAction.LABEL), 'Show Getting Started'); - Registry.as(ConfigExtensions.Configuration).registerConfiguration({ 'id': 'previewFeatures', 'title': nls.localize('previewFeatures.configTitle', "Preview Features"), diff --git a/src/sql/workbench/contrib/extensions/constants.ts b/src/sql/workbench/contrib/extensions/common/constants.ts similarity index 100% rename from src/sql/workbench/contrib/extensions/constants.ts rename to src/sql/workbench/contrib/extensions/common/constants.ts diff --git a/src/sql/workbench/contrib/extensions/extensionsActions.ts b/src/sql/workbench/contrib/extensions/common/extensionsActions.ts similarity index 83% rename from src/sql/workbench/contrib/extensions/extensionsActions.ts rename to src/sql/workbench/contrib/extensions/common/extensionsActions.ts index 33bf428ddc..77b9690c75 100644 --- a/src/sql/workbench/contrib/extensions/extensionsActions.ts +++ b/src/sql/workbench/contrib/extensions/common/extensionsActions.ts @@ -4,17 +4,16 @@ *--------------------------------------------------------------------------------------------*/ import { localize } from 'vs/nls'; -import { IAction, Action } from 'vs/base/common/actions'; -import { ShowViewletAction } from 'vs/workbench/browser/viewlet'; +import { Action } from 'vs/base/common/actions'; import { IViewletService } from 'vs/workbench/services/viewlet/browser/viewlet'; -import { IExtension, ExtensionState, IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewlet, AutoUpdateConfigurationKey, IExtensionContainer, EXTENSIONS_CONFIG, ExtensionsPolicy, ExtensionsPolicyKey } from 'vs/workbench/contrib/extensions/common/extensions'; -import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation'; +import { IExtensionsWorkbenchService, VIEWLET_ID, IExtensionsViewlet } from 'vs/workbench/contrib/extensions/common/extensions'; +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IExtensionRecommendation, IExtensionManagementServerService } from 'vs/workbench/services/extensionManagement/common/extensionManagement'; -import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; +import { INotificationService } from 'vs/platform/notification/common/notification'; import { IOpenerService } from 'vs/platform/opener/common/opener'; import { CancellationToken } from 'vs/base/common/cancellation'; import { PagedModel } from 'vs/base/common/paging'; -import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; +import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; function getScenarioID(scenarioType: string) { return 'workbench.extensions.action.show' + scenarioType; @@ -76,4 +75,4 @@ export class InstallRecommendedExtensionsByScenarioAction extends Action { }); }); } -} \ No newline at end of file +} diff --git a/src/sql/workbench/parts/grid/views/editData/editData.component.html b/src/sql/workbench/parts/editData/browser/editData.component.html similarity index 100% rename from src/sql/workbench/parts/grid/views/editData/editData.component.html rename to src/sql/workbench/parts/editData/browser/editData.component.html diff --git a/src/sql/workbench/parts/grid/views/editData/editData.component.ts b/src/sql/workbench/parts/editData/browser/editData.component.ts similarity index 99% rename from src/sql/workbench/parts/grid/views/editData/editData.component.ts rename to src/sql/workbench/parts/editData/browser/editData.component.ts index 904643edc9..5047ec5895 100644 --- a/src/sql/workbench/parts/grid/views/editData/editData.component.ts +++ b/src/sql/workbench/parts/editData/browser/editData.component.ts @@ -3,8 +3,6 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/workbench/parts/grid/media/flexbox'; -import 'vs/css!sql/workbench/parts/grid/media/styles'; import 'vs/css!./media/editData'; import { ElementRef, ChangeDetectorRef, OnInit, OnDestroy, Component, Inject, forwardRef, EventEmitter } from '@angular/core'; @@ -13,8 +11,8 @@ import { VirtualizedCollection } from 'angular2-slickgrid'; import { IGridDataSet } from 'sql/workbench/parts/grid/common/interfaces'; import * as Services from 'sql/base/browser/ui/table/formatters'; import { IEditDataComponentParams, IBootstrapParams } from 'sql/platform/bootstrap/common/bootstrapParams'; -import { GridParentComponent } from 'sql/workbench/parts/grid/views/gridParentComponent'; -import { EditDataGridActionProvider } from 'sql/workbench/parts/grid/views/editData/editDataGridActions'; +import { GridParentComponent } from 'sql/workbench/parts/editData/browser/gridParentComponent'; +import { EditDataGridActionProvider } from 'sql/workbench/parts/editData/browser/editDataGridActions'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; import { AutoColumnSize } from 'sql/base/browser/ui/table/plugins/autoSizeColumns.plugin'; diff --git a/src/sql/workbench/parts/grid/views/editData/editData.module.ts b/src/sql/workbench/parts/editData/browser/editData.module.ts similarity index 94% rename from src/sql/workbench/parts/grid/views/editData/editData.module.ts rename to src/sql/workbench/parts/editData/browser/editData.module.ts index 41f9c546af..edfe73f65d 100644 --- a/src/sql/workbench/parts/grid/views/editData/editData.module.ts +++ b/src/sql/workbench/parts/editData/browser/editData.module.ts @@ -9,7 +9,7 @@ import { CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; import { SlickGrid } from 'angular2-slickgrid'; -import { EditDataComponent } from 'sql/workbench/parts/grid/views/editData/editData.component'; +import { EditDataComponent } from 'sql/workbench/parts/editData/browser/editData.component'; import { providerIterator } from 'sql/platform/bootstrap/browser/bootstrapService'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; diff --git a/src/sql/workbench/parts/grid/views/editData/editDataGridActions.ts b/src/sql/workbench/parts/editData/browser/editDataGridActions.ts similarity index 92% rename from src/sql/workbench/parts/grid/views/editData/editDataGridActions.ts rename to src/sql/workbench/parts/editData/browser/editDataGridActions.ts index 572f340b39..373adc4e97 100644 --- a/src/sql/workbench/parts/grid/views/editData/editDataGridActions.ts +++ b/src/sql/workbench/parts/editData/browser/editDataGridActions.ts @@ -4,8 +4,8 @@ *--------------------------------------------------------------------------------------------*/ import { IGridInfo } from 'sql/workbench/parts/grid/common/interfaces'; -import { DataService } from 'sql/workbench/parts/grid/services/dataService'; -import { GridActionProvider } from 'sql/workbench/parts/grid/views/gridActions'; +import { DataService } from 'sql/workbench/parts/grid/common/dataService'; +import { GridActionProvider } from 'sql/workbench/parts/editData/common/gridActions'; import { localize } from 'vs/nls'; import { IAction, Action } from 'vs/base/common/actions'; diff --git a/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts b/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts index 03807fc803..286c99d0d7 100644 --- a/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts +++ b/src/sql/workbench/parts/editData/browser/editDataResultsEditor.ts @@ -18,8 +18,8 @@ import { IQueryModelService } from 'sql/platform/query/common/queryModel'; import { bootstrapAngular } from 'sql/platform/bootstrap/browser/bootstrapService'; import { BareResultsGridInfo } from 'sql/workbench/parts/query/browser/queryResultsEditor'; import { IEditDataComponentParams } from 'sql/platform/bootstrap/common/bootstrapParams'; -import { EditDataModule } from 'sql/workbench/parts/grid/views/editData/editData.module'; -import { EDITDATA_SELECTOR } from 'sql/workbench/parts/grid/views/editData/editData.component'; +import { EditDataModule } from 'sql/workbench/parts/editData/browser/editData.module'; +import { EDITDATA_SELECTOR } from 'sql/workbench/parts/editData/browser/editData.component'; import { EditDataResultsInput } from 'sql/workbench/parts/editData/common/editDataResultsInput'; import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; diff --git a/src/sql/workbench/parts/grid/views/gridCommands.ts b/src/sql/workbench/parts/editData/browser/gridCommands.ts similarity index 100% rename from src/sql/workbench/parts/grid/views/gridCommands.ts rename to src/sql/workbench/parts/editData/browser/gridCommands.ts diff --git a/src/sql/workbench/parts/grid/views/gridParentComponent.ts b/src/sql/workbench/parts/editData/browser/gridParentComponent.ts similarity index 98% rename from src/sql/workbench/parts/grid/views/gridParentComponent.ts rename to src/sql/workbench/parts/editData/browser/gridParentComponent.ts index 07d50ca48e..53bdbee5d1 100644 --- a/src/sql/workbench/parts/grid/views/gridParentComponent.ts +++ b/src/sql/workbench/parts/editData/browser/gridParentComponent.ts @@ -3,8 +3,8 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import 'vs/css!sql/workbench/parts/grid/media/flexbox'; -import 'vs/css!sql/workbench/parts/grid/media/styles'; +import 'vs/css!./media/flexbox'; +import 'vs/css!./media/styles'; import { Subscription, Subject } from 'rxjs/Rx'; import { ElementRef, QueryList, ChangeDetectorRef, ViewChildren } from '@angular/core'; @@ -13,8 +13,8 @@ import * as Constants from 'sql/workbench/parts/query/common/constants'; import * as LocalizedConstants from 'sql/workbench/parts/query/common/localizedConstants'; import { IGridInfo, IGridDataSet, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; import * as Utils from 'sql/platform/connection/common/utils'; -import { DataService } from 'sql/workbench/parts/grid/services/dataService'; -import * as actions from 'sql/workbench/parts/grid/views/gridActions'; +import { DataService } from 'sql/workbench/parts/grid/common/dataService'; +import * as actions from 'sql/workbench/parts/editData/common/gridActions'; import * as GridContentEvents from 'sql/workbench/parts/grid/common/gridContentEvents'; import { ResultsVisibleContext, ResultsGridFocussedContext, ResultsMessagesFocussedContext, QueryEditorVisibleContext } from 'sql/workbench/parts/query/common/queryContext'; import { IQueryEditorService } from 'sql/workbench/services/queryEditor/common/queryEditorService'; diff --git a/src/sql/workbench/parts/grid/views/editData/media/editData.css b/src/sql/workbench/parts/editData/browser/media/editData.css similarity index 100% rename from src/sql/workbench/parts/grid/views/editData/media/editData.css rename to src/sql/workbench/parts/editData/browser/media/editData.css diff --git a/src/sql/workbench/parts/grid/media/flexbox.css b/src/sql/workbench/parts/editData/browser/media/flexbox.css similarity index 100% rename from src/sql/workbench/parts/grid/media/flexbox.css rename to src/sql/workbench/parts/editData/browser/media/flexbox.css diff --git a/src/sql/workbench/parts/grid/media/styles.css b/src/sql/workbench/parts/editData/browser/media/styles.css similarity index 100% rename from src/sql/workbench/parts/grid/media/styles.css rename to src/sql/workbench/parts/editData/browser/media/styles.css diff --git a/src/sql/workbench/parts/grid/views/gridActions.ts b/src/sql/workbench/parts/editData/common/gridActions.ts similarity index 98% rename from src/sql/workbench/parts/grid/views/gridActions.ts rename to src/sql/workbench/parts/editData/common/gridActions.ts index 2bbb770409..415f45dcbe 100644 --- a/src/sql/workbench/parts/grid/views/gridActions.ts +++ b/src/sql/workbench/parts/editData/common/gridActions.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import { IGridInfo, SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; -import { DataService } from 'sql/workbench/parts/grid/services/dataService'; +import { DataService } from 'sql/workbench/parts/grid/common/dataService'; import { localize } from 'vs/nls'; import { IAction, Action } from 'vs/base/common/actions'; diff --git a/src/sql/workbench/parts/grid/services/dataService.ts b/src/sql/workbench/parts/grid/common/dataService.ts similarity index 100% rename from src/sql/workbench/parts/grid/services/dataService.ts rename to src/sql/workbench/parts/grid/common/dataService.ts diff --git a/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts b/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts index d04c293258..264389fa0c 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts +++ b/src/sql/workbench/parts/notebook/browser/outputs/gridOutput.component.ts @@ -13,7 +13,7 @@ import { IEditorService } from 'vs/workbench/services/editor/common/editorServic import { IUntitledEditorService } from 'vs/workbench/services/untitled/common/untitledEditorService'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { SaveFormat } from 'sql/workbench/parts/grid/common/interfaces'; -import { IDataResource } from 'sql/workbench/services/notebook/sql/sqlSessionManager'; +import { IDataResource } from 'sql/workbench/services/notebook/common/sql/sqlSessionManager'; import { ITextResourcePropertiesService } from 'vs/editor/common/services/resourceConfiguration'; import { getEolString, shouldIncludeHeaders, shouldRemoveNewLines } from 'sql/platform/query/common/queryRunner'; import { INotificationService } from 'vs/platform/notification/common/notification'; diff --git a/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts b/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts index aadfff83f6..1db409d0f5 100644 --- a/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts +++ b/src/sql/workbench/parts/notebook/browser/outputs/tableRenderers.ts @@ -8,7 +8,7 @@ import { Table } from 'sql/base/browser/ui/table/table'; import { textFormatter } from 'sql/base/browser/ui/table/formatters'; import { RowNumberColumn } from 'sql/base/browser/ui/table/plugins/rowNumberColumn.plugin'; import { escape } from 'sql/base/common/strings'; -import { IDataResource } from 'sql/workbench/services/notebook/sql/sqlSessionManager'; +import { IDataResource } from 'sql/workbench/services/notebook/common/sql/sqlSessionManager'; import { attachTableStyler } from 'sql/platform/theme/common/styler'; import { IThemeService } from 'vs/platform/theme/common/themeService'; import { MouseWheelSupport } from 'sql/base/browser/ui/table/plugins/mousewheelTableScroll.plugin'; diff --git a/src/sql/workbench/parts/query/browser/actions.ts b/src/sql/workbench/parts/query/browser/actions.ts index c6ea7eef5a..05b85e44b7 100644 --- a/src/sql/workbench/parts/query/browser/actions.ts +++ b/src/sql/workbench/parts/query/browser/actions.ts @@ -18,11 +18,11 @@ import { removeAnsiEscapeCodes } from 'vs/base/common/strings'; import { IGridDataProvider } from 'sql/platform/query/common/gridDataProvider'; import { INotificationService } from 'vs/platform/notification/common/notification'; import QueryRunner from 'sql/platform/query/common/queryRunner'; -import product from 'vs/platform/product/node/product'; import { GridTableState } from 'sql/workbench/parts/query/common/gridPanelState'; -import * as Constants from 'sql/workbench/contrib/extensions/constants'; -import { IAdsTelemetryService } from 'sql/platform/telemetry/telemetry'; +import * as Constants from 'sql/workbench/contrib/extensions/common/constants'; +import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; +import { IEnvironmentService } from 'vs/platform/environment/common/environment'; export interface IGridActionContext { gridDataProvider: IGridDataProvider; @@ -206,14 +206,15 @@ export class ChartDataAction extends Action { constructor( @IEditorService private editorService: IEditorService, - @IExtensionTipsService private readonly extensionTipsService: IExtensionTipsService + @IExtensionTipsService private readonly extensionTipsService: IExtensionTipsService, + @IEnvironmentService private readonly environmentService: IEnvironmentService ) { super(ChartDataAction.ID, ChartDataAction.LABEL, ChartDataAction.ICON); } public run(context: IGridActionContext): Promise { const activeEditor = this.editorService.activeControl as QueryEditor; - if (product.quality !== 'stable') { + if (this.environmentService.appQuality !== 'stable') { this.extensionTipsService.promptRecommendedExtensionsByScenario(Constants.visualizerExtensions); } activeEditor.chart({ batchId: context.batchId, resultId: context.resultId }); diff --git a/src/sql/workbench/parts/query/browser/query.contribution.ts b/src/sql/workbench/parts/query/browser/query.contribution.ts index 21b5b71b84..56c09509eb 100644 --- a/src/sql/workbench/parts/query/browser/query.contribution.ts +++ b/src/sql/workbench/parts/query/browser/query.contribution.ts @@ -25,8 +25,8 @@ import { RunQueryKeyboardAction, RunCurrentQueryKeyboardAction, CancelQueryKeyboardAction, RefreshIntellisenseKeyboardAction, ToggleQueryResultsKeyboardAction, RunQueryShortcutAction, RunCurrentQueryWithActualPlanKeyboardAction, FocusOnCurrentQueryKeyboardAction, ParseSyntaxAction } from 'sql/workbench/parts/query/browser/keyboardQueryActions'; -import * as gridActions from 'sql/workbench/parts/grid/views/gridActions'; -import * as gridCommands from 'sql/workbench/parts/grid/views/gridCommands'; +import * as gridActions from 'sql/workbench/parts/editData/common/gridActions'; +import * as gridCommands from 'sql/workbench/parts/editData/browser/gridCommands'; import * as Constants from 'sql/workbench/parts/query/common/constants'; import { localize } from 'vs/nls'; import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; diff --git a/src/sql/workbench/parts/telemetry/common/telemetry.contribution.ts b/src/sql/workbench/parts/telemetry/common/telemetry.contribution.ts index eab883ee8c..a1ac62c3e2 100644 --- a/src/sql/workbench/parts/telemetry/common/telemetry.contribution.ts +++ b/src/sql/workbench/parts/telemetry/common/telemetry.contribution.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { IAdsTelemetryService } from 'sql/platform/telemetry/telemetry'; +import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import { Registry } from 'vs/platform/registry/common/platform'; import { Extensions as WorkbenchExtensions, IWorkbenchContributionsRegistry, IWorkbenchContribution } from 'vs/workbench/common/contributions'; import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; diff --git a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts b/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts index 073223d7e7..7632380382 100644 --- a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts +++ b/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts @@ -32,7 +32,7 @@ import { registerNotebookThemes } from 'sql/workbench/parts/notebook/browser/not import { IQueryManagementService } from 'sql/platform/query/common/queryManagement'; import { notebookConstants } from 'sql/workbench/parts/notebook/common/models/modelInterfaces'; import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; -import { SqlNotebookProvider } from 'sql/workbench/services/notebook/sql/sqlNotebookProvider'; +import { SqlNotebookProvider } from 'sql/workbench/services/notebook/common/sql/sqlNotebookProvider'; import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService'; import { keys } from 'vs/base/common/map'; import { IFileService, IFileStatWithMetadata } from 'vs/platform/files/common/files'; diff --git a/src/sql/workbench/services/notebook/sql/sqlNotebookManager.ts b/src/sql/workbench/services/notebook/common/sql/sqlNotebookManager.ts similarity index 97% rename from src/sql/workbench/services/notebook/sql/sqlNotebookManager.ts rename to src/sql/workbench/services/notebook/common/sql/sqlNotebookManager.ts index fe2be454b4..d06eb687d9 100644 --- a/src/sql/workbench/services/notebook/sql/sqlNotebookManager.ts +++ b/src/sql/workbench/services/notebook/common/sql/sqlNotebookManager.ts @@ -9,7 +9,7 @@ import * as vscode from 'vscode'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; import { LocalContentManager } from 'sql/workbench/services/notebook/common/localContentManager'; -import { SqlSessionManager } from 'sql/workbench/services/notebook/sql/sqlSessionManager'; +import { SqlSessionManager } from 'sql/workbench/services/notebook/common/sql/sqlSessionManager'; export class SqlNotebookManager implements nb.NotebookProvider { private _contentManager: nb.ContentManager; @@ -47,4 +47,4 @@ export class SqlNotebookManager implements nb.NotebookProvider { public get standardKernels(): nb.IStandardKernel[] { return []; } -} \ No newline at end of file +} diff --git a/src/sql/workbench/services/notebook/sql/sqlNotebookProvider.ts b/src/sql/workbench/services/notebook/common/sql/sqlNotebookProvider.ts similarity index 96% rename from src/sql/workbench/services/notebook/sql/sqlNotebookProvider.ts rename to src/sql/workbench/services/notebook/common/sql/sqlNotebookProvider.ts index 23520099a4..250316794c 100644 --- a/src/sql/workbench/services/notebook/sql/sqlNotebookProvider.ts +++ b/src/sql/workbench/services/notebook/common/sql/sqlNotebookProvider.ts @@ -7,7 +7,7 @@ import { URI } from 'vs/base/common/uri'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { INotebookManager, INotebookProvider, SQL_NOTEBOOK_PROVIDER } from 'sql/workbench/services/notebook/common/notebookService'; -import { SqlNotebookManager } from 'sql/workbench/services/notebook/sql/sqlNotebookManager'; +import { SqlNotebookManager } from 'sql/workbench/services/notebook/common/sql/sqlNotebookManager'; export class SqlNotebookProvider implements INotebookProvider { private manager: SqlNotebookManager; @@ -27,4 +27,4 @@ export class SqlNotebookProvider implements INotebookProvider { handleNotebookClosed(notebookUri: URI): void { // No-op } -} \ No newline at end of file +} diff --git a/src/sql/workbench/services/notebook/sql/sqlSessionManager.ts b/src/sql/workbench/services/notebook/common/sql/sqlSessionManager.ts similarity index 100% rename from src/sql/workbench/services/notebook/sql/sqlSessionManager.ts rename to src/sql/workbench/services/notebook/common/sql/sqlSessionManager.ts diff --git a/src/sql/workbench/update/electron-browser/releaseNotes.contribution.ts b/src/sql/workbench/update/electron-browser/releaseNotes.contribution.ts new file mode 100644 index 0000000000..1cea49cb68 --- /dev/null +++ b/src/sql/workbench/update/electron-browser/releaseNotes.contribution.ts @@ -0,0 +1,13 @@ +/*--------------------------------------------------------------------------------------------- + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the Source EULA. See License.txt in the project root for license information. + *--------------------------------------------------------------------------------------------*/ + +import { IWorkbenchActionRegistry, Extensions as ActionExtensions } from 'vs/workbench/common/actions'; +import { ShowCurrentReleaseNotesAction } from 'sql/workbench/update/electron-browser/releaseNotes'; +import { SyncActionDescriptor } from 'vs/platform/actions/common/actions'; +import { Registry } from 'vs/platform/registry/common/platform'; + +// add product update and release notes contributions +Registry.as(ActionExtensions.WorkbenchActions) + .registerWorkbenchAction(new SyncActionDescriptor(ShowCurrentReleaseNotesAction, ShowCurrentReleaseNotesAction.ID, ShowCurrentReleaseNotesAction.LABEL), 'Show Getting Started'); diff --git a/src/sql/workbench/update/releaseNotes.ts b/src/sql/workbench/update/electron-browser/releaseNotes.ts similarity index 100% rename from src/sql/workbench/update/releaseNotes.ts rename to src/sql/workbench/update/electron-browser/releaseNotes.ts diff --git a/src/vs/platform/product/browser/productService.ts b/src/vs/platform/product/browser/productService.ts index f1abde0c15..ec4a2b76ee 100644 --- a/src/vs/platform/product/browser/productService.ts +++ b/src/vs/platform/product/browser/productService.ts @@ -21,6 +21,8 @@ export class ProductService implements IProductService { get vscodeVersion(): string { return '1.35.0'; } // {{SQL CARBON EDIT}} add vscodeversion + get recommendedExtensionsByScenario(): { [area: string]: Array } { return this.productConfiguration.recommendedExtensionsByScenario; }// {{SQL CARBON EDIT}} add getter + get commit(): string | undefined { return this.productConfiguration ? this.productConfiguration.commit : undefined; } get nameLong(): string { return ''; } @@ -48,4 +50,4 @@ export class ProductService implements IProductService { get extensionAllowedBadgeProviders(): readonly string[] | undefined { return this.productConfiguration ? this.productConfiguration.extensionAllowedBadgeProviders : undefined; } get aiConfig() { return this.productConfiguration ? this.productConfiguration.aiConfig : undefined; } -} \ No newline at end of file +} diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts index e8080310f7..ef3e0680cf 100644 --- a/src/vs/platform/product/common/product.ts +++ b/src/vs/platform/product/common/product.ts @@ -12,6 +12,7 @@ export interface IProductService { readonly version: string; readonly vscodeVersion: string; // {{SQL CARBON EDIT}} add vscode version + readonly recommendedExtensionsByScenario: { [area: string]: Array }; // {{SQL CARBON EDIT}} add getter readonly commit?: string; readonly nameLong: string; @@ -74,7 +75,7 @@ export interface IProductConfiguration { }; extensionTips: { [id: string]: string; }; recommendedExtensions: string[]; // {{SQL CARBON EDIT}} - recommendedExtensionsByScenario: string[]; // {{SQL CARBON EDIT}} + recommendedExtensionsByScenario: { [area: string]: Array }; // {{SQL CARBON EDIT}} extensionImportantTips: { [id: string]: { name: string; pattern: string; isExtensionPack?: boolean }; }; readonly exeBasedExtensionTips: { [id: string]: IExeBasedExtensionTip; }; readonly extensionKeywords: { [extension: string]: readonly string[]; }; diff --git a/src/vs/platform/product/node/productService.ts b/src/vs/platform/product/node/productService.ts index 540d05c74d..875cebf123 100644 --- a/src/vs/platform/product/node/productService.ts +++ b/src/vs/platform/product/node/productService.ts @@ -16,6 +16,8 @@ export class ProductService implements IProductService { get vscodeVersion(): string { return '1.35.0'; } // {{SQL CARBON EDIT}} add vscodeversion + get recommendedExtensionsByScenario(): { [area: string]: Array } { return product.recommendedExtensionsByScenario; }// {{SQL CARBON EDIT}} add getter + get commit(): string | undefined { return product.commit; } get nameLong(): string { return product.nameLong; } @@ -41,4 +43,4 @@ export class ProductService implements IProductService { get extensionKeywords(): { [extension: string]: readonly string[]; } | undefined { return product.extensionKeywords; } get extensionAllowedBadgeProviders(): readonly string[] | undefined { return product.extensionAllowedBadgeProviders; } -} \ No newline at end of file +} diff --git a/src/vs/workbench/common/editor/editorGroup.ts b/src/vs/workbench/common/editor/editorGroup.ts index 61304b3f0f..989c25a2d2 100644 --- a/src/vs/workbench/common/editor/editorGroup.ts +++ b/src/vs/workbench/common/editor/editorGroup.ts @@ -19,7 +19,7 @@ import { UntitledEditorInput } from 'vs/workbench/common/editor/untitledEditorIn import * as CustomInputConverter from 'sql/workbench/common/customInputConverter'; import { NotebookInput } from 'sql/workbench/parts/notebook/common/models/notebookInput'; import { FileEditorInput } from 'vs/workbench/contrib/files/common/editors/fileEditorInput'; -import * as path from 'path'; +import * as path from 'vs/base/common/path'; import * as os from 'os'; const EditorOpenPositioning = { diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts index f2e45817dd..ffa3d815f6 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsViews.ts @@ -48,8 +48,6 @@ import { IProductService } from 'vs/platform/product/common/product'; import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; -import product from 'vs/platform/product/node/product'; // {{SQL CARBON EDIT}} - class ExtensionsViewState extends Disposable implements IExtensionsViewState { @@ -429,15 +427,17 @@ export class ExtensionsListView extends ViewletPanel { } // {{SQL CARBON EDIT}} - let promiseRecommendedExtensionsByScenario; - Object.keys(product.recommendedExtensionsByScenario).forEach(scenarioType => { - let re = new RegExp('@' + scenarioType, 'i'); - if (re.test(query.value)) { - promiseRecommendedExtensionsByScenario = this.getRecommendedExtensionsByScenario(token, scenarioType); + if (this.productService) { + let promiseRecommendedExtensionsByScenario: Promise> | undefined; + Object.keys(this.productService.recommendedExtensionsByScenario).forEach(scenarioType => { + let re = new RegExp('@' + scenarioType, 'i'); + if (re.test(query.value)) { + promiseRecommendedExtensionsByScenario = this.getRecommendedExtensionsByScenario(token, scenarioType); + } + }); + if (promiseRecommendedExtensionsByScenario) { + return promiseRecommendedExtensionsByScenario; } - }); - if (promiseRecommendedExtensionsByScenario) { - return promiseRecommendedExtensionsByScenario; } // {{SQL CARBON EDIT}} - End diff --git a/src/vs/workbench/contrib/extensions/electron-browser/extensionTipsService.ts b/src/vs/workbench/contrib/extensions/electron-browser/extensionTipsService.ts index 06397b84cf..05922a0800 100644 --- a/src/vs/workbench/contrib/extensions/electron-browser/extensionTipsService.ts +++ b/src/vs/workbench/contrib/extensions/electron-browser/extensionTipsService.ts @@ -18,8 +18,8 @@ import product from 'vs/platform/product/node/product'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; // {{SQL CARBON EDIT}} import { ShowRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction, InstallRecommendedExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions'; -import { ShowRecommendedExtensionsByScenarioAction, InstallRecommendedExtensionsByScenarioAction } from 'sql/workbench/contrib/extensions/extensionsActions'; -import * as Constants from 'sql/workbench/contrib/extensions/constants'; +import { ShowRecommendedExtensionsByScenarioAction, InstallRecommendedExtensionsByScenarioAction } from 'sql/workbench/contrib/extensions/common/extensionsActions'; +import * as Constants from 'sql/workbench/contrib/extensions/common/constants'; // {{SQL CARBON EDIT}} - End import Severity from 'vs/base/common/severity'; import { IWorkspaceContextService, IWorkspaceFolder, IWorkspace, IWorkspaceFoldersChangeEvent, WorkbenchState } from 'vs/platform/workspace/common/workspace'; @@ -50,7 +50,7 @@ import { extname } from 'vs/base/common/resources'; import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'; import { IExeBasedExtensionTip } from 'vs/platform/product/common/product'; import { timeout } from 'vs/base/common/async'; -import { IAdsTelemetryService } from 'sql/platform/telemetry/telemetry'; +import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys'; const milliSecondsInADay = 1000 * 60 * 60 * 24; diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 451c1f7fe2..572c46ceb1 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -237,8 +237,8 @@ import { DashboardService } from 'sql/platform/dashboard/browser/dashboardServic import { NotebookService } from 'sql/workbench/services/notebook/common/notebookServiceImpl'; import { INotebookService } from 'sql/workbench/services/notebook/common/notebookService'; import { OEShimService, IOEShimService } from 'sql/workbench/parts/objectExplorer/common/objectExplorerViewTreeShim'; -import { IAdsTelemetryService } from 'sql/platform/telemetry/telemetry'; -import { AdsTelemetryService } from 'sql/platform/telemetry/adsTelemetryService'; +import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry'; +import { AdsTelemetryService } from 'sql/platform/telemetry/common/adsTelemetryService'; registerSingleton(IDashboardService, DashboardService); registerSingleton(IDashboardViewService, DashboardViewService); @@ -462,6 +462,7 @@ import { IWorkspaceStatsService, WorkspaceStatsService } from 'vs/workbench/cont // {{SQL CARBON EDIT}} // SQL import 'sql/workbench/parts/tasks/browser/tasks.contribution'; +import 'sql/workbench/update/electron-browser/releaseNotes.contribution'; // data explorer import 'sql/workbench/parts/dataExplorer/browser/dataExplorer.contribution';