diff --git a/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts index fc79b822d9..2f55fd3581 100644 --- a/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/core/dashboardPage.component.ts @@ -31,7 +31,7 @@ import * as nls from 'vs/nls'; import * as objects from 'vs/base/common/objects'; import { Event, Emitter } from 'vs/base/common/event'; import { Action, IAction, IActionViewItem } from 'vs/base/common/actions'; -import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration'; +import { ConfigurationTarget } from 'vs/platform/configuration/common/configuration'; import Severity from 'vs/base/common/severity'; import { INotificationService } from 'vs/platform/notification/common/notification'; import { IContextKeyService, ContextKeyExpr, RawContextKey, IContextKey } from 'vs/platform/contextkey/common/contextkey'; @@ -118,7 +118,6 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig @Inject(forwardRef(() => ChangeDetectorRef)) protected _cd: ChangeDetectorRef, @Inject(INotificationService) private notificationService: INotificationService, @Inject(IAngularEventingService) private angularEventingService: IAngularEventingService, - @Inject(IConfigurationService) private configurationService: IConfigurationService, @Inject(ILogService) private logService: ILogService, @Inject(ICommandService) private commandService: ICommandService, @Inject(IContextKeyService) contextKeyService: IContextKeyService, @@ -297,13 +296,6 @@ export abstract class DashboardPage extends AngularDisposable implements IConfig this.loadNewTabs(allTabs.filter((tab) => tab.group === homeTabGroupId)); - // If preview features are disabled only show the home tab since extension-contributed tabs - // are still under preview - const extensionTabsEnabled = this.configurationService.getValue('workbench')['enablePreviewFeatures']; - if (!extensionTabsEnabled) { - allTabs = []; - } - // Load tab setting configs this._tabSettingConfigs = this.dashboardService.getSettings>([this.context, 'tabs'].join('.')); diff --git a/src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.component.ts b/src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.component.ts index 83e41ee26d..ab11ba4515 100644 --- a/src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/pages/databaseDashboardPage.component.ts @@ -16,7 +16,6 @@ import { IAngularEventingService } from 'sql/platform/angularEventing/browser/an import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as nls from 'vs/nls'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ILogService } from 'vs/platform/log/common/log'; import { ICommandService } from 'vs/platform/commands/common/commands'; import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey'; @@ -48,7 +47,6 @@ export class DatabaseDashboardPage extends DashboardPage implements OnInit { @Inject(forwardRef(() => ElementRef)) el: ElementRef, @Inject(INotificationService) notificationService: INotificationService, @Inject(IAngularEventingService) angularEventingService: IAngularEventingService, - @Inject(IConfigurationService) configurationService: IConfigurationService, @Inject(ILogService) logService: ILogService, @Inject(ICommandService) commandService: ICommandService, @Inject(IContextKeyService) contextKeyService: IContextKeyService, @@ -56,7 +54,7 @@ export class DatabaseDashboardPage extends DashboardPage implements OnInit { @Inject(IKeybindingService) keybindingService: IKeybindingService, @Inject(IWorkbenchThemeService) themeService: IWorkbenchThemeService ) { - super(dashboardService, el, _cd, notificationService, angularEventingService, configurationService, logService, commandService, contextKeyService, menuService, keybindingService, themeService); + super(dashboardService, el, _cd, notificationService, angularEventingService, logService, commandService, contextKeyService, menuService, keybindingService, themeService); this._register(dashboardService.onUpdatePage(() => { this.refresh(true); this._cd.detectChanges(); diff --git a/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.component.ts b/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.component.ts index 587a2c6844..3227a7131a 100644 --- a/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.component.ts +++ b/src/sql/workbench/contrib/dashboard/browser/pages/serverDashboardPage.component.ts @@ -16,7 +16,6 @@ import { IAngularEventingService } from 'sql/platform/angularEventing/browser/an import * as colors from 'vs/platform/theme/common/colorRegistry'; import * as nls from 'vs/nls'; import { INotificationService } from 'vs/platform/notification/common/notification'; -import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ILogService } from 'vs/platform/log/common/log'; import { mssqlProviderName } from 'sql/platform/connection/common/constants'; import { ICommandService } from 'vs/platform/commands/common/commands'; @@ -52,7 +51,6 @@ export class ServerDashboardPage extends DashboardPage implements OnInit { @Inject(forwardRef(() => ElementRef)) el: ElementRef, @Inject(INotificationService) notificationService: INotificationService, @Inject(IAngularEventingService) angularEventingService: IAngularEventingService, - @Inject(IConfigurationService) configurationService: IConfigurationService, @Inject(ILogService) logService: ILogService, @Inject(ICommandService) commandService: ICommandService, @Inject(IContextKeyService) contextKeyService: IContextKeyService, @@ -61,7 +59,7 @@ export class ServerDashboardPage extends DashboardPage implements OnInit { @Inject(IContextMenuService) contextMenuService: IContextMenuService, @Inject(IWorkbenchThemeService) themeService: IWorkbenchThemeService ) { - super(dashboardService, el, _cd, notificationService, angularEventingService, configurationService, logService, commandService, contextKeyService, menuService, keybindingService, themeService); + super(dashboardService, el, _cd, notificationService, angularEventingService, logService, commandService, contextKeyService, menuService, keybindingService, themeService); // special-case handling for MSSQL data provider const connInfo = this.dashboardService.connectionManagementService.connectionInfo;