Change feature flag for SQL kernel to be user preference (#3838)

* Change feature flag for SQL kernel to be user preference

* fix test that was broken

* Tweak package.nls.json to show "(Preview)"

extensions/notebook/package.json

@@ -26,6 +26,11 @@
 					"type": "string",
 					"default": "",
 					"description": "%notebook.pythonPath.description%"
+				},
+				"notebook.sqlKernelEnabled": {
+					"type": "boolean",
+					"default": false,
+					"description": "%notebook.sqlKernelEnabled.description%"
 				}
 			}
 		},

extensions/notebook/package.nls.json

@@ -4,6 +4,7 @@
 	"notebook.configuration.title": "Notebook configuration",
 	"notebook.enabled.description": "Enable viewing notebook files using built-in notebook editor.",
 	"notebook.pythonPath.description": "Local path to python installation used by Notebooks.",
+	"notebook.sqlKernelEnabled.description": "Enable SQL kernel in notebook editor (Preview)",
 	"notebook.command.new": "New Notebook",
 	"notebook.command.open": "Open Notebook"
 }

src/sql/parts/notebook/notebook.component.ts

@@ -234,7 +234,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 
 	private async loadModel(): Promise<void> {
 		await this.awaitNonDefaultProvider();
-		let providerId = notebookUtils.sqlNotebooksEnabled() ? 'sql' : this._notebookParams.providers.find(provider => provider !== DEFAULT_NOTEBOOK_PROVIDER); // this is tricky; really should also depend on the connection profile
+		let providerId = notebookUtils.sqlNotebooksEnabled(this.contextKeyService) ? 'sql' : this._notebookParams.providers.find(provider => provider !== DEFAULT_NOTEBOOK_PROVIDER); // this is tricky; really should also depend on the connection profile
 		this.setContextKeyServiceWithProviderId(providerId);
 		this.fillInActionsForCurrentContext();
 		for (let providerId of this._notebookParams.providers) {
@@ -248,7 +248,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe
 			notificationService: this.notificationService,
 			notebookManagers: this.notebookManagers,
 			standardKernels: this._notebookParams.input.standardKernels,
-			providerId: notebookUtils.sqlNotebooksEnabled() ? 'sql' : 'jupyter', // this is tricky; really should also depend on the connection profile
+			providerId: notebookUtils.sqlNotebooksEnabled(this.contextKeyService) ? 'sql' : 'jupyter', // this is tricky; really should also depend on the connection profile
 			defaultKernel: this._notebookParams.input.defaultKernel,
 			capabilitiesService: this.capabilitiesService
 		}, false, this.profile);

src/sql/parts/notebook/notebookUtils.ts

@@ -12,6 +12,7 @@ import * as pfs from 'vs/base/node/pfs';
 import { localize } from 'vs/nls';
 import { IOutputChannel } from 'vs/workbench/parts/output/common/output';
 import { DEFAULT_NOTEBOOK_PROVIDER, DEFAULT_NOTEBOOK_FILETYPE, INotebookService } from 'sql/workbench/services/notebook/common/notebookService';
+import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 
 /**
@@ -73,9 +74,9 @@ export function getStandardKernelsForProvider(providerId: string, notebookServic
 	return <IStandardKernelWithProvider[]>(standardKernels);
 }
 
-// Private feature flag to enable Sql Notebook experience
+// Feature flag to enable Sql Notebook experience
-export function sqlNotebooksEnabled() {
+export function sqlNotebooksEnabled(contextKeyService: IContextKeyService) {
-	return process.env['SQLOPS_SQL_NOTEBOOK'] !== undefined;
+	return contextKeyService.contextMatchesRules(ContextKeyExpr.equals('config.notebook.sqlKernelEnabled', true));
 }
 
 export interface IStandardKernelWithProvider {

src/sql/workbench/services/notebook/common/notebookServiceImpl.ts

@@ -30,6 +30,7 @@ import { Deferred } from 'sql/base/common/promise';
 import { SqlSessionManager } from 'sql/workbench/services/notebook/common/sqlSessionManager';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
 import { sqlNotebooksEnabled } from 'sql/parts/notebook/notebookUtils';
+import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
 
 export interface NotebookProviderProperties {
 	provider: string;
@@ -88,7 +89,8 @@ export class NotebookService extends Disposable implements INotebookService {
 		@IStorageService private _storageService: IStorageService,
 		@IExtensionService extensionService: IExtensionService,
 		@IExtensionManagementService extensionManagementService: IExtensionManagementService,
-		@IInstantiationService private _instantiationService: IInstantiationService
+		@IInstantiationService private _instantiationService: IInstantiationService,
+		@IContextKeyService private _contextKeyService: IContextKeyService
 	) {
 		super();
 		this._register(notebookRegistry.onNewRegistration(this.updateRegisteredProviders, this));
@@ -351,7 +353,7 @@ export class NotebookService extends Disposable implements INotebookService {
 	}
 
 	private registerBuiltInProvider() {
-		if (!sqlNotebooksEnabled()) {
+		if (!sqlNotebooksEnabled(this._contextKeyService)) {
 			let defaultProvider = new BuiltinProvider();
 			this.registerProvider(defaultProvider.providerId, defaultProvider);
 			notebookRegistry.registerNotebookProvider({

src/sqltest/workbench/api/mainThreadNotebook.test.ts

@@ -18,6 +18,7 @@ import { NotebookService } from 'sql/workbench/services/notebook/common/notebook
 import { INotebookProvider } from 'sql/workbench/services/notebook/common/notebookService';
 import { INotebookManagerDetails, INotebookSessionDetails, INotebookKernelDetails, INotebookFutureDetails } from 'sql/workbench/api/common/sqlExtHostTypes';
 import { LocalContentManager } from 'sql/workbench/services/notebook/node/localContentManager';
+import { ContextKeyServiceStub } from 'sqltest/stubs/contextKeyServiceStub';
 
 suite('MainThreadNotebook Tests', () => {
 
@@ -31,7 +32,7 @@ suite('MainThreadNotebook Tests', () => {
 		let extContext = <IExtHostContext>{
 			getProxy: proxyType => mockProxy.object
 		};
-		mockNotebookService = TypeMoq.Mock.ofType(NotebookService);
+		mockNotebookService = TypeMoq.Mock.ofType(NotebookService, undefined, undefined, undefined, undefined, undefined, new ContextKeyServiceStub());
 		notebookUri = URI.parse('file:/user/default/my.ipynb');
 		mainThreadNotebook = new MainThreadNotebook(extContext, mockNotebookService.object);
 	});