diff --git a/src/sql/parts/admin/security/createLogin.module.ts b/src/sql/parts/admin/security/createLogin.module.ts index 391c33ccde..bad681b912 100644 --- a/src/sql/parts/admin/security/createLogin.module.ts +++ b/src/sql/parts/admin/security/createLogin.module.ts @@ -6,12 +6,14 @@ import { NgModule, Inject, forwardRef, ApplicationRef, ComponentFactoryResolver, Type } from '@angular/core'; import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; -import { CreateLoginComponent, CREATELOGIN_SELECTOR } from 'sql/parts/admin/security/createLogin.component'; +import { IBootstrapParams, providerIterator } from 'sql/services/bootstrap/bootstrapService'; +import { CreateLoginComponent } from 'sql/parts/admin/security/createLogin.component'; + +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; // Connection Dashboard main angular module -export const CreateLoginModule = (params: IBootstrapParams, selector: string): Type => { +export const CreateLoginModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { @NgModule({ declarations: [ @@ -24,7 +26,8 @@ export const CreateLoginModule = (params: IBootstrapParams, selector: string): T ], providers: [ { provide: APP_BASE_HREF, useValue: '/' }, - { provide: IBootstrapParams, useValue: params } + { provide: IBootstrapParams, useValue: params }, + ...providerIterator(instantiationService) ] }) class ModuleClass { diff --git a/src/sql/parts/dashboard/dashboard.module.ts b/src/sql/parts/dashboard/dashboard.module.ts index 2e0a7ead12..44c7940136 100644 --- a/src/sql/parts/dashboard/dashboard.module.ts +++ b/src/sql/parts/dashboard/dashboard.module.ts @@ -3,7 +3,7 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { Inject, NgModule, forwardRef, ApplicationRef, ComponentFactoryResolver, NgModuleRef, NgModuleFactory } from '@angular/core'; +import { Inject, NgModule, forwardRef, ApplicationRef, ComponentFactoryResolver } from '@angular/core'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; import { RouterModule, Routes, UrlSerializer, Router, NavigationEnd } from '@angular/router'; @@ -14,7 +14,7 @@ import { ChartsModule } from 'ng2-charts/ng2-charts'; import CustomUrlSerializer from 'sql/common/urlSerializer'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { Extensions as ComponentExtensions, IComponentRegistry } from 'sql/platform/dashboard/common/modelComponentRegistry'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; import { Registry } from 'vs/platform/registry/common/platform'; @@ -32,7 +32,7 @@ import { CommonServiceInterface } from 'sql/services/common/commonServiceInterfa import { ComponentHostDirective } from 'sql/parts/dashboard/common/componentHost.directive'; /* Base Components */ -import { DashboardComponent, DASHBOARD_SELECTOR } from 'sql/parts/dashboard/dashboard.component'; +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'; @@ -80,7 +80,8 @@ import { ExplorerWidget } from 'sql/parts/dashboard/widgets/explorer/explorerWid 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 { JobStepsViewComponent } from '../jobManagement/views/jobStepsView.component'; +import { JobStepsViewComponent } from 'sql/parts/jobManagement/views/jobStepsView.component'; +import { IInstantiationService, _util } from 'vs/platform/instantiation/common/instantiation'; let widgetComponents = [ PropertiesWidgetComponent, @@ -109,7 +110,7 @@ const appRoutes: Routes = [ ]; // Connection Dashboard main angular module -export const DashboardModule = (params, selector: string): any => { +export const DashboardModule = (params, selector: string, instantiationService: IInstantiationService): any => { @NgModule({ declarations: [ ...baseComponents, @@ -140,31 +141,31 @@ export const DashboardModule = (params, selector: string): any => { { provide: IBreadcrumbService, useClass: BreadcrumbService }, { provide: CommonServiceInterface, useClass: DashboardServiceInterface }, { provide: UrlSerializer, useClass: CustomUrlSerializer }, - { provide: IBootstrapParams, useValue: params } + { provide: IBootstrapParams, useValue: params }, + { provide: ISelector, useValue: selector }, + ...providerIterator(instantiationService) ] }) class ModuleClass { - private _bootstrap: DashboardServiceInterface; + private navigations = 0; constructor( @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver, - @Inject(forwardRef(() => CommonServiceInterface)) bootstrap: CommonServiceInterface, @Inject(forwardRef(() => Router)) private _router: Router, - @Inject(ITelemetryService) private telemetryService: ITelemetryService + @Inject(ITelemetryService) private telemetryService: ITelemetryService, + @Inject(ISelector) private selector: string ) { - this._bootstrap = bootstrap as DashboardServiceInterface; } ngDoBootstrap(appRef: ApplicationRef) { const factory = this._resolver.resolveComponentFactory(DashboardComponent); - this._bootstrap.selector = selector; - (factory).factory.selector = selector; + (factory).factory.selector = this.selector; appRef.bootstrap(factory); this._router.events.subscribe(e => { if (e instanceof NavigationEnd) { - this._bootstrap.handlePageNavigation(); + this.navigations++; TelemetryUtils.addTelemetry(this.telemetryService, TelemetryKeys.DashboardNavigated, { - numberOfNavigations: this._bootstrap.getNumberOfPageNavigations(), + numberOfNavigations: this.navigations, routeUrl: e.url }); } diff --git a/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts b/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts index 249ffe96b3..79a3687c9c 100644 --- a/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts +++ b/src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts @@ -4,50 +4,29 @@ *--------------------------------------------------------------------------------------------*/ /* Node Modules */ -import { Injectable, Inject, forwardRef, OnDestroy } from '@angular/core'; +import { Injectable, Inject, forwardRef } from '@angular/core'; import { Router } from '@angular/router'; -import { Observable } from 'rxjs/Observable'; /* SQL imports */ import { IDashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams'; import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; import { IMetadataService } from 'sql/services/metadata/metadataService'; import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement'; -import { ConnectionManagementInfo } from 'sql/parts/connection/common/connectionManagementInfo'; import { IAdminService } from 'sql/parts/admin/common/adminService'; import { IQueryManagementService } from 'sql/parts/query/common/queryManagement'; import { toDisposableSubscription } from 'sql/parts/common/rxjsUtils'; -import { IInsightsDialogService } from 'sql/parts/insights/common/interfaces'; -import { ICapabilitiesService } from 'sql/services/capabilities/capabilitiesService'; -import { IConnectionProfile } from 'sql/parts/connection/common/interfaces'; import { AngularEventType, IAngularEvent, IAngularEventingService } from 'sql/services/angularEventing/angularEventingService'; import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry'; import { TabSettingConfig } from 'sql/parts/dashboard/common/dashboardWidget'; -import { IDashboardViewService } from 'sql/services/dashboard/common/dashboardViewService'; -import { AngularDisposable } from 'sql/base/common/lifecycle'; -import { ConnectionContextkey } from 'sql/parts/connection/common/connectionContextKey'; -import { SingleConnectionMetadataService, SingleConnectionManagementService, SingleAdminService, SingleQueryManagementService, CommonServiceInterface } -from 'sql/services/common/commonServiceInterface.service'; - -import { ProviderMetadata, DatabaseInfo, SimpleExecuteResult } from 'sqlops'; +import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; /* VS imports */ -import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService'; -import { IContextMenuService, IContextViewService } from 'vs/platform/contextview/browser/contextView'; -import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { IDisposable } from 'vs/base/common/lifecycle'; import { IConfigurationService, ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; -import { ConfigurationEditingService, IConfigurationValue } from 'vs/workbench/services/configuration/node/configurationEditingService'; -import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; -import { IStorageService } from 'vs/platform/storage/common/storage'; import { Event, Emitter } from 'vs/base/common/event'; import Severity from 'vs/base/common/severity'; import * as nls from 'vs/nls'; -import { IPartService } from 'vs/workbench/services/part/common/partService'; import { deepClone } from 'vs/base/common/objects'; -import { ICommandService } from 'vs/platform/commands/common/commands'; -import { IContextKeyService, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey'; -import { IEnvironmentService } from 'vs/platform/environment/common/environment'; +import { RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey'; import { INotificationService } from 'vs/platform/notification/common/notification'; const DASHBOARD_SETTINGS = 'dashboard'; @@ -85,45 +64,22 @@ export class DashboardServiceInterface extends CommonServiceInterface { private _numberOfPageNavigations = 0; constructor( - @Inject(forwardRef(() => Router)) private _router: Router, - @Inject(INotificationService) private _notificationService: INotificationService, @Inject(IMetadataService) metadataService: IMetadataService, @Inject(IConnectionManagementService) connectionManagementService: IConnectionManagementService, @Inject(IAdminService) adminService: IAdminService, @Inject(IQueryManagementService) queryManagementService: IQueryManagementService, + @Inject(IBootstrapParams) params: IDashboardComponentParams, + @Inject(forwardRef(() => Router)) private _router: Router, + @Inject(INotificationService) private _notificationService: INotificationService, @Inject(IAngularEventingService) private angularEventingService: IAngularEventingService, - @Inject(IConfigurationService) private _configService: IConfigurationService, - @Inject(IBootstrapParams) _params: IDashboardComponentParams + @Inject(IConfigurationService) private _configService: IConfigurationService ) { - super(_params, metadataService, connectionManagementService, adminService, queryManagementService); - } - - private get params(): IDashboardComponentParams { - return this._params; - } - - /** - * Set the selector for this dashboard instance, should only be set once - */ - public set selector(selector: string) { - this._uniqueSelector = selector; - this._getbootstrapParams(); - } - - protected _getbootstrapParams(): void { - this.scopedContextKeyService = this.params.scopedContextService; - this._connectionContextKey = this.params.connectionContextKey; - this.dashboardContextKey = this._dashboardContextKey.bindTo(this.scopedContextKeyService); - this.uri = this.params.ownerUri; - } - - /** - * Set the uri for this dashboard instance, should only be set once - * Inits all the services that depend on knowing a uri - */ - protected set uri(uri: string) { - super.setUri(uri); - this._register(toDisposableSubscription(this.angularEventingService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event)))); + super(params, metadataService, connectionManagementService, adminService, queryManagementService); + // during testing there may not be params + if (this._params) { + this.dashboardContextKey = this._dashboardContextKey.bindTo(this.scopedContextKeyService); + this._register(toDisposableSubscription(this.angularEventingService.onAngularEvent(this._uri, (event) => this.handleDashboardEvent(event)))); + } } /** diff --git a/src/sql/parts/disasterRecovery/backup/backup.module.ts b/src/sql/parts/disasterRecovery/backup/backup.module.ts index bdaf4313f7..60da2c9647 100644 --- a/src/sql/parts/disasterRecovery/backup/backup.module.ts +++ b/src/sql/parts/disasterRecovery/backup/backup.module.ts @@ -4,20 +4,23 @@ *--------------------------------------------------------------------------------------------*/ import { - ApplicationRef, ComponentFactoryResolver, ModuleWithProviders, NgModule, + ApplicationRef, ComponentFactoryResolver, NgModule, Inject, forwardRef, Type } from '@angular/core'; import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; -import { BackupComponent, BACKUP_SELECTOR } from 'sql/parts/disasterRecovery/backup/backup.component'; + +import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; +import { BackupComponent } from 'sql/parts/disasterRecovery/backup/backup.component'; + +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; // work around const BrowserAnimationsModule = (require.__$__nodeRequire('@angular/platform-browser/animations')).BrowserAnimationsModule; // Backup wizard main angular module -export const BackupModule = (params: IBootstrapParams, selector: string): Type => { +export const BackupModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { @NgModule({ declarations: [ BackupComponent @@ -31,19 +34,22 @@ export const BackupModule = (params: IBootstrapParams, selector: string): Type ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver + @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver, + @Inject(ISelector) private selector: string ) { } ngDoBootstrap(appRef: ApplicationRef) { const factory = this._resolver.resolveComponentFactory(BackupComponent); - (factory).factory.selector = selector; + (factory).factory.selector = this.selector; appRef.bootstrap(factory); } } diff --git a/src/sql/parts/grid/views/editData/editData.module.ts b/src/sql/parts/grid/views/editData/editData.module.ts index 70d106e457..76227e0382 100644 --- a/src/sql/parts/grid/views/editData/editData.module.ts +++ b/src/sql/parts/grid/views/editData/editData.module.ts @@ -7,12 +7,14 @@ import { ApplicationRef, ComponentFactoryResolver, NgModule, Inject, forwardRef, Type } from '@angular/core'; import { CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; - -import { EditDataComponent, EDITDATA_SELECTOR } from 'sql/parts/grid/views/editData/editData.component'; import { SlickGrid } from 'angular2-slickgrid'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; -export const EditDataModule = (params: IBootstrapParams, selector: string): Type => { +import { EditDataComponent } from 'sql/parts/grid/views/editData/editData.component'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; + +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; + +export const EditDataModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { @NgModule({ @@ -30,19 +32,22 @@ export const EditDataModule = (params: IBootstrapParams, selector: string): Type EditDataComponent ], providers: [ - { provide: IBootstrapParams, useValue: params } + { provide: IBootstrapParams, useValue: params }, + { provide: ISelector, useValue: selector }, + ...providerIterator(instantiationService) ] }) class ModuleClass { constructor( - @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver + @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver, + @Inject(ISelector) private selector: string ) { } ngDoBootstrap(appRef: ApplicationRef) { const factory = this._resolver.resolveComponentFactory(EditDataComponent); - (factory).factory.selector = selector; + (factory).factory.selector = this.selector; appRef.bootstrap(factory); } } diff --git a/src/sql/parts/query/views/queryOutput.module.ts b/src/sql/parts/query/views/queryOutput.module.ts index aa35b8ef76..36ece0bacc 100644 --- a/src/sql/parts/query/views/queryOutput.module.ts +++ b/src/sql/parts/query/views/queryOutput.module.ts @@ -13,13 +13,14 @@ import { ChartsModule } from 'ng2-charts/ng2-charts'; const BrowserAnimationsModule = (require.__$__nodeRequire('@angular/platform-browser/animations')).BrowserAnimationsModule; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; import { Extensions, IInsightRegistry } from 'sql/platform/dashboard/common/insightRegistry'; import { Registry } from 'vs/platform/registry/common/platform'; +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { QueryOutputComponent, QUERY_OUTPUT_SELECTOR } from 'sql/parts/query/views/queryOutput.component'; +import { QueryOutputComponent } from 'sql/parts/query/views/queryOutput.component'; import { QueryPlanComponent, } from 'sql/parts/queryPlan/queryPlan.component'; import { QueryComponent } from 'sql/parts/grid/views/query/query.component'; import { TopOperationsComponent } from 'sql/parts/queryPlan/topOperations.component'; @@ -41,7 +42,7 @@ let baseComponents = [QueryComponent, ComponentHostDirective, QueryOutputCompone /* Insights */ let insightComponents = Registry.as(Extensions.InsightContribution).getAllCtors(); -export const QueryOutputModule = (params: IBootstrapParams, selector: string): Type => { +export const QueryOutputModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { @NgModule({ imports: [ @@ -67,19 +68,22 @@ export const QueryOutputModule = (params: IBootstrapParams, selector: string): T ...insightComponents ], providers: [ - { provide: IBootstrapParams, useValue: params } + { provide: IBootstrapParams, useValue: params }, + { provide: ISelector, useValue: selector }, + ...providerIterator(instantiationService) ] }) class ModuleClass { constructor( - @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver + @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver, + @Inject(ISelector) private selector: string ) { } ngDoBootstrap(appRef: ApplicationRef) { const factory = this._resolver.resolveComponentFactory(QueryOutputComponent); - (factory).factory.selector = selector; + (factory).factory.selector = this.selector; appRef.bootstrap(factory); } } diff --git a/src/sql/parts/queryPlan/queryPlan.module.ts b/src/sql/parts/queryPlan/queryPlan.module.ts index 8b8b3d5b49..b7f603258f 100644 --- a/src/sql/parts/queryPlan/queryPlan.module.ts +++ b/src/sql/parts/queryPlan/queryPlan.module.ts @@ -6,11 +6,14 @@ import { NgModule, Inject, forwardRef, ApplicationRef, ComponentFactoryResolver, Type } from '@angular/core'; import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; -import { QueryPlanComponent, QUERYPLAN_SELECTOR } from 'sql/parts/queryPlan/queryPlan.component'; + +import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; +import { QueryPlanComponent } from 'sql/parts/queryPlan/queryPlan.component'; + +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; // Connection Dashboard main angular module -export const QueryPlanModule = (params: IBootstrapParams, selector: string): Type => { +export const QueryPlanModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { @NgModule({ declarations: [ @@ -23,19 +26,22 @@ export const QueryPlanModule = (params: IBootstrapParams, selector: string): Typ ], providers: [ { provide: APP_BASE_HREF, useValue: '/' }, - { provide: IBootstrapParams, useValue: params } + { provide: IBootstrapParams, useValue: params }, + { provide: ISelector, useValue: selector }, + ...providerIterator(instantiationService) ] }) class ModuleClass { constructor( - @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver + @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver, + @Inject(ISelector) private selector: string ) { } ngDoBootstrap(appRef: ApplicationRef) { const factory = this._resolver.resolveComponentFactory(QueryPlanComponent); - (factory).factory.selector = selector; + (factory).factory.selector = this.selector; appRef.bootstrap(factory); } } diff --git a/src/sql/parts/tasks/dialog/taskDialog.module.ts b/src/sql/parts/tasks/dialog/taskDialog.module.ts index 9047180571..0f66ec00df 100644 --- a/src/sql/parts/tasks/dialog/taskDialog.module.ts +++ b/src/sql/parts/tasks/dialog/taskDialog.module.ts @@ -12,9 +12,11 @@ import { APP_BASE_HREF, CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { BrowserModule } from '@angular/platform-browser'; -import { TaskDialogComponent, TASKDIALOG_SELECTOR } from 'sql/parts/tasks/dialog/taskDialog.component'; +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; + +import { TaskDialogComponent } from 'sql/parts/tasks/dialog/taskDialog.component'; import { CreateDatabaseComponent } from 'sql/parts/admin/database/create/createDatabase.component'; -import { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; // Setup routes for various child components const appRoutes: Routes = [ @@ -27,7 +29,7 @@ const appRoutes: Routes = [ { path: '**', component: CreateDatabaseComponent } ]; -export const TaskDialogModule = (params: IBootstrapParams, selector: string): Type => { +export const TaskDialogModule = (params: IBootstrapParams, selector: string, instantiationService: IInstantiationService): Type => { @NgModule({ declarations: [ TaskDialogComponent, @@ -42,19 +44,22 @@ export const TaskDialogModule = (params: IBootstrapParams, selector: string): Ty ], providers: [ { provide: APP_BASE_HREF, useValue: '/' }, - { provide: IBootstrapParams, useValue: params } + { provide: IBootstrapParams, useValue: params }, + { provide: ISelector, useValue: selector }, + ...providerIterator(instantiationService) ] }) class ModuleClass { constructor( - @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver + @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver, + @Inject(ISelector) private selector: string ) { } ngDoBootstrap(appRef: ApplicationRef) { const factory = this._resolver.resolveComponentFactory(TaskDialogComponent); - (factory).factory.selector = selector; + (factory).factory.selector = this.selector; appRef.bootstrap(factory); } } diff --git a/src/sql/platform/dialog/dialog.module.ts b/src/sql/platform/dialog/dialog.module.ts index ae40ea1256..25e07772da 100644 --- a/src/sql/platform/dialog/dialog.module.ts +++ b/src/sql/platform/dialog/dialog.module.ts @@ -11,22 +11,25 @@ import { forwardRef, NgModule, ComponentFactoryResolver, Inject, ApplicationRef import { FormsModule } from '@angular/forms'; import { CommonModule, APP_BASE_HREF } from '@angular/common'; import { BrowserModule } from '@angular/platform-browser'; + import { DialogContainer } from 'sql/platform/dialog/dialogContainer.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 { IBootstrapParams } from 'sql/services/bootstrap/bootstrapService'; +import { IBootstrapParams, ISelector, providerIterator } from 'sql/services/bootstrap/bootstrapService'; import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service'; -import { Registry } from 'vs/platform/registry/common/platform'; import { Checkbox } from 'sql/base/browser/ui/checkbox/checkbox.component'; import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox.component'; import { InputBox } from 'sql/base/browser/ui/inputBox/inputBox.component'; +import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; +import { Registry } from 'vs/platform/registry/common/platform'; + /* Model-backed components */ let extensionComponents = Registry.as(Extensions.ComponentContribution).getAllCtors(); -export const DialogModule = (params, selector: string): any => { +export const DialogModule = (params, selector: string, instantiationService: IInstantiationService): any => { @NgModule({ declarations: [ Checkbox, @@ -47,20 +50,22 @@ export const DialogModule = (params, selector: string): any => { providers: [ { provide: APP_BASE_HREF, useValue: '/' }, CommonServiceInterface, - { provide: IBootstrapParams, useValue: params } + { provide: IBootstrapParams, useValue: params }, + { provide: ISelector, useValue: selector }, + ...providerIterator(instantiationService) ] }) class ModuleClass { constructor( @Inject(forwardRef(() => ComponentFactoryResolver)) private _resolver: ComponentFactoryResolver, - @Inject(forwardRef(() => CommonServiceInterface)) bootstrap: CommonServiceInterface, + @Inject(ISelector) private selector: string ) { } ngDoBootstrap(appRef: ApplicationRef) { const factoryWrapper: any = this._resolver.resolveComponentFactory(DialogContainer); - factoryWrapper.factory.selector = selector; + factoryWrapper.factory.selector = this.selector; appRef.bootstrap(factoryWrapper); } } diff --git a/src/sql/services/bootstrap/bootstrapService.ts b/src/sql/services/bootstrap/bootstrapService.ts index e7ccc1272b..f46b4d313a 100644 --- a/src/sql/services/bootstrap/bootstrapService.ts +++ b/src/sql/services/bootstrap/bootstrapService.ts @@ -3,20 +3,31 @@ * Licensed under the Source EULA. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { NgModuleRef, enableProdMode, InjectionToken, ReflectiveInjector, Type, PlatformRef, Provider } from '@angular/core'; +import { NgModuleRef, enableProdMode, InjectionToken, Type, PlatformRef, Provider, Injector, Optional, Inject, ComponentFactoryResolver } from '@angular/core'; import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { IEditorInput } from 'vs/platform/editor/common/editor'; import { IInstantiationService, _util } from 'vs/platform/instantiation/common/instantiation'; const selectorCounter = new Map(); -const serviceMap = new Map(); -export const IBootstrapParams = new InjectionToken('bootstrap_params'); +export function providerIterator(service: IInstantiationService): Provider[] { + return Array.from(_util.serviceIds.values()).map(v => { + return { + provide: v, useFactory: () => { + return (service)._getOrCreateServiceInstance(v); + } + }; + }); +} + +export const ISelector = new InjectionToken('selector'); + +export const IBootstrapParams = new InjectionToken('bootstrap_params'); export interface IBootstrapParams { } -export type IModuleFactory = (params: IBootstrapParams, selector: string) => Type; +export type IModuleFactory = (params: IBootstrapParams, selector: string, service: IInstantiationService) => Type; function createUniqueSelector(selector: string): string { let num: number; @@ -37,31 +48,13 @@ export function bootstrapAngular(service: IInstantiationService, moduleType: let selector = document.createElement(uniqueSelectorString); container.appendChild(selector); - serviceMap.set(uniqueSelectorString, service); - if (!platform) { - // Perform the bootsrap - - const providers: Provider = []; - - _util.serviceIds.forEach(id => { - providers.push({ - provide: id, useFactory: () => { - return (serviceMap.get(uniqueSelectorString))._getOrCreateServiceInstance(id); - } - }); - }); - - platform = platformBrowserDynamic(providers); + platform = platformBrowserDynamic(); } - platform.bootstrapModule(moduleType(params, uniqueSelectorString)).then(moduleRef => { + platform.bootstrapModule(moduleType(params, uniqueSelectorString, service)).then(moduleRef => { if (input) { input.onDispose(() => { - serviceMap.delete(uniqueSelectorString); - moduleRef.onDestroy(() => { - serviceMap.delete(uniqueSelectorString); - }); moduleRef.destroy(); }); } diff --git a/src/sql/services/common/commonServiceInterface.service.ts b/src/sql/services/common/commonServiceInterface.service.ts index dcbe1c1eef..fb7ee2bd21 100644 --- a/src/sql/services/common/commonServiceInterface.service.ts +++ b/src/sql/services/common/commonServiceInterface.service.ts @@ -95,7 +95,6 @@ export class SingleQueryManagementService { */ @Injectable() export class CommonServiceInterface extends AngularDisposable { - protected _uniqueSelector: string; protected _uri: string; /* Special Services */ @@ -115,6 +114,12 @@ export class CommonServiceInterface extends AngularDisposable { @Inject(IQueryManagementService) protected _queryManagementService: IQueryManagementService ) { super(); + // during testing there may not be params + if (this._params) { + this.scopedContextKeyService = this._params.scopedContextService; + this._connectionContextKey = this._params.connectionContextKey; + this.uri = this._params.ownerUri; + } } public get metadataService(): SingleConnectionMetadataService { @@ -133,20 +138,6 @@ export class CommonServiceInterface extends AngularDisposable { return this._singleQueryManagementService; } - /** - * Set the selector for this instance, should only be set once - */ - public set selector(selector: string) { - this._uniqueSelector = selector; - this._getbootstrapParams(); - } - - protected _getbootstrapParams(): void { - this.scopedContextKeyService = this._params.scopedContextService; - this._connectionContextKey = this._params.connectionContextKey; - this.uri = this._params.ownerUri; - } - protected setUri(uri: string) { this._uri = uri; this._singleMetadataService = new SingleConnectionMetadataService(this._metadataService, this._uri);