From c486c1193e72707802c66b99aa51084134a2c951 Mon Sep 17 00:00:00 2001
From: victor-meng <56978073+victor-meng@users.noreply.github.com>
Date: Wed, 7 Jul 2021 11:22:54 -0700
Subject: [PATCH] Fix scale component not showing in settings tab (#926)

---
 .../Controls/Settings/SettingsComponent.tsx   | 36 -------------------
 src/Explorer/Tree/Collection.ts               |  1 +
 2 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/src/Explorer/Controls/Settings/SettingsComponent.tsx b/src/Explorer/Controls/Settings/SettingsComponent.tsx
index cc7cc15ba..0094806c6 100644
--- a/src/Explorer/Controls/Settings/SettingsComponent.tsx
+++ b/src/Explorer/Controls/Settings/SettingsComponent.tsx
@@ -16,7 +16,6 @@ import { trace, traceFailure, traceStart, traceSuccess } from "../../../Shared/T
 import { userContext } from "../../../UserContext";
 import { MongoDBCollectionResource, MongoIndex } from "../../../Utils/arm/generatedClients/cosmos/types";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
-import { logConsoleError } from "../../../Utils/NotificationConsoleUtils";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import { useCommandBar } from "../../Menus/CommandBar/CommandBarComponentAdapter";
 import { SettingsTabV2 } from "../../Tabs/SettingsTabV2";
@@ -110,7 +109,6 @@ export interface SettingsComponentState {
 
   initialNotification: DataModels.Notification;
   selectedTab: SettingsV2TabTypes;
-  offerLoaded: boolean;
 }
 
 export class SettingsComponent extends React.Component<SettingsComponentProps, SettingsComponentState> {
@@ -195,7 +193,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
 
       initialNotification: undefined,
       selectedTab: SettingsV2TabTypes.ScaleTab,
-      offerLoaded: !!this.offer,
     };
 
     this.saveSettingsButton = {
@@ -217,7 +214,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     if (this.isCollectionSettingsTab) {
       this.refreshIndexTransformationProgress();
       this.loadMongoIndexes();
-      this.loadCollectionOffer();
     }
 
     this.setAutoPilotStates();
@@ -372,34 +368,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     });
   };
 
-  private async loadCollectionOffer() {
-    try {
-      this.props.settingsTab.isExecuting(true);
-      await this.collection.loadOffer();
-      this.props.settingsTab.tabTitle(this.collection.offer() ? "Settings" : "Scale & Settings");
-      this.setState({ offerLoaded: true });
-    } catch (error) {
-      this.props.settingsTab.isExecutionError(true);
-      const errorMessage = getErrorMessage(error);
-      traceFailure(
-        Action.Tab,
-        {
-          databaseName: this.collection.databaseId,
-          collectionName: this.collection.id(),
-
-          dataExplorerArea: Constants.Areas.Tab,
-          tabTitle: this.props.settingsTab.tabTitle,
-          error: errorMessage,
-          errorStack: getErrorStack(error),
-        },
-        this.props.settingsTab.onLoadStartKey
-      );
-      logConsoleError(`Error while fetching container settings for container ${this.collection.id()}: ${errorMessage}`);
-    } finally {
-      this.props.settingsTab.isExecuting(false);
-    }
-  }
-
   private getMongoIndexesToSave = (): MongoIndex[] => {
     let finalIndexes: MongoIndex[] = [];
     this.state.currentMongoIndexes?.map((mongoIndex: MongoIndex, index: number) => {
@@ -937,10 +905,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       );
     }
 
-    if (!this.state.offerLoaded) {
-      return <></>;
-    }
-
     const subSettingsComponentProps: SubSettingsComponentProps = {
       collection: this.collection,
       isAnalyticalStorageEnabled: this.isAnalyticalStorageEnabled,
diff --git a/src/Explorer/Tree/Collection.ts b/src/Explorer/Tree/Collection.ts
index a20b71633..7a9fcb22f 100644
--- a/src/Explorer/Tree/Collection.ts
+++ b/src/Explorer/Tree/Collection.ts
@@ -558,6 +558,7 @@ export default class Collection implements ViewModels.Collection {
   };
 
   public onSettingsClick = async (): Promise<void> => {
+    await this.loadOffer();
     useSelectedNode.getState().setSelectedNode(this);
     this.selectedSubnodeKind(ViewModels.CollectionTabKind.Settings);
     TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {