diff --git a/extensions/notebook/package.json b/extensions/notebook/package.json index fd45f51de4..5165e00782 100644 --- a/extensions/notebook/package.json +++ b/extensions/notebook/package.json @@ -339,7 +339,7 @@ { "id": "bookTreeView", "name": "Books", - "when": "bookOpened && isDevelopment" + "when": "bookOpened && notebookQuality != stable" } ] } diff --git a/src/sql/workbench/parts/notebook/notebook.component.ts b/src/sql/workbench/parts/notebook/notebook.component.ts index f64e1faf0e..308d3e9d3c 100644 --- a/src/sql/workbench/parts/notebook/notebook.component.ts +++ b/src/sql/workbench/parts/notebook/notebook.component.ts @@ -53,8 +53,8 @@ import { ITextFileService } from 'vs/workbench/services/textfile/common/textfile import { LabeledMenuItemActionItem, fillInActions } from 'vs/platform/actions/browser/menuEntryActionViewItem'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; import { Button } from 'sql/base/browser/ui/button/button'; -import { attachButtonStyler } from 'sql/platform/theme/common/styler'; import { isUndefinedOrNull } from 'vs/base/common/types'; +import product from 'vs/platform/product/node/product'; export const NOTEBOOK_SELECTOR: string = 'notebook-component'; @@ -441,7 +441,7 @@ export class NotebookComponent extends AngularDisposable implements OnInit, OnDe protected initNavSection(): void { this._navProvider = this.notebookService.getNavigationProvider(this._notebookParams.notebookUri); - if (this.contextKeyService.getContextKeyValue('isDevelopment') && + if (product.quality !== 'stable' && this.contextKeyService.getContextKeyValue('bookOpened') && this._navProvider) { this._navProvider.getNavigation(this._notebookParams.notebookUri).then(result => { diff --git a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts b/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts index b1908eb4f7..7cea3b7abc 100644 --- a/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts +++ b/src/sql/workbench/services/notebook/common/notebookServiceImpl.ts @@ -41,6 +41,7 @@ import { Schemas } from 'vs/base/common/network'; import { ILogService } from 'vs/platform/log/common/log'; import { toErrorMessage } from 'vs/base/common/errorMessage'; import { NotebookChangeType } from 'sql/workbench/parts/notebook/models/contracts'; +import product from 'vs/platform/product/node/product'; export interface NotebookProviderProperties { provider: string; @@ -167,6 +168,9 @@ export class NotebookService extends Disposable implements INotebookService { lifecycleService.onWillShutdown(() => this.shutdown()); this.hookContextKeyListeners(); this.hookNotebookThemesAndConfigListener(); + // Temporary (issue #6427 will remove): Add a product quality key so we can only show books on Insiders + this._contextKeyService.createKey('notebookQuality', product.quality); + } public dispose(): void {