Remove cached resource calls (#297)

src/Common/DataAccessUtilityBase.ts

@@ -168,22 +168,6 @@ export function deleteConflict(
   );
 }
 
-export function refreshCachedOffers(): Q.Promise<void> {
-  if (configContext.platform === Platform.Portal) {
-    return sendCachedDataMessage(MessageTypes.RefreshOffers, []);
-  } else {
-    return Q();
-  }
-}
-
-export function refreshCachedResources(options?: any): Q.Promise<void> {
-  if (configContext.platform === Platform.Portal) {
-    return sendCachedDataMessage(MessageTypes.RefreshResources, []);
-  } else {
-    return Q();
-  }
-}
-
 export function queryConflicts(
   databaseId: string,
   containerId: string,

src/Common/DocumentClientUtilityBase.ts

@@ -215,11 +215,3 @@ export function deleteConflict(
 
   return deferred.promise;
 }
-
-export function refreshCachedResources(options: any = {}): Q.Promise<void> {
-  return DataAccessUtilityBase.refreshCachedResources(options);
-}
-
-export function refreshCachedOffers(): Q.Promise<void> {
-  return DataAccessUtilityBase.refreshCachedOffers();
-}

src/Common/dataAccess/createCollection.ts

@@ -23,7 +23,6 @@ import {
 } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
 import { createUpdateTable, getTable } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
 import { logConsoleProgress, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
-import { refreshCachedResources } from "../DataAccessUtilityBase";
 import { userContext } from "../../UserContext";
 import { createDatabase } from "./createDatabase";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
@@ -54,7 +53,6 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
     }
 
     logConsoleInfo(`Successfully created container ${params.collectionId}`);
-    await refreshCachedResources();
     return collection;
   } catch (error) {
     handleError(error, `Error while creating container ${params.collectionId}`, "CreateCollection");

src/Common/dataAccess/createDatabase.ts

@@ -26,7 +26,6 @@ import {
 } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
 import { handleError } from "../ErrorHandlingUtils";
 import { logConsoleProgress, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
-import { refreshCachedOffers, refreshCachedResources } from "../DataAccessUtilityBase";
 import { userContext } from "../../UserContext";
 
 export async function createDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
@@ -39,8 +38,6 @@ export async function createDatabase(params: DataModels.CreateDatabaseParams): P
       ? createDatabaseWithARM(params)
       : createDatabaseWithSDK(params));
 
-    await refreshCachedResources();
-    await refreshCachedOffers();
     logConsoleInfo(`Successfully created database ${params.databaseId}`);
     return database;
   } catch (error) {

src/Common/dataAccess/deleteCollection.test.ts

@@ -7,7 +7,6 @@ import { AuthType } from "../../AuthType";
 import { client } from "../CosmosClient";
 import { updateUserContext } from "../../UserContext";
 import { DatabaseAccount } from "../../Contracts/DataModels";
-import { sendCachedDataMessage } from "../MessageHandler";
 import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 
 describe("deleteCollection", () => {
@@ -18,7 +17,6 @@ describe("deleteCollection", () => {
       } as DatabaseAccount,
       defaultExperience: DefaultAccountExperienceType.DocumentDB
     });
-    (sendCachedDataMessage as jest.Mock).mockResolvedValue(undefined);
   });
 
   it("should call ARM if logged in with AAD", async () => {

src/Common/dataAccess/deleteCollection.ts

@@ -9,7 +9,6 @@ import { handleError } from "../ErrorHandlingUtils";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { userContext } from "../../UserContext";
 import { client } from "../CosmosClient";
-import { refreshCachedResources } from "../DataAccessUtilityBase";
 
 export async function deleteCollection(databaseId: string, collectionId: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting container ${collectionId}`);
@@ -23,7 +22,6 @@ export async function deleteCollection(databaseId: string, collectionId: string)
         .delete();
     }
     logConsoleInfo(`Successfully deleted container ${collectionId}`);
-    await refreshCachedResources();
   } catch (error) {
     handleError(error, `Error while deleting container ${collectionId}`, "DeleteCollection");
     throw error;

src/Common/dataAccess/deleteDatabase.test.ts

@@ -7,7 +7,6 @@ import { AuthType } from "../../AuthType";
 import { client } from "../CosmosClient";
 import { updateUserContext } from "../../UserContext";
 import { DatabaseAccount } from "../../Contracts/DataModels";
-import { sendCachedDataMessage } from "../MessageHandler";
 import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 
 describe("deleteDatabase", () => {
@@ -18,7 +17,6 @@ describe("deleteDatabase", () => {
       } as DatabaseAccount,
       defaultExperience: DefaultAccountExperienceType.DocumentDB
     });
-    (sendCachedDataMessage as jest.Mock).mockResolvedValue(undefined);
   });
 
   it("should call ARM if logged in with AAD", async () => {

src/Common/dataAccess/deleteDatabase.ts

@@ -8,7 +8,6 @@ import { handleError } from "../ErrorHandlingUtils";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { userContext } from "../../UserContext";
 import { client } from "../CosmosClient";
-import { refreshCachedResources } from "../DataAccessUtilityBase";
 
 export async function deleteDatabase(databaseId: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting database ${databaseId}`);
@@ -25,7 +24,6 @@ export async function deleteDatabase(databaseId: string): Promise<void> {
         .delete();
     }
     logConsoleInfo(`Successfully deleted database ${databaseId}`);
-    await refreshCachedResources();
   } catch (error) {
     handleError(error, `Error while deleting database ${databaseId}`, "DeleteDatabase");
     throw error;

src/Common/dataAccess/readOffers.ts

@@ -1,28 +1,10 @@
 import { Offer } from "../../Contracts/DataModels";
-import { ClientDefaults } from "../Constants";
-import { MessageTypes } from "../../Contracts/ExplorerContracts";
-import { Platform, configContext } from "../../ConfigContext";
+import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { client } from "../CosmosClient";
 import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
-import { sendCachedDataMessage } from "../MessageHandler";
-import { userContext } from "../../UserContext";
 
 export const readOffers = async (): Promise<Offer[]> => {
   const clearMessage = logConsoleProgress(`Querying offers`);
-  try {
-    if (configContext.platform === Platform.Portal) {
-      const offers = sendCachedDataMessage<Offer[]>(MessageTypes.AllOffers, [
-        userContext.databaseAccount.id,
-        ClientDefaults.portalCacheTimeoutMs
-      ]);
-      clearMessage();
-
-      return offers;
-    }
-  } catch (error) {
-    // If error getting cached Offers, continue on and read via SDK
-  }
 
   try {
     const response = await client()

src/Common/dataAccess/updateCollection.ts

@@ -28,7 +28,6 @@ import {
 import { createUpdateTable, getTable } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
 import { handleError } from "../ErrorHandlingUtils";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
-import { refreshCachedResources } from "../DataAccessUtilityBase";
 import { userContext } from "../../UserContext";
 
 export async function updateCollection(
@@ -58,7 +57,6 @@ export async function updateCollection(
     }
 
     logConsoleInfo(`Successfully updated container ${collectionId}`);
-    await refreshCachedResources();
     return collection;
   } catch (error) {
     handleError(error, `Failed to update container ${collectionId}`, "UpdateCollection");

src/Common/dataAccess/updateOffer.ts

@@ -10,7 +10,6 @@ import { handleError } from "../ErrorHandlingUtils";
 import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { readCollectionOffer } from "./readCollectionOffer";
 import { readDatabaseOffer } from "./readDatabaseOffer";
-import { refreshCachedOffers, refreshCachedResources } from "../DataAccessUtilityBase";
 import {
   updateSqlDatabaseThroughput,
   migrateSqlDatabaseToAutoscale,
@@ -70,8 +69,6 @@ export const updateOffer = async (params: UpdateOfferParams): Promise<Offer> =>
     } else {
       updatedOffer = await updateOfferWithSDK(params);
     }
-    await refreshCachedOffers();
-    await refreshCachedResources();
     logConsoleInfo(`Successfully updated offer for ${offerResourceText}`);
     return updatedOffer;
   } catch (error) {

src/Explorer/Explorer.ts

@@ -15,7 +15,6 @@ import CassandraAddCollectionPane from "./Panes/CassandraAddCollectionPane";
 import Database from "./Tree/Database";
 import DeleteCollectionConfirmationPane from "./Panes/DeleteCollectionConfirmationPane";
 import DeleteDatabaseConfirmationPane from "./Panes/DeleteDatabaseConfirmationPane";
-import { refreshCachedResources } from "../Common/DocumentClientUtilityBase";
 import { readCollection } from "../Common/dataAccess/readCollection";
 import { readDatabases } from "../Common/dataAccess/readDatabases";
 import EditTableEntityPane from "./Panes/Tables/EditTableEntityPane";
@@ -1513,41 +1512,7 @@ export default class Explorer {
       dataExplorerArea: Constants.Areas.ResourceTree
     });
     this.isRefreshingExplorer(true);
-    refreshCachedResources().then(
-      () => {
-        TelemetryProcessor.traceSuccess(
-          Action.LoadDatabases,
-          {
-            description: "Refresh successful",
-            databaseAccountName: this.databaseAccount() && this.databaseAccount().name,
-            defaultExperience: this.defaultExperience && this.defaultExperience(),
-            dataExplorerArea: Constants.Areas.ResourceTree
-          },
-          startKey
-        );
-        this.isAuthWithResourceToken() ? this.refreshDatabaseForResourceToken() : this.refreshAllDatabases();
-      },
-      (error: any) => {
-        this.isRefreshingExplorer(false);
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while refreshing data: ${error.message}`
-        );
-        TelemetryProcessor.traceFailure(
-          Action.LoadDatabases,
-          {
-            description: "Unable to refresh cached resources",
-            databaseAccountName: this.databaseAccount() && this.databaseAccount().name,
-            defaultExperience: this.defaultExperience && this.defaultExperience(),
-            dataExplorerArea: Constants.Areas.ResourceTree,
-            error: error
-          },
-          startKey
-        );
-        throw error;
-      }
-    );
-
+    this.isAuthWithResourceToken() ? this.refreshDatabaseForResourceToken() : this.refreshAllDatabases();
     this.refreshNotebookList();
   };
 

src/Explorer/Panes/AddCollectionPane.ts

@@ -14,7 +14,6 @@ import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstan
 import { configContext, Platform } from "../../ConfigContext";
 import { ContextualPaneBase } from "./ContextualPaneBase";
 import { DynamicListItem } from "../Controls/DynamicList/DynamicListComponent";
-import { refreshCachedResources } from "../../Common/DocumentClientUtilityBase";
 import { createCollection } from "../../Common/dataAccess/createCollection";
 
 export interface AddCollectionPaneOptions extends ViewModels.PaneOptions {
@@ -896,9 +895,7 @@ export default class AddCollectionPane extends ContextualPaneBase {
         };
         TelemetryProcessor.traceSuccess(Action.CreateCollection, addCollectionPaneSuccessMessage, startKey);
         this.resetData();
-        return refreshCachedResources().then(() => {
-          this.container.refreshAllDatabases();
-        });
+        this.container.refreshAllDatabases();
       },
       (reason: any) => {
         this.isExecuting(false);

src/Explorer/Tables/TableDataClient.ts

@@ -15,13 +15,7 @@ import * as ViewModels from "../../Contracts/ViewModels";
 import { MessageTypes } from "../../Contracts/ExplorerContracts";
 import { sendMessage } from "../../Common/MessageHandler";
 import Explorer from "../Explorer";
-import {
-  queryDocuments,
-  refreshCachedResources,
-  deleteDocument,
-  updateDocument,
-  createDocument
-} from "../../Common/DocumentClientUtilityBase";
+import { queryDocuments, deleteDocument, updateDocument, createDocument } from "../../Common/DocumentClientUtilityBase";
 import { configContext } from "../../ConfigContext";
 
 export interface CassandraTableKeys {
@@ -424,7 +418,7 @@ export class CassandraAPIDataClient extends TableDataClient {
             ConsoleDataType.Info,
             `Successfully created a keyspace with query ${createKeyspaceQuery}`
           );
-          refreshCachedResources().finally(() => deferred.resolve());
+          deferred.resolve();
         },
         reason => {
           NotificationConsoleUtils.logConsoleMessage(
@@ -471,15 +465,7 @@ export class CassandraAPIDataClient extends TableDataClient {
                 ConsoleDataType.Info,
                 `Successfully created a table with query ${createTableQuery}`
               );
-              refreshCachedResources(null).then(
-                () => {
-                  deferred.resolve();
-                },
-                reason => {
-                  // Still resolve since the keyspace/table was successfully created at this point.
-                  deferred.resolve();
-                }
-              );
+              deferred.resolve();
             },
             reason => {
               NotificationConsoleUtils.logConsoleMessage(
@@ -520,15 +506,7 @@ export class CassandraAPIDataClient extends TableDataClient {
             ConsoleDataType.Info,
             `Successfully deleted resource with query ${deleteQuery}`
           );
-          refreshCachedResources(null).then(
-            () => {
-              deferred.resolve();
-            },
-            reason => {
-              // Still resolve since the keyspace/table was successfully deleted at this point.
-              deferred.resolve();
-            }
-          );
+          deferred.resolve();
         },
         reason => {
           NotificationConsoleUtils.logConsoleMessage(