Merge branch 'master' into jbunster/ru-gb-waiver

.eslintignore

@@ -206,6 +206,7 @@ src/Explorer/Tabs/QueryTablesTab.ts
 src/Explorer/Tabs/ScriptTabBase.ts
 src/Explorer/Tabs/SettingsTab.test.ts
 src/Explorer/Tabs/SettingsTab.ts
+src/Explorer/Tabs/SparkMasterTab.ts
 src/Explorer/Tabs/StoredProcedureTab.ts
 src/Explorer/Tabs/TabComponents.ts
 src/Explorer/Tabs/TabsBase.ts

.eslintrc.js

@@ -42,13 +42,6 @@ module.exports = {
     "no-null/no-null": "error",
     "@typescript-eslint/no-explicit-any": "error",
     "prefer-arrow/prefer-arrow-functions": ["error", { allowStandaloneDeclarations: true }],
-    eqeqeq: "error",
-    "no-restricted-syntax": [
-      "error",
-      {
-        selector: "CallExpression[callee.object.name='JSON'][callee.property.name='stringify'] Identifier[name=/$err/]",
-        message: "Do not use JSON.stringify(error). It will print '{}'"
-      }
-    ]
+    eqeqeq: "error"
   }
 };

less/documentDB.less

@@ -3023,7 +3023,3 @@ settings-pane {
 .infoBoxContent a {
     color: @AccentMediumHigh
 }
-
-.collapsibleSection :hover{
-    cursor: pointer;
-}

package-lock.json

@@ -76,6 +76,7 @@
       "version": "7.9.0",
       "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
       "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
+      "dev": true,
       "requires": {
         "@babel/code-frame": "^7.8.3",
         "@babel/generator": "^7.9.0",
@@ -98,7 +99,8 @@
         "source-map": {
           "version": "0.5.7",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+          "dev": true
         }
       }
     },
@@ -7201,10 +7203,11 @@
       }
     },
     "create-react-class": {
-      "version": "15.7.0",
-      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.7.0.tgz",
-      "integrity": "sha512-QZv4sFWG9S5RUvkTYWbflxeZX+JG7Cz0Tn33rQBJ+WFQTqTfUTjMjiv9tnfXazjsO5r0KhPs+AqCjyrQX6h2ng==",
+      "version": "15.6.3",
+      "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
+      "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
       "requires": {
+        "fbjs": "^0.8.9",
         "loose-envify": "^1.3.1",
         "object-assign": "^4.1.1"
       }
@@ -8501,6 +8504,24 @@
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
       "dev": true
     },
+    "encoding": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz",
+      "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==",
+      "requires": {
+        "iconv-lite": "^0.6.2"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.2.tgz",
+          "integrity": "sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==",
+          "requires": {
+            "safer-buffer": ">= 2.1.2 < 3.0.0"
+          }
+        }
+      }
+    },
     "end-of-stream": {
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
@@ -9646,6 +9667,27 @@
         "bser": "2.1.1"
       }
     },
+    "fbjs": {
+      "version": "0.8.17",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
+      "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
+      "requires": {
+        "core-js": "^1.0.0",
+        "isomorphic-fetch": "^2.1.1",
+        "loose-envify": "^1.0.0",
+        "object-assign": "^4.1.0",
+        "promise": "^7.1.1",
+        "setimmediate": "^1.0.5",
+        "ua-parser-js": "^0.7.18"
+      },
+      "dependencies": {
+        "core-js": {
+          "version": "1.2.7",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+          "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+        }
+      }
+    },
     "fd-slicer": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
@@ -11846,6 +11888,26 @@
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
+    "isomorphic-fetch": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+      "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+      "requires": {
+        "node-fetch": "^1.0.1",
+        "whatwg-fetch": ">=0.10.0"
+      },
+      "dependencies": {
+        "node-fetch": {
+          "version": "1.7.3",
+          "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+          "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+          "requires": {
+            "encoding": "^0.1.11",
+            "is-stream": "^1.0.1"
+          }
+        }
+      }
+    },
     "isstream": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -13344,6 +13406,36 @@
         "micromatch": "^3.1.10",
         "pretty-format": "^24.9.0",
         "realpath-native": "^1.1.0"
+      },
+      "dependencies": {
+        "@babel/core": {
+          "version": "7.11.6",
+          "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.11.6.tgz",
+          "integrity": "sha512-Wpcv03AGnmkgm6uS6k8iwhIwTrcP0m17TL1n1sy7qD0qelDu4XNeW0dN0mHfa+Gei211yDaLoEe/VlbXQzM4Bg==",
+          "requires": {
+            "@babel/code-frame": "^7.10.4",
+            "@babel/generator": "^7.11.6",
+            "@babel/helper-module-transforms": "^7.11.0",
+            "@babel/helpers": "^7.10.4",
+            "@babel/parser": "^7.11.5",
+            "@babel/template": "^7.10.4",
+            "@babel/traverse": "^7.11.5",
+            "@babel/types": "^7.11.5",
+            "convert-source-map": "^1.7.0",
+            "debug": "^4.1.0",
+            "gensync": "^1.0.0-beta.1",
+            "json5": "^2.1.2",
+            "lodash": "^4.17.19",
+            "resolve": "^1.3.2",
+            "semver": "^5.4.1",
+            "source-map": "^0.5.0"
+          }
+        },
+        "source-map": {
+          "version": "0.5.7",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w="
+        }
       }
     },
     "jest-dev-server": {
@@ -16527,8 +16619,6 @@
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
       "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
-      "dev": true,
-      "optional": true,
       "requires": {
         "asap": "~2.0.3"
       }
@@ -18156,8 +18246,7 @@
     "setimmediate": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
-      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
-      "dev": true
+      "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
     },
     "setprototypeof": {
       "version": "1.1.1",
@@ -19917,6 +20006,11 @@
         "free-style": "3.1.0"
       }
     },
+    "ua-parser-js": {
+      "version": "0.7.22",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz",
+      "integrity": "sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q=="
+    },
     "uglify-js": {
       "version": "3.4.10",
       "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz",

src/Common/Constants.ts

@@ -133,7 +133,6 @@ export class Features {
 // flight names returned from the portal are always lowercase
 export class Flights {
   public static readonly SettingsV2 = "settingsv2";
-  public static readonly MongoIndexEditor = "mongoindexeditor";
 }
 
 export class AfecFeatures {

src/Common/CosmosClient.ts

@@ -69,7 +69,7 @@ export async function getTokenFromAuthService(verb: string, resourceType: string
     const result = JSON.parse(await response.json());
     return result;
   } catch (error) {
-    logConsoleError(`Failed to get authorization headers for ${resourceType}: ${error.message}`);
+    logConsoleError(`Failed to get authorization headers for ${resourceType}: ${JSON.stringify(error)}`);
     return Promise.reject(error);
   }
 }

src/Common/DataAccessUtilityBase.ts

@@ -168,6 +168,22 @@ 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

@@ -1,14 +1,17 @@
 import { ConflictDefinition, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
+import { RequestOptions } from "@azure/cosmos/dist-esm";
 import Q from "q";
+import * as DataModels from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import ConflictId from "../Explorer/Tree/ConflictId";
 import DocumentId from "../Explorer/Tree/DocumentId";
 import StoredProcedure from "../Explorer/Tree/StoredProcedure";
-import { logConsoleInfo, logConsoleProgress } from "../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../Utils/NotificationConsoleUtils";
 import * as Constants from "./Constants";
+import { sendNotificationForError } from "./dataAccess/sendNotificationForError";
 import * as DataAccessUtilityBase from "./DataAccessUtilityBase";
 import { MinimalQueryIterator, nextPage } from "./IteratorUtilities";
-import { handleError } from "./ErrorHandlingUtils";
+import * as Logger from "./Logger";
 
 // TODO: Log all promise resolutions and errors with verbosity levels
 export function queryDocuments(
@@ -56,11 +59,13 @@ export function executeStoredProcedure(
         );
       },
       (error: any) => {
-        handleError(
-          error,
-          `Failed to execute stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}`,
-          "ExecuteStoredProcedure"
+        logConsoleError(
+          `Failed to execute stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}: ${JSON.stringify(
+            error
+          )}`
         );
+        Logger.logError(JSON.stringify(error), "ExecuteStoredProcedure", error.code);
+        sendNotificationForError(error);
         deferred.reject(error);
       }
     )
@@ -88,7 +93,9 @@ export function queryDocumentsPage(
         deferred.resolve(result);
       },
       (error: any) => {
-        handleError(error, `Failed to query ${entityName} for container ${resourceName}`, "QueryDocumentsPage");
+        logConsoleError(`Failed to query ${entityName} for container ${resourceName}: ${JSON.stringify(error)}`);
+        Logger.logError(JSON.stringify(error), "QueryDocumentsPage", error.code);
+        sendNotificationForError(error);
         deferred.reject(error);
       }
     )
@@ -109,7 +116,9 @@ export function readDocument(collection: ViewModels.CollectionBase, documentId:
         deferred.resolve(document);
       },
       (error: any) => {
-        handleError(error, `Failed to read ${entityName} ${documentId.id()}`, "ReadDocument");
+        logConsoleError(`Failed to read ${entityName} ${documentId.id()}: ${JSON.stringify(error)}`);
+        Logger.logError(JSON.stringify(error), "ReadDocument", error.code);
+        sendNotificationForError(error);
         deferred.reject(error);
       }
     )
@@ -135,7 +144,9 @@ export function updateDocument(
         deferred.resolve(updatedDocument);
       },
       (error: any) => {
-        handleError(error, `Failed to update ${entityName} ${documentId.id()}`, "UpdateDocument");
+        logConsoleError(`Failed to update ${entityName} ${documentId.id()}: ${JSON.stringify(error)}`);
+        Logger.logError(JSON.stringify(error), "UpdateDocument", error.code);
+        sendNotificationForError(error);
         deferred.reject(error);
       }
     )
@@ -157,7 +168,11 @@ export function createDocument(collection: ViewModels.CollectionBase, newDocumen
         deferred.resolve(savedDocument);
       },
       (error: any) => {
-        handleError(error, `Error while creating new ${entityName} for container ${collection.id()}`, "CreateDocument");
+        logConsoleError(
+          `Error while creating new ${entityName} for container ${collection.id()}:\n ${JSON.stringify(error)}`
+        );
+        Logger.logError(JSON.stringify(error), "CreateDocument", error.code);
+        sendNotificationForError(error);
         deferred.reject(error);
       }
     )
@@ -179,7 +194,9 @@ export function deleteDocument(collection: ViewModels.CollectionBase, documentId
         deferred.resolve(response);
       },
       (error: any) => {
-        handleError(error, `Error while deleting ${entityName} ${documentId.id()}`, "DeleteDocument");
+        logConsoleError(`Error while deleting ${entityName} ${documentId.id()}:\n ${JSON.stringify(error)}`);
+        Logger.logError(JSON.stringify(error), "DeleteDocument", error.code);
+        sendNotificationForError(error);
         deferred.reject(error);
       }
     )
@@ -205,7 +222,9 @@ export function deleteConflict(
         deferred.resolve(response);
       },
       (error: any) => {
-        handleError(error, `Error while deleting conflict ${conflictId.id()}`, "DeleteConflict");
+        logConsoleError(`Error while deleting conflict ${conflictId.id()}:\n ${JSON.stringify(error)}`);
+        Logger.logError(JSON.stringify(error), "DeleteConflict", error.code);
+        sendNotificationForError(error);
         deferred.reject(error);
       }
     )
@@ -215,3 +234,11 @@ 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/ErrorHandlingUtils.ts

@@ -1,11 +0,0 @@
-import { CosmosError, sendNotificationForError } from "./dataAccess/sendNotificationForError";
-import { logConsoleError } from "../Utils/NotificationConsoleUtils";
-import { logError } from "./Logger";
-import { replaceKnownError } from "./ErrorParserUtility";
-
-export const handleError = (error: CosmosError, consoleErrorPrefix: string, area: string): void => {
-  const sanitizedErrorMsg = replaceKnownError(error.message);
-  logConsoleError(`${consoleErrorPrefix}:\n ${sanitizedErrorMsg}`);
-  logError(sanitizedErrorMsg, area, error.code);
-  sendNotificationForError(error);
-};

src/Common/PortalNotifications.ts

@@ -1,41 +1,41 @@
-import * as DataModels from "../Contracts/DataModels";
-import * as ViewModels from "../Contracts/ViewModels";
-import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
-import { userContext } from "../UserContext";
-import { configContext, Platform } from "../ConfigContext";
-
-const notificationsPath = () => {
-  switch (configContext.platform) {
-    case Platform.Hosted:
-      return "/api/guest/notifications";
-    case Platform.Portal:
-      return "/api/notifications";
-    default:
-      throw new Error(`Unknown platform: ${configContext.platform}`);
-  }
-};
-
-export const fetchPortalNotifications = async (): Promise<DataModels.Notification[]> => {
-  if (configContext.platform === Platform.Emulator) {
-    return [];
-  }
-
-  const databaseAccount = userContext.databaseAccount;
-  const subscriptionId = userContext.subscriptionId;
-  const resourceGroup = userContext.resourceGroup;
-  const url = `${configContext.BACKEND_ENDPOINT}${notificationsPath()}?accountName=${
-    databaseAccount.name
-  }&subscriptionId=${subscriptionId}&resourceGroup=${resourceGroup}`;
-  const authorizationHeader: ViewModels.AuthorizationTokenHeaderMetadata = getAuthorizationHeader();
-  const headers = { [authorizationHeader.header]: authorizationHeader.token };
-
-  const response = await window.fetch(url, {
-    headers
-  });
-
-  if (!response.ok) {
-    throw new Error(await response.text());
-  }
-
-  return (await response.json()) as DataModels.Notification[];
-};
+import * as DataModels from "../Contracts/DataModels";
+import * as ViewModels from "../Contracts/ViewModels";
+import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
+import { userContext } from "../UserContext";
+import { configContext, Platform } from "../ConfigContext";
+
+const notificationsPath = () => {
+  switch (configContext.platform) {
+    case Platform.Hosted:
+      return "/api/guest/notifications";
+    case Platform.Portal:
+      return "/api/notifications";
+    default:
+      throw new Error(`Unknown platform: ${configContext.platform}`);
+  }
+};
+
+export const fetchPortalNotifications = async (): Promise<DataModels.Notification[]> => {
+  if (configContext.platform === Platform.Emulator) {
+    return [];
+  }
+
+  const databaseAccount = userContext.databaseAccount;
+  const subscriptionId = userContext.subscriptionId;
+  const resourceGroup = userContext.resourceGroup;
+  const url = `${configContext.BACKEND_ENDPOINT}${notificationsPath()}?accountName=${
+    databaseAccount.name
+  }&subscriptionId=${subscriptionId}&resourceGroup=${resourceGroup}`;
+  const authorizationHeader: ViewModels.AuthorizationTokenHeaderMetadata = getAuthorizationHeader();
+  const headers = { [authorizationHeader.header]: authorizationHeader.token };
+
+  const response = await window.fetch(url, {
+    headers
+  });
+
+  if (!response.ok) {
+    throw new Error(await response.text());
+  }
+
+  return (await response.json()) as DataModels.Notification[];
+};

src/Common/QueriesClient.ts

