Lazy load collection offer (#234)

src/Explorer/Tabs/SettingsTab.ts

@@ -1181,7 +1181,6 @@ export default class SettingsTab extends TabsBase implements ViewModels.WaitsFor
 
       this.container.isRefreshingExplorer(false);
       this._setBaseline();
-      this.collection.readSettings();
       this._wasAutopilotOriginallySet(this.isAutoPilotSelected());
       TelemetryProcessor.traceSuccess(
         Action.UpdateSettings,

src/Explorer/Tree/Collection.ts

@@ -8,7 +8,9 @@ import * as Constants from "../../Common/Constants";
 import { readStoredProcedures } from "../../Common/dataAccess/readStoredProcedures";
 import { readTriggers } from "../../Common/dataAccess/readTriggers";
 import { readUserDefinedFunctions } from "../../Common/dataAccess/readUserDefinedFunctions";
-import { createDocument, readCollectionQuotaInfo, readOffer, readOffers } from "../../Common/DocumentClientUtilityBase";
+import { createDocument } from "../../Common/DocumentClientUtilityBase";
+import { readCollectionOffer } from "../../Common/dataAccess/readCollectionOffer";
+import { readCollectionQuotaInfo } from "../../Common/dataAccess/readCollectionQuotaInfo";
 import * as Logger from "../../Common/Logger";
 import { configContext } from "../../ConfigContext";
 import * as DataModels from "../../Contracts/DataModels";
@@ -541,7 +543,7 @@ export default class Collection implements ViewModels.Collection {
     }
   };
 
-  public onSettingsClick = () => {
+  public onSettingsClick = async (): Promise<void> => {
     this.container.selectedNode(this);
     this.selectedSubnodeKind(ViewModels.CollectionTabKind.Settings);
     TelemetryProcessor.trace(Action.SelectItem, ActionModifiers.Mark, {
@@ -553,6 +555,7 @@ export default class Collection implements ViewModels.Collection {
       dataExplorerArea: Constants.Areas.ResourceTree
     });
 
+    await this.loadOffer();
     const tabTitle = !this.offer() ? "Settings" : "Scale & Settings";
     const pendingNotificationsPromise: Q.Promise<DataModels.Notification> = this._getPendingThroughputSplitNotification();
     const matchingTabs = this.container.tabsManager.getTabs(ViewModels.CollectionTabKind.Settings, tab => {
@@ -570,12 +573,12 @@ export default class Collection implements ViewModels.Collection {
         tabTitle: tabTitle
       });
 
-      Q.all([pendingNotificationsPromise, this.readSettings()]).then(
+      pendingNotificationsPromise.then(
         (data: any) => {
           const pendingNotification: DataModels.Notification = data && data[0];
           settingsTab = new SettingsTab({
             tabKind: ViewModels.CollectionTabKind.Settings,
-            title: !this.offer() ? "Settings" : "Scale & Settings",
+            title: tabTitle,
             tabPath: "",
 
             collection: this,
@@ -624,103 +627,12 @@ export default class Collection implements ViewModels.Collection {
     }
   };
 
-  public readSettings(): Q.Promise<void> {
-    const deferred: Q.Deferred<void> = Q.defer<void>();
-    this.container.isRefreshingExplorer(true);
-    const collectionDataModel: DataModels.Collection = <DataModels.Collection>{
-      id: this.id(),
-      _rid: this.rid,
-      _self: this.self,
-      defaultTtl: this.defaultTtl(),
-      indexingPolicy: this.indexingPolicy(),
-      partitionKey: this.partitionKey
-    };
-    const startKey: number = TelemetryProcessor.traceStart(Action.LoadOffers, {
-      databaseAccountName: this.container.databaseAccount().name,
-      databaseName: this.databaseId,
-      collectionName: this.id(),
-      defaultExperience: this.container.defaultExperience()
-    });
+  private async loadCollectionQuotaInfo(): Promise<void> {
     // TODO: Use the collection entity cache to get quota info
-    const quotaInfoPromise: Q.Promise<DataModels.CollectionQuotaInfo> = readCollectionQuotaInfo(this);
-    const offerInfoPromise: Q.Promise<DataModels.Offer[]> = readOffers({
-      isServerless: this.container.isServerlessEnabled()
-    });
-    Q.all([quotaInfoPromise, offerInfoPromise]).then(
-      () => {
-        this.container.isRefreshingExplorer(false);
-        const quotaInfoWithUniqueKeyPolicy: DataModels.CollectionQuotaInfo = quotaInfoPromise.valueOf();
-        this.uniqueKeyPolicy = quotaInfoWithUniqueKeyPolicy.uniqueKeyPolicy;
-        const quotaInfo = _.omit(quotaInfoWithUniqueKeyPolicy, "uniqueKeyPolicy");
-
-        const collectionOffer = this._getOfferForCollection(offerInfoPromise.valueOf(), collectionDataModel);
-        if (!collectionOffer) {
-          this.quotaInfo(quotaInfo);
-          TelemetryProcessor.traceSuccess(
-            Action.LoadOffers,
-            {
-              databaseAccountName: this.container.databaseAccount().name,
-              databaseName: this.databaseId,
-              collectionName: this.id(),
-              defaultExperience: this.container.defaultExperience()
-            },
-            startKey
-          );
-          deferred.resolve();
-          return;
-        }
-
-        readOffer(collectionOffer).then((offerDetail: DataModels.OfferWithHeaders) => {
-          if (OfferUtils.isNotOfferV1(collectionOffer)) {
-            const offerThroughputInfo: DataModels.OfferThroughputInfo = {
-              minimumRUForCollection:
-                offerDetail.content &&
-                offerDetail.content.collectionThroughputInfo &&
-                offerDetail.content.collectionThroughputInfo.minimumRUForCollection,
-              numPhysicalPartitions:
-                offerDetail.content &&
-                offerDetail.content.collectionThroughputInfo &&
-                offerDetail.content.collectionThroughputInfo.numPhysicalPartitions
-            };
-
-            collectionOffer.content.collectionThroughputInfo = offerThroughputInfo;
-          }
-
-          (collectionOffer as DataModels.OfferWithHeaders).headers = offerDetail.headers;
-          this.offer(collectionOffer);
-          this.offer.valueHasMutated();
-          this.quotaInfo(quotaInfo);
-          TelemetryProcessor.traceSuccess(
-            Action.LoadOffers,
-            {
-              databaseAccountName: this.container.databaseAccount().name,
-              databaseName: this.databaseId,
-              collectionName: this.id(),
-              defaultExperience: this.container.defaultExperience(),
-              offerVersion: collectionOffer && collectionOffer.offerVersion
-            },
-            startKey
-          );
-          deferred.resolve();
-        });
-      },
-      (error: any) => {
-        this.container.isRefreshingExplorer(false);
-        deferred.reject(error);
-        TelemetryProcessor.traceFailure(
-          Action.LoadOffers,
-          {
-            databaseAccountName: this.container.databaseAccount().name,
-            databaseName: this.databaseId,
-            collectionName: this.id(),
-            defaultExperience: this.container.defaultExperience()
-          },
-          startKey
-        );
-      }
-    );
-
-    return deferred.promise;
+    const quotaInfoWithUniqueKeyPolicy = await readCollectionQuotaInfo(this);
+    this.uniqueKeyPolicy = quotaInfoWithUniqueKeyPolicy.uniqueKeyPolicy;
+    const quotaInfo = _.omit(quotaInfoWithUniqueKeyPolicy, "uniqueKeyPolicy");
+    this.quotaInfo(quotaInfo);
   }
 
   public onNewQueryClick(source: any, event: MouseEvent, queryText?: string) {
@@ -1399,4 +1311,53 @@ export default class Collection implements ViewModels.Collection {
   public getDatabase(): ViewModels.Database {
     return this.container.findDatabaseWithId(this.databaseId);
   }
+
+  public async loadOffer(): Promise<void> {
+    if (!this.container.isServerlessEnabled() && !this.offer()) {
+      this.container.isRefreshingExplorer(true);
+      const startKey: number = TelemetryProcessor.traceStart(Action.LoadOffers, {
+        databaseAccountName: this.container.databaseAccount().name,
+        databaseName: this.databaseId,
+        collectionName: this.id(),
+        defaultExperience: this.container.defaultExperience()
+      });
+
+      const params: DataModels.ReadCollectionOfferParams = {
+        collectionId: this.id(),
+        collectionResourceId: this.self,
+        databaseId: this.databaseId
+      };
+
+      try {
+        this.offer(await readCollectionOffer(params));
+        await this.loadCollectionQuotaInfo();
+
+        TelemetryProcessor.traceSuccess(
+          Action.LoadOffers,
+          {
+            databaseAccountName: this.container.databaseAccount().name,
+            databaseName: this.databaseId,
+            collectionName: this.id(),
+            defaultExperience: this.container.defaultExperience(),
+            offerVersion: this.offer()?.offerVersion
+          },
+          startKey
+        );
+      } catch (error) {
+        TelemetryProcessor.traceFailure(
+          Action.LoadOffers,
+          {
+            databaseAccountName: this.container.databaseAccount().name,
+            databaseName: this.databaseId,
+            collectionName: this.id(),
+            defaultExperience: this.container.defaultExperience()
+          },
+          startKey
+        );
+        throw error;
+      } finally {
+        this.container.isRefreshingExplorer(false);
+      }
+    }
+  }
 }