integrate with contextkeyservice (#804)

* commting .d.ts changes

* added serverinfo to .d.ts

* maybe its working?

* works

* updated contrib

* remove unnecessary code

* fix compile errors

* change back sqlops engine for merge

src/sql/parts/dashboard/common/dashboardHelper.ts

@@ -19,6 +19,7 @@ import { WEBVIEW_CONTAINER } from 'sql/parts/dashboard/containers/dashboardWebvi
 import { NAV_SECTION } from 'sql/parts/dashboard/containers/dashboardNavSection.contribution';
 import { IDashboardContainerRegistry, Extensions as DashboardContainerExtensions, IDashboardContainer, registerContainerType } from 'sql/platform/dashboard/common/dashboardContainerRegistry';
 import { IDashboardTab } from 'sql/platform/dashboard/common/dashboardRegistry';
+import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 
 const dashboardcontainerRegistry = Registry.as<IDashboardContainerRegistry>(DashboardContainerExtensions.dashboardContainerContributions);
 const containerTypes = [
@@ -90,14 +91,8 @@ export function initExtensionConfigs(configurations: WidgetConfig[]): Array<Widg
 			let insightConfig = widgetRegistry.getRegisteredExtensionInsights(key);
 			if (insightConfig !== undefined) {
 				// Setup the default properties for this extension if needed
-				if (!config.provider && insightConfig.provider) {
-					config.provider = insightConfig.provider;
-				}
-				if (!config.name && insightConfig.name) {
-					config.name = insightConfig.name;
-				}
-				if (!config.edition && insightConfig.edition) {
-					config.edition = insightConfig.edition;
+				if (!config.when && insightConfig.when) {
+					config.when = insightConfig.when;
 				}
 				if (!config.gridItemConfig && insightConfig.gridItemConfig) {
 					config.gridItemConfig = {
@@ -163,28 +158,12 @@ export function addContext(config: WidgetConfig[], dashboardServer: DashboardSer
  * Returns a filtered version of the widgets passed based on edition and provider
  * @param config widgets to filter
  */
-export function filterConfigs<T extends { provider?: string | string[], edition?: number | number[] }>(config: T[], dashboardService: DashboardServiceInterface): Array<T> {
-	let connectionInfo: ConnectionManagementInfo = dashboardService.connectionManagementService.connectionInfo;
-	let edition = connectionInfo.serverInfo.engineEditionId;
-	let provider = connectionInfo.providerId;
-
-	// filter by provider
+export function filterConfigs<T extends { when?: string }>(config: T[], dashboardService: DashboardServiceInterface): Array<T> {
 	return config.filter((item) => {
-		if (item.provider) {
-			return stringOrStringArrayCompare(item.provider, provider);
-		} else {
+		if (!item.when) {
 			return true;
-		}
-	}).filter((item) => {
-		if (item.edition) {
-			if (edition) {
-				return stringOrStringArrayCompare(isNumberArray(item.edition) ? item.edition.map(item => item.toString()) : item.edition.toString(), edition.toString());
-			} else {
-				dashboardService.messageService.show(Severity.Warning, nls.localize('providerMissingEdition', 'Widget filters based on edition, but the provider does not have an edition'));
-				return true;
-			}
 		} else {
-			return true;
+			return dashboardService.contextKeyService.contextMatchesRules(ContextKeyExpr.deserialize(item.when));
 		}
 	});
 }

src/sql/parts/dashboard/common/dashboardPage.component.ts

@@ -66,7 +66,6 @@ export abstract class DashboardPage extends Disposable implements OnDestroy {
 	private _editEnabled = new Emitter<boolean>();
 	public readonly editEnabled: Event<boolean> = this._editEnabled.event;
 
-
 	// tslint:disable:no-unused-variable
 	private readonly homeTabTitle: string = nls.localize('home', 'Home');
 
@@ -113,7 +112,6 @@ export abstract class DashboardPage extends Disposable implements OnDestroy {
 			this.propertiesWidget = properties ? properties[0] : undefined;
 
 			this.createTabs(tempWidgets);
-
 		}
 	}
 

src/sql/parts/dashboard/common/dashboardWidget.ts

@@ -24,6 +24,7 @@ export interface WidgetConfig {
 	context: string;
 	provider: string | Array<string>;
 	edition: number | Array<number>;
+	when?: string;
 	gridItemConfig?: NgGridItemConfig;
 	widget: Object;
 	background_color?: string;

src/sql/parts/dashboard/dashboardEditor.ts

@@ -11,12 +11,18 @@ import { BaseEditor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 import { DashboardInput } from './dashboardInput';
 import { DashboardModule } from './dashboard.module';
 import { IBootstrapService } from 'sql/services/bootstrap/bootstrapService';
 import { DashboardComponentParams } from 'sql/services/bootstrap/bootstrapParams';
 import { DASHBOARD_SELECTOR } from 'sql/parts/dashboard/dashboard.component';
+import { ConnectionContextkey } from 'sql/parts/connection/common/connectionContextKey';
+import { IDashboardService } from 'sql/services/dashboard/common/dashboardService';
+import { ConnectionProfile } from '../connection/common/connectionProfile';
+import { IConnectionProfile } from 'sqlops';
+import { IConnectionManagementService } from 'sql/parts/connection/common/connectionManagement';
 
 export class DashboardEditor extends BaseEditor {
 
@@ -28,7 +34,10 @@ export class DashboardEditor extends BaseEditor {
 		@ITelemetryService telemetryService: ITelemetryService,
 		@IWorkbenchThemeService themeService: IWorkbenchThemeService,
 		@IInstantiationService private instantiationService: IInstantiationService,
-		@IBootstrapService private _bootstrapService: IBootstrapService
+		@IBootstrapService private _bootstrapService: IBootstrapService,
+		@IContextKeyService private _contextKeyService: IContextKeyService,
+		@IDashboardService private _dashboardService: IDashboardService,
+		@IConnectionManagementService private _connMan: IConnectionManagementService
 	) {
 		super(DashboardEditor.ID, telemetryService, themeService);
 	}
@@ -47,6 +56,15 @@ export class DashboardEditor extends BaseEditor {
 	 * Sets focus on this editor. Specifically, it sets the focus on the hosted text editor.
 	 */
 	public focus(): void {
+
+		let profile: IConnectionProfile;
+		if (this.input.connectionProfile instanceof ConnectionProfile) {
+			profile = this.input.connectionProfile.toIConnectionProfile();
+		} else {
+			profile = this.input.connectionProfile;
+		}
+		let serverInfo = this._connMan.getConnectionInfo(this.input.uri).serverInfo;
+		this._dashboardService.changeToDashboard({ profile, serverInfo });
 	}
 
 	/**
@@ -84,9 +102,22 @@ export class DashboardEditor extends BaseEditor {
 	 */
 	private bootstrapAngular(input: DashboardInput): void {
 		// Get the bootstrap params and perform the bootstrap
+		let profile: IConnectionProfile;
+		if (input.connectionProfile instanceof ConnectionProfile) {
+			profile = input.connectionProfile.toIConnectionProfile();
+		} else {
+			profile = this.input.connectionProfile;
+		}
+		let 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);
+		connectionContextKey.set(input.connectionProfile);
+
 		let params: DashboardComponentParams = {
 			connection: input.connectionProfile,
-			ownerUri: input.uri
+			ownerUri: input.uri,
+			scopedContextService: scopedContextService
 		};
 
 		input.hasBootstrapped = true;

src/sql/parts/dashboard/pages/dashboardPageContribution.ts

@@ -30,31 +30,9 @@ export function generateDashboardWidgetSchema(type?: 'database' | 'server', exte
 			icon: {
 				type: 'string'
 			},
-			provider: {
-				anyOf: [
-					{
-						type: 'string'
-					},
-					{
-						type: 'array',
-						items: {
-							type: 'string'
-						}
-					}
-				]
-			},
-			edition: {
-				anyOf: [
-					{
-						type: 'number'
-					},
-					{
-						type: 'array',
-						items: {
-							type: 'number'
-						}
-					}
-				]
+			when: {
+				description: localize('sqlops.extension.contributes.widget.when', 'Condition which must be true to show this item'),
+				type: 'string'
 			},
 			gridItemConfig: {
 				type: 'object',
@@ -102,31 +80,9 @@ export function generateDashboardGridLayoutSchema(type?: 'database' | 'server',
 			icon: {
 				type: 'string'
 			},
-			provider: {
-				anyOf: [
-					{
-						type: 'string'
-					},
-					{
-						type: 'array',
-						items: {
-							type: 'string'
-						}
-					}
-				]
-			},
-			edition: {
-				anyOf: [
-					{
-						type: 'number'
-					},
-					{
-						type: 'array',
-						items: {
-							type: 'number'
-						}
-					}
-				]
+			when: {
+				description: localize('sqlops.extension.contributes.widget.when', 'Condition which must be true to show this item'),
+				type: 'string'
 			}
 		}
 	};

src/sql/parts/dashboard/services/dashboardServiceInterface.service.ts

@@ -23,6 +23,7 @@ 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 { PinConfig } from 'sql/parts/dashboard/common/dashboardWidget';
+import { IDashboardWebviewService } from 'sql/services/dashboardWebview/common/dashboardWebviewService';
 
 import { ProviderMetadata, DatabaseInfo, SimpleExecuteResult } from 'sqlops';
 
@@ -42,8 +43,7 @@ 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 { IDashboardWebviewService } from 'sql/services/dashboardWebview/common/dashboardWebviewService';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 const DASHBOARD_SETTINGS = 'dashboard';
 
@@ -137,6 +137,7 @@ export class DashboardServiceInterface implements OnDestroy {
 	private _commandService: ICommandService;
 	private _dashboardWebviewService: IDashboardWebviewService;
 	private _partService: IPartService;
+	private _contextKeyService: IContextKeyService;
 	private _angularEventingService: IAngularEventingService;
 
 	private _updatePage = new Emitter<void>();
@@ -219,6 +220,10 @@ export class DashboardServiceInterface implements OnDestroy {
 		return this._partService;
 	}
 
+	public get contextKeyService(): IContextKeyService {
+		return this._contextKeyService;
+	}
+
 	public get adminService(): SingleAdminService {
 		return this._adminService;
 	}
@@ -256,8 +261,9 @@ export class DashboardServiceInterface implements OnDestroy {
 	}
 
 	private _getbootstrapParams(): void {
-		this._bootstrapParams = this._bootstrapService.getBootstrapParams(this._uniqueSelector);
+		this._bootstrapParams = this._bootstrapService.getBootstrapParams<DashboardComponentParams>(this._uniqueSelector);
 		this.uri = this._bootstrapParams.ownerUri;
+		this._contextKeyService = this._bootstrapParams.scopedContextService;
 	}
 
 	/**

src/sql/parts/dashboard/widgets/insights/interfaces.ts

@@ -51,8 +51,7 @@ export interface IInsightsConfig {
 	cacheId?: string;
 	type: any;
 	name?: string;
-	provider?: string;
-	edition?: number | Array<number>;
+	when?: string;
 	gridItemConfig?: ISize;
 	query?: string | Array<string>;
 	queryFile?: string;