@@ -53,7 +53,7 @@ export class QueriesClient {
           return Promise.resolve(collection);
         },
         (error: any) => {
-          const stringifiedError: string = error.message;
+          const stringifiedError: string = JSON.stringify(error);
           NotificationConsoleUtils.logConsoleMessage(
             ConsoleDataType.Error,
             `Failed to set up account for saving queries: ${stringifiedError}`
@@ -163,7 +163,7 @@ export class QueriesClient {
               return Promise.resolve(queries);
             },
             (error: any) => {
-              const stringifiedError: string = error.message;
+              const stringifiedError: string = JSON.stringify(error);
               NotificationConsoleUtils.logConsoleMessage(
                 ConsoleDataType.Error,
                 `Failed to fetch saved queries: ${stringifiedError}`
@@ -175,7 +175,7 @@ export class QueriesClient {
         },
         (error: any) => {
           // should never get into this state but we handle this regardless
-          const stringifiedError: string = error.message;
+          const stringifiedError: string = JSON.stringify(error);
           NotificationConsoleUtils.logConsoleMessage(
             ConsoleDataType.Error,
             `Failed to fetch saved queries: ${stringifiedError}`
@@ -232,7 +232,7 @@ export class QueriesClient {
           return Promise.resolve();
         },
         (error: any) => {
-          const stringifiedError: string = error.message;
+          const stringifiedError: string = JSON.stringify(error);
           NotificationConsoleUtils.logConsoleMessage(
             ConsoleDataType.Error,
             `Failed to delete query ${query.queryName}: ${stringifiedError}`

src/Common/dataAccess/createCollection.ts

@@ -1,4 +1,5 @@
 import * as DataModels from "../../Contracts/DataModels";
+import * as ErrorParserUtility from "../ErrorParserUtility";
 import { AuthType } from "../../AuthType";
 import { ContainerResponse, DatabaseResponse } from "@azure/cosmos";
 import { ContainerRequest } from "@azure/cosmos/dist-esm/client/Container/ContainerRequest";
@@ -22,19 +23,21 @@ import {
   getGremlinGraph
 } 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 { logConsoleProgress, logConsoleError, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { refreshCachedResources } from "../DataAccessUtilityBase";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 import { createDatabase } from "./createDatabase";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
-import { handleError } from "../ErrorHandlingUtils";
 
 export const createCollection = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {
+  let collection: DataModels.Collection;
   const clearMessage = logConsoleProgress(
     `Creating a new container ${params.collectionId} for database ${params.databaseId}`
   );
   try {
-    let collection: DataModels.Collection;
     if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       if (params.createNewDatabase) {
         const createDatabaseParams: DataModels.CreateDatabaseParams = {
@@ -51,15 +54,18 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
     } else {
       collection = await createCollectionWithSDK(params);
     }
-
-    logConsoleInfo(`Successfully created container ${params.collectionId}`);
-    return collection;
   } catch (error) {
-    handleError(error, `Error while creating container ${params.collectionId}`, "CreateCollection");
-    throw error;
-  } finally {
+    const sanitizedError = ErrorParserUtility.replaceKnownError(JSON.stringify(error));
+    logConsoleError(`Error while creating container ${params.collectionId}:\n ${sanitizedError}`);
+    logError(JSON.stringify(error), "CreateCollection", error.code);
+    sendNotificationForError(error);
     clearMessage();
+    throw error;
   }
+  logConsoleInfo(`Successfully created container ${params.collectionId}`);
+  await refreshCachedResources();
+  clearMessage();
+  return collection;
 };
 
 const createCollectionWithARM = async (params: DataModels.CreateCollectionParams): Promise<DataModels.Collection> => {

src/Common/dataAccess/createDatabase.ts

@@ -24,28 +24,36 @@ import {
   createUpdateGremlinDatabase,
   getGremlinDatabase
 } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress, logConsoleError, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { refreshCachedOffers, refreshCachedResources } from "../DataAccessUtilityBase";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function createDatabase(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {
+  let database: DataModels.Database;
   const clearMessage = logConsoleProgress(`Creating a new database ${params.databaseId}`);
   try {
     if (userContext.defaultExperience === DefaultAccountExperienceType.Table) {
       throw new Error("Creating database resources is not allowed for tables accounts");
     }
-    const database: DataModels.Database = await (window.authType === AuthType.AAD && !userContext.useSDKOperations
-      ? createDatabaseWithARM(params)
-      : createDatabaseWithSDK(params));
-
-    logConsoleInfo(`Successfully created database ${params.databaseId}`);
-    return database;
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
+      database = await createDatabaseWithARM(params);
+    } else {
+      database = await createDatabaseWithSDK(params);
+    }
   } catch (error) {
-    handleError(error, `Error while creating database ${params.databaseId}`, "CreateDatabase");
-    throw error;
-  } finally {
+    logConsoleError(`Error while creating database ${params.databaseId}:\n ${error.message}`);
+    logError(JSON.stringify(error), "CreateDatabase", error.code);
+    sendNotificationForError(error);
     clearMessage();
+    throw error;
   }
+  logConsoleInfo(`Successfully created database ${params.databaseId}`);
+  await refreshCachedResources();
+  await refreshCachedOffers();
+  clearMessage();
+  return database;
 }
 
 async function createDatabaseWithARM(params: DataModels.CreateDatabaseParams): Promise<DataModels.Database> {

src/Common/dataAccess/createStoredProcedure.ts

@@ -1,5 +1,4 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
 import {
   SqlStoredProcedureCreateUpdateParameters,
@@ -10,8 +9,9 @@ import {
   createUpdateSqlStoredProcedure,
   getSqlStoredProcedure
 } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function createStoredProcedure(
@@ -21,11 +21,7 @@ export async function createStoredProcedure(
 ): Promise<StoredProcedureDefinition & Resource> {
   const clearMessage = logConsoleProgress(`Creating stored procedure ${storedProcedure.id}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       try {
         const getResponse = await getSqlStoredProcedure(
           userContext.subscriptionId,
@@ -70,7 +66,9 @@ export async function createStoredProcedure(
       .scripts.storedProcedures.create(storedProcedure);
     return response?.resource;
   } catch (error) {
-    handleError(error, `Error while creating stored procedure ${storedProcedure.id}`, "CreateStoredProcedure");
+    logConsoleError(`Error while creating stored procedure ${storedProcedure.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "CreateStoredProcedure", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/createTrigger.ts

@@ -1,5 +1,4 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { Resource, TriggerDefinition } from "@azure/cosmos";
 import {
   SqlTriggerCreateUpdateParameters,
@@ -19,11 +18,7 @@ export async function createTrigger(
 ): Promise<TriggerDefinition & Resource> {
   const clearMessage = logConsoleProgress(`Creating trigger ${trigger.id}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       try {
         const getResponse = await getSqlTrigger(
           userContext.subscriptionId,
@@ -34,7 +29,7 @@ export async function createTrigger(
           trigger.id
         );
         if (getResponse?.properties?.resource) {
-          throw new Error(`Create trigger failed: ${trigger.id} already exists`);
+          throw new Error(`Create trigger failed: trigger with id ${trigger.id} already exists`);
         }
       } catch (error) {
         if (error.code !== "NotFound") {
@@ -66,8 +61,8 @@ export async function createTrigger(
       .scripts.triggers.create(trigger);
     return response.resource;
   } catch (error) {
-    logConsoleError(`Error while creating trigger ${trigger.id}:\n ${error.message}`);
-    logError(error.message, "CreateTrigger", error.code);
+    logConsoleError(`Error while creating trigger ${trigger.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "CreateTrigger", error.code);
     sendNotificationForError(error);
     throw error;
   } finally {

src/Common/dataAccess/createUserDefinedFunction.ts

@@ -1,5 +1,4 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
 import {
   SqlUserDefinedFunctionCreateUpdateParameters,
@@ -10,8 +9,9 @@ import {
   createUpdateSqlUserDefinedFunction,
   getSqlUserDefinedFunction
 } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function createUserDefinedFunction(
@@ -21,11 +21,7 @@ export async function createUserDefinedFunction(
 ): Promise<UserDefinedFunctionDefinition & Resource> {
   const clearMessage = logConsoleProgress(`Creating user defined function ${userDefinedFunction.id}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       try {
         const getResponse = await getSqlUserDefinedFunction(
           userContext.subscriptionId,
@@ -70,11 +66,9 @@ export async function createUserDefinedFunction(
       .scripts.userDefinedFunctions.create(userDefinedFunction);
     return response?.resource;
   } catch (error) {
-    handleError(
-      error,
-      `Error while creating user defined function ${userDefinedFunction.id}`,
-      "CreateUserupdateUserDefinedFunction"
-    );
+    logConsoleError(`Error while creating user defined function ${userDefinedFunction.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "CreateUserupdateUserDefinedFunction", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/deleteCollection.test.ts

@@ -7,6 +7,7 @@ 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", () => {
@@ -17,6 +18,7 @@ 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

@@ -5,10 +5,12 @@ import { deleteCassandraTable } from "../../Utils/arm/generatedClients/2020-04-0
 import { deleteMongoDBCollection } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
 import { deleteGremlinGraph } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
 import { deleteTable } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 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}`);
@@ -21,13 +23,15 @@ export async function deleteCollection(databaseId: string, collectionId: string)
         .container(collectionId)
         .delete();
     }
-    logConsoleInfo(`Successfully deleted container ${collectionId}`);
   } catch (error) {
-    handleError(error, `Error while deleting container ${collectionId}`, "DeleteCollection");
+    logConsoleError(`Error while deleting container ${collectionId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "DeleteCollection", error.code);
+    sendNotificationForError(error);
     throw error;
-  } finally {
-    clearMessage();
   }
+  logConsoleInfo(`Successfully deleted container ${collectionId}`);
+  clearMessage();
+  await refreshCachedResources();
 }
 
 function deleteCollectionWithARM(databaseId: string, collectionId: string): Promise<void> {

src/Common/dataAccess/deleteDatabase.test.ts

@@ -7,6 +7,7 @@ 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", () => {
@@ -17,6 +18,7 @@ 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

@@ -4,10 +4,12 @@ import { deleteSqlDatabase } from "../../Utils/arm/generatedClients/2020-04-01/s
 import { deleteCassandraKeyspace } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
 import { deleteMongoDBDatabase } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
 import { deleteGremlinDatabase } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { userContext } from "../../UserContext";
 import { client } from "../CosmosClient";
+import { refreshCachedResources } from "../DataAccessUtilityBase";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 
 export async function deleteDatabase(databaseId: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting database ${databaseId}`);
@@ -23,13 +25,15 @@ export async function deleteDatabase(databaseId: string): Promise<void> {
         .database(databaseId)
         .delete();
     }
-    logConsoleInfo(`Successfully deleted database ${databaseId}`);
   } catch (error) {
-    handleError(error, `Error while deleting database ${databaseId}`, "DeleteDatabase");
+    logConsoleError(`Error while deleting database ${databaseId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "DeleteDatabase", error.code);
+    sendNotificationForError(error);
     throw error;
-  } finally {
-    clearMessage();
   }
+  logConsoleInfo(`Successfully deleted database ${databaseId}`);
+  clearMessage();
+  await refreshCachedResources();
 }
 
 function deleteDatabaseWithARM(databaseId: string): Promise<void> {

src/Common/dataAccess/deleteStoredProcedure.ts

@@ -1,9 +1,9 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { client } from "../CosmosClient";
 import { deleteSqlStoredProcedure } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function deleteStoredProcedure(
@@ -13,11 +13,7 @@ export async function deleteStoredProcedure(
 ): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting stored procedure ${storedProcedureId}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       await deleteSqlStoredProcedure(
         userContext.subscriptionId,
         userContext.resourceGroup,
@@ -34,7 +30,9 @@ export async function deleteStoredProcedure(
         .delete();
     }
   } catch (error) {
-    handleError(error, `Error while deleting stored procedure ${storedProcedureId}`, "DeleteStoredProcedure");
+    logConsoleError(`Error while deleting stored procedure ${storedProcedureId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "DeleteStoredProcedure", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/deleteTrigger.ts

@@ -1,19 +1,15 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { client } from "../CosmosClient";
 import { deleteSqlTrigger } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function deleteTrigger(databaseId: string, collectionId: string, triggerId: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting trigger ${triggerId}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       await deleteSqlTrigger(
         userContext.subscriptionId,
         userContext.resourceGroup,
@@ -30,7 +26,9 @@ export async function deleteTrigger(databaseId: string, collectionId: string, tr
         .delete();
     }
   } catch (error) {
-    handleError(error, `Error while deleting trigger ${triggerId}`, "DeleteTrigger");
+    logConsoleError(`Error while deleting trigger ${triggerId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "DeleteTrigger", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/deleteUserDefinedFunction.ts

@@ -1,19 +1,15 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { client } from "../CosmosClient";
 import { deleteSqlUserDefinedFunction } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function deleteUserDefinedFunction(databaseId: string, collectionId: string, id: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting user defined function ${id}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       await deleteSqlUserDefinedFunction(
         userContext.subscriptionId,
         userContext.resourceGroup,
@@ -30,7 +26,9 @@ export async function deleteUserDefinedFunction(databaseId: string, collectionId
         .delete();
     }
   } catch (error) {
-    handleError(error, `Error while deleting user defined function ${id}`, "DeleteUserDefinedFunction");
+    logConsoleError(`Error while deleting user defined function ${id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "DeleteUserDefinedFunction", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/readCollection.ts

@@ -1,7 +1,8 @@
 import * as DataModels from "../../Contracts/DataModels";
 import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 
 export async function readCollection(databaseId: string, collectionId: string): Promise<DataModels.Collection> {
   let collection: DataModels.Collection;
@@ -13,7 +14,9 @@ export async function readCollection(databaseId: string, collectionId: string):
       .read();
     collection = response.resource as DataModels.Collection;
   } catch (error) {
-    handleError(error, `Error while querying container ${collectionId}`, "ReadCollection");
+    logConsoleError(`Error while querying container ${collectionId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadCollection", error.code);
+    sendNotificationForError(error);
     throw error;
   }
   clearMessage();

src/Common/dataAccess/readCollectionOffer.ts

@@ -4,14 +4,15 @@ import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType
 import { HttpHeaders } from "../Constants";
 import { RequestOptions } from "@azure/cosmos/dist-esm";
 import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
 import { getSqlContainerThroughput } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { getMongoDBCollectionThroughput } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
 import { getCassandraTableThroughput } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
 import { getGremlinGraphThroughput } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
 import { getTableThroughput } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
 import { readOffers } from "./readOffers";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export const readCollectionOffer = async (
@@ -56,7 +57,9 @@ export const readCollectionOffer = async (
       }
     );
   } catch (error) {
-    handleError(error, `Error while querying offer for collection ${params.collectionId}`, "ReadCollectionOffer");
+    logConsoleError(`Error while querying offer for collection ${params.collectionId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadCollectionOffer", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/readCollectionQuotaInfo.ts

@@ -5,8 +5,9 @@ import { ContainerDefinition, Resource } from "@azure/cosmos";
 import { HttpHeaders } from "../Constants";
 import { RequestOptions } from "@azure/cosmos/dist-esm";
 import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 
 interface ResourceWithStatistics {
   statistics: DataModels.Statistic[];
@@ -37,7 +38,9 @@ export const readCollectionQuotaInfo = async (
 
     return quota;
   } catch (error) {
-    handleError(error, `Error while querying quota info for container ${collection.id}`, "ReadCollectionQuotaInfo");
+    logConsoleError(`Error while querying quota info for container ${collection.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadCollectionQuotaInfo", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/readCollections.ts

@@ -2,16 +2,18 @@ import * as DataModels from "../../Contracts/DataModels";
 import { AuthType } from "../../AuthType";
 import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
 import { listSqlContainers } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { listCassandraTables } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
 import { listMongoDBCollections } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
 import { listGremlinGraphs } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
 import { listTables } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function readCollections(databaseId: string): Promise<DataModels.Collection[]> {
+  let collections: DataModels.Collection[];
   const clearMessage = logConsoleProgress(`Querying containers for database ${databaseId}`);
   try {
     if (
@@ -20,20 +22,22 @@ export async function readCollections(databaseId: string): Promise<DataModels.Co
       userContext.defaultExperience !== DefaultAccountExperienceType.MongoDB &&
       userContext.defaultExperience !== DefaultAccountExperienceType.Table
     ) {
-      return await readCollectionsWithARM(databaseId);
+      collections = await readCollectionsWithARM(databaseId);
+    } else {
+      const sdkResponse = await client()
+        .database(databaseId)
+        .containers.readAll()
+        .fetchAll();
+      collections = sdkResponse.resources as DataModels.Collection[];
     }
-
-    const sdkResponse = await client()
-      .database(databaseId)
-      .containers.readAll()
-      .fetchAll();
-    return sdkResponse.resources as DataModels.Collection[];
   } catch (error) {
-    handleError(error, `Error while querying containers for database ${databaseId}`, "ReadCollections");
+    logConsoleError(`Error while querying containers for database ${databaseId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadCollections", error.code);
+    sendNotificationForError(error);
     throw error;
-  } finally {
-    clearMessage();
   }
+  clearMessage();
+  return collections;
 }
 
 async function readCollectionsWithARM(databaseId: string): Promise<DataModels.Collection[]> {

src/Common/dataAccess/readDatabaseOffer.ts

@@ -8,9 +8,10 @@ import { getSqlDatabaseThroughput } from "../../Utils/arm/generatedClients/2020-
 import { getMongoDBDatabaseThroughput } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
 import { getCassandraKeyspaceThroughput } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
 import { getGremlinDatabaseThroughput } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
 import { readOffers } from "./readOffers";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export const readDatabaseOffer = async (
@@ -47,7 +48,9 @@ export const readDatabaseOffer = async (
       }
     );
   } catch (error) {
-    handleError(error, `Error while querying offer for database ${params.databaseId}`, "ReadDatabaseOffer");
+    logConsoleError(`Error while querying offer for database ${params.databaseId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadDatabaseOffer", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/readDatabases.ts

@@ -2,12 +2,13 @@ import * as DataModels from "../../Contracts/DataModels";
 import { AuthType } from "../../AuthType";
 import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
 import { listSqlDatabases } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { listCassandraKeyspaces } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
 import { listMongoDBDatabases } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
 import { listGremlinDatabases } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function readDatabases(): Promise<DataModels.Database[]> {
@@ -27,7 +28,9 @@ export async function readDatabases(): Promise<DataModels.Database[]> {
       databases = sdkResponse.resources as DataModels.Database[];
     }
   } catch (error) {
-    handleError(error, `Error while querying databases`, "ReadDatabases");
+    logConsoleError(`Error while querying databases:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadDatabases", error.code);
+    sendNotificationForError(error);
     throw error;
   }
   clearMessage();

src/Common/dataAccess/readMongoDBCollection.tsx

@@ -1,58 +0,0 @@
-import { userContext } from "../../UserContext";
-import { getMongoDBCollection } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
-import { MongoDBCollectionResource } from "../../Utils/arm/generatedClients/2020-04-01/types";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
-import * as Constants from "../Constants";
-import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
-import { AuthType } from "../../AuthType";
-
-export async function readMongoDBCollectionThroughRP(
-  databaseId: string,
-  collectionId: string
-): Promise<MongoDBCollectionResource> {
-  if (window.authType !== AuthType.AAD) {
-    return undefined;
-  }
-  let collection: MongoDBCollectionResource;
-  const subscriptionId = userContext.subscriptionId;
-  const resourceGroup = userContext.resourceGroup;
-  const accountName = userContext.databaseAccount.name;
-
-  const clearMessage = logConsoleProgress(`Reading container ${collectionId}`);
-  try {
-    const response = await getMongoDBCollection(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
-    collection = response.properties.resource;
-  } catch (error) {
-    handleError(error, `Error while reading container ${collectionId}`, "ReadMongoDBCollection");
-    throw error;
-  }
-  clearMessage();
-  return collection;
-}
-
-export async function getMongoDBCollectionIndexTransformationProgress(
-  databaseId: string,
-  collectionId: string
-): Promise<number> {
-  if (window.authType !== AuthType.AAD) {
-    return undefined;
-  }
-  let indexTransformationPercentage: number;
-  const clearMessage = logConsoleProgress(`Reading container ${collectionId}`);
-  try {
-    const response = await client()
-      .database(databaseId)
-      .container(collectionId)
-      .read({ populateQuotaInfo: true });
-
-    indexTransformationPercentage = parseInt(
-      response.headers[Constants.HttpHeaders.collectionIndexTransformationProgress] as string
-    );
-  } catch (error) {
-    handleError(error, `Error while reading container ${collectionId}`, "ReadMongoDBCollection");
-    throw error;
-  }
-  clearMessage();
-  return indexTransformationPercentage;
-}

src/Common/dataAccess/readOffers.ts

@@ -1,10 +1,29 @@
 import { Offer } from "../../Contracts/DataModels";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { ClientDefaults } from "../Constants";
+import { MessageTypes } from "../../Contracts/ExplorerContracts";
+import { Platform, configContext } from "../../ConfigContext";
 import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
+import { logConsoleProgress, logConsoleError } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendCachedDataMessage } from "../MessageHandler";
+import { sendNotificationForError } from "./sendNotificationForError";
+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()
@@ -17,7 +36,9 @@ export const readOffers = async (): Promise<Offer[]> => {
       return [];
     }
 
-    handleError(error, `Error while querying offers`, "ReadOffers");
+    logConsoleError(`Error while querying offers:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadOffers", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/readStoredProcedures.ts

@@ -1,10 +1,10 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
 import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
 import { listSqlStoredProcedures } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function readStoredProcedures(
@@ -13,11 +13,7 @@ export async function readStoredProcedures(
 ): Promise<(StoredProcedureDefinition & Resource)[]> {
   const clearMessage = logConsoleProgress(`Querying stored procedures for container ${collectionId}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       const rpResponse = await listSqlStoredProcedures(
         userContext.subscriptionId,
         userContext.resourceGroup,
@@ -35,7 +31,9 @@ export async function readStoredProcedures(
       .fetchAll();
     return response?.resources;
   } catch (error) {
-    handleError(error, `Failed to query stored procedures for container ${collectionId}`, "ReadStoredProcedures");
+    logConsoleError(`Failed to query stored procedures for container ${collectionId}: ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadStoredProcedures", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/readTriggers.ts

@@ -1,11 +1,11 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { Resource, TriggerDefinition } from "@azure/cosmos";
 import { client } from "../CosmosClient";
 import { listSqlTriggers } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
-import { handleError } from "../ErrorHandlingUtils";
 
 export async function readTriggers(
   databaseId: string,
@@ -13,11 +13,7 @@ export async function readTriggers(
 ): Promise<(TriggerDefinition & Resource)[]> {
   const clearMessage = logConsoleProgress(`Querying triggers for container ${collectionId}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       const rpResponse = await listSqlTriggers(
         userContext.subscriptionId,
         userContext.resourceGroup,
@@ -35,7 +31,9 @@ export async function readTriggers(
       .fetchAll();
     return response?.resources;
   } catch (error) {
-    handleError(error, `Failed to query triggers for container ${collectionId}`, "ReadTriggers");
+    logConsoleError(`Failed to query triggers for container ${collectionId}: ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadTriggers", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/readUserDefinedFunctions.ts

@@ -1,10 +1,10 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
 import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
 import { listSqlUserDefinedFunctions } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function readUserDefinedFunctions(
@@ -13,11 +13,7 @@ export async function readUserDefinedFunctions(
 ): Promise<(UserDefinedFunctionDefinition & Resource)[]> {
   const clearMessage = logConsoleProgress(`Querying user defined functions for container ${collectionId}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       const rpResponse = await listSqlUserDefinedFunctions(
         userContext.subscriptionId,
         userContext.resourceGroup,
@@ -35,11 +31,9 @@ export async function readUserDefinedFunctions(
       .fetchAll();
     return response?.resources;
   } catch (error) {
-    handleError(
-      error,
-      `Failed to query user defined functions for container ${collectionId}`,
-      "ReadUserDefinedFunctions"
-    );
+    logConsoleError(`Failed to query user defined functions for container ${collectionId}: ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadUserDefinedFunctions", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/sendNotificationForError.ts

@@ -2,7 +2,7 @@ import * as Constants from "../Constants";
 import { sendMessage } from "../MessageHandler";
 import { MessageTypes } from "../../Contracts/ExplorerContracts";
 
-export interface CosmosError {
+interface CosmosError {
   code: number;
   message?: string;
 }

src/Common/dataAccess/updateCollection.ts

@@ -3,10 +3,7 @@ import { Collection } from "../../Contracts/DataModels";
 import { ContainerDefinition } from "@azure/cosmos";
 import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import {
-  CreateUpdateOptions,
   ExtendedResourceProperties,
-  MongoDBCollectionCreateUpdateParameters,
-  MongoDBCollectionResource,
   SqlContainerCreateUpdateParameters,
   SqlContainerResource
 } from "../../Utils/arm/generatedClients/2020-04-01/types";
@@ -26,8 +23,10 @@ import {
   getGremlinGraph
 } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
 import { createUpdateTable, getTable } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { refreshCachedResources } from "../DataAccessUtilityBase";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function updateCollection(
@@ -52,14 +51,16 @@ export async function updateCollection(
         .database(databaseId)
         .container(collectionId)
         .replace(newCollection as ContainerDefinition, options);
-
       collection = sdkResponse.resource as Collection;
     }
 
     logConsoleInfo(`Successfully updated container ${collectionId}`);
+    await refreshCachedResources();
     return collection;
   } catch (error) {
-    handleError(error, `Failed to update container ${collectionId}`, "UpdateCollection");
+    logConsoleError(`Failed to update container ${collectionId}: ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "UpdateCollection", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();
@@ -79,6 +80,15 @@ async function updateCollectionWithARM(
   switch (defaultExperience) {
     case DefaultAccountExperienceType.DocumentDB:
       return updateSqlContainer(databaseId, collectionId, subscriptionId, resourceGroup, accountName, newCollection);
+    case DefaultAccountExperienceType.MongoDB:
+      return updateMongoDBCollection(
+        databaseId,
+        collectionId,
+        subscriptionId,
+        resourceGroup,
+        accountName,
+        newCollection
+      );
     case DefaultAccountExperienceType.Cassandra:
       return updateCassandraTable(databaseId, collectionId, subscriptionId, resourceGroup, accountName, newCollection);
     case DefaultAccountExperienceType.Graph:
@@ -115,35 +125,26 @@ async function updateSqlContainer(
   throw new Error(`Sql container to update does not exist. Database id: ${databaseId} Collection id: ${collectionId}`);
 }
 
-export async function updateMongoDBCollectionThroughRP(
+async function updateMongoDBCollection(
   databaseId: string,
   collectionId: string,
-  newCollection: MongoDBCollectionResource,
-  updateOptions?: CreateUpdateOptions
-): Promise<MongoDBCollectionResource> {
-  const subscriptionId = userContext.subscriptionId;
-  const resourceGroup = userContext.resourceGroup;
-  const accountName = userContext.databaseAccount.name;
-
+  subscriptionId: string,
+  resourceGroup: string,
+  accountName: string,
+  newCollection: Collection
+): Promise<Collection> {
   const getResponse = await getMongoDBCollection(subscriptionId, resourceGroup, accountName, databaseId, collectionId);
   if (getResponse && getResponse.properties && getResponse.properties.resource) {
-    const updateParams: MongoDBCollectionCreateUpdateParameters = {
-      properties: {
-        resource: newCollection,
-        options: updateOptions
-      }
-    };
-
+    getResponse.properties.resource = newCollection as SqlContainerResource & ExtendedResourceProperties;
     const updateResponse = await createUpdateMongoDBCollection(
       subscriptionId,
       resourceGroup,
       accountName,
       databaseId,
       collectionId,
-      updateParams
+      getResponse as SqlContainerCreateUpdateParameters
     );
-
-    return updateResponse && (updateResponse.properties.resource as MongoDBCollectionResource);
+    return updateResponse && (updateResponse.properties.resource as Collection);
   }
 
   throw new Error(

src/Common/dataAccess/updateOffer.ts

@@ -6,10 +6,12 @@ import { OfferDefinition } from "@azure/cosmos";
 import { RequestOptions } from "@azure/cosmos/dist-esm";
 import { ThroughputSettingsUpdateParameters } from "../../Utils/arm/generatedClients/2020-04-01/types";
 import { client } from "../CosmosClient";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
 import { readCollectionOffer } from "./readCollectionOffer";
 import { readDatabaseOffer } from "./readDatabaseOffer";
+import { refreshCachedOffers, refreshCachedResources } from "../DataAccessUtilityBase";
+import { sendNotificationForError } from "./sendNotificationForError";
 import {
   updateSqlDatabaseThroughput,
   migrateSqlDatabaseToAutoscale,
@@ -69,10 +71,14 @@ 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) {
-    handleError(error, `Error updating offer for ${offerResourceText}`, "UpdateCollection");
+    logConsoleError(`Error updating offer for ${offerResourceText}: ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "UpdateCollection", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/updateStoredProcedure.ts

@@ -1,5 +1,4 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
 import {
   SqlStoredProcedureCreateUpdateParameters,
@@ -10,8 +9,9 @@ import {
   createUpdateSqlStoredProcedure,
   getSqlStoredProcedure
 } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function updateStoredProcedure(
@@ -21,11 +21,7 @@ export async function updateStoredProcedure(
 ): Promise<StoredProcedureDefinition & Resource> {
   const clearMessage = logConsoleProgress(`Updating stored procedure ${storedProcedure.id}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       const getResponse = await getSqlStoredProcedure(
         userContext.subscriptionId,
         userContext.resourceGroup,
@@ -64,7 +60,10 @@ export async function updateStoredProcedure(
       .replace(storedProcedure);
     return response?.resource;
   } catch (error) {
-    handleError(error, `Error while updating stored procedure ${storedProcedure.id}`, "UpdateStoredProcedure");
+    const errorMessage = error.code === "NotFound" ? `${storedProcedure.id} does not exist.` : JSON.stringify(error);
+    logConsoleError(`Error while updating stored procedure ${storedProcedure.id}:\n ${errorMessage}`);
+    logError(errorMessage, "UpdateStoredProcedure", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/updateTrigger.ts

@@ -1,5 +1,4 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import {
   SqlTriggerCreateUpdateParameters,
   SqlTriggerResource
@@ -7,8 +6,9 @@ import {
 import { TriggerDefinition } from "@azure/cosmos";
 import { client } from "../CosmosClient";
 import { createUpdateSqlTrigger, getSqlTrigger } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function updateTrigger(
@@ -18,11 +18,7 @@ export async function updateTrigger(
 ): Promise<TriggerDefinition> {
   const clearMessage = logConsoleProgress(`Updating trigger ${trigger.id}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       const getResponse = await getSqlTrigger(
         userContext.subscriptionId,
         userContext.resourceGroup,
@@ -61,7 +57,10 @@ export async function updateTrigger(
       .replace(trigger);
     return response?.resource;
   } catch (error) {
-    handleError(error, `Error while updating trigger ${trigger.id}`, "UpdateTrigger");
+    const errorMessage = error.code === "NotFound" ? `${trigger.id} does not exist.` : JSON.stringify(error);
+    logConsoleError(`Error while updating trigger ${trigger.id}:\n ${errorMessage}`);
+    logError(errorMessage, "UpdateTrigger", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Common/dataAccess/updateUserDefinedFunction.ts

@@ -1,5 +1,4 @@
 import { AuthType } from "../../AuthType";
-import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
 import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
 import {
   SqlUserDefinedFunctionCreateUpdateParameters,
@@ -10,8 +9,9 @@ import {
   createUpdateSqlUserDefinedFunction,
   getSqlUserDefinedFunction
 } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
-import { handleError } from "../ErrorHandlingUtils";
-import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
 import { userContext } from "../../UserContext";
 
 export async function updateUserDefinedFunction(
@@ -21,11 +21,7 @@ export async function updateUserDefinedFunction(
 ): Promise<UserDefinedFunctionDefinition & Resource> {
   const clearMessage = logConsoleProgress(`Updating user defined function ${userDefinedFunction.id}`);
   try {
-    if (
-      window.authType === AuthType.AAD &&
-      !userContext.useSDKOperations &&
-      userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
-    ) {
+    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
       const getResponse = await getSqlUserDefinedFunction(
         userContext.subscriptionId,
         userContext.resourceGroup,
@@ -64,11 +60,11 @@ export async function updateUserDefinedFunction(
       .replace(userDefinedFunction);
     return response?.resource;
   } catch (error) {
-    handleError(
-      error,
-      `Error while updating user defined function ${userDefinedFunction.id}`,
-      "UpdateUserupdateUserDefinedFunction"
-    );
+    const errorMessage =
+      error.code === "NotFound" ? `${userDefinedFunction.id} does not exist.` : JSON.stringify(error);
+    logConsoleError(`Error while updating user defined function ${userDefinedFunction.id}:\n ${errorMessage}`);
+    logError(errorMessage, "UpdateUserupdateUserDefinedFunction", error.code);
+    sendNotificationForError(error);
     throw error;
   } finally {
     clearMessage();

src/Contracts/ViewModels.ts

@@ -289,10 +289,6 @@ export interface DocumentsTabOptions extends TabOptions {
   resourceTokenPartitionKey?: string;
 }
 
-export interface SettingsTabV2Options extends TabOptions {
-  getPendingNotification: Q.Promise<DataModels.Notification>;
-}
-
 export interface ConflictsTabOptions extends TabOptions {
   partitionKey: DataModels.PartitionKey;
   conflictIds: ko.ObservableArray<ConflictId>;
@@ -355,6 +351,7 @@ export enum CollectionTabKind {
   Notebook = 13 /* Deprecated */,
   Terminal = 14,
   NotebookV2 = 15,
+  SparkMasterTab = 16,
   Gallery = 17,
   NotebookViewer = 18,
   SettingsV2 = 19

src/Explorer/ComponentRegisterer.test.ts

@@ -20,6 +20,10 @@ describe("Component Registerer", () => {
     expect(ko.components.isRegistered("graph-style")).toBe(true);
   });
 
+  it("should register collapsible-panel component", () => {
+    expect(ko.components.isRegistered("collapsible-panel")).toBe(true);
+  });
+
   it("should register json-editor component", () => {
     expect(ko.components.isRegistered("json-editor")).toBe(true);
   });

src/Explorer/ComponentRegisterer.ts

@@ -1,6 +1,7 @@
 import * as ko from "knockout";
 import * as PaneComponents from "./Panes/PaneComponents";
 import * as TabComponents from "./Tabs/TabComponents";
+import { CollapsiblePanelComponent } from "./Controls/CollapsiblePanel/CollapsiblePanelComponent";
 import { DiffEditorComponent } from "./Controls/DiffEditor/DiffEditorComponent";
 import { DynamicListComponent } from "./Controls/DynamicList/DynamicListComponent";
 import { EditorComponent } from "./Controls/Editor/EditorComponent";
@@ -17,6 +18,7 @@ ko.components.register("input-typeahead", new InputTypeaheadComponent());
 ko.components.register("new-vertex-form", NewVertexComponent);
 ko.components.register("error-display", new ErrorDisplayComponent());
 ko.components.register("graph-style", GraphStyleComponent);
+ko.components.register("collapsible-panel", new CollapsiblePanelComponent());
 ko.components.register("editor", new EditorComponent());
 ko.components.register("json-editor", new JsonEditorComponent());
 ko.components.register("diff-editor", new DiffEditorComponent());
@@ -40,6 +42,7 @@ ko.components.register("mongo-shell-tab", new TabComponents.MongoShellTab());
 ko.components.register("conflicts-tab", new TabComponents.ConflictsTab());
 ko.components.register("notebookv2-tab", new TabComponents.NotebookV2Tab());
 ko.components.register("terminal-tab", new TabComponents.TerminalTab());
+ko.components.register("spark-master-tab", new TabComponents.SparkMasterTab());
 ko.components.register("gallery-tab", new TabComponents.GalleryTab());
 ko.components.register("notebook-viewer-tab", new TabComponents.NotebookViewerTab());
 

src/Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.ts

@@ -0,0 +1,56 @@
+import * as ko from "knockout";
+import template from "./collapsible-panel-component.html";
+
+/**
+ * Helper class for ko component registration
+ */
+export class CollapsiblePanelComponent {
+  constructor() {
+    return {
+      viewModel: CollapsiblePanelViewModel,
+      template
+    };
+  }
+}
+
+/**
+ * Parameters for this component
+ */
+interface CollapsiblePanelParams {
+  collapsedTitle: ko.Observable<string>;
+  expandedTitle: ko.Observable<string>;
+  isCollapsed?: ko.Observable<boolean>;
+  collapseToLeft?: boolean;
+}
+
+/**
+ * Collapsible panel:
+ *  Contains a header with [>] button to collapse and an title ("expandedTitle").
+ *  Collapsing the panel:
+ *   - shrinks width to narrow amount
+ *   - hides children
+ *   - shows [<]
+ *   - shows vertical title ("collapsedTitle")
+ *   - the default behavior is to collapse to the right (ie, place this component on the right or use "collapseToLeft" parameter)
+ *
+ * How to use in your markup:
+ * <collapsible-panel params="{ collapsedTitle:'Properties', expandedTitle:'Expanded properties' }">
+ *      <!-- add your markup here: the ko context is the same as outside of collapsible-panel (ie $data) -->
+ * </collapsible-panel>
+ *
+ * Use the optional "isCollapsed" parameter to programmatically collapse/expand the pane from outside the component.
+ * Use the optional "collapseToLeft" parameter to collapse to the left.
+ */
+class CollapsiblePanelViewModel {
+  private params: CollapsiblePanelParams;
+  private isCollapsed: ko.Observable<boolean>;
+
+  public constructor(params: CollapsiblePanelParams) {
+    this.params = params;
+    this.isCollapsed = params.isCollapsed || ko.observable(false);
+  }
+
+  private toggleCollapse(): void {
+    this.isCollapsed(!this.isCollapsed());
+  }
+}

src/Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent.test.tsx

@@ -1,14 +0,0 @@
-import { shallow } from "enzyme";
-import React from "react";
-import { CollapsibleSectionComponent, CollapsibleSectionProps } from "./CollapsibleSectionComponent";
-
-describe("CollapsibleSectionComponent", () => {
-  it("renders", () => {
-    const props: CollapsibleSectionProps = {
-      title: "Sample title"
-    };
-
-    const wrapper = shallow(<CollapsibleSectionComponent {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-});

src/Explorer/Controls/CollapsiblePanel/CollapsibleSectionComponent.tsx

@@ -1,36 +0,0 @@
-import { Icon, Label, Stack } from "office-ui-fabric-react";
-import * as React from "react";
-import { accordionIconStyles, accordionStackTokens } from "../Settings/SettingsRenderUtils";
-
-export interface CollapsibleSectionProps {
-  title: string;
-}
-
-export interface CollapsibleSectionState {
-  isExpanded: boolean;
-}
-
-export class CollapsibleSectionComponent extends React.Component<CollapsibleSectionProps, CollapsibleSectionState> {
-  constructor(props: CollapsibleSectionProps) {
-    super(props);
-    this.state = {
-      isExpanded: true
-    };
-  }
-
-  private toggleCollapsed = (): void => {
-    this.setState({ isExpanded: !this.state.isExpanded });
-  };
-
-  public render(): JSX.Element {
-    return (
-      <>
-        <Stack className="collapsibleSection" horizontal tokens={accordionStackTokens} onClick={this.toggleCollapsed}>
-          <Icon iconName={this.state.isExpanded ? "ChevronDown" : "ChevronRight"} styles={accordionIconStyles} />
-          <Label>{this.props.title}</Label>
-        </Stack>
-        {this.state.isExpanded && this.props.children}
-      </>
-    );
-  }
-}

src/Explorer/Controls/CollapsiblePanel/__snapshots__/CollapsibleSectionComponent.test.tsx.snap

@@ -1,30 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`CollapsibleSectionComponent renders 1`] = `
-<Fragment>
-  <Stack
-    className="collapsibleSection"
-    horizontal={true}
-    onClick={[Function]}
-    tokens={
-      Object {
-        "childrenGap": 10,
-      }
-    }
-  >
-    <StyledIconBase
-      iconName="ChevronDown"
-      styles={
-        Object {
-          "root": Object {
-            "paddingTop": 7,
-          },
-        }
-      }
-    />
-    <StyledLabelBase>
-      Sample title
-    </StyledLabelBase>
-  </Stack>
-</Fragment>
-`;

src/Explorer/Controls/CollapsiblePanel/collapsible-panel-component.html

@@ -0,0 +1,44 @@
+<div class="collapsiblePanel" data-bind="css: { paneCollapsed:isCollapsed() }">
+  <div class="panelHeader" data-bind="visible: !isCollapsed()">
+    <span
+      class="collapsedIconContainer collapseExpandButton"
+      data-bind="click:toggleCollapse, css: { 'pull-right':params.collapseToLeft }"
+    >
+      <img
+        class="collapsedIcon imgVerticalAlignment"
+        src="/imgarrowlefticon.svg"
+        alt="Collapse"
+        data-bind="css: { expanded:!isCollapsed(), iconMirror:params.collapseToLeft }"
+      />
+    </span>
+    <span
+      class="expandedTitle"
+      data-bind="text: params.expandedTitle, css:{ iconSpacer:!params.collapseToLeft }"
+    ></span>
+  </div>
+
+  <div class="collapsibleNav nav" data-bind="visible:isCollapsed">
+    <ul class="nav">
+      <li class="collapsedBtn collapseExpandButton">
+        <span class="collapsedIconContainer" data-bind="click: toggleCollapse">
+          <img
+            class="collapsedIcon"
+            src="/imgarrowlefticon.svg"
+            data-bind="css: { expanded:!isCollapsed(), iconMirror:params.collapseToLeft }"
+            alt="Expand"
+          />
+        </span>
+        <span class="rotatedInner" data-bind="click: toggleCollapse">
+          <span data-bind="text: params.collapsedTitle"></span>
+        </span>
+      </li>
+    </ul>
+  </div>
+
+  <div class="panelContent" data-bind="visible:!isCollapsed()">
+    <!-- ko with:$parent -->
+    <!-- ko template: { nodes: $componentTemplateNodes } -->
+    <!-- /ko -->
+    <!-- /ko -->
+  </div>
+</div>

src/Explorer/Controls/Settings/SettingsComponent.test.tsx

@@ -8,10 +8,7 @@ import * as DataModels from "../../../Contracts/DataModels";
 import ko from "knockout";
 import { TtlType, isDirty } from "./SettingsUtils";
 import Explorer from "../../Explorer";
-jest.mock("../../../Common/dataAccess/readMongoDBCollection", () => ({
-  getMongoDBCollectionIndexTransformationProgress: jest.fn().mockReturnValue(undefined)
-}));
-import { updateCollection, updateMongoDBCollectionThroughRP } from "../../../Common/dataAccess/updateCollection";
+import { updateCollection } from "../../../Common/dataAccess/updateCollection";
 jest.mock("../../../Common/dataAccess/updateCollection", () => ({
   updateCollection: jest.fn().mockReturnValue({
     id: undefined,
@@ -21,17 +18,9 @@ jest.mock("../../../Common/dataAccess/updateCollection", () => ({
     changeFeedPolicy: undefined,
     analyticalStorageTtl: undefined,
     geospatialConfig: undefined
-  } as DataModels.Collection),
-  updateMongoDBCollectionThroughRP: jest.fn().mockReturnValue({
-    id: undefined,
-    shardKey: undefined,
-    indexes: [],
-    analyticalStorageTtl: undefined
-  } as MongoDBCollectionResource)
+  } as DataModels.Collection)
 }));
 import { updateOffer } from "../../../Common/dataAccess/updateOffer";
-import { MongoDBCollectionResource } from "../../../Utils/arm/generatedClients/2020-04-01/types";
-import Q from "q";
 jest.mock("../../../Common/dataAccess/updateOffer", () => ({
   updateOffer: jest.fn().mockReturnValue({} as DataModels.Offer)
 }));
@@ -46,10 +35,7 @@ describe("SettingsComponent", () => {
       node: undefined,
       hashLocation: "settings",
       isActive: ko.observable(false),
-      onUpdateTabsButtons: undefined,
-      getPendingNotification: Q.Promise<DataModels.Notification>(() => {
-        return;
-      })
+      onUpdateTabsButtons: undefined
     })
   };
 
@@ -202,17 +188,13 @@ describe("SettingsComponent", () => {
     expect(settingsComponentInstance.isOfferReplacePending()).toEqual(true);
   });
 
-  it("save calls updateCollection, updateMongoDBCollectionThroughRP and updateOffer", async () => {
+  it("save calls updateCollection and updateOffer", async () => {
     const wrapper = shallow(<SettingsComponent {...baseProps} />);
-    wrapper.setState({ isSubSettingsSaveable: true, isScaleSaveable: true, isMongoIndexingPolicySaveable: true });
+    wrapper.setState({ isSubSettingsSaveable: true, isScaleSaveable: true });
     wrapper.update();
     const settingsComponentInstance = wrapper.instance() as SettingsComponent;
-    settingsComponentInstance.mongoDBCollectionResource = {
-      id: "id"
-    };
     await settingsComponentInstance.onSaveClick();
     expect(updateCollection).toBeCalled();
-    expect(updateMongoDBCollectionThroughRP).toBeCalled();
     expect(updateOffer).toBeCalled();
   });
 

src/Explorer/Controls/Settings/SettingsComponent.tsx

@@ -11,17 +11,13 @@ import { Action, ActionModifiers } from "../../../Shared/Telemetry/TelemetryCons
 import { RequestOptions } from "@azure/cosmos/dist-esm";
 import Explorer from "../../Explorer";
 import { updateOffer } from "../../../Common/dataAccess/updateOffer";
-import { updateCollection, updateMongoDBCollectionThroughRP } from "../../../Common/dataAccess/updateCollection";
+import { updateCollection } from "../../../Common/dataAccess/updateCollection";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import { userContext } from "../../../UserContext";
 import { updateOfferThroughputBeyondLimit } from "../../../Common/dataAccess/updateOfferThroughputBeyondLimit";
 import SettingsTab from "../../Tabs/SettingsTabV2";
 import { throughputUnit } from "./SettingsRenderUtils";
 import { ScaleComponent, ScaleComponentProps } from "./SettingsSubComponents/ScaleComponent";
-import {
-  MongoIndexingPolicyComponent,
-  MongoIndexingPolicyComponentProps
-} from "./SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent";
 import {
   getMaxRUs,
   hasDatabaseSharedThroughput,
@@ -31,11 +27,8 @@ import {
   SettingsV2TabTypes,
   getTabTitle,
   isDirty,
-  AddMongoIndexProps,
-  MongoIndexTypes,
   parseConflictResolutionMode,
-  parseConflictResolutionProcedure,
-  getMongoNotification
+  parseConflictResolutionProcedure
 } from "./SettingsUtils";
 import {
   ConflictResolutionComponent,
@@ -45,11 +38,6 @@ import { SubSettingsComponent, SubSettingsComponentProps } from "./SettingsSubCo
 import { Pivot, PivotItem, IPivotProps, IPivotItemProps } from "office-ui-fabric-react";
 import "./SettingsComponent.less";
 import { IndexingPolicyComponent, IndexingPolicyComponentProps } from "./SettingsSubComponents/IndexingPolicyComponent";
-import { MongoDBCollectionResource, MongoIndex } from "../../../Utils/arm/generatedClients/2020-04-01/types";
-import {
-  getMongoDBCollectionIndexTransformationProgress,
-  readMongoDBCollectionThroughRP
-} from "../../../Common/dataAccess/readMongoDBCollection";
 
 interface SettingsV2TabInfo {
   tab: SettingsV2TabTypes;
@@ -96,13 +84,6 @@ export interface SettingsComponentState {
   shouldDiscardIndexingPolicy: boolean;
   isIndexingPolicyDirty: boolean;
 
-  isMongoIndexingPolicySaveable: boolean;
-  isMongoIndexingPolicyDiscardable: boolean;
-  currentMongoIndexes: MongoIndex[];
-  indexesToDrop: number[];
-  indexesToAdd: AddMongoIndexProps[];
-  indexTransformationProgress: number;
-
   conflictResolutionPolicyMode: DataModels.ConflictResolutionMode;
   conflictResolutionPolicyModeBaseline: DataModels.ConflictResolutionMode;
   conflictResolutionPolicyPath: string;
@@ -117,17 +98,17 @@ export interface SettingsComponentState {
 
 export class SettingsComponent extends React.Component<SettingsComponentProps, SettingsComponentState> {
   private static readonly sixMonthsInSeconds = 15768000;
-  private saveSettingsButton: ButtonV2;
-  private discardSettingsChangesButton: ButtonV2;
 
-  private isAnalyticalStorageEnabled: boolean;
+  public saveSettingsButton: ButtonV2;
+  public discardSettingsChangesButton: ButtonV2;
+
+  public isAnalyticalStorageEnabled: boolean;
   private collection: ViewModels.Collection;
   private container: Explorer;
   private changeFeedPolicyVisible: boolean;
   private isFixedContainer: boolean;
   private autoPilotTiersList: ViewModels.DropdownOption<DataModels.AutopilotTier>[];
   private shouldShowIndexingPolicyEditor: boolean;
-  public mongoDBCollectionResource: MongoDBCollectionResource;
 
   constructor(props: SettingsComponentProps) {
     super(props);
@@ -177,13 +158,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       shouldDiscardIndexingPolicy: false,
       isIndexingPolicyDirty: false,
 
-      indexesToDrop: [],
-      indexesToAdd: [],
-      currentMongoIndexes: undefined,
-      isMongoIndexingPolicySaveable: false,
-      isMongoIndexingPolicyDiscardable: false,
-      indexTransformationProgress: undefined,
-
       conflictResolutionPolicyMode: undefined,
       conflictResolutionPolicyModeBaseline: undefined,
       conflictResolutionPolicyPath: undefined,
@@ -212,7 +186,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
   }
 
   componentDidMount(): void {
-    this.loadMongoIndexes();
     this.setAutoPilotStates();
     this.setBaseline();
     if (this.props.settingsTab.isActive()) {
@@ -226,35 +199,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     }
   }
 
-  public loadMongoIndexes = async (): Promise<void> => {
-    if (
-      this.container.isMongoIndexEditorEnabled() &&
-      this.container.isPreferredApiMongoDB() &&
-      this.container.databaseAccount()
-    ) {
-      await this.refreshIndexTransformationProgress();
-
-      this.mongoDBCollectionResource = await readMongoDBCollectionThroughRP(
-        this.collection.databaseId,
-        this.collection.id()
-      );
-
-      if (this.mongoDBCollectionResource) {
-        this.setState({
-          currentMongoIndexes: [...this.mongoDBCollectionResource.indexes]
-        });
-      }
-    }
-  };
-
-  public refreshIndexTransformationProgress = async (): Promise<void> => {
-    const currentProgress = await getMongoDBCollectionIndexTransformationProgress(
-      this.collection.databaseId,
-      this.collection.id()
-    );
-    this.setState({ indexTransformationProgress: currentProgress });
-  };
-
   public isSaveSettingsButtonEnabled = (): boolean => {
     if (this.isOfferReplacePending()) {
       return false;
@@ -264,8 +208,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       this.state.isScaleSaveable ||
       this.state.isSubSettingsSaveable ||
       this.state.isIndexingPolicyDirty ||
-      this.state.isConflictResolutionDirty ||
-      (!!this.state.currentMongoIndexes && this.state.isMongoIndexingPolicySaveable)
+      this.state.isConflictResolutionDirty
     );
   };
 
@@ -274,8 +217,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       this.state.isScaleDiscardable ||
       this.state.isSubSettingsDiscardable ||
       this.state.isIndexingPolicyDirty ||
-      this.state.isConflictResolutionDirty ||
-      (!!this.state.currentMongoIndexes && this.state.isMongoIndexingPolicyDiscardable)
+      this.state.isConflictResolutionDirty
     );
   };
 
@@ -394,27 +336,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         });
       }
 
-      if (this.state.isMongoIndexingPolicySaveable && this.mongoDBCollectionResource) {
-        const newMongoIndexes = this.getMongoIndexesToSave();
-        const newMongoCollection: MongoDBCollectionResource = {
-          ...this.mongoDBCollectionResource,
-          indexes: newMongoIndexes
-        };
-        this.mongoDBCollectionResource = await updateMongoDBCollectionThroughRP(
-          this.collection.databaseId,
-          this.collection.id(),
-          newMongoCollection
-        );
-
-        await this.refreshIndexTransformationProgress();
-        this.setState({
-          isMongoIndexingPolicySaveable: false,
-          indexesToDrop: [],
-          indexesToAdd: [],
-          currentMongoIndexes: [...this.mongoDBCollectionResource.indexes]
-        });
-      }
-
       if (this.state.isScaleSaveable) {
         const newThroughput = this.state.throughput;
         const newOffer: DataModels.Offer = { ...this.collection.offer() };
@@ -471,18 +392,33 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
             throughput: newThroughput,
             offerIsRUPerMinuteThroughputEnabled: false
           };
-
-          await updateOfferThroughputBeyondLimit(requestPayload);
-          this.collection.offer().content.offerThroughput = originalThroughputValue;
-          this.setState({
-            isScaleSaveable: false,
-            isScaleDiscardable: false,
-            throughput: originalThroughputValue,
-            throughputBaseline: originalThroughputValue,
-            initialNotification: {
-              description: `Throughput update for ${newThroughput} ${throughputUnit}`
-            } as DataModels.Notification
-          });
+          try {
+            await updateOfferThroughputBeyondLimit(requestPayload);
+            this.collection.offer().content.offerThroughput = originalThroughputValue;
+            this.setState({
+              throughput: originalThroughputValue,
+              throughputBaseline: originalThroughputValue,
+              initialNotification: {
+                description: `Throughput update for ${newThroughput} ${throughputUnit}`
+              } as DataModels.Notification
+            });
+            this.setState({ isScaleSaveable: false, isScaleDiscardable: false });
+          } catch (error) {
+            traceFailure(
+              Action.SettingsV2Updated,
+              {
+                databaseAccountName: this.container.databaseAccount().name,
+                databaseName: this.collection?.databaseId,
+                collectionName: this.collection?.id(),
+                defaultExperience: this.container.defaultExperience(),
+                dataExplorerArea: Constants.Areas.Tab,
+                tabTitle: this.props.settingsTab.tabTitle(),
+                error: error
+              },
+              startKey
+            );
+            throw error;
+          }
         } else {
           const updateOfferParams: DataModels.UpdateOfferParams = {
             databaseId: this.collection.databaseId,
@@ -561,8 +497,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       timeToLiveSeconds: this.state.timeToLiveSecondsBaseline,
       geospatialConfigType: this.state.geospatialConfigTypeBaseline,
       indexingPolicyContent: this.state.indexingPolicyContentBaseline,
-      indexesToAdd: [],
-      indexesToDrop: [],
       conflictResolutionPolicyMode: this.state.conflictResolutionPolicyModeBaseline,
       conflictResolutionPolicyPath: this.state.conflictResolutionPolicyPathBaseline,
       conflictResolutionPolicyProcedure: this.state.conflictResolutionPolicyProcedureBaseline,
@@ -577,23 +511,10 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       isSubSettingsSaveable: false,
       isSubSettingsDiscardable: false,
       isIndexingPolicyDirty: false,
-      isMongoIndexingPolicySaveable: false,
-      isMongoIndexingPolicyDiscardable: false,
       isConflictResolutionDirty: false
     });
   };
 
-  private getMongoIndexesToSave = (): MongoIndex[] => {
-    let finalIndexes: MongoIndex[] = [];
-    this.state.currentMongoIndexes?.map((mongoIndex: MongoIndex, index: number) => {
-      if (!this.state.indexesToDrop.includes(index)) {
-        finalIndexes.push(mongoIndex);
-      }
-    });
-    finalIndexes = finalIndexes.concat(this.state.indexesToAdd.map((m: AddMongoIndexProps) => m.mongoIndex));
-    return finalIndexes;
-  };
-
   private onScaleSaveableChange = (isScaleSaveable: boolean): void =>
     this.setState({ isScaleSaveable: isScaleSaveable });
 
@@ -623,36 +544,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     }
   };
 
-  private onIndexDrop = (index: number): void => this.setState({ indexesToDrop: [...this.state.indexesToDrop, index] });
-
-  private onRevertIndexDrop = (index: number): void => {
-    const indexesToDrop = [...this.state.indexesToDrop];
-    indexesToDrop.splice(index, 1);
-    this.setState({ indexesToDrop });
-  };
-
-  private onRevertIndexAdd = (index: number): void => {
-    const indexesToAdd = [...this.state.indexesToAdd];
-    indexesToAdd.splice(index, 1);
-    this.setState({ indexesToAdd });
-  };
-
-  private onIndexAddOrChange = (index: number, description: string, type: MongoIndexTypes): void => {
-    const newIndexesToAdd = [...this.state.indexesToAdd];
-    const notification = getMongoNotification(description, type);
-    const newMongoIndexWithType: AddMongoIndexProps = {
-      mongoIndex: { key: { keys: [description] } } as MongoIndex,
-      type: type,
-      notification: notification
-    };
-    if (index === newIndexesToAdd.length) {
-      newIndexesToAdd.push(newMongoIndexWithType);
-    } else {
-      newIndexesToAdd[index] = newMongoIndexWithType;
-    }
-    this.setState({ indexesToAdd: newIndexesToAdd });
-  };
-
   private onConflictResolutionPolicyModeChange = (newMode: DataModels.ConflictResolutionMode): void =>
     this.setState({ conflictResolutionPolicyMode: newMode });
 
@@ -691,12 +582,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
   private onIndexingPolicyDirtyChange = (isIndexingPolicyDirty: boolean): void =>
     this.setState({ isIndexingPolicyDirty: isIndexingPolicyDirty });
 
-  private onMongoIndexingPolicySaveableChange = (isMongoIndexingPolicySaveable: boolean): void =>
-    this.setState({ isMongoIndexingPolicySaveable });
-
-  private onMongoIndexingPolicyDiscardableChange = (isMongoIndexingPolicyDiscardable: boolean): void =>
-    this.setState({ isMongoIndexingPolicyDiscardable });
-
   public getAnalyticalStorageTtl = (): number => {
     if (this.isAnalyticalStorageEnabled) {
       if (this.state.analyticalStorageTtlSelection === TtlType.On) {
@@ -919,20 +804,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
       onIndexingPolicyDirtyChange: this.onIndexingPolicyDirtyChange
     };
 
-    const mongoIndexingPolicyComponentProps: MongoIndexingPolicyComponentProps = {
-      mongoIndexes: this.state.currentMongoIndexes,
-      onIndexDrop: this.onIndexDrop,
-      indexesToDrop: this.state.indexesToDrop,
-      onRevertIndexDrop: this.onRevertIndexDrop,
-      indexesToAdd: this.state.indexesToAdd,
-      onRevertIndexAdd: this.onRevertIndexAdd,
-      onIndexAddOrChange: this.onIndexAddOrChange,
-      indexTransformationProgress: this.state.indexTransformationProgress,
-      refreshIndexTransformationProgress: this.refreshIndexTransformationProgress,
-      onMongoIndexingPolicySaveableChange: this.onMongoIndexingPolicySaveableChange,
-      onMongoIndexingPolicyDiscardableChange: this.onMongoIndexingPolicyDiscardableChange
-    };
-
     const conflictResolutionPolicyComponentProps: ConflictResolutionComponentProps = {
       collection: this.collection,
       container: this.container,
@@ -949,7 +820,7 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
     };
 
     const tabs: SettingsV2TabInfo[] = [];
-    if (!hasDatabaseSharedThroughput(this.collection) && this.collection.offer()) {
+    if (!hasDatabaseSharedThroughput(this.collection)) {
       tabs.push({
         tab: SettingsV2TabTypes.ScaleTab,
         content: <ScaleComponent {...scaleComponentProps} />
@@ -966,15 +837,6 @@ export class SettingsComponent extends React.Component<SettingsComponentProps, S
         tab: SettingsV2TabTypes.IndexingPolicyTab,
         content: <IndexingPolicyComponent {...indexingPolicyComponentProps} />
       });
-    } else if (
-      this.container.isMongoIndexEditorEnabled() &&
-      this.container.isPreferredApiMongoDB() &&
-      this.container.isEnableMongoCapabilityPresent()
-    ) {
-      tabs.push({
-        tab: SettingsV2TabTypes.IndexingPolicyTab,
-        content: <MongoIndexingPolicyComponent {...mongoIndexingPolicyComponentProps} />
-      });
     }
 
     if (this.hasConflictResolution()) {

src/Explorer/Controls/Settings/SettingsComponentAdapter.tsx

@@ -4,11 +4,17 @@ import { ReactAdapter } from "../../../Bindings/ReactBindingHandler";
 import { SettingsComponent, SettingsComponentProps } from "./SettingsComponent";
 
 export class SettingsComponentAdapter implements ReactAdapter {
-  public parameters: ko.Computed<boolean>;
+  public parameters: ko.Observable<number>;
 
-  constructor(private props: SettingsComponentProps) {}
+  constructor(private props: SettingsComponentProps) {
+    this.parameters = ko.observable<number>(Date.now());
+  }
 
   public renderComponent(): JSX.Element {
-    return this.parameters() ? <SettingsComponent {...this.props} /> : <></>;
+    return <SettingsComponent {...this.props} />;
+  }
+
+  public triggerRender(): void {
+    window.requestAnimationFrame(() => this.parameters(Date.now()));
   }
 }

src/Explorer/Controls/Settings/SettingsRenderUtils.test.tsx

@@ -15,11 +15,7 @@ import {
   getToolTipContainer,
   conflictResolutionCustomToolTip,
   changeFeedPolicyToolTip,
-  conflictResolutionLwwTooltip,
-  mongoIndexingPolicyDisclaimer,
-  mongoIndexingPolicyAADError,
-  mongoIndexTransformationRefreshingMessage,
-  renderMongoIndexTransformationRefreshMessage
+  conflictResolutionLwwTooltip
 } from "./SettingsRenderUtils";
 
 class SettingsRenderUtilsTestComponent extends React.Component {
@@ -49,16 +45,6 @@ class SettingsRenderUtilsTestComponent extends React.Component {
         {conflictResolutionLwwTooltip}
         {conflictResolutionCustomToolTip}
         {changeFeedPolicyToolTip}
-
-        {mongoIndexingPolicyDisclaimer}
-        {mongoIndexingPolicyAADError}
-        {mongoIndexTransformationRefreshingMessage}
-        {renderMongoIndexTransformationRefreshMessage(0, () => {
-          return;
-        })}
-        {renderMongoIndexTransformationRefreshMessage(90, () => {
-          return;
-        })}
       </>
     );
   }

src/Explorer/Controls/Settings/SettingsRenderUtils.tsx

@@ -21,24 +21,13 @@ import {
   Link,
   Text,
   IMessageBarStyles,
-  ITextStyles,
-  IDetailsRowStyles,
-  IStackStyles,
-  IIconStyles,
-  IDetailsListStyles,
-  IDropdownStyles,
-  ISeparatorStyles,
-  MessageBar,
-  MessageBarType,
-  Stack,
-  Spinner,
-  SpinnerSize
+  ITextStyles
 } from "office-ui-fabric-react";
 import { isDirtyTypes, isDirty } from "./SettingsUtils";
 
 const infoAndToolTipTextStyle: ITextStyles = { root: { fontSize: 12 } };
 
-export const noLeftPaddingCheckBoxStyle: ICheckboxStyles = {
+export const spendAckCheckBoxStyle: ICheckboxStyles = {
   label: {
     margin: 0,
     padding: "2 0 2 0"
@@ -56,20 +45,6 @@ export const titleAndInputStackProps: Partial<IStackProps> = {
   tokens: { childrenGap: 5 }
 };
 
-export const mongoWarningStackProps: Partial<IStackProps> = {
-  tokens: { childrenGap: 5 }
-};
-
-export const mongoErrorMessageStyles: Partial<IMessageBarStyles> = { root: { marginLeft: 10 } };
-
-export const createAndAddMongoIndexStackProps: Partial<IStackProps> = {
-  tokens: { childrenGap: 5 }
-};
-
-export const addMongoIndexStackProps: Partial<IStackProps> = {
-  tokens: { childrenGap: 10 }
-};
-
 export const checkBoxAndInputStackProps: Partial<IStackProps> = {
   tokens: { childrenGap: 10 }
 };
@@ -78,54 +53,6 @@ export const toolTipLabelStackTokens: IStackTokens = {
   childrenGap: 6
 };
 
-export const accordionStackTokens: IStackTokens = {
-  childrenGap: 10
-};
-
-export const addMongoIndexSubElementsTokens: IStackTokens = {
-  childrenGap: 20
-};
-
-export const accordionIconStyles: IIconStyles = { root: { paddingTop: 7 } };
-
-export const mediumWidthStackStyles: IStackStyles = { root: { width: 600 } };
-
-export const shortWidthTextFieldStyles: Partial<ITextFieldStyles> = { root: { paddingLeft: 10, width: 210 } };
-
-export const shortWidthDropDownStyles: Partial<IDropdownStyles> = { dropdown: { paddingleft: 10, width: 202 } };
-
-export const transparentDetailsRowStyles: Partial<IDetailsRowStyles> = {
-  root: {
-    selectors: {
-      ":hover": {
-        background: "transparent"
-      }
-    }
-  }
-};
-
-export const customDetailsListStyles: Partial<IDetailsListStyles> = {
-  root: {
-    selectors: {
-      ".ms-FocusZone": {
-        paddingTop: 0
-      }
-    }
-  }
-};
-
-export const separatorStyles: Partial<ISeparatorStyles> = {
-  root: [
-    {
-      selectors: {
-        "::before": {
-          background: StyleConstants.BaseMedium
-        }
-      }
-    }
-  ]
-};
-
 export const messageBarStyles: Partial<IMessageBarStyles> = { root: { marginTop: "5px" } };
 
 export const throughputUnit = "RU/s";
@@ -386,56 +313,6 @@ export const changeFeedPolicyToolTip: JSX.Element = (
   </Text>
 );
 
-export const mongoIndexingPolicyDisclaimer: JSX.Element = (
-  <Text>
-    For queries that filter on multiple properties, create multiple single field indexes instead of a compound index.
-    <Link href="https://docs.microsoft.com/azure/cosmos-db/mongodb-indexing#index-types" target="_blank">
-      {` Compound indexes `}
-    </Link>
-    are only used for sorting query results. If you need to add a compound index, you can create one using the Mongo
-    shell.
-  </Text>
-);
-
-export const mongoIndexingPolicyAADError: JSX.Element = (
-  <MessageBar messageBarType={MessageBarType.error}>
-    <Text>
-      To use the indexing policy editor, please login to the
-      <Link target="_blank" href="https://portal.azure.com">
-        {"azure portal."}
-      </Link>
-    </Text>
-  </MessageBar>
-);
-
-export const mongoIndexTransformationRefreshingMessage: JSX.Element = (
-  <Stack horizontal {...mongoWarningStackProps}>
-    <Text>Refreshing index transformation progress</Text>
-    <Spinner size={SpinnerSize.medium} />
-  </Stack>
-);
-
-export const renderMongoIndexTransformationRefreshMessage = (
-  progress: number,
-  performRefresh: () => void
-): JSX.Element => {
-  if (progress === 0) {
-    return (
-      <Text>
-        {"You can make more indexing changes once the current index transformation is complete. "}
-        <Link onClick={performRefresh}>{"Refresh to check if it has completed."}</Link>
-      </Text>
-    );
-  } else {
-    return (
-      <Text>
-        {`You can make more indexing changes once the current index transformation has completed. It is ${progress}% complete. `}
-        <Link onClick={performRefresh}>{"Refresh to check the progress."}</Link>
-      </Text>
-    );
-  }
-};
-
 export const getTextFieldStyles = (current: isDirtyTypes, baseline: isDirtyTypes): Partial<ITextFieldStyles> => ({
   fieldGroup: {
     height: 25,

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/AddMongoIndexComponent.test.tsx

@@ -1,24 +0,0 @@
-import { shallow } from "enzyme";
-import React from "react";
-import { MongoIndexTypes, MongoNotificationType } from "../../SettingsUtils";
-import { AddMongoIndexComponent, AddMongoIndexComponentProps } from "./AddMongoIndexComponent";
-
-describe("AddMongoIndexComponent", () => {
-  it("renders", () => {
-    const props: AddMongoIndexComponentProps = {
-      position: 1,
-      description: "sample_key",
-      type: MongoIndexTypes.Single,
-      notification: { type: MongoNotificationType.Error, message: "sample error" },
-      onIndexAddOrChange: () => {
-        return;
-      },
-      onDiscard: () => {
-        return;
-      }
-    };
-
-    const wrapper = shallow(<AddMongoIndexComponent {...props} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-});

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/AddMongoIndexComponent.tsx

@@ -1,103 +0,0 @@
-import * as React from "react";
-import {
-  MessageBar,
-  MessageBarType,
-  Stack,
-  IconButton,
-  TextField,
-  Dropdown,
-  IDropdownOption,
-  ITextField
-} from "office-ui-fabric-react";
-import {
-  addMongoIndexSubElementsTokens,
-  mongoErrorMessageStyles,
-  mongoWarningStackProps,
-  shortWidthDropDownStyles,
-  shortWidthTextFieldStyles
-} from "../../SettingsRenderUtils";
-import {
-  getMongoIndexTypeText,
-  MongoIndexTypes,
-  MongoNotificationMessage,
-  MongoNotificationType,
-  MongoWildcardPlaceHolder
-} from "../../SettingsUtils";
-
-export interface AddMongoIndexComponentProps {
-  position: number;
-  description: string;
-  type: MongoIndexTypes;
-  notification: MongoNotificationMessage;
-  onIndexAddOrChange: (description: string, type: MongoIndexTypes) => void;
-  onDiscard: () => void;
-  disabled?: boolean;
-}
-
-export class AddMongoIndexComponent extends React.Component<AddMongoIndexComponentProps> {
-  private descriptionTextField: ITextField;
-  private indexTypes: IDropdownOption[] = [MongoIndexTypes.Single, MongoIndexTypes.Wildcard].map(
-    (value: MongoIndexTypes) => ({
-      text: getMongoIndexTypeText(value),
-      key: value
-    })
-  );
-
-  private onDescriptionChange = (
-    event: React.FormEvent<HTMLInputElement | HTMLTextAreaElement>,
-    newValue?: string
-  ): void => {
-    this.props.onIndexAddOrChange(newValue, this.props.type);
-  };
-
-  private onTypeChange = (event: React.FormEvent<HTMLDivElement>, option?: IDropdownOption): void => {
-    const newType = MongoIndexTypes[option.key as keyof typeof MongoIndexTypes];
-    this.props.onIndexAddOrChange(this.props.description, newType);
-  };
-
-  private setRef = (textField: ITextField) => (this.descriptionTextField = textField);
-
-  public focus = (): void => {
-    this.descriptionTextField.focus();
-  };
-
-  public render(): JSX.Element {
-    return (
-      <Stack {...mongoWarningStackProps}>
-        <Stack horizontal tokens={addMongoIndexSubElementsTokens}>
-          <TextField
-            ariaLabel={"Index Field Name " + this.props.position}
-            disabled={this.props.disabled}
-            styles={shortWidthTextFieldStyles}
-            componentRef={this.setRef}
-            value={this.props.description}
-            placeholder={this.props.type === MongoIndexTypes.Wildcard ? MongoWildcardPlaceHolder : undefined}
-            onChange={this.onDescriptionChange}
-          />
-
-          <Dropdown
-            ariaLabel={"Index Type " + this.props.position}
-            disabled={this.props.disabled}
-            styles={shortWidthDropDownStyles}
-            placeholder="Select an index type"
-            selectedKey={this.props.type}
-            options={this.indexTypes}
-            onChange={this.onTypeChange}
-          />
-
-          <IconButton
-            ariaLabel={"Undo Button " + this.props.position}
-            iconProps={{ iconName: "Undo" }}
-            disabled={!this.props.description && !this.props.type}
-            onClick={() => this.props.onDiscard()}
-          />
-        </Stack>
-        {this.props.notification?.type === MongoNotificationType.Error && (
-          <MessageBar styles={mongoErrorMessageStyles} messageBarType={MessageBarType.error}>
-            {this.props.notification.message}
-          </MessageBar>
-        )}
-      </Stack>
-    );
-  }
-}

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.test.tsx

@@ -1,122 +0,0 @@
-import { shallow } from "enzyme";
-import React from "react";
-import { MongoIndexTypes, MongoNotificationMessage, MongoNotificationType } from "../../SettingsUtils";
-import { MongoIndexingPolicyComponent, MongoIndexingPolicyComponentProps } from "./MongoIndexingPolicyComponent";
-
-describe("MongoIndexingPolicyComponent", () => {
-  const baseProps: MongoIndexingPolicyComponentProps = {
-    mongoIndexes: [],
-    onIndexDrop: () => {
-      return;
-    },
-    indexesToDrop: [],
-    onRevertIndexDrop: () => {
-      return;
-    },
-    indexesToAdd: [],
-    onRevertIndexAdd: () => {
-      return;
-    },
-    onIndexAddOrChange: () => {
-      return;
-    },
-    indexTransformationProgress: undefined,
-    refreshIndexTransformationProgress: () =>
-      new Promise(() => {
-        return;
-      }),
-    onMongoIndexingPolicySaveableChange: () => {
-      return;
-    },
-    onMongoIndexingPolicyDiscardableChange: () => {
-      return;
-    }
-  };
-
-  it("renders", () => {
-    const wrapper = shallow(<MongoIndexingPolicyComponent {...baseProps} />);
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  it("isIndexingTransforming", () => {
-    const wrapper = shallow(<MongoIndexingPolicyComponent {...baseProps} />);
-    const mongoIndexingPolicyComponent = wrapper.instance() as MongoIndexingPolicyComponent;
-    expect(mongoIndexingPolicyComponent.isIndexingTransforming()).toEqual(false);
-    wrapper.setProps({ indexTransformationProgress: 50 });
-    expect(mongoIndexingPolicyComponent.isIndexingTransforming()).toEqual(true);
-    wrapper.setProps({ indexTransformationProgress: 100 });
-    expect(mongoIndexingPolicyComponent.isIndexingTransforming()).toEqual(false);
-  });
-
-  describe("AddMongoIndexProps test", () => {
-    const wrapper = shallow(<MongoIndexingPolicyComponent {...baseProps} />);
-    const mongoIndexingPolicyComponent = wrapper.instance() as MongoIndexingPolicyComponent;
-
-    it("defaults", () => {
-      expect(mongoIndexingPolicyComponent.isMongoIndexingPolicySaveable()).toEqual(false);
-      expect(mongoIndexingPolicyComponent.isMongoIndexingPolicyDiscardable()).toEqual(false);
-      expect(mongoIndexingPolicyComponent.getMongoWarningNotificationMessage()).toEqual(undefined);
-    });
-
-    const sampleWarning = "sampleWarning";
-    const sampleError = "sampleError";
-
-    const cases = [
-      [
-        { type: MongoNotificationType.Warning, message: sampleWarning } as MongoNotificationMessage,
-        false,
-        false,
-        true,
-        sampleWarning
-      ],
-      [
-        { type: MongoNotificationType.Error, message: sampleError } as MongoNotificationMessage,
-        false,
-        false,
-        true,
-        undefined
-      ],
-      [
-        { type: MongoNotificationType.Error, message: sampleError } as MongoNotificationMessage,
-        true,
-        false,
-        true,
-        undefined
-      ],
-      [undefined, false, true, true, undefined],
-      [undefined, true, true, true, undefined]
-    ];
-
-    test.each(cases)(
-      "",
-      (
-        notification: MongoNotificationMessage,
-        indexToDropIsPresent: boolean,
-        isMongoIndexingPolicySaveable: boolean,
-        isMongoIndexingPolicyDiscardable: boolean,
-        mongoWarningNotificationMessage: string
-      ) => {
-        const addMongoIndexProps = {
-          mongoIndex: { key: { keys: ["sampleKey"] } },
-          type: MongoIndexTypes.Single,
-          notification: notification
-        };
-
-        let indexesToDrop: number[] = [];
-        if (indexToDropIsPresent) {
-          indexesToDrop = [0];
-        }
-        wrapper.setProps({ indexesToAdd: [addMongoIndexProps], indexesToDrop: indexesToDrop });
-        wrapper.update();
-
-        expect(mongoIndexingPolicyComponent.isMongoIndexingPolicySaveable()).toEqual(isMongoIndexingPolicySaveable);
-        expect(mongoIndexingPolicyComponent.isMongoIndexingPolicyDiscardable()).toEqual(
-          isMongoIndexingPolicyDiscardable
-        );
-        expect(mongoIndexingPolicyComponent.getMongoWarningNotificationMessage()).toEqual(
-          mongoWarningNotificationMessage
-        );
-      }
-    );
-  });
-});

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/MongoIndexingPolicyComponent.tsx

@@ -1,369 +0,0 @@
-import * as React from "react";
-import {
-  DetailsList,
-  DetailsListLayoutMode,
-  Stack,
-  IconButton,
-  Text,
-  SelectionMode,
-  IDetailsRowProps,
-  DetailsRow,
-  IColumn,
-  MessageBar,
-  MessageBarType,
-  Spinner,
-  SpinnerSize,
-  Separator
-} from "office-ui-fabric-react";
-import {
-  addMongoIndexStackProps,
-  customDetailsListStyles,
-  mongoIndexingPolicyDisclaimer,
-  mediumWidthStackStyles,
-  subComponentStackProps,
-  transparentDetailsRowStyles,
-  createAndAddMongoIndexStackProps,
-  separatorStyles,
-  mongoIndexingPolicyAADError,
-  mongoIndexTransformationRefreshingMessage,
-  renderMongoIndexTransformationRefreshMessage
-} from "../../SettingsRenderUtils";
-import { MongoIndex } from "../../../../../Utils/arm/generatedClients/2020-04-01/types";
-import {
-  MongoIndexTypes,
-  AddMongoIndexProps,
-  MongoIndexIdField,
-  MongoNotificationType,
-  getMongoIndexType,
-  getMongoIndexTypeText
-} from "../../SettingsUtils";
-import { AddMongoIndexComponent } from "./AddMongoIndexComponent";
-import { CollapsibleSectionComponent } from "../../../CollapsiblePanel/CollapsibleSectionComponent";
-import { handleError } from "../../../../../Common/ErrorHandlingUtils";
-import { AuthType } from "../../../../../AuthType";
-
-export interface MongoIndexingPolicyComponentProps {
-  mongoIndexes: MongoIndex[];
-  onIndexDrop: (index: number) => void;
-  indexesToDrop: number[];
-  onRevertIndexDrop: (index: number) => void;
-  indexesToAdd: AddMongoIndexProps[];
-  onRevertIndexAdd: (index: number) => void;
-  onIndexAddOrChange: (index: number, description: string, type: MongoIndexTypes) => void;
-  indexTransformationProgress: number;
-  refreshIndexTransformationProgress: () => Promise<void>;
-  onMongoIndexingPolicySaveableChange: (isMongoIndexingPolicySaveable: boolean) => void;
-  onMongoIndexingPolicyDiscardableChange: (isMongoIndexingPolicyDiscardable: boolean) => void;
-}
-
-interface MongoIndexingPolicyComponentState {
-  isRefreshingIndexTransformationProgress: boolean;
-}
-
-interface MongoIndexDisplayProps {
-  definition: JSX.Element;
-  type: JSX.Element;
-  actionButton: JSX.Element;
-}
-
-export class MongoIndexingPolicyComponent extends React.Component<
-  MongoIndexingPolicyComponentProps,
-  MongoIndexingPolicyComponentState
-> {
-  private shouldCheckComponentIsDirty = true;
-  private addMongoIndexComponentRefs: React.RefObject<AddMongoIndexComponent>[] = [];
-  private initialIndexesColumns: IColumn[] = [
-    { key: "definition", name: "Definition", fieldName: "definition", minWidth: 100, maxWidth: 200, isResizable: true },
-    { key: "type", name: "Type", fieldName: "type", minWidth: 100, maxWidth: 200, isResizable: true },
-    {
-      key: "actionButton",
-      name: "Drop Index",
-      fieldName: "actionButton",
-      minWidth: 100,
-      maxWidth: 200,
-      isResizable: true
-    }
-  ];
-
-  private indexesToBeDroppedColumns: IColumn[] = [
-    { key: "definition", name: "Definition", fieldName: "definition", minWidth: 100, maxWidth: 200, isResizable: true },
-    { key: "type", name: "Type", fieldName: "type", minWidth: 100, maxWidth: 200, isResizable: true },
-    {
-      key: "actionButton",
-      name: "Add index back",
-      fieldName: "actionButton",
-      minWidth: 100,
-      maxWidth: 200,
-      isResizable: true
-    }
-  ];
-
-  constructor(props: MongoIndexingPolicyComponentProps) {
-    super(props);
-    this.state = {
-      isRefreshingIndexTransformationProgress: false
-    };
-  }
-
-  componentDidUpdate(prevProps: MongoIndexingPolicyComponentProps): void {
-    if (this.props.indexesToAdd.length > prevProps.indexesToAdd.length) {
-      this.addMongoIndexComponentRefs[prevProps.indexesToAdd.length]?.current?.focus();
-    }
-    this.onComponentUpdate();
-  }
-
-  componentDidMount(): void {
-    this.onComponentUpdate();
-  }
-
-  private onComponentUpdate = (): void => {
-    if (!this.shouldCheckComponentIsDirty) {
-      this.shouldCheckComponentIsDirty = true;
-      return;
-    }
-    this.props.onMongoIndexingPolicySaveableChange(this.isMongoIndexingPolicySaveable());
-    this.props.onMongoIndexingPolicyDiscardableChange(this.isMongoIndexingPolicyDiscardable());
-    this.shouldCheckComponentIsDirty = false;
-  };
-
-  public isMongoIndexingPolicySaveable = (): boolean => {
-    if (this.props.indexesToAdd.length === 0 && this.props.indexesToDrop.length === 0) {
-      return false;
-    }
-
-    const addErrorsExist = !!this.props.indexesToAdd.find(addMongoIndexProps => addMongoIndexProps.notification);
-
-    if (addErrorsExist) {
-      return false;
-    }
-
-    return true;
-  };
-
-  public isMongoIndexingPolicyDiscardable = (): boolean => {
-    return this.props.indexesToAdd.length > 0 || this.props.indexesToDrop.length > 0;
-  };
-
-  public getMongoWarningNotificationMessage = (): string => {
-    return this.props.indexesToAdd.find(
-      addMongoIndexProps => addMongoIndexProps.notification?.type === MongoNotificationType.Warning
-    )?.notification.message;
-  };
-
-  private onRenderRow = (props: IDetailsRowProps): JSX.Element => {
-    return <DetailsRow {...props} styles={transparentDetailsRowStyles} />;
-  };
-
-  private getActionButton = (arrayPosition: number, isCurrentIndex: boolean): JSX.Element => {
-    return isCurrentIndex ? (
-      <IconButton
-        ariaLabel="Delete index Button"
-        iconProps={{ iconName: "Delete" }}
-        disabled={this.isIndexingTransforming()}
-        onClick={() => {
-          this.props.onIndexDrop(arrayPosition);
-        }}
-      />
-    ) : (
-      <IconButton
-        ariaLabel="Add back Index Button"
-        iconProps={{ iconName: "Add" }}
-        onClick={() => {
-          this.props.onRevertIndexDrop(arrayPosition);
-        }}
-      />
-    );
-  };
-
-  private getMongoIndexDisplayProps = (
-    mongoIndex: MongoIndex,
-    arrayPosition: number,
-    isCurrentIndex: boolean
-  ): MongoIndexDisplayProps => {
-    const keys = mongoIndex?.key?.keys;
-    const type = getMongoIndexType(keys);
-    const definition = keys?.join();
-    let mongoIndexDisplayProps: MongoIndexDisplayProps;
-    if (type) {
-      mongoIndexDisplayProps = {
-        definition: <Text>{definition}</Text>,
-        type: <Text>{getMongoIndexTypeText(type)}</Text>,
-        actionButton: definition === MongoIndexIdField ? <></> : this.getActionButton(arrayPosition, isCurrentIndex)
-      };
-    }
-    return mongoIndexDisplayProps;
-  };
-
-  private renderIndexesToBeAdded = (): JSX.Element => {
-    const indexesToAddLength = this.props.indexesToAdd.length;
-    for (let i = 0; i < indexesToAddLength; i++) {
-      const existingIndexToAddRef = React.createRef<AddMongoIndexComponent>();
-      this.addMongoIndexComponentRefs[i] = existingIndexToAddRef;
-    }
-    const newIndexToAddRef = React.createRef<AddMongoIndexComponent>();
-    this.addMongoIndexComponentRefs[indexesToAddLength] = newIndexToAddRef;
-
-    return (
-      <Stack {...addMongoIndexStackProps} styles={mediumWidthStackStyles}>
-        {this.props.indexesToAdd.map((mongoIndexWithType, arrayPosition) => {
-          const keys = mongoIndexWithType.mongoIndex.key.keys;
-          const type = mongoIndexWithType.type;
-          const notification = mongoIndexWithType.notification;
-          return (
-            <AddMongoIndexComponent
-              ref={this.addMongoIndexComponentRefs[arrayPosition]}
-              position={arrayPosition}
-              key={arrayPosition}
-              description={keys.join()}
-              type={type}
-              notification={notification}
-              onIndexAddOrChange={(description, type) =>
-                this.props.onIndexAddOrChange(arrayPosition, description, type)
-              }
-              onDiscard={() => {
-                this.addMongoIndexComponentRefs.splice(arrayPosition, 1);
-                this.props.onRevertIndexAdd(arrayPosition);
-              }}
-            />
-          );
-        })}
-
-        <AddMongoIndexComponent
-          ref={this.addMongoIndexComponentRefs[indexesToAddLength]}
-          disabled={this.isIndexingTransforming()}
-          position={indexesToAddLength}
-          key={indexesToAddLength}
-          description={undefined}
-          type={undefined}
-          notification={undefined}
-          onIndexAddOrChange={(description, type) =>
-            this.props.onIndexAddOrChange(indexesToAddLength, description, type)
-          }
-          onDiscard={() => {
-            this.props.onRevertIndexAdd(indexesToAddLength);
-          }}
-        />
-      </Stack>
-    );
-  };
-
-  private renderInitialIndexes = (): JSX.Element => {
-    const initialIndexes = this.props.mongoIndexes
-      .map((mongoIndex, arrayPosition) => this.getMongoIndexDisplayProps(mongoIndex, arrayPosition, true))
-      .filter((value, arrayPosition) => !!value && !this.props.indexesToDrop.includes(arrayPosition));
-
-    return (
-      <Stack {...createAndAddMongoIndexStackProps} styles={mediumWidthStackStyles}>
-        <CollapsibleSectionComponent title="Current index(es)">
-          {
-            <>
-              <DetailsList
-                styles={customDetailsListStyles}
-                disableSelectionZone
-                items={initialIndexes}
-                columns={this.initialIndexesColumns}
-                selectionMode={SelectionMode.none}
-                onRenderRow={this.onRenderRow}
-                layoutMode={DetailsListLayoutMode.justified}
-              />
-              {this.renderIndexesToBeAdded()}
-            </>
-          }
-        </CollapsibleSectionComponent>
-      </Stack>
-    );
-  };
-
-  private renderIndexesToBeDropped = (): JSX.Element => {
-    const indexesToBeDropped = this.props.indexesToDrop.map((dropIndex, arrayPosition) =>
-      this.getMongoIndexDisplayProps(this.props.mongoIndexes[dropIndex], arrayPosition, false)
-    );
-
-    return (
-      <Stack styles={mediumWidthStackStyles}>
-        <CollapsibleSectionComponent title="Index(es) to be dropped">
-          {indexesToBeDropped.length > 0 && (
-            <DetailsList
-              styles={customDetailsListStyles}
-              disableSelectionZone
-              items={indexesToBeDropped}
-              columns={this.indexesToBeDroppedColumns}
-              selectionMode={SelectionMode.none}
-              onRenderRow={this.onRenderRow}
-              layoutMode={DetailsListLayoutMode.justified}
-            />
-          )}
-        </CollapsibleSectionComponent>
-      </Stack>
-    );
-  };
-
-  private refreshIndexTransformationProgress = async () => {
-    this.setState({ isRefreshingIndexTransformationProgress: true });
-    try {
-      await this.props.refreshIndexTransformationProgress();
-    } catch (error) {
-      handleError(error, "Refreshing index transformation progress failed.", "RefreshIndexTransformationProgress");
-    } finally {
-      this.setState({ isRefreshingIndexTransformationProgress: false });
-    }
-  };
-
-  public isIndexingTransforming = (): boolean =>
-    // index transformation progress can be 0
-    this.props.indexTransformationProgress !== undefined && this.props.indexTransformationProgress !== 100;
-
-  private onClickRefreshIndexingTransformationLink = async () => await this.refreshIndexTransformationProgress();
-
-  private renderIndexTransformationWarning = (): JSX.Element => {
-    if (this.state.isRefreshingIndexTransformationProgress) {
-      return mongoIndexTransformationRefreshingMessage;
-    } else if (this.isIndexingTransforming()) {
-      return renderMongoIndexTransformationRefreshMessage(
-        this.props.indexTransformationProgress,
-        this.onClickRefreshIndexingTransformationLink
-      );
-    }
-    return undefined;
-  };
-
-  private renderWarningMessage = (): JSX.Element => {
-    let warningMessage: string;
-    if (this.getMongoWarningNotificationMessage()) {
-      warningMessage = this.getMongoWarningNotificationMessage();
-    } else if (this.isMongoIndexingPolicySaveable()) {
-      warningMessage =
-        "You have not saved the latest changes made to your indexing policy. Please click save to confirm the changes.";
-    }
-
-    return (
-      <>
-        {this.renderIndexTransformationWarning() && (
-          <MessageBar messageBarType={MessageBarType.warning}>{this.renderIndexTransformationWarning()}</MessageBar>
-        )}
-
-        {warningMessage && (
-          <MessageBar messageBarType={MessageBarType.warning}>
-            <Text>{warningMessage}</Text>
-          </MessageBar>
-        )}
-      </>
-    );
-  };
-
-  public render(): JSX.Element {
-    if (this.props.mongoIndexes) {
-      return (
-        <Stack {...subComponentStackProps}>
-          {this.renderWarningMessage()}
-          {mongoIndexingPolicyDisclaimer}
-          {this.renderInitialIndexes()}
-          <Separator styles={separatorStyles} />
-          {this.renderIndexesToBeDropped()}
-        </Stack>
-      );
-    } else {
-      return window.authType !== AuthType.AAD ? mongoIndexingPolicyAADError : <Spinner size={SpinnerSize.large} />;
-    }
-  }
-}

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/__snapshots__/AddMongoIndexComponent.test.tsx.snap

@@ -1,83 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AddMongoIndexComponent renders 1`] = `
-<Stack
-  tokens={
-    Object {
-      "childrenGap": 5,
-    }
-  }
->
-  <Stack
-    horizontal={true}
-    tokens={
-      Object {
-        "childrenGap": 20,
-      }
-    }
-  >
-    <StyledTextFieldBase
-      ariaLabel="Index Field Name 1"
-      componentRef={[Function]}
-      onChange={[Function]}
-      styles={
-        Object {
-          "root": Object {
-            "paddingLeft": 10,
-            "width": 210,
-          },
-        }
-      }
-      value="sample_key"
-    />
-    <StyledWithResponsiveMode
-      ariaLabel="Index Type 1"
-      onChange={[Function]}
-      options={
-        Array [
-          Object {
-            "key": "Single",
-            "text": "Single Field",
-          },
-          Object {
-            "key": "Wildcard",
-            "text": "Wildcard",
-          },
-        ]
-      }
-      placeholder="Select an index type"
-      selectedKey="Single"
-      styles={
-        Object {
-          "dropdown": Object {
-            "paddingleft": 10,
-            "width": 202,
-          },
-        }
-      }
-    />
-    <CustomizedIconButton
-      ariaLabel="Undo Button 1"
-      disabled={false}
-      iconProps={
-        Object {
-          "iconName": "Undo",
-        }
-      }
-      onClick={[Function]}
-    />
-  </Stack>
-  <StyledMessageBarBase
-    messageBarType={1}
-    styles={
-      Object {
-        "root": Object {
-          "marginLeft": 10,
-        },
-      }
-    }
-  >
-    sample error
-  </StyledMessageBarBase>
-</Stack>
-`;

src/Explorer/Controls/Settings/SettingsSubComponents/MongoIndexingPolicy/__snapshots__/MongoIndexingPolicyComponent.test.tsx.snap

@@ -1,137 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`MongoIndexingPolicyComponent renders 1`] = `
-<Stack
-  tokens={
-    Object {
-      "childrenGap": 20,
-    }
-  }
->
-  <Text>
-    For queries that filter on multiple properties, create multiple single field indexes instead of a compound index.
-    <StyledLinkBase
-      href="https://docs.microsoft.com/azure/cosmos-db/mongodb-indexing#index-types"
-      target="_blank"
-    >
-       Compound indexes 
-    </StyledLinkBase>
-    are only used for sorting query results. If you need to add a compound index, you can create one using the Mongo shell.
-  </Text>
-  <Stack
-    styles={
-      Object {
-        "root": Object {
-          "width": 600,
-        },
-      }
-    }
-    tokens={
-      Object {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <CollapsibleSectionComponent
-      title="Current index(es)"
-    >
-      <StyledWithViewportComponent
-        columns={
-          Array [
-            Object {
-              "fieldName": "definition",
-              "isResizable": true,
-              "key": "definition",
-              "maxWidth": 200,
-              "minWidth": 100,
-              "name": "Definition",
-            },
-            Object {
-              "fieldName": "type",
-              "isResizable": true,
-              "key": "type",
-              "maxWidth": 200,
-              "minWidth": 100,
-              "name": "Type",
-            },
-            Object {
-              "fieldName": "actionButton",
-              "isResizable": true,
-              "key": "actionButton",
-              "maxWidth": 200,
-              "minWidth": 100,
-              "name": "Drop Index",
-            },
-          ]
-        }
-        disableSelectionZone={true}
-        items={Array []}
-        layoutMode={1}
-        onRenderRow={[Function]}
-        selectionMode={0}
-        styles={
-          Object {
-            "root": Object {
-              "selectors": Object {
-                ".ms-FocusZone": Object {
-                  "paddingTop": 0,
-                },
-              },
-            },
-          }
-        }
-      />
-      <Stack
-        styles={
-          Object {
-            "root": Object {
-              "width": 600,
-            },
-          }
-        }
-        tokens={
-          Object {
-            "childrenGap": 10,
-          }
-        }
-      >
-        <AddMongoIndexComponent
-          disabled={false}
-          key="0"
-          onDiscard={[Function]}
-          onIndexAddOrChange={[Function]}
-          position={0}
-        />
-      </Stack>
-    </CollapsibleSectionComponent>
-  </Stack>
-  <Styled
-    styles={
-      Object {
-        "root": Array [
-          Object {
-            "selectors": Object {
-              "::before": Object {
-                "background": undefined,
-              },
-            },
-          },
-        ],
-      }
-    }
-  />
-  <Stack
-    styles={
-      Object {
-        "root": Object {
-          "width": 600,
-        },
-      }
-    }
-  >
-    <CollapsibleSectionComponent
-      title="Index(es) to be dropped"
-    />
-  </Stack>
-</Stack>
-`;

src/Explorer/Controls/Settings/SettingsSubComponents/ScaleComponent.tsx

@@ -98,11 +98,11 @@ export class ScaleComponent extends React.Component<ScaleComponentProps> {
   };
 
   public canThroughputExceedMaximumValue = (): boolean => {
-    return (
-      !this.props.isFixedContainer &&
-      configContext.platform === Platform.Portal &&
-      !this.props.container.isRunningOnNationalCloud()
-    );
+    const isPublicAzurePortal: boolean =
+      configContext.platform === Platform.Portal && !this.props.container.isRunningOnNationalCloud();
+    const hasPartitionKey = !!this.props.collection.partitionKey;
+
+    return isPublicAzurePortal && hasPartitionKey;
   };
 
   public getInitialNotificationElement = (): JSX.Element => {

src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/ThroughputInputAutoPilotV3Component.tsx

@@ -3,7 +3,7 @@ import * as AutoPilotUtils from "../../../../../Utils/AutoPilotUtils";
 import {
   getTextFieldStyles,
   getToolTipContainer,
-  noLeftPaddingCheckBoxStyle,
+  spendAckCheckBoxStyle,
   titleAndInputStackProps,
   checkBoxAndInputStackProps,
   getChoiceGroupStyles,
@@ -142,7 +142,7 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
 
     this.step = this.props.step ?? ThroughputInputAutoPilotV3Component.defaultStep;
     this.throughputInputMaxValue = this.props.canExceedMaximumValue ? Int32.Max : this.props.maximum;
-    this.autoPilotInputMaxValue = this.props.isFixed ? this.props.maximum : Int32.Max;
+    this.autoPilotInputMaxValue = Int32.Max;
   }
 
   public hasProvisioningTypeChanged = (): boolean =>
@@ -278,13 +278,12 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
       {this.props.spendAckVisible && (
         <Checkbox
           id="spendAckCheckBox"
-          styles={noLeftPaddingCheckBoxStyle}
+          styles={spendAckCheckBoxStyle}
           label={this.props.spendAckText}
           checked={this.state.spendAckChecked}
           onChange={this.onSpendAckChecked}
         />
       )}
-      {this.props.isFixed && <p>When using a collection with fixed storage capacity, you can set up to 10,000 RU/s.</p>}
     </>
   );
 
@@ -317,21 +316,21 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
       {this.props.spendAckVisible && (
         <Checkbox
           id="spendAckCheckBox"
-          styles={noLeftPaddingCheckBoxStyle}
+          styles={spendAckCheckBoxStyle}
           label={this.props.spendAckText}
           checked={this.state.spendAckChecked}
           onChange={this.onSpendAckChecked}
         />
       )}
 
-      {this.props.isFixed && <p>When using a collection with fixed storage capacity, you can set up to 10,000 RU/s.</p>}
+      {this.props.isFixed && <p>Choose unlimited storage capacity for more than 10,000 RU/s.</p>}
     </Stack>
   );
 
   public render(): JSX.Element {
     return (
       <Stack {...checkBoxAndInputStackProps}>
-        {this.renderThroughputModeChoices()}
+        {!this.props.isFixed && this.renderThroughputModeChoices()}
 
         {this.props.isAutoPilotSelected ? this.renderAutoPilotInput() : this.renderThroughputInput()}
       </Stack>

src/Explorer/Controls/Settings/SettingsUtils.test.tsx

@@ -2,20 +2,12 @@ import { collection, container } from "./TestUtils";
 import {
   getMaxRUs,
   getMinRUs,
-  getMongoIndexType,
-  getMongoNotification,
   getSanitizedInputValue,
   hasDatabaseSharedThroughput,
   isDirty,
   isDirtyTypes,
-  MongoIndexTypes,
-  MongoNotificationType,
   parseConflictResolutionMode,
-  parseConflictResolutionProcedure,
-  MongoWildcardPlaceHolder,
-  getMongoIndexTypeText,
-  SingleFieldText,
-  WildcardText
+  parseConflictResolutionProcedure
 } from "./SettingsUtils";
 import * as DataModels from "../../../Contracts/DataModels";
 import * as ViewModels from "../../../Contracts/ViewModels";
@@ -99,43 +91,7 @@ describe("SettingsUtils", () => {
   it("getSanitizedInputValue", () => {
     const max = 100;
     expect(getSanitizedInputValue("", max)).toEqual(0);
-    expect(getSanitizedInputValue("999", max)).toEqual(100);
+    expect(getSanitizedInputValue("999", max)).toEqual(99);
     expect(getSanitizedInputValue("10", max)).toEqual(10);
   });
-
-  it("getMongoIndexType", () => {
-    expect(getMongoIndexType(["Single"])).toEqual(MongoIndexTypes.Single);
-    expect(getMongoIndexType(["Wildcard.$**"])).toEqual(MongoIndexTypes.Wildcard);
-    expect(getMongoIndexType(["Key1", "Key2"])).toEqual(undefined);
-  });
-
-  it("getMongoIndexTypeText", () => {
-    expect(getMongoIndexTypeText(MongoIndexTypes.Single)).toEqual(SingleFieldText);
-    expect(getMongoIndexTypeText(MongoIndexTypes.Wildcard)).toEqual(WildcardText);
-  });
-
-  it("getMongoNotification", () => {
-    const singleIndexDescription = "sampleKey";
-    const wildcardIndexDescription = "sampleKey.$**";
-
-    let notification = getMongoNotification(singleIndexDescription, undefined);
-    expect(notification.message).toEqual("Please select a type for each index.");
-    expect(notification.type).toEqual(MongoNotificationType.Warning);
-
-    notification = getMongoNotification(singleIndexDescription, MongoIndexTypes.Single);
-    expect(notification).toEqual(undefined);
-
-    notification = getMongoNotification(wildcardIndexDescription, MongoIndexTypes.Wildcard);
-    expect(notification).toEqual(undefined);
-
-    notification = getMongoNotification("", MongoIndexTypes.Single);
-    expect(notification.message).toEqual("Please enter a field name.");
-    expect(notification.type).toEqual(MongoNotificationType.Error);
-
-    notification = getMongoNotification(singleIndexDescription, MongoIndexTypes.Wildcard);
-    expect(notification.message).toEqual(
-      "Wildcard path is not present in the field name. Use a pattern like " + MongoWildcardPlaceHolder
-    );
-    expect(notification.type).toEqual(MongoNotificationType.Error);
-  });
 });

src/Explorer/Controls/Settings/SettingsUtils.tsx

@@ -5,17 +5,12 @@ import * as SharedConstants from "../../../Shared/Constants";
 import * as PricingUtils from "../../../Utils/PricingUtils";
 
 import Explorer from "../../Explorer";
-import { MongoIndex } from "../../../Utils/arm/generatedClients/2020-04-01/types";
 
 const zeroValue = 0;
 export type isDirtyTypes = boolean | string | number | DataModels.IndexingPolicy;
 export const TtlOff = "off";
 export const TtlOn = "on";
 export const TtlOnNoDefault = "on-nodefault";
-export const MongoIndexIdField = "_id";
-export const MongoWildcardPlaceHolder = "properties.$**";
-export const SingleFieldText = "Single Field";
-export const WildcardText = "Wildcard";
 
 export enum ChangeFeedPolicyState {
   Off = "Off",
@@ -33,17 +28,6 @@ export enum GeospatialConfigType {
   Geometry = "Geometry"
 }
 
-export enum MongoIndexTypes {
-  Single = "Single",
-  Wildcard = "Wildcard"
-}
-
-export interface AddMongoIndexProps {
-  mongoIndex: MongoIndex;
-  type: MongoIndexTypes;
-  notification: MongoNotificationMessage;
-}
-
 export enum SettingsV2TabTypes {
   ScaleTab,
   ConflictResolutionTab,
@@ -56,16 +40,6 @@ export interface IsComponentDirtyResult {
   isDiscardable: boolean;
 }
 
-export enum MongoNotificationType {
-  Warning = "Warning",
-  Error = "Error"
-}
-
-export interface MongoNotificationMessage {
-  type: MongoNotificationType;
-  message: string;
-}
-
 export const hasDatabaseSharedThroughput = (collection: ViewModels.Collection): boolean => {
   const database: ViewModels.Database = collection.getDatabase();
   return database?.isDatabaseShared() && !collection.offer();
@@ -80,7 +54,7 @@ export const getMaxRUs = (collection: ViewModels.Collection, container: Explorer
   const numPartitionsFromOffer: number =
     collection?.offer && collection.offer()?.content?.collectionThroughputInfo?.numPhysicalPartitions;
 
-  const numPartitionsFromQuotaInfo: number = collection?.quotaInfo()?.numPartitions;
+  const numPartitionsFromQuotaInfo: number = collection?.quotaInfo().numPartitions;
 
   const numPartitions = numPartitionsFromOffer ?? numPartitionsFromQuotaInfo ?? 1;
 
@@ -105,7 +79,7 @@ export const getMinRUs = (collection: ViewModels.Collection, container: Explorer
     return collectionThroughputInfo.minimumRUForCollection;
   }
 
-  const numPartitions = collectionThroughputInfo?.numPhysicalPartitions ?? collection.quotaInfo()?.numPartitions;
+  const numPartitions = collectionThroughputInfo?.numPhysicalPartitions ?? collection.quotaInfo().numPartitions;
 
   if (!numPartitions || numPartitions === 1) {
     return SharedConstants.CollectionCreation.DefaultCollectionRUs400;
@@ -157,12 +131,13 @@ export const parseConflictResolutionProcedure = (procedureFromBackEnd: string):
 };
 
 export const getSanitizedInputValue = (newValueString: string, max: number): number => {
-  const newValue = parseInt(newValueString);
+  let newValue = parseInt(newValueString);
   if (isNaN(newValue)) {
-    return zeroValue;
+    newValue = zeroValue;
+  } else if (newValue > max) {
+    newValue = Math.floor(newValue / 10);
   }
-  // make sure new value does not exceed the maximum throughput
-  return Math.min(newValue, max);
+  return newValue;
 };
 
 export const isDirty = (current: isDirtyTypes, baseline: isDirtyTypes): boolean => {
@@ -205,48 +180,3 @@ export const getTabTitle = (tab: SettingsV2TabTypes): string => {
       throw new Error(`Unknown tab ${tab}`);
   }
 };
-
-export const getMongoNotification = (description: string, type: MongoIndexTypes): MongoNotificationMessage => {
-  if (description && !type) {
-    return {
-      type: MongoNotificationType.Warning,
-      message: "Please select a type for each index."
-    };
-  }
-
-  if (type && (!description || description.trim().length === 0)) {
-    return {
-      type: MongoNotificationType.Error,
-      message: "Please enter a field name."
-    };
-  } else if (type === MongoIndexTypes.Wildcard && description?.indexOf("$**") === -1) {
-    return {
-      type: MongoNotificationType.Error,
-      message: "Wildcard path is not present in the field name. Use a pattern like " + MongoWildcardPlaceHolder
-    };
-  }
-
-  return undefined;
-};
-
-export const getMongoIndexType = (keys: string[]): MongoIndexTypes => {
-  const length = keys?.length;
-  let type: MongoIndexTypes;
-
-  if (length === 1) {
-    if (keys[0].indexOf("$**") !== -1) {
-      type = MongoIndexTypes.Wildcard;
-    } else {
-      type = MongoIndexTypes.Single;
-    }
-  }
-
-  return type;
-};
-
-export const getMongoIndexTypeText = (index: MongoIndexTypes): string => {
-  if (index === MongoIndexTypes.Single) {
-    return SingleFieldText;
-  }
-  return WildcardText;
-};

src/Explorer/Controls/Settings/__snapshots__/SettingsComponent.test.tsx.snap

@@ -983,7 +983,6 @@ exports[`SettingsComponent renders 1`] = `
                 "isHostedDataExplorerEnabled": [Function],
                 "isLeftPaneExpanded": [Function],
                 "isLinkInjectionEnabled": [Function],
-                "isMongoIndexEditorEnabled": [Function],
                 "isNotebookEnabled": [Function],
                 "isNotebooksEnabledForAccount": [Function],
                 "isNotificationConsoleExpanded": [Function],
@@ -2290,7 +2289,6 @@ exports[`SettingsComponent renders 1`] = `
               "isHostedDataExplorerEnabled": [Function],
               "isLeftPaneExpanded": [Function],
               "isLinkInjectionEnabled": [Function],
-              "isMongoIndexEditorEnabled": [Function],
               "isNotebookEnabled": [Function],
               "isNotebooksEnabledForAccount": [Function],
               "isNotificationConsoleExpanded": [Function],
@@ -3610,7 +3608,6 @@ exports[`SettingsComponent renders 1`] = `
                 "isHostedDataExplorerEnabled": [Function],
                 "isLeftPaneExpanded": [Function],
                 "isLinkInjectionEnabled": [Function],
-                "isMongoIndexEditorEnabled": [Function],
                 "isNotebookEnabled": [Function],
                 "isNotebooksEnabledForAccount": [Function],
                 "isNotificationConsoleExpanded": [Function],
@@ -4917,7 +4914,6 @@ exports[`SettingsComponent renders 1`] = `
               "isHostedDataExplorerEnabled": [Function],
               "isLeftPaneExpanded": [Function],
               "isLinkInjectionEnabled": [Function],
-              "isMongoIndexEditorEnabled": [Function],
               "isNotebookEnabled": [Function],
               "isNotebooksEnabledForAccount": [Function],
               "isNotificationConsoleExpanded": [Function],

src/Explorer/Controls/Settings/__snapshots__/SettingsRenderUtils.test.tsx.snap

@@ -310,59 +310,5 @@ exports[`SettingsUtils functions render 1`] = `
   >
     Enable change feed log retention policy to retain last 10 minutes of history for items in the container by default. To support this, the request unit (RU) charge for this container will be multiplied by a factor of two for writes. Reads are unaffected.
   </Text>
-  <Text>
-    For queries that filter on multiple properties, create multiple single field indexes instead of a compound index.
-    <StyledLinkBase
-      href="https://docs.microsoft.com/azure/cosmos-db/mongodb-indexing#index-types"
-      target="_blank"
-    >
-       Compound indexes 
-    </StyledLinkBase>
-    are only used for sorting query results. If you need to add a compound index, you can create one using the Mongo shell.
-  </Text>
-  <StyledMessageBarBase
-    messageBarType={1}
-  >
-    <Text>
-      To use the indexing policy editor, please login to the
-      <StyledLinkBase
-        href="https://portal.azure.com"
-        target="_blank"
-      >
-        azure portal.
-      </StyledLinkBase>
-    </Text>
-  </StyledMessageBarBase>
-  <Stack
-    horizontal={true}
-    tokens={
-      Object {
-        "childrenGap": 5,
-      }
-    }
-  >
-    <Text>
-      Refreshing index transformation progress
-    </Text>
-    <StyledSpinnerBase
-      size={2}
-    />
-  </Stack>
-  <Text>
-    You can make more indexing changes once the current index transformation is complete. 
-    <StyledLinkBase
-      onClick={[Function]}
-    >
-      Refresh to check if it has completed.
-    </StyledLinkBase>
-  </Text>
-  <Text>
-    You can make more indexing changes once the current index transformation has completed. It is 90% complete. 
-    <StyledLinkBase
-      onClick={[Function]}
-    >
-      Refresh to check the progress.
-    </StyledLinkBase>
-  </Text>
 </Fragment>
 `;

src/Explorer/Controls/ThroughputInput/ThroughputInputComponentAutoscaleV3.html

@@ -119,10 +119,6 @@
       <span data-bind="text: spendAckText, attr: { for: spendAckId }"></span>
     </p>
     <!-- /ko -->
-
-    <!-- ko if: isFixed -->
-    <p>Choose unlimited storage capacity for more than 10,000 RU/s.</p>
-    <!-- /ko -->
   </div>
 
   <div data-bind="visible: !isAutoPilotSelected()">

src/Explorer/Explorer.ts

@@ -15,6 +15,7 @@ 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";
@@ -205,7 +206,6 @@ export default class Explorer {
   public isCodeOfConductEnabled: ko.Computed<boolean>;
   public isLinkInjectionEnabled: ko.Computed<boolean>;
   public isSettingsV2Enabled: ko.Observable<boolean>;
-  public isMongoIndexEditorEnabled: ko.Observable<boolean>;
   public isGitHubPaneEnabled: ko.Observable<boolean>;
   public isPublishNotebookPaneEnabled: ko.Observable<boolean>;
   public isCopyNotebookPaneEnabled: ko.Observable<boolean>;
@@ -412,8 +412,8 @@ export default class Explorer {
     this.isLinkInjectionEnabled = ko.computed<boolean>(() =>
       this.isFeatureEnabled(Constants.Features.enableLinkInjection)
     );
+    //this.isSettingsV2Enabled = ko.computed<boolean>(() => this.isFeatureEnabled(Constants.Features.enableSettingsV2));
     this.isSettingsV2Enabled = ko.observable(false);
-    this.isMongoIndexEditorEnabled = ko.observable(false);
     this.isGitHubPaneEnabled = ko.observable<boolean>(false);
     this.isPublishNotebookPaneEnabled = ko.observable<boolean>(false);
     this.isCopyNotebookPaneEnabled = ko.observable<boolean>(false);
@@ -1120,7 +1120,7 @@ export default class Explorer {
     );
     this.renewExplorerShareAccess(this, this.tokenForRenewal())
       .fail((error: any) => {
-        const stringifiedError: string = error.message;
+        const stringifiedError: string = JSON.stringify(error);
         this.renewTokenError("Invalid connection string specified");
         NotificationConsoleUtils.logConsoleMessage(
           ConsoleDataType.Error,
@@ -1149,7 +1149,7 @@ export default class Explorer {
         NotificationConsoleUtils.clearInProgressMessageWithId(id);
         NotificationConsoleUtils.logConsoleMessage(
           ConsoleDataType.Error,
-          `Failed to generate share url: ${error.message}`
+          `Failed to generate share url: ${JSON.stringify(error)}`
         );
         console.error(error);
       }
@@ -1174,7 +1174,10 @@ export default class Explorer {
           deferred.resolve();
         },
         (error: any) => {
-          NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, `Failed to connect: ${error.message}`);
+          NotificationConsoleUtils.logConsoleMessage(
+            ConsoleDataType.Error,
+            `Failed to connect: ${JSON.stringify(error)}`
+          );
           deferred.reject(error);
         }
       )
@@ -1454,13 +1457,13 @@ export default class Explorer {
             databaseAccountName: this.databaseAccount().name,
             defaultExperience: this.defaultExperience(),
             dataExplorerArea: Constants.Areas.ResourceTree,
-            error: error.message
+            error: JSON.stringify(error)
           },
           startKey
         );
         NotificationConsoleUtils.logConsoleMessage(
           ConsoleDataType.Error,
-          `Error while refreshing databases: ${error.message}`
+          `Error while refreshing databases: ${JSON.stringify(error)}`
         );
       }
     );
@@ -1512,7 +1515,41 @@ export default class Explorer {
       dataExplorerArea: Constants.Areas.ResourceTree
     });
     this.isRefreshingExplorer(true);
-    this.isAuthWithResourceToken() ? this.refreshDatabaseForResourceToken() : this.refreshAllDatabases();
+    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: ${JSON.stringify(error)}`
+        );
+        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.refreshNotebookList();
   };
 
@@ -1563,7 +1600,7 @@ export default class Explorer {
       return Promise.all(sparkPromises).then(() => workspaceItems);
     } catch (error) {
       Logger.logError(error, "Explorer/this._arcadiaManager.listWorkspacesAsync");
-      NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, error.message);
+      NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, JSON.stringify(error));
       return Promise.resolve([]);
     }
   }
@@ -1601,7 +1638,7 @@ export default class Explorer {
       Logger.logError(error, "initNotebooks/getNotebookConnectionInfoAsync");
       NotificationConsoleUtils.logConsoleMessage(
         ConsoleDataType.Error,
-        `Failed to get notebook workspace connection info: ${error.message}`
+        `Failed to get notebook workspace connection info: ${JSON.stringify(error)}`
       );
       throw error;
     } finally {
@@ -1678,7 +1715,7 @@ export default class Explorer {
       }
     } catch (error) {
       Logger.logError(error, "Explorer/ensureNotebookWorkspaceRunning");
-      NotificationConsoleUtils.logConsoleError(`Failed to initialize notebook workspace: ${error.message}`);
+      NotificationConsoleUtils.logConsoleError(`Failed to initialize notebook workspace: ${JSON.stringify(error)}`);
     } finally {
       clearMessage && clearMessage();
     }
@@ -1914,10 +1951,6 @@ export default class Explorer {
     if (flights.indexOf(Constants.Flights.SettingsV2) !== -1) {
       this.isSettingsV2Enabled(true);
     }
-
-    if (flights.indexOf(Constants.Flights.MongoIndexEditor) !== -1) {
-      this.isMongoIndexEditorEnabled(true);
-    }
   }
 
   public findSelectedCollection(): ViewModels.Collection {
@@ -2060,7 +2093,7 @@ export default class Explorer {
             databaseAccountName: this.databaseAccount() && this.databaseAccount().name,
             defaultExperience: this.defaultExperience && this.defaultExperience(),
             dataExplorerArea: Constants.Areas.ResourceTree,
-            trace: error.message
+            trace: JSON.stringify(error)
           },
           startKey
         );
@@ -2522,7 +2555,7 @@ export default class Explorer {
       (error: any) => {
         NotificationConsoleUtils.logConsoleMessage(
           ConsoleDataType.Error,
-          `Could not download notebook ${error.message}`
+          `Could not download notebook ${JSON.stringify(error)}`
         );
 
         clearMessage();

src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx

@@ -892,7 +892,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     backendPromise.then(
       (result: UserQueryResult) => (this.queryTotalRequestCharge = result.requestCharge),
       (error: any) => {
-        const errorMsg = `Failure in submitting query: ${query}: ${error.message}`;
+        const errorMsg = `Failure in submitting query: ${query}: ${JSON.stringify(error)}`;
         GraphExplorer.reportToConsole(ConsoleDataType.Error, errorMsg);
         this.setState({
           filterQueryError: errorMsg
@@ -1826,7 +1826,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
     promise
       .then((result: GremlinClient.GremlinRequestResult) => this.processGremlinQueryResults(result))
       .catch((error: any) => {
-        const errorMsg = `Failed to process query result: ${error.message}`;
+        const errorMsg = `Failed to process query result: ${JSON.stringify(error)}`;
         GraphExplorer.reportToConsole(ConsoleDataType.Error, errorMsg);
         this.setState({
           filterQueryError: errorMsg

src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts

@@ -57,9 +57,9 @@ export class GremlinClient {
           this.flushResult(result.requestId);
         }
       },
-      failureCallback: (result: Result, error: any) => {
+      failureCallback: (result: Result, error: string) => {
         if (typeof error !== "string") {
-          error = error.message;
+          error = JSON.stringify(error);
         }
 
         const requestId = result.requestId;

src/Explorer/Notebook/NotebookComponent/store.ts

@@ -47,7 +47,7 @@ export default function configureStore(
       onTraceFailure(title, `${error.message} ${JSON.stringify(error.stack)}`);
       console.error(error);
     } else {
-      onTraceFailure(title, error.message);
+      onTraceFailure(title, JSON.stringify(error));
     }
   };
 

src/Explorer/Notebook/NotebookRenderer/NotebookRenderer.less

@@ -106,7 +106,3 @@
 .expanded::before {
     content: '';
 }
-
-.monaco-editor .monaco-list .main {
-    background-color: transparent;
-}

src/Explorer/Panes/AddCollectionPane.ts

@@ -14,6 +14,7 @@ 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 {
@@ -895,7 +896,9 @@ export default class AddCollectionPane extends ContextualPaneBase {
         };
         TelemetryProcessor.traceSuccess(Action.CreateCollection, addCollectionPaneSuccessMessage, startKey);
         this.resetData();
-        this.container.refreshAllDatabases();
+        return refreshCachedResources().then(() => {
+          this.container.refreshAllDatabases();
+        });
       },
       (reason: any) => {
         this.isExecuting(false);

src/Explorer/Panes/BrowseQueriesPane.ts

@@ -70,7 +70,8 @@ export class BrowseQueriesPane extends ContextualPaneBase {
         },
         startKey
       );
-      this.formErrors(`Failed to setup a collection for saved queries: ${error.message}`);
+      this.formErrors("Failed to setup a collection for saved queries");
+      this.formErrors(`Failed to setup a collection for saved queries: ${JSON.stringify(error)}`);
     } finally {
       this.isExecuting(false);
     }

src/Explorer/Panes/RenewAdHocAccessPane.ts

@@ -82,7 +82,7 @@ export class RenewAdHocAccessPane extends ContextualPaneBase {
     this.container
       .renewShareAccess(this.accessKey())
       .fail((error: any) => {
-        const errorMessage: string = error.message;
+        const errorMessage: string = JSON.stringify(error);
         NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Error, `Failed to connect: ${errorMessage}`);
         this.formErrors(errorMessage);
         this.formErrorsDetails(errorMessage);

src/Explorer/Panes/SaveQueryPane.ts

@@ -88,7 +88,7 @@ export class SaveQueryPane extends ContextualPaneBase {
       (error: any) => {
         this.isExecuting(false);
         if (typeof error != "string") {
-          error = error.message;
+          error = JSON.stringify(error);
         }
         this.formErrors("Failed to save query");
         this.formErrorsDetails(`Failed to save query: ${error}`);
@@ -143,7 +143,7 @@ export class SaveQueryPane extends ContextualPaneBase {
         startKey
       );
       this.formErrors("Failed to setup a container for saved queries");
-      this.formErrors(`Failed to setup a container for saved queries: ${error.message}`);
+      this.formErrors(`Failed to setup a container for saved queries: ${JSON.stringify(error)}`);
     } finally {
       this.isExecuting(false);
     }

src/Explorer/Panes/SetupNotebooksPane.ts

@@ -85,7 +85,7 @@ export class SetupNotebooksPane extends ContextualPaneBase {
         "Successfully created a default notebook workspace for the account"
       );
     } catch (error) {
-      const errorMessage = typeof error == "string" ? error : error.message;
+      const errorMessage = typeof error == "string" ? error : JSON.stringify(error);
       TelemetryProcessor.traceFailure(
         Action.CreateNotebookWorkspace,
         {

src/Explorer/Tables/TableDataClient.ts

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

src/Explorer/Tabs/DatabaseSettingsTab.html

@@ -85,6 +85,13 @@
           <span>Learn more about minimum throughput </span>
           <a href="https://docs.microsoft.com/azure/cosmos-db/set-throughput" target="_blank">here.</a>
         </p>
+        <p data-bind="visible: canRequestBelowMinRU">
+          Need to scale below <span data-bind="text: minRUsText"></span> RU/s? Reach out by filling
+          <a
+            href="https://customervoice.microsoft.com/Pages/ResponsePage.aspx?id=v4j5cvGGr0GRqy180BHbRzBPrdEMjvxPuDm8fCLUtXpUQ0JLV1Y5VVlDS1RNUE1aRzVHQlVQTVA1SS4u"
+            >this questionnaire</a
+          >.
+        </p>
         <p data-bind="visible: canRequestSupport">
           <!-- TODO: Replace link with call to the Azure Support blade -->
           <a href="https://aka.ms/cosmosdbfeedback?subject=Cosmos%20DB%20More%20Throughput%20Request"

src/Explorer/Tabs/DatabaseSettingsTab.ts

@@ -61,6 +61,7 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
   public saveSettingsButton: ViewModels.Button;
   public discardSettingsChangesButton: ViewModels.Button;
 
+  public canRequestBelowMinRU: ko.PureComputed<boolean>;
   public canRequestSupport: ko.PureComputed<boolean>;
   public canThroughputExceedMaximumValue: ko.Computed<boolean>;
   public costsVisible: ko.Computed<boolean>;
@@ -68,6 +69,7 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
   public isTemplateReady: ko.Observable<boolean>;
   public minRUAnotationVisible: ko.Computed<boolean>;
   public minRUs: ko.Computed<number>;
+  public minRUsText: ko.PureComputed<string>;
   public maxRUs: ko.Computed<number>;
   public maxRUsText: ko.PureComputed<string>;
   public maxRUThroughputInputLimit: ko.Computed<number>;
@@ -203,6 +205,11 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
     this.canThroughputExceedMaximumValue = ko.pureComputed<boolean>(
       () => configContext.platform === Platform.Portal && !this.container.isRunningOnNationalCloud()
     );
+
+    this.canRequestBelowMinRU = ko.pureComputed(() => {
+      return true; // TODO: Implement and test
+    });
+
     this.canRequestSupport = ko.pureComputed(() => {
       if (
         configContext.platform === Platform.Emulator ||
@@ -277,6 +284,8 @@ export default class DatabaseSettingsTab extends TabsBase implements ViewModels.
       return this.maxRUs();
     });
 
+    this.minRUsText = ko.pureComputed(() => this.minRUs().toLocaleString());
+
     this.maxRUsText = ko.pureComputed(() => {
       return SharedConstants.CollectionCreation.DefaultCollectionRUs1Million.toLocaleString();
     });

src/Explorer/Tabs/DocumentsTab.ts

@@ -776,7 +776,7 @@ export default class DocumentsTab extends TabsBase {
           this.isExecutionError(true);
           NotificationConsoleUtils.logConsoleMessage(
             ConsoleDataType.Error,
-            typeof error === "string" ? error : error.message
+            typeof error === "string" ? error : JSON.stringify(error)
           );
           if (this.onLoadStartKey != null && this.onLoadStartKey != undefined) {
             TelemetryProcessor.traceFailure(

src/Explorer/Tabs/SettingsTab.ts

@@ -492,11 +492,11 @@ export default class SettingsTab extends TabsBase implements ViewModels.WaitsFor
     });
 
     this.canThroughputExceedMaximumValue = ko.pureComputed<boolean>(() => {
-      return (
-        this._isFixedContainer() &&
-        configContext.platform === Platform.Portal &&
-        !this.container.isRunningOnNationalCloud()
-      );
+      const isPublicAzurePortal: boolean =
+        configContext.platform === Platform.Portal && !this.container.isRunningOnNationalCloud();
+      const hasPartitionKey = !!this.collection.partitionKey;
+
+      return isPublicAzurePortal && hasPartitionKey;
     });
 
     this.canRequestSupport = ko.pureComputed(() => {

src/Explorer/Tabs/SettingsTabV2.tsx

@@ -1,91 +1,22 @@
 import * as ViewModels from "../../Contracts/ViewModels";
-import * as DataModels from "../../Contracts/DataModels";
 import TabsBase from "./TabsBase";
 import { SettingsComponentAdapter } from "../Controls/Settings/SettingsComponentAdapter";
 import { SettingsComponentProps } from "../Controls/Settings/SettingsComponent";
 import Explorer from "../Explorer";
-import { traceFailure } from "../../Shared/Telemetry/TelemetryProcessor";
-import ko from "knockout";
-import * as Constants from "../../Common/Constants";
-import { Action } from "../../Shared/Telemetry/TelemetryConstants";
-import { logConsoleError } from "../../Utils/NotificationConsoleUtils";
 
 export default class SettingsTabV2 extends TabsBase {
   public settingsComponentAdapter: SettingsComponentAdapter;
-  private notificationRead: ko.Observable<boolean>;
-  private notification: DataModels.Notification;
-  private offerRead: ko.Observable<boolean>;
-  private currentCollection: ViewModels.Collection;
-  private options: ViewModels.SettingsTabV2Options;
 
-  constructor(options: ViewModels.SettingsTabV2Options) {
+  constructor(options: ViewModels.TabOptions) {
     super(options);
-    this.options = options;
     this.tabId = "SettingsV2-" + this.tabId;
     const props: SettingsComponentProps = {
       settingsTab: this
     };
     this.settingsComponentAdapter = new SettingsComponentAdapter(props);
-    this.currentCollection = this.collection as ViewModels.Collection;
-    this.notificationRead = ko.observable(false);
-    this.offerRead = ko.observable(false);
-    this.settingsComponentAdapter.parameters = ko.computed<boolean>(() => {
-      if (this.notificationRead() && this.offerRead()) {
-        this.pendingNotification(this.notification);
-        this.notification = undefined;
-        this.offerRead(false);
-        this.notificationRead(false);
-        return true;
-      }
-      return false;
-    });
   }
 
   public onActivate(): Q.Promise<unknown> {
-    this.isExecuting(true);
-    this.currentCollection.loadOffer().then(
-      () => {
-        // passed in options and set by parent as "Settings" by default
-        this.tabTitle("Scale & Settings");
-        this.offerRead(true);
-        this.options.getPendingNotification.then(
-          (data: DataModels.Notification) => {
-            this.notification = data;
-            this.notificationRead(true);
-            this.isExecuting(false);
-          },
-          error => {
-            this.notification = undefined;
-            this.notificationRead(true);
-            this.isExecuting(false);
-            traceFailure(
-              Action.Tab,
-              {
-                databaseAccountName: this.options.collection.container.databaseAccount().name,
-                databaseName: this.options.collection.databaseId,
-                collectionName: this.options.collection.id(),
-                defaultExperience: this.options.collection.container.defaultExperience(),
-                dataExplorerArea: Constants.Areas.Tab,
-                tabTitle: this.tabTitle,
-                error: error
-              },
-              this.options.onLoadStartKey
-            );
-            logConsoleError(
-              `Error while fetching container settings for container ${this.options.collection.id()}: ${JSON.stringify(
-                error
-              )}`
-            );
-            throw error;
-          }
-        );
-      },
-      () => {
-        this.offerRead(true);
-        this.isExecuting(false);
-      }
-    );
-
     return super.onActivate().then(() => {
       this.collection.selectedSubnodeKind(ViewModels.CollectionTabKind.SettingsV2);
     });

src/Explorer/Tabs/SparkMasterTab.html

@@ -0,0 +1,7 @@
+<div style="width: 100%; height: 100%; margin-left: 3px;" data-bind="attr: { id: tabId }">
+  <!-- This runs the NotebookApp hosted by DataExplorer -->
+  <iframe
+    style="width:100%; height: 100%; border:none"
+    data-bind="setTemplateReady: true, attr: { src: sparkMasterSrc }, visible: !!sparkMasterSrc()"
+  ></iframe>
+</div>

src/Explorer/Tabs/SparkMasterTab.ts

@@ -0,0 +1,35 @@
+import * as ko from "knockout";
+import * as DataModels from "../../Contracts/DataModels";
+import * as ViewModels from "../../Contracts/ViewModels";
+import TabsBase from "./TabsBase";
+import Explorer from "../Explorer";
+
+interface SparkMasterTabOptions extends ViewModels.TabOptions {
+  clusterConnectionInfo: DataModels.SparkClusterConnectionInfo;
+  container: Explorer;
+}
+
+export default class SparkMasterTab extends TabsBase {
+  public sparkMasterSrc: ko.Observable<string>;
+
+  private _clusterConnectionInfo: DataModels.SparkClusterConnectionInfo;
+  private _container: Explorer;
+
+  constructor(options: SparkMasterTabOptions) {
+    super(options);
+    super.onActivate.bind(this);
+    this._container = options.container;
+    this._clusterConnectionInfo = options.clusterConnectionInfo;
+    const sparkMasterEndpoint =
+      this._clusterConnectionInfo &&
+      this._clusterConnectionInfo.endpoints &&
+      this._clusterConnectionInfo.endpoints.find(
+        endpoint => endpoint.kind === DataModels.SparkClusterEndpointKind.SparkUI
+      );
+    this.sparkMasterSrc = ko.observable<string>(sparkMasterEndpoint && sparkMasterEndpoint.endpoint);
+  }
+
+  protected getContainer() {
+    return this._container;
+  }
+}

src/Explorer/Tabs/TabComponents.ts

@@ -1,6 +1,7 @@
 import DocumentsTabTemplate from "./DocumentsTab.html";
 import ConflictsTabTemplate from "./ConflictsTab.html";
 import GraphTabTemplate from "./GraphTab.html";
+import SparkMasterTabTemplate from "./SparkMasterTab.html";
 import NotebookV2TabTemplate from "./NotebookV2Tab.html";
 import TerminalTabTemplate from "./TerminalTab.html";
 import MongoDocumentsTabTemplate from "./MongoDocumentsTab.html";
@@ -60,6 +61,15 @@ export class GraphTab {
   }
 }
 
+export class SparkMasterTab {
+  constructor() {
+    return {
+      viewModel: TabComponent,
+      template: SparkMasterTabTemplate
+    };
+  }
+}
+
 export class NotebookV2Tab {
   constructor() {
     return {

src/Explorer/Tree/Collection.ts

@@ -551,11 +551,7 @@ export default class Collection implements ViewModels.Collection {
       dataExplorerArea: Constants.Areas.ResourceTree
     });
 
-    const isSettingsV2Enabled = this.container.isSettingsV2Enabled();
-    if (!isSettingsV2Enabled) {
-      await this.loadOffer();
-    }
-
+    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 => {
@@ -582,30 +578,28 @@ export default class Collection implements ViewModels.Collection {
       onUpdateTabsButtons: this.container.onUpdateTabsButtons
     };
 
+    const isSettingsV2Enabled = this.container.isSettingsV2Enabled();
+    var settingsTab: TabsBase;
     if (isSettingsV2Enabled) {
-      let settingsTabV2 = matchingTabs && (matchingTabs[0] as SettingsTabV2);
-      this.launchSettingsTabV2(settingsTabV2, traceStartData, settingsTabOptions, pendingNotificationsPromise);
+      settingsTab = matchingTabs && (matchingTabs[0] as SettingsTabV2);
     } else {
-      let settingsTab = matchingTabs && (matchingTabs[0] as SettingsTab);
-      this.launchSettingsTabV1(settingsTab, traceStartData, settingsTabOptions, pendingNotificationsPromise);
+      settingsTab = matchingTabs && (matchingTabs[0] as SettingsTab);
     }
-  };
 
-  private launchSettingsTabV1 = (
-    settingsTab: SettingsTab,
-    traceStartData: any,
-    settingsTabOptions: ViewModels.TabOptions,
-    getPendingNotification: Q.Promise<DataModels.Notification>
-  ): void => {
     if (!settingsTab) {
       const startKey: number = TelemetryProcessor.traceStart(Action.Tab, traceStartData);
       settingsTabOptions.onLoadStartKey = startKey;
 
-      getPendingNotification.then(
+      pendingNotificationsPromise.then(
         (data: any) => {
           const pendingNotification: DataModels.Notification = data && data[0];
-          settingsTabOptions.tabKind = ViewModels.CollectionTabKind.Settings;
-          settingsTab = new SettingsTab(settingsTabOptions);
+          if (isSettingsV2Enabled) {
+            settingsTabOptions.tabKind = ViewModels.CollectionTabKind.SettingsV2;
+            settingsTab = new SettingsTabV2(settingsTabOptions);
+          } else {
+            settingsTabOptions.tabKind = ViewModels.CollectionTabKind.Settings;
+            settingsTab = new SettingsTab(settingsTabOptions);
+          }
           this.container.tabsManager.activateNewTab(settingsTab);
           settingsTab.pendingNotification(pendingNotification);
         },
@@ -618,20 +612,20 @@ export default class Collection implements ViewModels.Collection {
               collectionName: this.id(),
               defaultExperience: this.container.defaultExperience(),
               dataExplorerArea: Constants.Areas.Tab,
-              tabTitle: settingsTabOptions.title,
+              tabTitle: tabTitle,
               error: error
             },
             startKey
           );
           NotificationConsoleUtils.logConsoleMessage(
             ConsoleDataType.Error,
-            `Error while fetching container settings for container ${this.id()}: ${error.message}`
+            `Error while fetching container settings for container ${this.id()}: ${JSON.stringify(error)}`
           );
           throw error;
         }
       );
     } else {
-      getPendingNotification.then(
+      pendingNotificationsPromise.then(
         (pendingNotification: DataModels.Notification) => {
           settingsTab.pendingNotification(pendingNotification);
           this.container.tabsManager.activateTab(settingsTab);
@@ -644,28 +638,6 @@ export default class Collection implements ViewModels.Collection {
     }
   };
 
-  private launchSettingsTabV2 = (
-    settingsTabV2: SettingsTabV2,
-    traceStartData: any,
-    settingsTabOptions: ViewModels.TabOptions,
-    getPendingNotification: Q.Promise<DataModels.Notification>
-  ): void => {
-    const settingsTabV2Options: ViewModels.SettingsTabV2Options = {
-      ...settingsTabOptions,
-      getPendingNotification: getPendingNotification
-    };
-
-    if (!settingsTabV2) {
-      const startKey: number = TelemetryProcessor.traceStart(Action.Tab, traceStartData);
-      settingsTabV2Options.onLoadStartKey = startKey;
-      settingsTabV2Options.tabKind = ViewModels.CollectionTabKind.SettingsV2;
-      settingsTabV2 = new SettingsTabV2(settingsTabV2Options);
-      this.container.tabsManager.activateNewTab(settingsTabV2);
-    } else {
-      this.container.tabsManager.activateTab(settingsTabV2);
-    }
-  };
-
   private async loadCollectionQuotaInfo(): Promise<void> {
     // TODO: Use the collection entity cache to get quota info
     const quotaInfoWithUniqueKeyPolicy = await readCollectionQuotaInfo(this);
@@ -869,7 +841,7 @@ export default class Collection implements ViewModels.Collection {
           collectionName: this.id(),
           defaultExperience: this.container.defaultExperience(),
           dataExplorerArea: Constants.Areas.ResourceTree,
-          error: typeof error === "string" ? error : error.message
+          error: typeof error === "string" ? error : JSON.stringify(error)
         });
       }
     );
@@ -928,7 +900,7 @@ export default class Collection implements ViewModels.Collection {
           collectionName: this.id(),
           defaultExperience: this.container.defaultExperience(),
           dataExplorerArea: Constants.Areas.ResourceTree,
-          error: typeof error === "string" ? error : error.message
+          error: typeof error === "string" ? error : JSON.stringify(error)
         });
       }
     );
@@ -988,7 +960,7 @@ export default class Collection implements ViewModels.Collection {
           collectionName: this.id(),
           defaultExperience: this.container.defaultExperience(),
           dataExplorerArea: Constants.Areas.ResourceTree,
-          error: typeof error === "string" ? error : error.message
+          error: typeof error === "string" ? error : JSON.stringify(error)
         });
       }
     );
@@ -1185,7 +1157,7 @@ export default class Collection implements ViewModels.Collection {
           },
           error => {
             record.numFailed++;
-            record.errors = [...record.errors, error.message];
+            record.errors = [...record.errors, JSON.stringify(error)];
             return Q.resolve();
           }
         );
@@ -1238,7 +1210,7 @@ export default class Collection implements ViewModels.Collection {
       (error: any) => {
         Logger.logError(
           JSON.stringify({
-            error: error.message,
+            error: JSON.stringify(error),
             accountName: this.container && this.container.databaseAccount(),
             databaseName: this.databaseId,
             collectionName: this.id()

src/Explorer/Tree/Database.ts

@@ -103,7 +103,7 @@ export default class Database implements ViewModels.Database {
           );
           NotificationConsoleUtils.logConsoleMessage(
             ConsoleDataType.Error,
-            `Error while fetching database settings for database ${this.id()}: ${error.message}`
+            `Error while fetching database settings for database ${this.id()}: ${JSON.stringify(error)}`
           );
           throw error;
         }
@@ -239,7 +239,7 @@ export default class Database implements ViewModels.Database {
       (error: any) => {
         Logger.logError(
           JSON.stringify({
-            error: error.message,
+            error: JSON.stringify(error),
             accountName: this.container && this.container.databaseAccount(),
             databaseName: this.id(),
             collectionName: this.id()

src/Explorer/Tree/StoredProcedure.ts

@@ -158,7 +158,7 @@ export default class StoredProcedure {
             sprocTab.onExecuteSprocsResult(result, result.scriptLogs);
           },
           (error: any) => {
-            sprocTab.onExecuteSprocsError(error.message);
+            sprocTab.onExecuteSprocsError(JSON.stringify(error));
           }
         )
         .finally(() => {

src/GitHub/GitHubContentProvider.ts

@@ -423,7 +423,7 @@ export class GitHubContentProvider implements IContentProvider {
       request: {},
       status: error.errno,
       response: error,
-      responseText: error.message,
+      responseText: JSON.stringify(error),
       responseType: "json"
     };
   }

src/HostedExplorer.ts

@@ -514,7 +514,7 @@ class HostedExplorer {
         actionType: ActionType.TransmitCachedData,
         message: {
           id: message && message.id,
-          error: error.message
+          error: JSON.stringify(error)
         }
       });
     }
@@ -1008,7 +1008,7 @@ class HostedExplorer {
 
       return accounts;
     } catch (error) {
-      this._logConsoleMessage(ConsoleDataType.Error, `Failed to fetch accounts: ${error.message}`);
+      this._logConsoleMessage(ConsoleDataType.Error, `Failed to fetch accounts: ${JSON.stringify(error)}`);
       this._clearInProgressMessageWithId(id);
 
       throw error;
@@ -1047,7 +1047,7 @@ class HostedExplorer {
         displayText: "Error loading account"
       });
       this._updateLoadingStatusText(`Failed to load selected account: ${newAccount.name}`);
-      this._logConsoleMessage(ConsoleDataType.Error, `Failed to connect: ${error.message}`);
+      this._logConsoleMessage(ConsoleDataType.Error, `Failed to connect: ${JSON.stringify(error)}`);
       this._clearInProgressMessageWithId(id);
       throw error;
     }

src/Juno/JunoClient.test.ts

@@ -1,12 +1,9 @@
 import ko from "knockout";
 import { HttpHeaders, HttpStatusCodes } from "../Common/Constants";
-import { IPinnedRepo, JunoClient, IPublishNotebookRequest } from "./JunoClient";
+import { IPinnedRepo, JunoClient } from "./JunoClient";
 import { configContext } from "../ConfigContext";
 import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 import { DatabaseAccount } from "../Contracts/DataModels";
-import { updateUserContext, userContext } from "../UserContext";
-
-const sampleSubscriptionId = "subscriptionId";
 
 const sampleDatabaseAccount: DatabaseAccount = {
   id: "id",
@@ -134,20 +131,11 @@ describe("GitHub", () => {
 
 describe("Gallery", () => {
   const junoClient = new JunoClient(ko.observable<DatabaseAccount>(sampleDatabaseAccount));
-  const originalSubscriptionId = userContext.subscriptionId;
-
-  beforeAll(() => {
-    updateUserContext({ subscriptionId: sampleSubscriptionId });
-  });
 
   afterEach(() => {
     jest.resetAllMocks();
   });
 
-  afterAll(() => {
-    updateUserContext({ subscriptionId: originalSubscriptionId });
-  });
-
   it("getSampleNotebooks", async () => {
     window.fetch = jest.fn().mockReturnValue({
       status: HttpStatusCodes.OK,
@@ -307,15 +295,12 @@ describe("Gallery", () => {
 
     const authorizationHeader = getAuthorizationHeader();
     expect(response.status).toBe(HttpStatusCodes.OK);
-    expect(window.fetch).toBeCalledWith(
-      `${configContext.JUNO_ENDPOINT}/api/notebooks/${sampleSubscriptionId}/gallery/published`,
-      {
-        headers: {
-          [authorizationHeader.header]: authorizationHeader.token,
-          [HttpHeaders.contentType]: "application/json"
-        }
+    expect(window.fetch).toBeCalledWith(`${configContext.JUNO_ENDPOINT}/api/notebooks/gallery/published`, {
+      headers: {
+        [authorizationHeader.header]: authorizationHeader.token,
+        [HttpHeaders.contentType]: "application/json"
       }
-    );
+    });
   });
 
   it("deleteNotebook", async () => {
@@ -345,26 +330,17 @@ describe("Gallery", () => {
     const author = "author";
     const thumbnailUrl = "thumbnailUrl";
     const content = `{ "key": "value" }`;
-    const addLinkToNotebookViewer = false;
     window.fetch = jest.fn().mockReturnValue({
       status: HttpStatusCodes.OK,
       json: () => undefined as any
     });
 
-    const response = await junoClient.publishNotebook(
-      name,
-      description,
-      tags,
-      author,
-      thumbnailUrl,
-      content,
-      addLinkToNotebookViewer
-    );
+    const response = await junoClient.publishNotebook(name, description, tags, author, thumbnailUrl, content, false);
 
     const authorizationHeader = getAuthorizationHeader();
     expect(response.status).toBe(HttpStatusCodes.OK);
     expect(window.fetch).toBeCalledWith(
-      `${configContext.JUNO_ENDPOINT}/api/notebooks/${sampleSubscriptionId}/${sampleDatabaseAccount.name}/gallery`,
+      `${configContext.JUNO_ENDPOINT}/api/notebooks/${sampleDatabaseAccount.name}/gallery`,
       {
         method: "PUT",
         headers: {
@@ -377,9 +353,8 @@ describe("Gallery", () => {
           tags,
           author,
           thumbnailUrl,
-          content: JSON.parse(content),
-          addLinkToNotebookViewer
-        } as IPublishNotebookRequest)
+          content: JSON.parse(content)
+        })
       }
     );
   });

src/Juno/JunoClient.ts

@@ -5,7 +5,6 @@ import * as DataModels from "../Contracts/DataModels";
 import { AuthorizeAccessComponent } from "../Explorer/Controls/GitHub/AuthorizeAccessComponent";
 import { IGitHubResponse } from "../GitHub/GitHubClient";
 import { IGitHubOAuthToken } from "../GitHub/GitHubOAuthService";
-import { userContext } from "../UserContext";
 import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 
 export interface IJunoResponse<T> {
@@ -56,15 +55,13 @@ export interface IUserGallery {
   published: string[];
 }
 
-// Only exported for unit test
-export interface IPublishNotebookRequest {
+interface IPublishNotebookRequest {
   name: string;
   description: string;
   tags: string[];
   author: string;
   thumbnailUrl: string;
   content: any;
-  addLinkToNotebookViewer: boolean;
 }
 
 export class JunoClient {
@@ -334,7 +331,7 @@ export class JunoClient {
   }
 
   public async getPublishedNotebooks(): Promise<IJunoResponse<IGalleryItem[]>> {
-    return await this.getNotebooks(`${this.getNotebooksUrl()}/${this.getSubscriptionId()}/gallery/published`, {
+    return await this.getNotebooks(`${this.getNotebooksUrl()}/gallery/published`, {
       headers: JunoClient.getHeaders()
     });
   }
@@ -365,22 +362,28 @@ export class JunoClient {
     content: string,
     isLinkInjectionEnabled: boolean
   ): Promise<IJunoResponse<IGalleryItem>> {
-    const response = await window.fetch(
-      `${this.getNotebooksUrl()}/${this.getSubscriptionId()}/${this.getAccount()}/gallery`,
-      {
-        method: "PUT",
-        headers: JunoClient.getHeaders(),
-        body: JSON.stringify({
-          name,
-          description,
-          tags,
-          author,
-          thumbnailUrl,
-          content: JSON.parse(content),
-          addLinkToNotebookViewer: isLinkInjectionEnabled
-        } as IPublishNotebookRequest)
-      }
-    );
+    const response = await window.fetch(`${this.getNotebooksAccountUrl()}/gallery`, {
+      method: "PUT",
+      headers: JunoClient.getHeaders(),
+      body: isLinkInjectionEnabled
+        ? JSON.stringify({
+            name,
+            description,
+            tags,
+            author,
+            thumbnailUrl,
+            content: JSON.parse(content),
+            addLinkToNotebookViewer: isLinkInjectionEnabled
+          } as IPublishNotebookRequest)
+        : JSON.stringify({
+            name,
+            description,
+            tags,
+            author,
+            thumbnailUrl,
+            content: JSON.parse(content)
+          } as IPublishNotebookRequest)
+    });
 
     let data: IGalleryItem;
     if (response.status === HttpStatusCodes.OK) {
@@ -445,16 +448,8 @@ export class JunoClient {
     return `${configContext.JUNO_ENDPOINT}/api/notebooks`;
   }
 
-  private getAccount(): string {
-    return this.databaseAccount().name;
-  }
-
-  private getSubscriptionId(): string {
-    return userContext.subscriptionId;
-  }
-
   private getNotebooksAccountUrl(): string {
-    return `${this.getNotebooksUrl()}/${this.getAccount()}`;
+    return `${configContext.JUNO_ENDPOINT}/api/notebooks/${this.databaseAccount().name}`;
   }
 
   private static getHeaders(): HeadersInit {

src/Platform/Hosted/Main.ts

@@ -245,7 +245,7 @@ export default class Main {
         );
       },
       (error: any) => {
-        deferred.reject(`Failed to generate encrypted token: ${error.message}`);
+        deferred.reject(`Failed to generate encrypted token: ${JSON.stringify(error)}`);
       }
     );
 

src/workers/upload/index.ts

@@ -93,7 +93,7 @@ function createDocumentsFromFile(fileName: string, documentContent: string): voi
         })
         .catch(error => {
           console.error(error);
-          recordUploadDetailErrorForFile(fileName, error.message);
+          recordUploadDetailErrorForFile(fileName, JSON.stringify(error));
           numUploadsFailed++;
         })
         .finally(() => {