From 23b2d8100f3d3df31a921a8610b8d76f890fbd5c Mon Sep 17 00:00:00 2001 From: Laurent Nguyen Date: Thu, 11 Jun 2020 12:39:58 +0200 Subject: [PATCH] Remove obsolete feature flags (and reformat) (#27) * Reformat * Remove unused feature flags: graph, cacheOptimizations, settingsPane, throughputOverview, enableNteract --- src/Common/Constants.ts | 5 ----- src/Contracts/ViewModels.ts | 1 - src/Explorer/Explorer.ts | 8 +++----- src/Explorer/OpenActionsStubs.ts | 1 - src/Explorer/Panes/GenericRightPaneComponent.tsx | 9 +++++++-- src/Explorer/Panes/UploadItemsPaneAdapter.tsx | 6 +----- 6 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/Common/Constants.ts b/src/Common/Constants.ts index 35112f27b..03ad88d56 100644 --- a/src/Common/Constants.ts +++ b/src/Common/Constants.ts @@ -104,11 +104,9 @@ export class CapabilityNames { } export class Features { - public static readonly graphs = "graphs"; public static readonly cosmosdb = "cosmosdb"; public static readonly enableChangeFeedPolicy = "enablechangefeedpolicy"; public static readonly enableRupm = "enablerupm"; - public static readonly cacheOptimizations = "dataexplorercacheoptimizations"; public static readonly executeSproc = "dataexplorerexecutesproc"; public static readonly hostedDataExplorer = "hosteddataexplorerenabled"; public static readonly enableTtl = "enablettl"; @@ -116,9 +114,6 @@ export class Features { public static readonly enableGallery = "enablegallery"; public static readonly enableSpark = "enablespark"; public static readonly livyEndpoint = "livyendpoint"; - public static readonly settingsPane = "dataexplorersettingspane"; - public static readonly throughputOverview = "throughputOverview"; - public static readonly enableNteract = "enablenteract"; public static readonly notebookServerUrl = "notebookserverurl"; public static readonly notebookServerToken = "notebookservertoken"; public static readonly notebookBasePath = "notebookbasepath"; diff --git a/src/Contracts/ViewModels.ts b/src/Contracts/ViewModels.ts index e9d858992..3dd00eaee 100644 --- a/src/Contracts/ViewModels.ts +++ b/src/Contracts/ViewModels.ts @@ -87,7 +87,6 @@ export interface Explorer { isFeatureEnabled: (feature: string) => boolean; isGalleryEnabled: ko.Computed; isGitHubPaneEnabled: ko.Observable; - isGraphsEnabled: ko.Computed; isRightPanelV2Enabled: ko.Computed; canExceedMaximumValue: ko.Computed; hasAutoPilotV2FeatureFlag: ko.Computed; diff --git a/src/Explorer/Explorer.ts b/src/Explorer/Explorer.ts index 476fbad22..3d43b9af2 100644 --- a/src/Explorer/Explorer.ts +++ b/src/Explorer/Explorer.ts @@ -205,7 +205,6 @@ export default class Explorer implements ViewModels.Explorer { // features public isGalleryEnabled: ko.Computed; public isGitHubPaneEnabled: ko.Observable; - public isGraphsEnabled: ko.Computed; public isHostedDataExplorerEnabled: ko.Computed; public isRightPanelV2Enabled: ko.Computed; public canExceedMaximumValue: ko.Computed; @@ -414,9 +413,6 @@ export default class Explorer implements ViewModels.Explorer { this.shouldShowContextSwitchPrompt = ko.observable(false); this.isGalleryEnabled = ko.computed(() => this.isFeatureEnabled(Constants.Features.enableGallery)); this.isGitHubPaneEnabled = ko.observable(false); - this.isGraphsEnabled = ko.computed(() => { - return this.isFeatureEnabled(Constants.Features.graphs); - }); this.canExceedMaximumValue = ko.computed(() => this.isFeatureEnabled(Constants.Features.canExceedMaximumValue) @@ -554,7 +550,9 @@ export default class Explorer implements ViewModels.Explorer { !this.isRunningOnNationalCloud() && !this.isPreferredApiGraph() ); - this.isRightPanelV2Enabled = ko.computed(() => this.isFeatureEnabled(Constants.Features.enableRightPanelV2)); + this.isRightPanelV2Enabled = ko.computed(() => + this.isFeatureEnabled(Constants.Features.enableRightPanelV2) + ); this.defaultExperience.subscribe((defaultExperience: string) => { if ( defaultExperience && diff --git a/src/Explorer/OpenActionsStubs.ts b/src/Explorer/OpenActionsStubs.ts index e919c27ba..b0df3f44d 100644 --- a/src/Explorer/OpenActionsStubs.ts +++ b/src/Explorer/OpenActionsStubs.ts @@ -98,7 +98,6 @@ export class ExplorerStub implements ViewModels.Explorer { public manageSparkClusterPane: ViewModels.ContextualPane; public isGalleryEnabled: ko.Computed; public isGitHubPaneEnabled: ko.Observable; - public isGraphsEnabled: ko.Computed; public isRightPanelV2Enabled: ko.Computed; public canExceedMaximumValue: ko.Computed; public isHostedDataExplorerEnabled: ko.Computed; diff --git a/src/Explorer/Panes/GenericRightPaneComponent.tsx b/src/Explorer/Panes/GenericRightPaneComponent.tsx index 407fb6ab9..753119ccf 100644 --- a/src/Explorer/Panes/GenericRightPaneComponent.tsx +++ b/src/Explorer/Panes/GenericRightPaneComponent.tsx @@ -49,7 +49,12 @@ export class GenericRightPaneComponent extends React.Component
-
+
{this.createPanelHeader()} {this.createErrorSection()} @@ -137,5 +142,5 @@ export class GenericRightPaneComponent extends React.Component { const notificationConsoleElement: HTMLElement = document.getElementById("explorerNotificationConsole"); return window.innerHeight - $(notificationConsoleElement).height(); - } + }; } diff --git a/src/Explorer/Panes/UploadItemsPaneAdapter.tsx b/src/Explorer/Panes/UploadItemsPaneAdapter.tsx index 730b30480..99f35c495 100644 --- a/src/Explorer/Panes/UploadItemsPaneAdapter.tsx +++ b/src/Explorer/Panes/UploadItemsPaneAdapter.tsx @@ -110,11 +110,7 @@ export class UploadItemsPaneAdapter implements ReactAdapter { } private createContent = (): JSX.Element => { - return ( -
- {this.createMainContentSection()} -
- ); + return
{this.createMainContentSection()}
; }; private createMainContentSection = (): JSX.Element => {