Disable endtoendpuppeteer tests

Co-authored-by: Daniel Si Pham <v-danpha@microsoft.com>

.github/workflows/ci.yml

@@ -3,8 +3,8 @@ on:
   push:
     branches:
       - master
-      - hotfix/*
-      - release/*
+      - hotfix/**
+      - release/**
   pull_request:
     branches:
       - master
@@ -196,26 +196,6 @@ jobs:
         shell: bash
         env:
           NODE_TLS_REJECT_UNAUTHORIZED: 0
-  endtoendpuppeteer:
-    name: "End to end puppeteer tests"
-    needs: [lint, format, compile, unittest]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      - name: End to End Puppeteer Tests
-        run: |
-          npm ci
-          npm start &
-          npm run wait-for-server
-          npm run test:e2e
-        shell: bash
-        env:
-          NODE_TLS_REJECT_UNAUTHORIZED: 0
-          PORTAL_RUNNER_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_SQL }}
   nuget:
     name: Publish Nuget
     if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/')

less/documentDB.less

@@ -1522,6 +1522,10 @@ p {
     .tooltipVisible();
 }
 
+.infoTooltip a {
+    color: @AccentHigh;
+}
+
 .nowrap {
     white-space: nowrap;
 }
@@ -2972,6 +2976,10 @@ settings-pane {
     .enableAnalyticalStorageRadio:nth-child(n+2) {
         margin-left: @LargeSpace;
     }
+
+    .enableAnalyticalStorageRadioLabel {
+        padding: 0px
+    }
 }
 
 .addCollectionLabel {
@@ -3009,4 +3017,4 @@ settings-pane {
 
 .infoBoxContent a {
     color: @AccentMediumHigh
-} 
+}

src/Common/DataAccessUtilityBase.ts

@@ -1,28 +1,26 @@
-import * as _ from "underscore";
-import * as Constants from "./Constants";
-import * as DataModels from "../Contracts/DataModels";
-import * as HeadersUtility from "./HeadersUtility";
-import * as ViewModels from "../Contracts/ViewModels";
-import Q from "q";
 import {
   ConflictDefinition,
   FeedOptions,
   ItemDefinition,
+  OfferDefinition,
   QueryIterator,
-  Resource,
-  TriggerDefinition,
-  OfferDefinition
+  Resource
 } from "@azure/cosmos";
-import { client } from "./CosmosClient";
-import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";
-import { sendCachedDataMessage } from "./MessageHandler";
-import { MessageTypes } from "../Contracts/ExplorerContracts";
-import { OfferUtils } from "../Utils/OfferUtils";
 import { RequestOptions } from "@azure/cosmos/dist-esm";
-import StoredProcedure from "../Explorer/Tree/StoredProcedure";
-import { Platform, configContext } from "../ConfigContext";
-import DocumentId from "../Explorer/Tree/DocumentId";
+import Q from "q";
+import { configContext, Platform } from "../ConfigContext";
+import * as DataModels from "../Contracts/DataModels";
+import { MessageTypes } from "../Contracts/ExplorerContracts";
+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 { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";
+import { OfferUtils } from "../Utils/OfferUtils";
+import * as Constants from "./Constants";
+import { client } from "./CosmosClient";
+import * as HeadersUtility from "./HeadersUtility";
+import { sendCachedDataMessage } from "./MessageHandler";
 
 export function getCommonQueryOptions(options: FeedOptions): any {
   const storedItemPerPageSetting: number = LocalStorageUtility.getEntryNumber(StorageKey.ActualItemPerPage);
@@ -55,85 +53,55 @@ export function queryDocuments(
   return Q(documentsIterator);
 }
 
-export function readStoredProcedures(
-  collection: ViewModels.Collection,
-  options?: any
-): Q.Promise<DataModels.StoredProcedure[]> {
+export function getPartitionKeyHeaderForConflict(conflictId: ConflictId): Object {
+  const partitionKeyDefinition: DataModels.PartitionKey = conflictId.partitionKey;
+  const partitionKeyValue: any = conflictId.partitionKeyValue;
+
+  return getPartitionKeyHeader(partitionKeyDefinition, partitionKeyValue);
+}
+
+export function getPartitionKeyHeader(partitionKeyDefinition: DataModels.PartitionKey, partitionKeyValue: any): Object {
+  if (!partitionKeyDefinition) {
+    return undefined;
+  }
+
+  if (partitionKeyValue === undefined) {
+    return [{}];
+  }
+
+  return [partitionKeyValue];
+}
+
+export function updateOffer(
+  offer: DataModels.Offer,
+  newOffer: DataModels.Offer,
+  options?: RequestOptions
+): Q.Promise<DataModels.Offer> {
   return Q(
     client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.storedProcedures.readAll(options)
-      .fetchAll()
-      .then(response => response.resources as DataModels.StoredProcedure[])
+      .offer(offer.id)
+      // TODO Remove casting when SDK types are fixed (https://github.com/Azure/azure-sdk-for-js/issues/10660)
+      .replace((newOffer as unknown) as OfferDefinition, options)
+      .then(response => {
+        return Promise.all([refreshCachedOffers(), refreshCachedResources()]).then(() => response.resource);
+      })
   );
 }
 
-export function readStoredProcedure(
-  collection: ViewModels.Collection,
-  requestedResource: DataModels.Resource,
-  options?: any
-): Q.Promise<DataModels.StoredProcedure> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.storedProcedure(requestedResource.id)
-      .read(options)
-      .then(response => response.resource as DataModels.StoredProcedure)
-  );
-}
-export function readUserDefinedFunctions(
-  collection: ViewModels.Collection,
-  options: any
-): Q.Promise<DataModels.UserDefinedFunction[]> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.userDefinedFunctions.readAll(options)
-      .fetchAll()
-      .then(response => response.resources as DataModels.UserDefinedFunction[])
-  );
-}
-export function readUserDefinedFunction(
-  collection: ViewModels.Collection,
-  requestedResource: DataModels.Resource,
-  options?: any
-): Q.Promise<DataModels.UserDefinedFunction> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.userDefinedFunction(requestedResource.id)
-      .read(options)
-      .then(response => response.resource as DataModels.UserDefinedFunction)
-  );
-}
+export function updateDocument(
+  collection: ViewModels.CollectionBase,
+  documentId: DocumentId,
+  newDocument: any
+): Q.Promise<any> {
+  const partitionKey = documentId.partitionKeyValue;
 
-export function readTriggers(collection: ViewModels.Collection, options: any): Q.Promise<DataModels.Trigger[]> {
   return Q(
     client()
       .database(collection.databaseId)
       .container(collection.id())
-      .scripts.triggers.readAll(options)
-      .fetchAll()
-      .then(response => response.resources as DataModels.Trigger[])
-  );
-}
-
-export function readTrigger(
-  collection: ViewModels.Collection,
-  requestedResource: DataModels.Resource,
-  options?: any
-): Q.Promise<DataModels.Trigger> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.trigger(requestedResource.id)
-      .read(options)
-      .then(response => response.resource as DataModels.Trigger)
+      .item(documentId.id(), partitionKey)
+      .replace(newDocument)
+      .then(response => response.resource)
   );
 }
 
@@ -165,6 +133,16 @@ export function executeStoredProcedure(
   );
 }
 
+export function createDocument(collection: ViewModels.CollectionBase, newDocument: any): Q.Promise<any> {
+  return Q(
+    client()
+      .database(collection.databaseId)
+      .container(collection.id())
+      .items.create(newDocument)
+      .then(response => response.resource)
+  );
+}
+
 export function readDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
   const partitionKey = documentId.partitionKeyValue;
 
@@ -178,155 +156,6 @@ export function readDocument(collection: ViewModels.CollectionBase, documentId:
   );
 }
 
-export function getPartitionKeyHeaderForConflict(conflictId: ConflictId): Object {
-  const partitionKeyDefinition: DataModels.PartitionKey = conflictId.partitionKey;
-  const partitionKeyValue: any = conflictId.partitionKeyValue;
-
-  return getPartitionKeyHeader(partitionKeyDefinition, partitionKeyValue);
-}
-
-export function getPartitionKeyHeader(partitionKeyDefinition: DataModels.PartitionKey, partitionKeyValue: any): Object {
-  if (!partitionKeyDefinition) {
-    return undefined;
-  }
-
-  if (partitionKeyValue === undefined) {
-    return [{}];
-  }
-
-  return [partitionKeyValue];
-}
-
-export function updateDocument(
-  collection: ViewModels.CollectionBase,
-  documentId: DocumentId,
-  newDocument: any
-): Q.Promise<any> {
-  const partitionKey = documentId.partitionKeyValue;
-
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .item(documentId.id(), partitionKey)
-      .replace(newDocument)
-      .then(response => response.resource)
-  );
-}
-
-export function updateOffer(
-  offer: DataModels.Offer,
-  newOffer: DataModels.Offer,
-  options?: RequestOptions
-): Q.Promise<DataModels.Offer> {
-  return Q(
-    client()
-      .offer(offer.id)
-      // TODO Remove casting when SDK types are fixed (https://github.com/Azure/azure-sdk-for-js/issues/10660)
-      .replace((newOffer as unknown) as OfferDefinition, options)
-      .then(response => {
-        return Promise.all([refreshCachedOffers(), refreshCachedResources()]).then(() => response.resource);
-      })
-  );
-}
-
-export function updateStoredProcedure(
-  collection: ViewModels.Collection,
-  storedProcedure: DataModels.StoredProcedure,
-  options: any
-): Q.Promise<DataModels.StoredProcedure> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.storedProcedure(storedProcedure.id)
-      .replace(storedProcedure, options)
-      .then(response => response.resource as DataModels.StoredProcedure)
-  );
-}
-
-export function updateUserDefinedFunction(
-  collection: ViewModels.Collection,
-  userDefinedFunction: DataModels.UserDefinedFunction,
-  options?: any
-): Q.Promise<DataModels.UserDefinedFunction> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.userDefinedFunction(userDefinedFunction.id)
-      .replace(userDefinedFunction, options)
-      .then(response => response.resource as DataModels.StoredProcedure)
-  );
-}
-
-export function updateTrigger(
-  collection: ViewModels.Collection,
-  trigger: DataModels.Trigger,
-  options?: any
-): Q.Promise<DataModels.Trigger> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.trigger(trigger.id)
-      .replace(trigger as TriggerDefinition, options)
-      .then(response => response.resource as DataModels.Trigger)
-  );
-}
-
-export function createDocument(collection: ViewModels.CollectionBase, newDocument: any): Q.Promise<any> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .items.create(newDocument)
-      .then(response => response.resource as DataModels.StoredProcedure)
-  );
-}
-
-export function createStoredProcedure(
-  collection: ViewModels.Collection,
-  newStoredProcedure: DataModels.StoredProcedure,
-  options?: any
-): Q.Promise<DataModels.StoredProcedure> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.storedProcedures.create(newStoredProcedure, options)
-      .then(response => response.resource as DataModels.StoredProcedure)
-  );
-}
-
-export function createUserDefinedFunction(
-  collection: ViewModels.Collection,
-  newUserDefinedFunction: DataModels.UserDefinedFunction,
-  options: any
-): Q.Promise<DataModels.UserDefinedFunction> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.userDefinedFunctions.create(newUserDefinedFunction, options)
-      .then(response => response.resource as DataModels.UserDefinedFunction)
-  );
-}
-
-export function createTrigger(
-  collection: ViewModels.Collection,
-  newTrigger: DataModels.Trigger,
-  options?: any
-): Q.Promise<DataModels.Trigger> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.triggers.create(newTrigger as TriggerDefinition, options)
-      .then(response => response.resource as DataModels.Trigger)
-  );
-}
-
 export function deleteDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
   const partitionKey = documentId.partitionKeyValue;
 
@@ -355,48 +184,6 @@ export function deleteConflict(
   );
 }
 
-export function deleteStoredProcedure(
-  collection: ViewModels.Collection,
-  storedProcedure: DataModels.StoredProcedure,
-  options: any
-): Q.Promise<any> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.storedProcedure(storedProcedure.id)
-      .delete()
-  );
-}
-
-export function deleteUserDefinedFunction(
-  collection: ViewModels.Collection,
-  userDefinedFunction: DataModels.UserDefinedFunction,
-  options: any
-): Q.Promise<any> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.userDefinedFunction(userDefinedFunction.id)
-      .delete()
-  );
-}
-
-export function deleteTrigger(
-  collection: ViewModels.Collection,
-  trigger: DataModels.Trigger,
-  options: any
-): Q.Promise<any> {
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .scripts.trigger(trigger.id)
-      .delete()
-  );
-}
-
 export function readCollectionQuotaInfo(
   collection: ViewModels.Collection,
   options: any

src/Common/DocumentClientUtilityBase.ts

@@ -1,18 +1,17 @@
-import * as Constants from "./Constants";
+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 Q from "q";
-import { ConflictDefinition, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
-import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
-import * as DataAccessUtilityBase from "./DataAccessUtilityBase";
-import * as Logger from "./Logger";
-import { MinimalQueryIterator, nextPage } from "./IteratorUtilities";
-import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
-import { RequestOptions } from "@azure/cosmos/dist-esm";
-import StoredProcedure from "../Explorer/Tree/StoredProcedure";
 import ConflictId from "../Explorer/Tree/ConflictId";
 import DocumentId from "../Explorer/Tree/DocumentId";
+import StoredProcedure from "../Explorer/Tree/StoredProcedure";
+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 * as Logger from "./Logger";
 
 // TODO: Log all promise resolutions and errors with verbosity levels
 export function queryDocuments(
@@ -42,121 +41,6 @@ export function getEntityName() {
   return "item";
 }
 
-export function readStoredProcedures(
-  collection: ViewModels.Collection,
-  options: any = {}
-): Q.Promise<DataModels.StoredProcedure[]> {
-  var deferred = Q.defer<DataModels.StoredProcedure[]>();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Querying stored procedures for container ${collection.id()}`
-  );
-  DataAccessUtilityBase.readStoredProcedures(collection, options)
-    .then(
-      (storedProcedures: DataModels.StoredProcedure[]) => {
-        deferred.resolve(storedProcedures);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Failed to query stored procedures for container ${collection.id()}: ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "ReadStoredProcedures", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function readStoredProcedure(
-  collection: ViewModels.Collection,
-  requestedResource: DataModels.Resource,
-  options?: any
-): Q.Promise<DataModels.StoredProcedure> {
-  return DataAccessUtilityBase.readStoredProcedure(collection, requestedResource, options);
-}
-
-export function readUserDefinedFunctions(
-  collection: ViewModels.Collection,
-  options: any = {}
-): Q.Promise<DataModels.UserDefinedFunction[]> {
-  var deferred = Q.defer<DataModels.UserDefinedFunction[]>();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Querying user defined functions for collection ${collection.id()}`
-  );
-  DataAccessUtilityBase.readUserDefinedFunctions(collection, options)
-    .then(
-      (userDefinedFunctions: DataModels.UserDefinedFunction[]) => {
-        deferred.resolve(userDefinedFunctions);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Failed to query user defined functions for container ${collection.id()}: ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "ReadUDFs", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function readUserDefinedFunction(
-  collection: ViewModels.Collection,
-  requestedResource: DataModels.Resource,
-  options: any
-): Q.Promise<DataModels.UserDefinedFunction> {
-  return DataAccessUtilityBase.readUserDefinedFunction(collection, requestedResource, options);
-}
-
-export function readTriggers(collection: ViewModels.Collection, options: any): Q.Promise<DataModels.Trigger[]> {
-  var deferred = Q.defer<DataModels.Trigger[]>();
-
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Querying triggers for container ${collection.id()}`
-  );
-  DataAccessUtilityBase.readTriggers(collection, options)
-    .then(
-      (triggers: DataModels.Trigger[]) => {
-        deferred.resolve(triggers);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Failed to query triggers for container ${collection.id()}: ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "ReadTriggers", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function readTrigger(
-  collection: ViewModels.Collection,
-  requestedResource: DataModels.Resource,
-  options?: any
-): Q.Promise<DataModels.Trigger> {
-  return DataAccessUtilityBase.readTrigger(collection, requestedResource, options);
-}
-
 export function executeStoredProcedure(
   collection: ViewModels.Collection,
   storedProcedure: StoredProcedure,
@@ -165,22 +49,17 @@ export function executeStoredProcedure(
 ): Q.Promise<any> {
   var deferred = Q.defer<any>();
 
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Executing stored procedure ${storedProcedure.id()}`
-  );
+  const clearMessage = logConsoleProgress(`Executing stored procedure ${storedProcedure.id()}`);
   DataAccessUtilityBase.executeStoredProcedure(collection, storedProcedure, partitionKeyValue, params)
     .then(
       (response: any) => {
         deferred.resolve(response);
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
+        logConsoleInfo(
           `Finished executing stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}`
         );
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
+        logConsoleError(
           `Failed to execute stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}: ${JSON.stringify(
             error
           )}`
@@ -191,7 +70,7 @@ export function executeStoredProcedure(
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -205,32 +84,23 @@ export function queryDocumentsPage(
 ): Q.Promise<ViewModels.QueryResults> {
   var deferred = Q.defer<ViewModels.QueryResults>();
   const entityName = getEntityName();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Querying ${entityName} for container ${resourceName}`
-  );
+  const clearMessage = logConsoleProgress(`Querying ${entityName} for container ${resourceName}`);
   Q(nextPage(documentsIterator, firstItemIndex))
     .then(
       (result: ViewModels.QueryResults) => {
         const itemCount = (result.documents && result.documents.length) || 0;
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully fetched ${itemCount} ${entityName} for container ${resourceName}`
-        );
+        logConsoleInfo(`Successfully fetched ${itemCount} ${entityName} for container ${resourceName}`);
         deferred.resolve(result);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Failed to query ${entityName} for container ${resourceName}: ${JSON.stringify(error)}`
-        );
+        logConsoleError(`Failed to query ${entityName} for container ${resourceName}: ${JSON.stringify(error)}`);
         Logger.logError(JSON.stringify(error), "QueryDocumentsPage", error.code);
         sendNotificationForError(error);
         deferred.reject(error);
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -239,27 +109,21 @@ export function queryDocumentsPage(
 export function readDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
   var deferred = Q.defer<any>();
   const entityName = getEntityName();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Reading ${entityName} ${documentId.id()}`
-  );
+  const clearMessage = logConsoleProgress(`Reading ${entityName} ${documentId.id()}`);
   DataAccessUtilityBase.readDocument(collection, documentId)
     .then(
       (document: any) => {
         deferred.resolve(document);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Failed to read ${entityName} ${documentId.id()}: ${JSON.stringify(error)}`
-        );
+        logConsoleError(`Failed to read ${entityName} ${documentId.id()}: ${JSON.stringify(error)}`);
         Logger.logError(JSON.stringify(error), "ReadDocument", error.code);
         sendNotificationForError(error);
         deferred.reject(error);
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -272,31 +136,22 @@ export function updateDocument(
 ): Q.Promise<any> {
   var deferred = Q.defer<any>();
   const entityName = getEntityName();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Updating ${entityName} ${documentId.id()}`
-  );
+  const clearMessage = logConsoleProgress(`Updating ${entityName} ${documentId.id()}`);
   DataAccessUtilityBase.updateDocument(collection, documentId, newDocument)
     .then(
       (updatedDocument: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully updated ${entityName} ${documentId.id()}`
-        );
+        logConsoleInfo(`Successfully updated ${entityName} ${documentId.id()}`);
         deferred.resolve(updatedDocument);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Failed to update ${entityName} ${documentId.id()}: ${JSON.stringify(error)}`
-        );
+        logConsoleError(`Failed to update ${entityName} ${documentId.id()}: ${JSON.stringify(error)}`);
         Logger.logError(JSON.stringify(error), "UpdateDocument", error.code);
         sendNotificationForError(error);
         deferred.reject(error);
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -308,24 +163,15 @@ export function updateOffer(
   options: RequestOptions
 ): Q.Promise<DataModels.Offer> {
   var deferred = Q.defer<any>();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Updating offer for resource ${offer.resource}`
-  );
+  const clearMessage = logConsoleProgress(`Updating offer for resource ${offer.resource}`);
   DataAccessUtilityBase.updateOffer(offer, newOffer, options)
     .then(
       (replacedOffer: DataModels.Offer) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully updated offer for resource ${offer.resource}`
-        );
+        logConsoleInfo(`Successfully updated offer for resource ${offer.resource}`);
         deferred.resolve(replacedOffer);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error updating offer for resource ${offer.resource}: ${JSON.stringify(error)}`
-        );
+        logConsoleError(`Error updating offer for resource ${offer.resource}: ${JSON.stringify(error)}`);
         Logger.logError(
           JSON.stringify({
             oldOffer: offer,
@@ -340,108 +186,7 @@ export function updateOffer(
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function updateStoredProcedure(
-  collection: ViewModels.Collection,
-  storedProcedure: DataModels.StoredProcedure,
-  options?: any
-): Q.Promise<DataModels.StoredProcedure> {
-  var deferred = Q.defer<any>();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Updating stored procedure ${storedProcedure.id}`
-  );
-  DataAccessUtilityBase.updateStoredProcedure(collection, storedProcedure, options)
-    .then(
-      (updatedStoredProcedure: DataModels.StoredProcedure) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully updated stored procedure ${storedProcedure.id}`
-        );
-        deferred.resolve(updatedStoredProcedure);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while updating stored procedure ${storedProcedure.id}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "UpdateStoredProcedure", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function updateUserDefinedFunction(
-  collection: ViewModels.Collection,
-  userDefinedFunction: DataModels.UserDefinedFunction,
-  options: any = {}
-): Q.Promise<DataModels.UserDefinedFunction> {
-  var deferred = Q.defer<any>();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Updating user defined function ${userDefinedFunction.id}`
-  );
-  DataAccessUtilityBase.updateUserDefinedFunction(collection, userDefinedFunction, options)
-    .then(
-      (updatedUserDefinedFunction: DataModels.UserDefinedFunction) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully updated user defined function ${userDefinedFunction.id}`
-        );
-        deferred.resolve(updatedUserDefinedFunction);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while updating user defined function ${userDefinedFunction.id}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "UpdateUDF", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function updateTrigger(
-  collection: ViewModels.Collection,
-  trigger: DataModels.Trigger
-): Q.Promise<DataModels.Trigger> {
-  var deferred = Q.defer<any>();
-  const id = NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.InProgress, `Updating trigger ${trigger.id}`);
-  DataAccessUtilityBase.updateTrigger(collection, trigger)
-    .then(
-      (updatedTrigger: DataModels.Trigger) => {
-        NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Info, `Updated trigger ${trigger.id}`);
-        deferred.resolve(updatedTrigger);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while updating trigger ${trigger.id}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "UpdateTrigger", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -450,22 +195,15 @@ export function updateTrigger(
 export function createDocument(collection: ViewModels.CollectionBase, newDocument: any): Q.Promise<any> {
   var deferred = Q.defer<any>();
   const entityName = getEntityName();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Creating new ${entityName} for container ${collection.id()}`
-  );
+  const clearMessage = logConsoleProgress(`Creating new ${entityName} for container ${collection.id()}`);
   DataAccessUtilityBase.createDocument(collection, newDocument)
     .then(
       (savedDocument: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully created new ${entityName} for container ${collection.id()}`
-        );
+        logConsoleInfo(`Successfully created new ${entityName} for container ${collection.id()}`);
         deferred.resolve(savedDocument);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
+        logConsoleError(
           `Error while creating new ${entityName} for container ${collection.id()}:\n ${JSON.stringify(error)}`
         );
         Logger.logError(JSON.stringify(error), "CreateDocument", error.code);
@@ -474,115 +212,7 @@ export function createDocument(collection: ViewModels.CollectionBase, newDocumen
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function createStoredProcedure(
-  collection: ViewModels.Collection,
-  newStoredProcedure: DataModels.StoredProcedure,
-  options?: any
-): Q.Promise<DataModels.StoredProcedure> {
-  var deferred = Q.defer<any>();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Creating stored procedure for container ${collection.id()}`
-  );
-  DataAccessUtilityBase.createStoredProcedure(collection, newStoredProcedure, options)
-    .then(
-      (createdStoredProcedure: DataModels.StoredProcedure) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully created stored procedure for container ${collection.id()}`
-        );
-        deferred.resolve(createdStoredProcedure);
-      },
-      error => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while creating stored procedure for container ${collection.id()}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "CreateStoredProcedure", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function createUserDefinedFunction(
-  collection: ViewModels.Collection,
-  newUserDefinedFunction: DataModels.UserDefinedFunction,
-  options?: any
-): Q.Promise<DataModels.UserDefinedFunction> {
-  var deferred = Q.defer<any>();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Creating user defined function for container ${collection.id()}`
-  );
-  DataAccessUtilityBase.createUserDefinedFunction(collection, newUserDefinedFunction, options)
-    .then(
-      (createdUserDefinedFunction: DataModels.UserDefinedFunction) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully created user defined function for container ${collection.id()}`
-        );
-        deferred.resolve(createdUserDefinedFunction);
-      },
-      error => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while creating user defined function for container ${collection.id()}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "CreateUDF", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function createTrigger(
-  collection: ViewModels.Collection,
-  newTrigger: DataModels.Trigger,
-  options: any = {}
-): Q.Promise<DataModels.Trigger> {
-  var deferred = Q.defer<any>();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Creating trigger for container ${collection.id()}`
-  );
-  DataAccessUtilityBase.createTrigger(collection, newTrigger, options)
-    .then(
-      (createdTrigger: DataModels.Trigger) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully created trigger for container ${collection.id()}`
-        );
-        deferred.resolve(createdTrigger);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while creating trigger for container ${collection.id()}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "CreateTrigger", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -591,31 +221,22 @@ export function createTrigger(
 export function deleteDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
   var deferred = Q.defer<any>();
   const entityName = getEntityName();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Deleting ${entityName} ${documentId.id()}`
-  );
+  const clearMessage = logConsoleProgress(`Deleting ${entityName} ${documentId.id()}`);
   DataAccessUtilityBase.deleteDocument(collection, documentId)
     .then(
       (response: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully deleted ${entityName} ${documentId.id()}`
-        );
+        logConsoleInfo(`Successfully deleted ${entityName} ${documentId.id()}`);
         deferred.resolve(response);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while deleting ${entityName} ${documentId.id()}:\n ${JSON.stringify(error)}`
-        );
+        logConsoleError(`Error while deleting ${entityName} ${documentId.id()}:\n ${JSON.stringify(error)}`);
         Logger.logError(JSON.stringify(error), "DeleteDocument", error.code);
         sendNotificationForError(error);
         deferred.reject(error);
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -628,134 +249,22 @@ export function deleteConflict(
 ): Q.Promise<any> {
   var deferred = Q.defer<any>();
 
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Deleting conflict ${conflictId.id()}`
-  );
+  const clearMessage = logConsoleProgress(`Deleting conflict ${conflictId.id()}`);
   DataAccessUtilityBase.deleteConflict(collection, conflictId, options)
     .then(
       (response: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully deleted conflict ${conflictId.id()}`
-        );
+        logConsoleInfo(`Successfully deleted conflict ${conflictId.id()}`);
         deferred.resolve(response);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while deleting conflict ${conflictId.id()}:\n ${JSON.stringify(error)}`
-        );
+        logConsoleError(`Error while deleting conflict ${conflictId.id()}:\n ${JSON.stringify(error)}`);
         Logger.logError(JSON.stringify(error), "DeleteConflict", error.code);
         sendNotificationForError(error);
         deferred.reject(error);
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function deleteStoredProcedure(
-  collection: ViewModels.Collection,
-  storedProcedure: DataModels.StoredProcedure,
-  options: any = {}
-): Q.Promise<DataModels.StoredProcedure> {
-  var deferred = Q.defer<any>();
-
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Deleting stored procedure ${storedProcedure.id}`
-  );
-  DataAccessUtilityBase.deleteStoredProcedure(collection, storedProcedure, options)
-    .then(
-      (response: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully deleted stored procedure ${storedProcedure.id}`
-        );
-        deferred.resolve(response);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while deleting stored procedure ${storedProcedure.id}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "DeleteStoredProcedure", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function deleteUserDefinedFunction(
-  collection: ViewModels.Collection,
-  userDefinedFunction: DataModels.UserDefinedFunction,
-  options: any = {}
-): Q.Promise<DataModels.UserDefinedFunction> {
-  var deferred = Q.defer<any>();
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Deleting user defined function ${userDefinedFunction.id}`
-  );
-  DataAccessUtilityBase.deleteUserDefinedFunction(collection, userDefinedFunction, options)
-    .then(
-      (response: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Info,
-          `Successfully deleted user defined function ${userDefinedFunction.id}`
-        );
-        deferred.resolve(response);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while deleting user defined function ${userDefinedFunction.id}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "DeleteUDF", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
-    });
-
-  return deferred.promise;
-}
-
-export function deleteTrigger(
-  collection: ViewModels.Collection,
-  trigger: DataModels.Trigger,
-  options: any = {}
-): Q.Promise<DataModels.Trigger> {
-  var deferred = Q.defer<any>();
-  const id = NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.InProgress, `Deleting trigger ${trigger.id}`);
-  DataAccessUtilityBase.deleteTrigger(collection, trigger, options)
-    .then(
-      (response: any) => {
-        NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Info, `Successfully deleted trigger ${trigger.id}`);
-        deferred.resolve(response);
-      },
-      (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while deleting trigger ${trigger.id}:\n ${JSON.stringify(error)}`
-        );
-        Logger.logError(JSON.stringify(error), "DeleteTrigger", error.code);
-        sendNotificationForError(error);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -775,27 +284,21 @@ export function readCollectionQuotaInfo(
 ): Q.Promise<DataModels.CollectionQuotaInfo> {
   var deferred = Q.defer<DataModels.CollectionQuotaInfo>();
 
-  const id = NotificationConsoleUtils.logConsoleMessage(
-    ConsoleDataType.InProgress,
-    `Querying quota info for container ${collection.id}`
-  );
+  const clearMessage = logConsoleProgress(`Querying quota info for container ${collection.id}`);
   DataAccessUtilityBase.readCollectionQuotaInfo(collection, options)
     .then(
       (quota: DataModels.CollectionQuotaInfo) => {
         deferred.resolve(quota);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while querying quota info for container ${collection.id}:\n ${JSON.stringify(error)}`
-        );
+        logConsoleError(`Error while querying quota info for container ${collection.id}:\n ${JSON.stringify(error)}`);
         Logger.logError(JSON.stringify(error), "ReadCollectionQuotaInfo", error.code);
         sendNotificationForError(error);
         deferred.reject(error);
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -804,24 +307,21 @@ export function readCollectionQuotaInfo(
 export function readOffers(options: any = {}): Q.Promise<DataModels.Offer[]> {
   var deferred = Q.defer<DataModels.Offer[]>();
 
-  const id = NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.InProgress, "Querying offers");
+  const clearMessage = logConsoleProgress("Querying offers");
   DataAccessUtilityBase.readOffers(options)
     .then(
       (offers: DataModels.Offer[]) => {
         deferred.resolve(offers);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while querying offers:\n ${JSON.stringify(error)}`
-        );
+        logConsoleError(`Error while querying offers:\n ${JSON.stringify(error)}`);
         Logger.logError(JSON.stringify(error), "ReadOffers", error.code);
         sendNotificationForError(error);
         deferred.reject(error);
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;
@@ -833,24 +333,21 @@ export function readOffer(
 ): Q.Promise<DataModels.OfferWithHeaders> {
   var deferred = Q.defer<DataModels.OfferWithHeaders>();
 
-  const id = NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.InProgress, "Querying offer");
+  const clearMessage = logConsoleProgress("Querying offer");
   DataAccessUtilityBase.readOffer(requestedResource, options)
     .then(
       (offer: DataModels.OfferWithHeaders) => {
         deferred.resolve(offer);
       },
       (error: any) => {
-        NotificationConsoleUtils.logConsoleMessage(
-          ConsoleDataType.Error,
-          `Error while querying offer:\n ${JSON.stringify(error)}`
-        );
+        logConsoleError(`Error while querying offer:\n ${JSON.stringify(error)}`);
         Logger.logError(JSON.stringify(error), "ReadOffer", error.code);
         sendNotificationForError(error);
         deferred.reject(error);
       }
     )
     .finally(() => {
-      NotificationConsoleUtils.clearInProgressMessageWithId(id);
+      clearMessage();
     });
 
   return deferred.promise;

src/Common/MessageHandler.test.ts

@@ -1,6 +1,5 @@
 import Q from "q";
 import * as MessageHandler from "./MessageHandler";
-import { MessageTypes } from "../Contracts/ExplorerContracts";
 
 describe("Message Handler", () => {
   it("should handle cached message", async () => {
@@ -26,4 +25,34 @@ describe("Message Handler", () => {
     MessageHandler.runGarbageCollector();
     expect(MessageHandler.RequestMap["123"]).toBeUndefined();
   });
+
+  describe("getDataExplorerWindow", () => {
+    it("should return current window if current window has dataExplorerPlatform property", () => {
+      const currentWindow: Window = { dataExplorerPlatform: 0 } as any;
+
+      expect(MessageHandler.getDataExplorerWindow(currentWindow)).toEqual(currentWindow);
+    });
+
+    it("should return current window's parent if current window's parent has dataExplorerPlatform property", () => {
+      const parentWindow: Window = { dataExplorerPlatform: 0 } as any;
+      const currentWindow: Window = { parent: parentWindow } as any;
+
+      expect(MessageHandler.getDataExplorerWindow(currentWindow)).toEqual(parentWindow);
+    });
+
+    it("should return undefined if none of the windows in the hierarchy have dataExplorerPlatform property and window's parent is reference to itself", () => {
+      const parentWindow: Window = {} as any;
+      (parentWindow as any).parent = parentWindow; // If a window does not have a parent, its parent property is a reference to itself.
+      const currentWindow: Window = { parent: parentWindow } as any;
+
+      expect(MessageHandler.getDataExplorerWindow(currentWindow)).toBeUndefined();
+    });
+
+    it("should return undefined if none of the windows in the hierarchy have dataExplorerPlatform property and window's parent is not defined", () => {
+      const parentWindow: Window = {} as any;
+      const currentWindow: Window = { parent: parentWindow } as any;
+
+      expect(MessageHandler.getDataExplorerWindow(currentWindow)).toBeUndefined();
+    });
+  });
 });

src/Common/MessageHandler.ts

@@ -48,16 +48,43 @@ export function sendCachedDataMessage<TResponseDataModel>(
 
 export function sendMessage(data: any): void {
   if (canSendMessage()) {
-    window.parent.postMessage(
+    // We try to find data explorer window first, then fallback to current window
+    const portalChildWindow = getDataExplorerWindow(window) || window;
+    portalChildWindow.parent.postMessage(
       {
         signature: "pcIframe",
         data: data
       },
-      window.document.referrer
+      portalChildWindow.document.referrer
     );
   }
 }
 
+// Only exported for unit tests
+export const getDataExplorerWindow = (currentWindow: Window): Window | undefined => {
+  // Start with the current window and traverse up the parent hierarchy to find a window
+  // with `dataExplorerPlatform` property
+  let dataExplorerWindow: Window | undefined = currentWindow;
+
+  try {
+    // TODO: Need to `any` here since the window imports Explorer which can't be in strict mode yet
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    while (dataExplorerWindow && (dataExplorerWindow as any).dataExplorerPlatform == undefined) {
+      // If a window does not have a parent, its parent property is a reference to itself.
+      if (dataExplorerWindow.parent == dataExplorerWindow) {
+        dataExplorerWindow = undefined;
+      } else {
+        dataExplorerWindow = dataExplorerWindow.parent;
+      }
+    }
+  } catch (error) {
+    // This can happen if we come across parent from a different origin
+    dataExplorerWindow = undefined;
+  }
+
+  return dataExplorerWindow;
+};
+
 export function canSendMessage(): boolean {
   return window.parent !== window;
 }

src/Common/dataAccess/createStoredProcedure.ts

@@ -0,0 +1,28 @@
+import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function createStoredProcedure(
+  databaseId: string,
+  collectionId: string,
+  storedProcedure: StoredProcedureDefinition
+): Promise<StoredProcedureDefinition & Resource> {
+  let createdStoredProcedure: StoredProcedureDefinition & Resource;
+  const clearMessage = logConsoleProgress(`Creating stored procedure ${storedProcedure.id}`);
+  try {
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.storedProcedures.create(storedProcedure);
+    createdStoredProcedure = response.resource;
+  } catch (error) {
+    logConsoleError(`Error while creating stored procedure ${storedProcedure.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "CreateStoredProcedure", error.code);
+    sendNotificationForError(error);
+  }
+
+  clearMessage();
+  return createdStoredProcedure;
+}

src/Common/dataAccess/createTrigger.ts

@@ -0,0 +1,28 @@
+import { Resource, TriggerDefinition } from "@azure/cosmos";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function createTrigger(
+  databaseId: string,
+  collectionId: string,
+  trigger: TriggerDefinition
+): Promise<TriggerDefinition & Resource> {
+  let createdTrigger: TriggerDefinition & Resource;
+  const clearMessage = logConsoleProgress(`Creating trigger ${trigger.id}`);
+  try {
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.triggers.create(trigger);
+    createdTrigger = response.resource;
+  } catch (error) {
+    logConsoleError(`Error while creating trigger ${trigger.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "CreateTrigger", error.code);
+    sendNotificationForError(error);
+  }
+
+  clearMessage();
+  return createdTrigger;
+}

src/Common/dataAccess/createUserDefinedFunction.ts

@@ -0,0 +1,28 @@
+import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function createUserDefinedFunction(
+  databaseId: string,
+  collectionId: string,
+  userDefinedFunction: UserDefinedFunctionDefinition
+): Promise<UserDefinedFunctionDefinition & Resource> {
+  let createdUserDefinedFunction: UserDefinedFunctionDefinition & Resource;
+  const clearMessage = logConsoleProgress(`Creating user defined function ${userDefinedFunction.id}`);
+  try {
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.userDefinedFunctions.create(userDefinedFunction);
+    createdUserDefinedFunction = response.resource;
+  } catch (error) {
+    logConsoleError(`Error while creating user defined function ${userDefinedFunction.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "CreateUserupdateUserDefinedFunction", error.code);
+    sendNotificationForError(error);
+  }
+
+  clearMessage();
+  return createdUserDefinedFunction;
+}

src/Common/dataAccess/deleteStoredProcedure.ts

@@ -0,0 +1,26 @@
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function deleteStoredProcedure(
+  databaseId: string,
+  collectionId: string,
+  storedProcedureId: string
+): Promise<void> {
+  const clearMessage = logConsoleProgress(`Deleting stored procedure ${storedProcedureId}`);
+  try {
+    await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.storedProcedure(storedProcedureId)
+      .delete();
+  } catch (error) {
+    logConsoleError(`Error while deleting stored procedure ${storedProcedureId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "DeleteStoredProcedure", error.code);
+    sendNotificationForError(error);
+  }
+
+  clearMessage();
+  return undefined;
+}

src/Common/dataAccess/deleteTrigger.ts

@@ -0,0 +1,22 @@
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function deleteTrigger(databaseId: string, collectionId: string, triggerId: string): Promise<void> {
+  const clearMessage = logConsoleProgress(`Deleting trigger ${triggerId}`);
+  try {
+    await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.trigger(triggerId)
+      .delete();
+  } catch (error) {
+    logConsoleError(`Error while deleting trigger ${triggerId}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "DeleteTrigger", error.code);
+    sendNotificationForError(error);
+  }
+
+  clearMessage();
+  return undefined;
+}

src/Common/dataAccess/deleteUserDefinedFunction.ts

@@ -0,0 +1,22 @@
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function deleteUserDefinedFunction(databaseId: string, collectionId: string, id: string): Promise<void> {
+  const clearMessage = logConsoleProgress(`Deleting user defined function ${id}`);
+  try {
+    await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.userDefinedFunction(id)
+      .delete();
+  } catch (error) {
+    logConsoleError(`Error while deleting user defined function ${id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "DeleteUserDefinedFunction", error.code);
+    sendNotificationForError(error);
+  }
+
+  clearMessage();
+  return undefined;
+}

src/Common/dataAccess/readStoredProcedures.ts

@@ -0,0 +1,27 @@
+import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function readStoredProcedures(
+  databaseId: string,
+  collectionId: string
+): Promise<(StoredProcedureDefinition & Resource)[]> {
+  let sprocs: (StoredProcedureDefinition & Resource)[];
+  const clearMessage = logConsoleProgress(`Querying stored procedures for container ${collectionId}`);
+  try {
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.storedProcedures.readAll()
+      .fetchAll();
+    sprocs = response.resources;
+  } catch (error) {
+    logConsoleError(`Failed to query stored procedures for container ${collectionId}: ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadStoredProcedures", error.code);
+    sendNotificationForError(error);
+  }
+  clearMessage();
+  return sprocs;
+}

src/Common/dataAccess/readTriggers.ts

@@ -0,0 +1,27 @@
+import { Resource, TriggerDefinition } from "@azure/cosmos";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function readTriggers(
+  databaseId: string,
+  collectionId: string
+): Promise<(TriggerDefinition & Resource)[]> {
+  let triggers: (TriggerDefinition & Resource)[];
+  const clearMessage = logConsoleProgress(`Querying triggers for container ${collectionId}`);
+  try {
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.triggers.readAll()
+      .fetchAll();
+    triggers = response.resources;
+  } catch (error) {
+    logConsoleError(`Failed to query triggers for container ${collectionId}: ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadTriggers", error.code);
+    sendNotificationForError(error);
+  }
+  clearMessage();
+  return triggers;
+}

src/Common/dataAccess/readUserDefinedFunctions.ts

@@ -0,0 +1,27 @@
+import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function readUserDefinedFunctions(
+  databaseId: string,
+  collectionId: string
+): Promise<(UserDefinedFunctionDefinition & Resource)[]> {
+  let udfs: (UserDefinedFunctionDefinition & Resource)[];
+  const clearMessage = logConsoleProgress(`Querying user defined functions for container ${collectionId}`);
+  try {
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.userDefinedFunctions.readAll()
+      .fetchAll();
+    udfs = response.resources;
+  } catch (error) {
+    logConsoleError(`Failed to query user defined functions for container ${collectionId}: ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "ReadUserDefinedFunctions", error.code);
+    sendNotificationForError(error);
+  }
+  clearMessage();
+  return udfs;
+}

src/Common/dataAccess/updateStoredProcedure.ts

@@ -0,0 +1,29 @@
+import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function updateStoredProcedure(
+  databaseId: string,
+  collectionId: string,
+  storedProcedure: StoredProcedureDefinition
+): Promise<StoredProcedureDefinition & Resource> {
+  let updatedStoredProcedure: StoredProcedureDefinition & Resource;
+  const clearMessage = logConsoleProgress(`Updating stored procedure ${storedProcedure.id}`);
+  try {
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.storedProcedure(storedProcedure.id)
+      .replace(storedProcedure);
+    updatedStoredProcedure = response.resource;
+  } catch (error) {
+    logConsoleError(`Error while updating stored procedure ${storedProcedure.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "UpdateStoredProcedure", error.code);
+    sendNotificationForError(error);
+  }
+
+  clearMessage();
+  return updatedStoredProcedure;
+}

src/Common/dataAccess/updateTrigger.ts

@@ -0,0 +1,29 @@
+import { TriggerDefinition } from "@azure/cosmos";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function updateTrigger(
+  databaseId: string,
+  collectionId: string,
+  trigger: TriggerDefinition
+): Promise<TriggerDefinition> {
+  let updatedTrigger: TriggerDefinition;
+  const clearMessage = logConsoleProgress(`Updating trigger ${trigger.id}`);
+  try {
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.trigger(trigger.id)
+      .replace(trigger);
+    updatedTrigger = response.resource;
+  } catch (error) {
+    logConsoleError(`Error while updating trigger ${trigger.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "UpdateTrigger", error.code);
+    sendNotificationForError(error);
+  }
+
+  clearMessage();
+  return updatedTrigger;
+}

src/Common/dataAccess/updateUserDefinedFunction.ts

@@ -0,0 +1,29 @@
+import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
+import { logConsoleError, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import { client } from "../CosmosClient";
+import { logError } from "../Logger";
+import { sendNotificationForError } from "./sendNotificationForError";
+
+export async function updateUserDefinedFunction(
+  databaseId: string,
+  collectionId: string,
+  userDefinedFunction: UserDefinedFunctionDefinition
+): Promise<UserDefinedFunctionDefinition & Resource> {
+  let updatedUserDefinedFunction: UserDefinedFunctionDefinition & Resource;
+  const clearMessage = logConsoleProgress(`Updating user defined function ${userDefinedFunction.id}`);
+  try {
+    const response = await client()
+      .database(databaseId)
+      .container(collectionId)
+      .scripts.userDefinedFunction(userDefinedFunction.id)
+      .replace(userDefinedFunction);
+    updatedUserDefinedFunction = response.resource;
+  } catch (error) {
+    logConsoleError(`Error while updating user defined function ${userDefinedFunction.id}:\n ${JSON.stringify(error)}`);
+    logError(JSON.stringify(error), "UpdateUserupdateUserDefinedFunction", error.code);
+    sendNotificationForError(error);
+  }
+
+  clearMessage();
+  return updatedUserDefinedFunction;
+}

src/Contracts/DataModels.ts

@@ -88,10 +88,6 @@ export interface Resource {
   id: string;
 }
 
-export interface ResourceRequest {
-  id: string;
-}
-
 export interface Collection extends Resource {
   defaultTtl?: number;
   indexingPolicy?: IndexingPolicy;
@@ -104,39 +100,12 @@ export interface Collection extends Resource {
   geospatialConfig?: GeospatialConfig;
 }
 
-export interface CreateCollectionWithRpResponse extends Resource {
-  properties: Collection;
-  name: string;
-  type: string;
-}
-
-export interface CollectionRequest extends ResourceRequest {
-  defaultTtl?: number;
-  indexingPolicy?: IndexingPolicy;
-  partitionKey?: PartitionKey;
-  uniqueKeyPolicy?: UniqueKeyPolicy;
-  conflictResolutionPolicy?: ConflictResolutionPolicy;
-}
-
 export interface Database extends Resource {
   collections?: Collection[];
 }
 
 export interface DocumentId extends Resource {}
 
-export interface Script extends Resource {
-  body: string;
-}
-
-export interface StoredProcedure extends Script {}
-
-export interface UserDefinedFunction extends Script {}
-
-export interface Trigger extends Script {
-  triggerType: string;
-  triggerOperation: string;
-}
-
 export interface ConflictId extends Resource {
   resourceId?: string;
   resourceType?: string;
@@ -259,28 +228,6 @@ export interface ErrorDataModel {
   code?: string;
 }
 
-/**
- * Defines a property bag for telemetry e.g. see ITelemetryError.
- */
-export interface ITelemetryProperties {
-  [propertyName: string]: string;
-}
-
-/**
- * Defines a property bag for telemetry e.g. see ITelemetryError.
- */
-export interface ITelemetryEvent {
-  name: string;
-  properties?: ITelemetryProperties;
-}
-
-/**
- * Defines an error to be logged as telemetry data.
- */
-export interface ITelemetryError extends ITelemetryEvent {
-  error: any;
-}
-
 export interface CreateDatabaseAndCollectionRequest {
   databaseId: string;
   collectionId: string;
@@ -307,11 +254,6 @@ export enum AutopilotTier {
   Tier4 = 4
 }
 
-export interface RpOptions {
-  // tier is sent as string, autoscale as object (AutoPilotCreationSettings)
-  [key: string]: string | AutoPilotCreationSettings;
-}
-
 export interface Query {
   id: string;
   resourceId: string;
@@ -347,12 +289,6 @@ export interface CreateCollectionParams {
   uniqueKeyPolicy?: UniqueKeyPolicy;
 }
 
-export interface SharedThroughputRange {
-  minimumRU: number;
-  maximumRU: number;
-  defaultRU: number;
-}
-
 export interface Notification {
   id: string;
   kind: string;
@@ -495,25 +431,6 @@ export interface NotebookConfigurationEndpointInfo {
   token: string;
 }
 
-export interface SparkCluster {
-  id: string;
-  name: string;
-  type: string;
-  properties: {
-    kind: string;
-    driverSize: string;
-    workerSize: string;
-    workerInstanceCount: number;
-    creationTime: string;
-    status: string;
-    libraries?: SparkClusterLibrary[];
-  };
-}
-
-export interface SparkClusterFeedResponse {
-  value: SparkCluster[];
-}
-
 export interface SparkClusterConnectionInfo {
   userName: string;
   password: string;
@@ -555,79 +472,10 @@ export interface MongoParameters extends RpParameters {
   analyticalStorageTtl?: number;
 }
 
-export interface GraphParameters extends RpParameters {
-  pk: string;
-  coll: string;
-  cd: Boolean;
-  indexingPolicy?: IndexingPolicy;
-}
-
-export interface CreationRequest {
-  properties: {
-    resource: {
-      id: string;
-    };
-    options: RpOptions;
-  };
-}
-
-export interface SqlCollectionParameters extends RpParameters {
-  uniqueKeyPolicy?: UniqueKeyPolicy;
-  pk: string;
-  coll: string;
-  cd: Boolean;
-  analyticalStorageTtl?: number;
-  indexingPolicy?: IndexingPolicy;
-}
-
-export interface MongoCreationRequest extends CreationRequest {
-  properties: {
-    resource: {
-      id: string;
-      analyticalStorageTtl?: number;
-      shardKey?: {};
-    };
-    options: RpOptions;
-  };
-}
-
-export interface GraphCreationRequest extends CreationRequest {
-  properties: {
-    resource: {
-      id: string;
-      partitionKey: {};
-      indexingPolicy?: IndexingPolicy;
-    };
-    options: RpOptions;
-  };
-}
-
-export interface CreateDatabaseWithRpResponse {
-  id: string;
-  name: string;
-  type: string;
-  properties: {
-    id: string;
-  };
-}
-
 export interface SparkClusterLibrary {
   name: string;
 }
 
-export interface SqlCollectionCreationRequest extends CreationRequest {
-  properties: {
-    resource: {
-      uniqueKeyPolicy?: UniqueKeyPolicy;
-      id: string;
-      partitionKey: {};
-      analyticalStorageTtl?: number;
-      indexingPolicy?: IndexingPolicy;
-    };
-    options: RpOptions;
-  };
-}
-
 export interface Library extends SparkClusterLibrary {
   properties: {
     kind: "Jar";

src/Contracts/ViewModels.ts

@@ -1,16 +1,22 @@
-import * as DataModels from "./DataModels";
+import {
+  QueryMetrics,
+  Resource,
+  StoredProcedureDefinition,
+  TriggerDefinition,
+  UserDefinedFunctionDefinition
+} from "@azure/cosmos";
 import Q from "q";
-import { CassandraTableKey, CassandraTableKeys } from "../Explorer/Tables/TableDataClient";
 import { CommandButtonComponentProps } from "../Explorer/Controls/CommandButton/CommandButtonComponent";
-import { ConsoleData } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
-import { QueryMetrics } from "@azure/cosmos";
-import { UploadDetails } from "../workers/upload/definitions";
 import Explorer from "../Explorer/Explorer";
-import UserDefinedFunction from "../Explorer/Tree/UserDefinedFunction";
+import { ConsoleData } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
+import { CassandraTableKey, CassandraTableKeys } from "../Explorer/Tables/TableDataClient";
+import ConflictId from "../Explorer/Tree/ConflictId";
+import DocumentId from "../Explorer/Tree/DocumentId";
 import StoredProcedure from "../Explorer/Tree/StoredProcedure";
 import Trigger from "../Explorer/Tree/Trigger";
-import DocumentId from "../Explorer/Tree/DocumentId";
-import ConflictId from "../Explorer/Tree/ConflictId";
+import UserDefinedFunction from "../Explorer/Tree/UserDefinedFunction";
+import { UploadDetails } from "../workers/upload/definitions";
+import * as DataModels from "./DataModels";
 
 export interface TokenProvider {
   getAuthHeader(): Promise<Headers>;
@@ -153,13 +159,13 @@ export interface Collection extends CollectionBase {
   collapseUserDefinedFunctions(): void;
   collapseTriggers(): void;
 
-  loadUserDefinedFunctions(): Q.Promise<any>;
-  loadStoredProcedures(): Q.Promise<any>;
-  loadTriggers(): Q.Promise<any>;
+  loadUserDefinedFunctions(): Promise<any>;
+  loadStoredProcedures(): Promise<any>;
+  loadTriggers(): Promise<any>;
 
-  createStoredProcedureNode(data: DataModels.StoredProcedure): StoredProcedure;
-  createUserDefinedFunctionNode(data: DataModels.UserDefinedFunction): UserDefinedFunction;
-  createTriggerNode(data: DataModels.Trigger): Trigger;
+  createStoredProcedureNode(data: StoredProcedureDefinition & Resource): StoredProcedure;
+  createUserDefinedFunctionNode(data: UserDefinedFunctionDefinition & Resource): UserDefinedFunction;
+  createTriggerNode(data: TriggerDefinition & Resource): Trigger;
   findStoredProcedureWithId(sprocRid: string): StoredProcedure;
   findTriggerWithId(triggerRid: string): Trigger;
   findUserDefinedFunctionWithId(udfRid: string): UserDefinedFunction;

src/Explorer/Controls/GitHub/GitHubReposComponent.tsx

@@ -66,7 +66,9 @@ export class GitHubReposComponent extends React.Component<GitHubReposComponentPr
 
     return (
       <>
-        <div className={"firstdivbg headerline"}>{header}</div>
+        <div className={"firstdivbg headerline"} role="heading" aria-level={2}>
+          {header}
+        </div>
         <div className={"paneMainContent"}>{content}</div>
         {!this.props.showAuthorizeAccess && (
           <>

src/Explorer/Controls/ThroughputInput/ThroughputInputComponentAutoscaleV3.html

@@ -84,7 +84,7 @@
         step: step,
         'class':'migration collid select-font-size',
         min: minAutoPilotThroughput,
-        'aria-label': ariaLabel,
+        'aria-label': 'Max request units per second',
         type: isAutoscaleThroughputInputFieldRequired() ? 'number' : 'hidden',
         css: {
           dirty: maxAutoPilotThroughputSet.editableIsDirty

src/Explorer/Controls/TreeComponent/TreeComponent.tsx

@@ -282,7 +282,7 @@ export class TreeNodeComponent extends React.Component<TreeNodeComponentProps, T
       <img
         className="expandCollapseIcon"
         src={this.state.isExpanded ? TriangleDownIcon : TriangleRightIcon}
-        alt={this.state.isExpanded ? "Branch is expanded" : "Branch is collapsed"}
+        alt={this.state.isExpanded ? `${node.label} branch is expanded` : `${node.label} branch is collapsed`}
         onKeyPress={(event: React.KeyboardEvent<HTMLDivElement>) => this.onCollapseExpandIconKeyPress(event, node)}
         tabIndex={0}
         role="button"

src/Explorer/Controls/TreeComponent/__snapshots__/TreeComponent.test.tsx.snap

@@ -49,7 +49,7 @@ exports[`TreeNodeComponent does not render children by default 1`] = `
     tabIndex={-1}
   >
     <img
-      alt="Branch is collapsed"
+      alt="label branch is collapsed"
       className="expandCollapseIcon"
       onKeyPress={[Function]}
       role="button"
@@ -140,7 +140,7 @@ exports[`TreeNodeComponent renders a simple node (sorted children, expanded) 1`]
     tabIndex={-1}
   >
     <img
-      alt="Branch is expanded"
+      alt="label branch is expanded"
       className="expandCollapseIcon"
       onKeyPress={[Function]}
       role="button"
@@ -278,7 +278,7 @@ exports[`TreeNodeComponent renders sorted children, expanded, leaves and parents
     tabIndex={-1}
   >
     <img
-      alt="Branch is expanded"
+      alt="label branch is expanded"
       className="expandCollapseIcon"
       onKeyPress={[Function]}
       role="button"
@@ -436,7 +436,7 @@ exports[`TreeNodeComponent renders unsorted children by default 1`] = `
     tabIndex={-1}
   >
     <img
-      alt="Branch is expanded"
+      alt="label branch is expanded"
       className="expandCollapseIcon"
       onKeyPress={[Function]}
       role="button"

src/Explorer/Explorer.ts

@@ -87,6 +87,7 @@ import { ContextualPaneBase } from "./Panes/ContextualPaneBase";
 import TabsBase from "./Tabs/TabsBase";
 import { CommandButtonComponentProps } from "./Controls/CommandButton/CommandButtonComponent";
 import { updateUserContext, userContext } from "../UserContext";
+import { stringToBlob } from "../Utils/BlobUtils";
 
 BindingHandlersRegisterer.registerBindingHandlers();
 // Hold a reference to ComponentRegisterer to prevent transpiler to ignore import
@@ -2621,9 +2622,11 @@ export default class Explorer {
       throw new Error(error);
     }
 
+    const clearMessage = NotificationConsoleUtils.logConsoleProgress(`Downloading ${notebookFile.path}`);
+
     return this.notebookManager?.notebookContentClient.readFileContent(notebookFile.path).then(
       (content: string) => {
-        const blob = new Blob([content], { type: "octet/stream" });
+        const blob = stringToBlob(content, "text/plain");
         if (navigator.msSaveBlob) {
           // for IE and Edge
           navigator.msSaveBlob(blob, notebookFile.name);
@@ -2640,12 +2643,16 @@ export default class Explorer {
           downloadLink.click();
           downloadLink.remove();
         }
+
+        clearMessage();
       },
       (error: any) => {
         NotificationConsoleUtils.logConsoleMessage(
           ConsoleDataType.Error,
           `Could not download notebook ${JSON.stringify(error)}`
         );
+
+        clearMessage();
       }
     );
   }

src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx

@@ -130,11 +130,14 @@ export class NotificationConsoleComponent extends React.Component<
               <span className="headerStatusEllipsis">{this.state.headerStatus}</span>
             </span>
           </div>
-          <div className="expandCollapseButton" role="button" tabIndex={0}>
-            <img
-              src={this.state.isExpanded ? ChevronDownIcon : ChevronUpIcon}
-              alt={this.state.isExpanded ? "collapse console" : "expand console"}
-            />
+          <div
+            className="expandCollapseButton"
+            role="button"
+            tabIndex={0}
+            aria-label={this.state.isExpanded ? "collapse console" : "expand console"}
+            aria-expanded={this.state.isExpanded}
+          >
+            <img src={this.state.isExpanded ? ChevronDownIcon : ChevronUpIcon} alt="" />
           </div>
         </div>
         <AnimateHeight

src/Explorer/Menus/NotificationConsole/__snapshots__/NotificationConsoleComponent.test.tsx.snap

@@ -68,12 +68,14 @@ exports[`NotificationConsoleComponent renders the console (expanded) 1`] = `
       </span>
     </div>
     <div
+      aria-expanded={true}
+      aria-label="collapse console"
       className="expandCollapseButton"
       role="button"
       tabIndex={0}
     >
       <img
-        alt="collapse console"
+        alt=""
         src=""
       />
     </div>

src/Explorer/Notebook/NotebookContentClient.ts

@@ -194,17 +194,24 @@ export class NotebookContentClient {
       });
   }
 
-  public readFileContent(filePath: string): Promise<string> {
-    return this.contentProvider
-      .get(this.getServerConfig(), filePath, { type: "notebook", format: "text", content: 1 })
-      .toPromise()
-      .then(xhr => {
-        const content = (xhr.response as any).content;
-        if (!content) {
-          throw new Error("No content read");
-        }
+  public async readFileContent(filePath: string): Promise<string> {
+    const xhr = await this.contentProvider.get(this.getServerConfig(), filePath, { content: 1 }).toPromise();
+    const content = (xhr.response as any).content;
+    if (!content) {
+      throw new Error("No content read");
+    }
+
+    const format = (xhr.response as any).format;
+    switch (format) {
+      case "text":
+        return content;
+      case "base64":
+        return atob(content);
+      case "json":
         return stringifyNotebook(content);
-      });
+      default:
+        throw new Error(`Unsupported content format ${format}`);
+    }
   }
 
   private deleteNotebookFile(path: string): Promise<string> {

src/Explorer/Panes/AddCollectionPane.html

@@ -24,7 +24,7 @@
 <script type="text/html" id="add-collection-inputs">
                                                                 <!-- Add collection header - Start -->
   <div class="firstdivbg headerline">
-      <span id="containerTitle" data-bind="text: title"></span>
+      <span id="containerTitle" role="heading" aria-level="2" data-bind="text: title" ></span>
       <div class="closeImg" id="closeBtnAddCollection" role="button" aria-label="Add collection close pane"
           data-bind="click: cancel, event: { keypress: onCloseKeyPress }" tabindex="0">
           <img src="../../../images/close-black.svg" title="Close" alt="Close" />
@@ -537,9 +537,11 @@
                                                           attr: {
                                                               'aria-checked': isAnalyticalStorageOn() ? 'true' : 'false'
                                                           }" />
-                      <span for="enableAnalyticalStorageRadioOn" data-bind="disable: showEnableSynapseLink">
-                          On
-                      </span>
+                      <label for="enableAnalyticalStorageRadioOn" class="enableAnalyticalStorageRadioLabel">
+                        <span data-bind="disable: showEnableSynapseLink">
+                            On
+                        </span>
+                      </label>
 
                       <input class="enableAnalyticalStorageRadio" id="enableAnalyticalStorageRadioOff"
                           name="analyticalStore" type="radio" role="radio" tabindex="0" data-bind="
@@ -549,9 +551,11 @@
                                                           attr: {
                                                               'aria-checked': isAnalyticalStorageOn() ? 'false' : 'true'
                                                           }" />
-                      <span for="enableAnalyticalStorageRadioOff" data-bind="disable: showEnableSynapseLink">
-                          Off
-                      </span>
+                      <label for="enableAnalyticalStorageRadioOff" class="enableAnalyticalStorageRadioLabel">
+                        <span data-bind="disable: showEnableSynapseLink">
+                            Off
+                        </span>
+                      </label>
                   </div>
 
                   <div class="paragraph italic" data-bind="visible: ttl90DaysEnabled() && isAnalyticalStorageOn()">

src/Explorer/Panes/AddCollectionPane.ts

@@ -608,7 +608,7 @@ export default class AddCollectionPane extends ContextualPaneBase {
         return true;
       }
 
-      if (this.container.isPreferredApiMongoDB() && this.container.hasStorageAnalyticsAfecFeature()) {
+      if (this.container.isPreferredApiMongoDB()) {
         return true;
       }
 

src/Explorer/Panes/AddDatabasePane.html

@@ -24,7 +24,7 @@
 <script type="text/html" id="add-database-inputs">
                                 <!-- Add database header - Start -->
   <div class="firstdivbg headerline">
-      <span id="databaseTitle" data-bind="text: title"></span>
+      <span id="databaseTitle" role="heading" aria-level="2" data-bind="text: title"></span>
       <div class="closeImg" role="button" aria-label="Close pane"
           data-bind="click: cancel, event: { keypress: onCloseKeyPress }" tabindex="0">
           <img src="../../../images/close-black.svg" title="Close" alt="Close" />
@@ -73,8 +73,8 @@
           </p>
 
           <input id="database-id" type="text" aria-required="true" autocomplete="off" pattern="[^/?#\\]*[^/?# \\]"
-              title="May not end with space nor contain characters '\' '/' '#' '?'" placeholder="Type a new database id"
-              size="40" class="collid" data-bind="textInput: databaseId, hasFocus: firstFieldHasFocus"
+              title="May not end with space nor contain characters '\' '/' '#' '?'"
+              size="40" class="collid" data-bind="textInput: databaseId, hasFocus: firstFieldHasFocus, attr: { placeholder: databaseIdPlaceHolder }"
               aria-label="Database id" autofocus>
 
           <!-- Database provisioned throughput - Start -->

src/Explorer/Panes/AddDatabasePane.ts

@@ -16,6 +16,7 @@ import { PlatformType } from "../../PlatformType";
 export default class AddDatabasePane extends ContextualPaneBase {
   public defaultExperience: ko.Computed<string>;
   public databaseIdLabel: ko.Computed<string>;
+  public databaseIdPlaceHolder: ko.Computed<string>;
   public databaseId: ko.Observable<string>;
   public databaseIdTooltipText: ko.Computed<string>;
   public databaseLevelThroughputTooltipText: ko.Computed<string>;
@@ -70,6 +71,11 @@ export default class AddDatabasePane extends ContextualPaneBase {
     this.databaseIdLabel = ko.computed<string>(() =>
       this.container.isPreferredApiCassandra() ? "Keyspace id" : "Database id"
     );
+
+    this.databaseIdPlaceHolder = ko.computed<string>(() =>
+      this.container.isPreferredApiCassandra() ? "Type a new keyspace id" : "Type a new database id"
+    );
+
     this.databaseIdTooltipText = ko.computed<string>(() => {
       const isCassandraAccount: boolean = this.container.isPreferredApiCassandra();
       return `A ${isCassandraAccount ? "keyspace" : "database"} is a logical container of one or more ${

src/Explorer/Panes/BrowseQueriesPane.html

@@ -6,7 +6,7 @@
       <div class="paneContentContainer">
         <!-- Save Query header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/CassandraAddCollectionPane.html

@@ -17,7 +17,7 @@
       >
         <!-- Add Cassandra collection header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/DeleteCollectionConfirmationPane.html

@@ -15,7 +15,7 @@
       >
         <!-- Delete Collection Confirmation header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/DeleteDatabaseConfirmationPane.html

@@ -15,7 +15,7 @@
       >
         <!-- Delete Database Confirmation header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/DeleteDatabaseConfirmationPane.ts

@@ -13,6 +13,7 @@ import DeleteFeedback from "../../Common/DeleteFeedback";
 import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import { deleteDatabase } from "../../Common/dataAccess/deleteDatabase";
+import { ARMError } from "../../Utils/arm/request";
 
 export default class DeleteDatabaseConfirmationPane extends ContextualPaneBase {
   public databaseIdConfirmationText: ko.Observable<string>;
@@ -105,11 +106,12 @@ export default class DeleteDatabaseConfirmationPane extends ContextualPaneBase {
           this.databaseDeleteFeedback("");
         }
       },
-      (reason: any) => {
+      (reason: unknown) => {
         this.isExecuting(false);
-        const message = ErrorParserUtility.parse(reason);
-        this.formErrors(message[0].message);
-        this.formErrorsDetails(message[0].message);
+
+        const message = reason instanceof ARMError ? reason.message : ErrorParserUtility.parse(reason)[0].message;
+        this.formErrors(message);
+        this.formErrorsDetails(message);
         TelemetryProcessor.traceFailure(
           Action.DeleteDatabase,
           {

src/Explorer/Panes/ExecuteSprocParamsPane.html

@@ -11,7 +11,7 @@
       <form class="paneContentContainer" data-bind="submit: execute">
         <!-- Input params header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/GenericRightPaneComponent.tsx

@@ -70,7 +70,9 @@ export class GenericRightPaneComponent extends React.Component<GenericRightPaneP
   private renderPanelHeader = (): JSX.Element => {
     return (
       <div className="firstdivbg headerline">
-        <span id="databaseTitle">{this.props.title}</span>
+        <span id="databaseTitle" role="heading" aria-level={2}>
+          {this.props.title}
+        </span>
         <IconButton
           ariaLabel="Close pane"
           title="Close pane"

src/Explorer/Panes/GraphNewVertexPane.html

@@ -6,7 +6,7 @@
       <form class="paneContentContainer" data-bind="submit: submit">
         <!-- New Vertex header - Start -->
         <div class="firstdivbg headerline">
-          <span>New Vertex</span>
+          <span role="heading" aria-level="2">New Vertex</span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/GraphStylingPane.html

@@ -6,7 +6,7 @@
       <form class="paneContentContainer" data-bind="submit: submit">
         <!-- Graph Styling header - Start -->
         <div class="firstdivbg headerline">
-          <span>Graph Styling</span>
+          <span role="heading" aria-level="2">Graph Styling</span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/LoadQueryPane.html

@@ -6,7 +6,7 @@
       <form class="paneContentContainer" data-bind="submit: submit">
         <!-- Load Query header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/RenewAdHocAccessPane.html

@@ -11,7 +11,7 @@
       <form class="paneContentContainer" data-bind="submit: submit">
         <!-- Renew ad-hoc access header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/SaveQueryPane.html

@@ -6,7 +6,7 @@
       <form class="paneContentContainer" data-bind="submit: submit">
         <!-- Save Query header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div class="closeImg" role="button" aria-label="Close pane" tabindex="0" data-bind="click: cancel">
             <img src="../../../images/close-black.svg" title="Close" alt="Close" />
           </div>

src/Explorer/Panes/SettingsPane.html

@@ -12,7 +12,7 @@
       <form class="paneContentContainer" data-bind="submit: submit">
         <!-- Settings Confirmation header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/SetupNotebooksPane.html

@@ -6,7 +6,7 @@
       <div class="paneContentContainer">
         <!-- Setup notebooks header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/StringInputPane.html

@@ -6,7 +6,7 @@
       <form class="paneContentContainer" data-bind="submit: submit">
         <!-- String Input header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div class="closeImg" role="button" aria-label="Close pane" tabindex="0" data-bind="click: cancel"></div>
         </div>
         <!-- String Input header - End -->

src/Explorer/Panes/SwitchDirectoryPane.html

@@ -5,7 +5,7 @@
     <div class="contextual-pane-in">
       <!-- Switch Directory header - Start -->
       <div class="firstdivbg headerline">
-        <span data-bind="text: title"></span>
+        <span role="heading" aria-level="2" data-bind="text: title"></span>
         <div class="closeImg" role="button" aria-label="Close pane" tabindex="0" data-bind="click: close">
           <img src="../../../images/close-black.svg" title="Close" alt="Close" />
         </div>

src/Explorer/Panes/Tables/TableEditEntityPane.html

@@ -19,7 +19,7 @@
       >
         <!-- Edit table entity header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Panes/UploadFilePane.html

@@ -6,7 +6,7 @@
       <form class="paneContentContainer" data-bind="submit: submit">
         <!-- Upload File header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div class="closeImg" role="button" aria-label="Close pane" tabindex="0" data-bind="click: cancel">
             <img src="../../../images/close-black.svg" title="Close" alt="Close" />
           </div>

src/Explorer/Panes/UploadItemsPane.html

@@ -11,7 +11,7 @@
       <form class="paneContentContainer" data-bind="submit: submit">
         <!-- Upload items header - Start -->
         <div class="firstdivbg headerline">
-          <span data-bind="text: title"></span>
+          <span role="heading" aria-level="2" data-bind="text: title"></span>
           <div
             class="closeImg"
             role="button"

src/Explorer/Tabs/ConflictsTab.html

@@ -100,7 +100,7 @@
           </table>
         </div>
         <div class="loadMore">
-          <a role="link" data-bind="click: loadNextPage, event: { keypress: onLoadMoreKeyInput }" tabindex="0"
+          <a role="button" data-bind="click: loadNextPage, event: { keypress: onLoadMoreKeyInput }" tabindex="0"
             >Load more</a
           >
         </div>

src/Explorer/Tabs/DocumentsTab.html

@@ -200,7 +200,7 @@
           </table>
         </div>
         <div class="loadMore">
-          <a role="link" data-bind="click: loadNextPage, event: { keypress: onLoadMoreKeyInput }" tabindex="0"
+          <a role="button" data-bind="click: loadNextPage, event: { keypress: onLoadMoreKeyInput }" tabindex="0"
             >Load more</a
           >
         </div>

src/Explorer/Tabs/MongoDocumentsTab.html

@@ -390,7 +390,7 @@
         </table>
 
         <div class="loadMore">
-          <a role="link" data-bind="click: loadNextPage, event: { keypress: onLoadMoreKeyInput }" tabindex="0"
+          <a role="button" data-bind="click: loadNextPage, event: { keypress: onLoadMoreKeyInput }" tabindex="0"
             >Load more</a
           >
         </div>

src/Explorer/Tabs/QueryTab.html

@@ -111,17 +111,18 @@
           data-bind="visible: isMetricsToggled() && allResultsMetadata().length > 0 && errors().length === 0"
         >
           <table class="queryMetricsSummary">
+            <caption>
+              Query Statistics
+            </caption>
             <thead class="queryMetricsSummaryHead">
               <tr class="queryMetricsSummaryHeader queryMetricsSummaryTuple">
-                <th title="METRIC">METRIC</th>
-                <th></th>
-                <th title="VALUE">VALUE</th>
+                <th title="METRIC" scope="col">METRIC</th>
+                <th title="VALUE" scope="col">VALUE</th>
               </tr>
             </thead>
             <tbody class="queryMetricsSummaryBody" data-bind="with: aggregatedQueryMetrics">
               <tr class="queryMetricsSummaryTuple">
                 <td title="Request Charge">Request Charge</td>
-                <td></td>
                 <td>
                   <span
                     data-bind="text: $parent.requestChargeDisplayText, attr: { title: $parent.requestChargeDisplayText }"
@@ -130,7 +131,6 @@
               </tr>
               <tr class="queryMetricsSummaryTuple">
                 <td title="Showing Results">Showing Results</td>
-                <td></td>
                 <td>
                   <span
                     data-bind="text: $parent.showingDocumentsDisplayText, attr: { title: $parent.showingDocumentsDisplayText }"
@@ -138,8 +138,8 @@
                 </td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="Retrieved document count">Retrieved document count</span></td>
                 <td>
+                  <span title="Retrieved document count">Retrieved document count</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Total number of retrieved documents</span>
@@ -148,8 +148,8 @@
                 <td><span data-bind="text: retrievedDocumentCount, attr: { title: retrievedDocumentCount }"></span></td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="Retrieved document size">Retrieved document size</span></td>
                 <td>
+                  <span title="Retrieved document size">Retrieved document size</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Total size of retrieved documents in bytes</span>
@@ -161,8 +161,8 @@
                 </td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="Output document count">Output document count</span></td>
                 <td>
+                  <span title="Output document count">Output document count</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Number of output documents</span>
@@ -171,8 +171,8 @@
                 <td><span data-bind="text: outputDocumentCount, attr: { title: outputDocumentCount }"></span></td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="Output document size">Output document size</span></td>
                 <td>
+                  <span title="Output document size">Output document size</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Total size of output documents in bytes</span>
@@ -184,8 +184,8 @@
                 </td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="Index hit document count">Index hit document count</span></td>
                 <td>
+                  <span title="Index hit document count">Index hit document count</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Total number of documents matched by the filter</span>
@@ -194,8 +194,8 @@
                 <td><span data-bind="text: indexHitDocumentCount, attr: { title: indexHitDocumentCount }"></span></td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="Index lookup time">Index lookup time</span></td>
                 <td>
+                  <span title="Index lookup time">Index lookup time</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Time spent in physical index layer</span>
@@ -206,8 +206,8 @@
                 </td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="Document load time">Document load time</span></td>
                 <td>
+                  <span title="Document load time">Document load time</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Time spent in loading documents</span>
@@ -218,8 +218,8 @@
                 </td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="Query engine execution time">Query engine execution time</span></td>
                 <td>
+                  <span title="Query engine execution time">Query engine execution time</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText queryEngineExeTimeInfo"
@@ -236,8 +236,8 @@
                 </td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="System function execution time">System function execution time</span></td>
                 <td>
+                  <span title="System function execution time">System function execution time</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Total time spent executing system (built-in) functions</span>
@@ -251,8 +251,8 @@
                 </td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="User defined function execution time">User defined function execution time</span></td>
                 <td>
+                  <span title="User defined function execution time">User defined function execution time</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Total time spent executing user-defined functions</span>
@@ -266,8 +266,8 @@
                 </td>
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.isQueryMetricsEnabled">
-                <td><span title="Document write time">Document write time</span></td>
                 <td>
+                  <span title="Document write time">Document write time</span>
                   <span class="queryMetricInfoTooltip" role="tooltip" tabindex="0">
                     <img class="infoImg" src="/info-bubble.svg" alt="More information" />
                     <span class="queryMetricTooltipText">Time spent to write query result set to response buffer</span>
@@ -279,7 +279,6 @@
               </tr>
               <tr class="queryMetricsSummaryTuple" data-bind="visible: $parent.roundTrips() != null">
                 <td title="Round Trips">Round Trips</td>
-                <td></td>
                 <td><span data-bind="text: $parent.roundTrips, attr: { title: $parent.roundTrips }"></span></td>
               </tr>
               <!-- TODO: Report activity id for mongo queries -->

src/Explorer/Tabs/QueryTab.less

@@ -93,7 +93,7 @@
                 margin-left: @MediumSpace;
                 .flex-display();
                 .flex-direction();
-    
+
 
                 .togglesWithMetadata {
                     margin-top: @MediumSpace;
@@ -102,23 +102,23 @@
                         height: @ToggleHeight;
                         width: @ToggleWidth;
                         margin-left: @MediumSpace;
-            
+
                         &:focus {
                             .focus();
                         }
-            
+
                         .tab {
                             margin-right: @MediumSpace;
                         }
-            
+
                         .toggleSwitch {
                             .toggleSwitch();
                         }
-            
+
                         .selectedToggle {
                             .selectedToggle();
                         }
-            
+
                         .unselectedToggle {
                             .unselectedToggle();
                         }
@@ -136,7 +136,7 @@
                     .queryResultNextEnable {
                         color: @AccentMediumHigh;
                         font-size: @mediumFontSize;
-                        cursor: pointer; 
+                        cursor: pointer;
 
                         img {
                             height: @ImgHeight;
@@ -153,7 +153,7 @@
                         img {
                             height: @ImgHeight;
                             width: @ImgWidth;
-                            margin-left: @SmallSpace; 
+                            margin-left: @SmallSpace;
                         }
                     }
                 }
@@ -181,7 +181,7 @@
                     cursor: pointer;
                     padding: @SmallSpace;
                 }
-            
+
                 .queryMetricsSummaryContainer {
                     .flex-display();
                     .flex-direction();
@@ -195,10 +195,14 @@
                         overflow-y: auto;
                         overflow-x: hidden;
 
+                        caption {
+                            width: 100px;
+                        }
+
                         .queryMetricsSummaryHead {
                             .flex-display();
                         }
-                
+
                         .queryMetricsSummaryHeader.queryMetricsSummaryTuple {
                             font-size: 10px;
                         }
@@ -207,7 +211,7 @@
                             .flex-display();
                             .flex-direction();
                         }
-                
+
                         .queryMetricsSummaryTuple {
                             border-bottom: 1px solid @BaseMedium;
                             height: 32px;
@@ -221,18 +225,14 @@
                                     text-overflow: ellipsis;
                                     overflow: hidden;
                                     white-space: nowrap;
-                                    flex: 0 1 auto;
-                                }
-
-                                &:nth-child(2) {
-                                    flex: 1 1 auto;
+                                    flex: 0 0 50%;
                                 }
 
                                 &:nth-child(3) {
                                     text-overflow: ellipsis;
                                     overflow: hidden;
                                     white-space: nowrap;
-                                    flex: 0 0 50%; 
+                                    flex: 0 0 50%;
                                 }
 
                                 .queryMetricInfoTooltip {
@@ -264,7 +264,7 @@
                                             .tooltipTextAfter();
                                         }
                                     }
-                                    
+
                                     .queryEngineExeTimeInfo {
                                         width: @QueryEngineExeInfo;
                                         top: -85px;

src/Explorer/Tabs/QueryTablesTab.html

@@ -17,7 +17,7 @@
     <div class="error-bar">
       <div class="error-message" aria-label="Error Message" data-bind="visible: hasQueryError">
         <span><img class="entity-error-Img" src="/error_red.svg"/></span>
-        <span class="error-text" data-bind="text: queryErrorMessage"></span>
+        <span class="error-text" role="alert" data-bind="text: queryErrorMessage"></span>
       </div>
     </div>
     <!-- Tables Query Tab Errors - End-->

src/Explorer/Tabs/ScriptTabBase.ts

@@ -1,15 +1,14 @@
-import * as Constants from "../../Common/Constants";
 import * as ko from "knockout";
+import * as monaco from "monaco-editor";
 import Q from "q";
-
+import DiscardIcon from "../../../images/discard.svg";
+import SaveIcon from "../../../images/save-cosmos.svg";
+import * as Constants from "../../Common/Constants";
+import editable from "../../Common/EditableUtility";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
-import TabsBase from "./TabsBase";
-import editable from "../../Common/EditableUtility";
-import * as monaco from "monaco-editor";
-import SaveIcon from "../../../images/save-cosmos.svg";
-import DiscardIcon from "../../../images/discard.svg";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
+import TabsBase from "./TabsBase";
 
 export default abstract class ScriptTabBase extends TabsBase implements ViewModels.WaitsForTemplate {
   public ariaLabel: ko.Observable<string>;
@@ -30,7 +29,8 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
   public formIsValid: ko.Computed<boolean>;
   public formIsDirty: ko.Computed<boolean>;
   public isNew: ko.Observable<boolean>;
-  public resource: ko.Observable<DataModels.Script>;
+  // TODO: Remove any. The SDK types for all the script.body are slightly incorrect which makes this REALLY hard to type correct.
+  public resource: ko.Observable<any>;
   public isTemplateReady: ko.Observable<boolean>;
   protected _partitionKey: DataModels.PartitionKey;
 
@@ -194,8 +194,8 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
     });
   }
 
-  public abstract onSaveClick: () => Q.Promise<any>;
-  public abstract onUpdateClick: () => Q.Promise<any>;
+  public abstract onSaveClick: () => Promise<any>;
+  public abstract onUpdateClick: () => Promise<any>;
 
   public onDiscard = (): Q.Promise<any> => {
     this.setBaselines();
@@ -206,14 +206,14 @@ export default abstract class ScriptTabBase extends TabsBase implements ViewMode
     return Q();
   };
 
-  public onSaveOrUpdateClick(): Q.Promise<any> {
+  public onSaveOrUpdateClick(): Promise<any> {
     if (this.saveButton.visible()) {
       return this.onSaveClick();
     } else if (this.updateButton.visible()) {
       return this.onUpdateClick();
     }
 
-    return Q();
+    return undefined;
   }
 
   protected getTabsButtons(): CommandButtonComponentProps[] {

src/Explorer/Tabs/StoredProcedureTab.ts

@@ -1,17 +1,18 @@
+import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
 import * as ko from "knockout";
-import * as _ from "underscore";
 import Q from "q";
+import * as _ from "underscore";
+import ExecuteQueryIcon from "../../../images/ExecuteQuery.svg";
 import * as Constants from "../../Common/Constants";
-import * as DataModels from "../../Contracts/DataModels";
+import { createStoredProcedure } from "../../Common/dataAccess/createStoredProcedure";
+import { updateStoredProcedure } from "../../Common/dataAccess/updateStoredProcedure";
+import editable from "../../Common/EditableUtility";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { Action } from "../../Shared/Telemetry/TelemetryConstants";
-import editable from "../../Common/EditableUtility";
-import ScriptTabBase from "./ScriptTabBase";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
-import ExecuteQueryIcon from "../../../images/ExecuteQuery.svg";
-import StoredProcedure from "../Tree/StoredProcedure";
-import { createStoredProcedure, updateStoredProcedure } from "../../Common/DocumentClientUtilityBase";
 import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandButtonComponent";
+import StoredProcedure from "../Tree/StoredProcedure";
+import ScriptTabBase from "./ScriptTabBase";
 
 enum ToggleState {
   Result = "result",
@@ -24,7 +25,6 @@ export default class StoredProcedureTab extends ScriptTabBase {
   public executeResultsEditorId: string;
   public executeLogsEditorId: string;
   public toggleState: ko.Observable<ToggleState>;
-
   public originalSprocBody: ViewModels.Editable<string>;
   public resultsData: ko.Observable<string>;
   public logsData: ko.Observable<string>;
@@ -54,13 +54,11 @@ export default class StoredProcedureTab extends ScriptTabBase {
     this.buildCommandBarOptions();
   }
 
-  public onSaveClick = (): Q.Promise<DataModels.StoredProcedure> => {
-    const resource: DataModels.StoredProcedure = <DataModels.StoredProcedure>{
+  public onSaveClick = (): Promise<StoredProcedureDefinition & Resource> => {
+    return this._createStoredProcedure({
       id: this.id(),
       body: this.editorContent()
-    };
-
-    return this._createStoredProcedure(resource);
+    });
   };
 
   public onDiscard = (): Q.Promise<any> => {
@@ -72,8 +70,8 @@ export default class StoredProcedureTab extends ScriptTabBase {
     return Q();
   };
 
-  public onUpdateClick = (): Q.Promise<any> => {
-    const data: DataModels.StoredProcedure = this._getResource();
+  public onUpdateClick = (): Promise<any> => {
+    const data = this._getResource();
 
     this.isExecutionError(false);
     this.isExecuting(true);
@@ -83,18 +81,18 @@ export default class StoredProcedureTab extends ScriptTabBase {
       dataExplorerArea: Constants.Areas.Tab,
       tabTitle: this.tabTitle()
     });
-    return updateStoredProcedure(this.collection, data)
+    return updateStoredProcedure(this.collection.databaseId, this.collection.id(), data)
       .then(
-        (updatedResource: DataModels.StoredProcedure) => {
+        updatedResource => {
           this.resource(updatedResource);
           this.tabTitle(updatedResource.id);
           this.node.id(updatedResource.id);
-          this.node.body(updatedResource.body);
+          this.node.body(updatedResource.body as string);
           this.setBaselines();
 
           const editorModel = this.editor() && this.editor().getModel();
-          editorModel && editorModel.setValue(updatedResource.body);
-          this.editorContent.setBaseline(updatedResource.body);
+          editorModel && editorModel.setValue(updatedResource.body as string);
+          this.editorContent.setBaseline(updatedResource.body as string);
           TelemetryProcessor.traceSuccess(
             Action.UpdateStoredProcedure,
             {
@@ -220,18 +218,14 @@ export default class StoredProcedureTab extends ScriptTabBase {
     });
   }
 
-  private _getResource(): DataModels.StoredProcedure {
-    const resource: DataModels.StoredProcedure = <DataModels.StoredProcedure>{
-      _rid: this.resource()._rid,
-      _self: this.resource()._self,
+  private _getResource() {
+    return {
       id: this.id(),
       body: this.editorContent()
     };
-
-    return resource;
   }
 
-  private _createStoredProcedure(resource: DataModels.StoredProcedure): Q.Promise<DataModels.StoredProcedure> {
+  private _createStoredProcedure(resource: StoredProcedureDefinition): Promise<StoredProcedureDefinition & Resource> {
     this.isExecutionError(false);
     this.isExecuting(true);
     const startKey: number = TelemetryProcessor.traceStart(Action.CreateStoredProcedure, {
@@ -241,7 +235,7 @@ export default class StoredProcedureTab extends ScriptTabBase {
       tabTitle: this.tabTitle()
     });
 
-    return createStoredProcedure(this.collection, resource)
+    return createStoredProcedure(this.collection.databaseId, this.collection.id(), resource)
       .then(
         createdResource => {
           this.tabTitle(createdResource.id);
@@ -256,8 +250,8 @@ export default class StoredProcedureTab extends ScriptTabBase {
           this.setBaselines();
 
           const editorModel = this.editor() && this.editor().getModel();
-          editorModel && editorModel.setValue(createdResource.body);
-          this.editorContent.setBaseline(createdResource.body);
+          editorModel && editorModel.setValue(createdResource.body as string);
+          this.editorContent.setBaseline(createdResource.body as string);
           this.node = this.collection.createStoredProcedureNode(createdResource);
           TelemetryProcessor.traceSuccess(
             Action.CreateStoredProcedure,
@@ -284,7 +278,7 @@ export default class StoredProcedureTab extends ScriptTabBase {
             },
             startKey
           );
-          return Q.reject(createError);
+          return Promise.reject(createError);
         }
       )
       .finally(() => this.isExecuting(false));

src/Explorer/Tabs/TriggerTab.ts

@@ -1,13 +1,13 @@
-import Q from "q";
+import { Resource, TriggerDefinition, TriggerOperation, TriggerType } from "@azure/cosmos";
 import * as Constants from "../../Common/Constants";
-import * as DataModels from "../../Contracts/DataModels";
+import { createTrigger } from "../../Common/dataAccess/createTrigger";
+import { updateTrigger } from "../../Common/dataAccess/updateTrigger";
+import editable from "../../Common/EditableUtility";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { Action } from "../../Shared/Telemetry/TelemetryConstants";
-import ScriptTabBase from "./ScriptTabBase";
-import editable from "../../Common/EditableUtility";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import Trigger from "../Tree/Trigger";
-import { createTrigger, updateTrigger } from "../../Common/DocumentClientUtilityBase";
+import ScriptTabBase from "./ScriptTabBase";
 
 export default class TriggerTab extends ScriptTabBase {
   public collection: ViewModels.Collection;
@@ -27,13 +27,17 @@ export default class TriggerTab extends ScriptTabBase {
     super.buildCommandBarOptions();
   }
 
-  public onSaveClick = (): Q.Promise<DataModels.Trigger> => {
-    const data: DataModels.Trigger = this._getResource();
-    return this._createTrigger(data);
+  public onSaveClick = (): Promise<TriggerDefinition & Resource> => {
+    return this._createTrigger({
+      id: this.id(),
+      body: this.editorContent(),
+      triggerOperation: this.triggerOperation() as TriggerOperation,
+      triggerType: this.triggerType() as TriggerType
+    });
   };
 
-  public onUpdateClick = (): Q.Promise<any> => {
-    const data: DataModels.Trigger = this._getResource();
+  public onUpdateClick = (): Promise<any> => {
+    const data = this._getResource();
     this.isExecutionError(false);
     this.isExecuting(true);
     const startKey: number = TelemetryProcessor.traceStart(Action.UpdateTrigger, {
@@ -42,14 +46,19 @@ export default class TriggerTab extends ScriptTabBase {
       tabTitle: this.tabTitle()
     });
 
-    return updateTrigger(this.collection, data)
+    return updateTrigger(this.collection.databaseId, this.collection.id(), {
+      id: this.id(),
+      body: this.editorContent(),
+      triggerOperation: this.triggerOperation() as TriggerOperation,
+      triggerType: this.triggerType() as TriggerType
+    })
       .then(
-        (createdResource: DataModels.Trigger) => {
+        createdResource => {
           this.resource(createdResource);
           this.tabTitle(createdResource.id);
 
           this.node.id(createdResource.id);
-          this.node.body(createdResource.body);
+          this.node.body(createdResource.body as string);
           this.node.triggerType(createdResource.triggerOperation);
           this.node.triggerOperation(createdResource.triggerOperation);
           TelemetryProcessor.traceSuccess(
@@ -66,8 +75,8 @@ export default class TriggerTab extends ScriptTabBase {
           this.setBaselines();
 
           const editorModel = this.editor().getModel();
-          editorModel.setValue(createdResource.body);
-          this.editorContent.setBaseline(createdResource.body);
+          editorModel.setValue(createdResource.body as string);
+          this.editorContent.setBaseline(createdResource.body as string);
         },
         (createError: any) => {
           this.isExecutionError(true);
@@ -89,7 +98,7 @@ export default class TriggerTab extends ScriptTabBase {
   public setBaselines() {
     super.setBaselines();
 
-    const resource = <DataModels.Trigger>this.resource();
+    const resource = this.resource();
     this.triggerOperation.setBaseline(resource.triggerOperation);
     this.triggerType.setBaseline(resource.triggerType);
   }
@@ -109,7 +118,7 @@ export default class TriggerTab extends ScriptTabBase {
     }
   }
 
-  private _createTrigger(resource: DataModels.Trigger): Q.Promise<DataModels.Trigger> {
+  private _createTrigger(resource: TriggerDefinition): Promise<TriggerDefinition & Resource> {
     this.isExecutionError(false);
     this.isExecuting(true);
     const startKey: number = TelemetryProcessor.traceStart(Action.CreateTrigger, {
@@ -119,9 +128,9 @@ export default class TriggerTab extends ScriptTabBase {
       tabTitle: this.tabTitle()
     });
 
-    return createTrigger(this.collection, resource)
+    return createTrigger(this.collection.databaseId, this.collection.id(), resource)
       .then(
-        (createdResource: DataModels.Trigger) => {
+        createdResource => {
           this.tabTitle(createdResource.id);
           this.isNew(false);
           this.resource(createdResource);
@@ -134,8 +143,8 @@ export default class TriggerTab extends ScriptTabBase {
           this.setBaselines();
 
           const editorModel = this.editor().getModel();
-          editorModel.setValue(createdResource.body);
-          this.editorContent.setBaseline(createdResource.body);
+          editorModel.setValue(createdResource.body as string);
+          this.editorContent.setBaseline(createdResource.body as string);
 
           this.node = this.collection.createTriggerNode(createdResource);
           TelemetryProcessor.traceSuccess(
@@ -163,22 +172,18 @@ export default class TriggerTab extends ScriptTabBase {
             },
             startKey
           );
-          return Q.reject(createError);
+          return Promise.reject(createError);
         }
       )
       .finally(() => this.isExecuting(false));
   }
 
-  private _getResource(): DataModels.Trigger {
-    const resource: DataModels.Trigger = <DataModels.Trigger>{
-      _rid: this.resource()._rid,
-      _self: this.resource()._self,
+  private _getResource() {
+    return {
       id: this.id(),
       body: this.editorContent(),
       triggerOperation: this.triggerOperation(),
       triggerType: this.triggerType()
     };
-
-    return resource;
   }
 }

src/Explorer/Tabs/UserDefinedFunctionTab.ts

@@ -1,12 +1,12 @@
-import Q from "q";
+import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
 import * as Constants from "../../Common/Constants";
-import * as DataModels from "../../Contracts/DataModels";
+import { createUserDefinedFunction } from "../../Common/dataAccess/createUserDefinedFunction";
+import { updateUserDefinedFunction } from "../../Common/dataAccess/updateUserDefinedFunction";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { Action } from "../../Shared/Telemetry/TelemetryConstants";
-import ScriptTabBase from "./ScriptTabBase";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import UserDefinedFunction from "../Tree/UserDefinedFunction";
-import { createUserDefinedFunction, updateUserDefinedFunction } from "../../Common/DocumentClientUtilityBase";
+import ScriptTabBase from "./ScriptTabBase";
 
 export default class UserDefinedFunctionTab extends ScriptTabBase {
   public collection: ViewModels.Collection;
@@ -19,13 +19,13 @@ export default class UserDefinedFunctionTab extends ScriptTabBase {
     super.buildCommandBarOptions();
   }
 
-  public onSaveClick = (): Q.Promise<DataModels.UserDefinedFunction> => {
-    const data: DataModels.UserDefinedFunction = this._getResource();
+  public onSaveClick = (): Promise<UserDefinedFunctionDefinition & Resource> => {
+    const data = this._getResource();
     return this._createUserDefinedFunction(data);
   };
 
-  public onUpdateClick = (): Q.Promise<any> => {
-    const data: DataModels.UserDefinedFunction = this._getResource();
+  public onUpdateClick = (): Promise<any> => {
+    const data = this._getResource();
     this.isExecutionError(false);
     this.isExecuting(true);
     const startKey: number = TelemetryProcessor.traceStart(Action.UpdateUDF, {
@@ -35,14 +35,14 @@ export default class UserDefinedFunctionTab extends ScriptTabBase {
       tabTitle: this.tabTitle()
     });
 
-    return updateUserDefinedFunction(this.collection, data)
+    return updateUserDefinedFunction(this.collection.databaseId, this.collection.id(), data)
       .then(
-        (createdResource: DataModels.UserDefinedFunction) => {
+        createdResource => {
           this.resource(createdResource);
           this.tabTitle(createdResource.id);
 
           this.node.id(createdResource.id);
-          this.node.body(createdResource.body);
+          this.node.body(createdResource.body as string);
           TelemetryProcessor.traceSuccess(
             Action.UpdateUDF,
             {
@@ -57,8 +57,8 @@ export default class UserDefinedFunctionTab extends ScriptTabBase {
           this.setBaselines();
 
           const editorModel = this.editor().getModel();
-          editorModel.setValue(createdResource.body);
-          this.editorContent.setBaseline(createdResource.body);
+          editorModel.setValue(createdResource.body as string);
+          this.editorContent.setBaseline(createdResource.body as string);
         },
         (createError: any) => {
           this.isExecutionError(true);
@@ -93,8 +93,8 @@ export default class UserDefinedFunctionTab extends ScriptTabBase {
   }
 
   private _createUserDefinedFunction(
-    resource: DataModels.UserDefinedFunction
-  ): Q.Promise<DataModels.UserDefinedFunction> {
+    resource: UserDefinedFunctionDefinition
+  ): Promise<UserDefinedFunctionDefinition & Resource> {
     this.isExecutionError(false);
     this.isExecuting(true);
     const startKey: number = TelemetryProcessor.traceStart(Action.CreateUDF, {
@@ -104,9 +104,9 @@ export default class UserDefinedFunctionTab extends ScriptTabBase {
       tabTitle: this.tabTitle()
     });
 
-    return createUserDefinedFunction(this.collection, resource)
+    return createUserDefinedFunction(this.collection.databaseId, this.collection.id(), resource)
       .then(
-        (createdResource: DataModels.UserDefinedFunction) => {
+        createdResource => {
           this.tabTitle(createdResource.id);
           this.isNew(false);
           this.resource(createdResource);
@@ -118,8 +118,8 @@ export default class UserDefinedFunctionTab extends ScriptTabBase {
           this.setBaselines();
 
           const editorModel = this.editor().getModel();
-          editorModel.setValue(createdResource.body);
-          this.editorContent.setBaseline(createdResource.body);
+          editorModel.setValue(createdResource.body as string);
+          this.editorContent.setBaseline(createdResource.body as string);
 
           this.node = this.collection.createUserDefinedFunctionNode(createdResource);
           TelemetryProcessor.traceSuccess(
@@ -147,14 +147,14 @@ export default class UserDefinedFunctionTab extends ScriptTabBase {
             },
             startKey
           );
-          return Q.reject(createError);
+          return Promise.reject(createError);
         }
       )
       .finally(() => this.isExecuting(false));
   }
 
   private _getResource() {
-    const resource: DataModels.UserDefinedFunction = <DataModels.UserDefinedFunction>{
+    const resource = {
       _rid: this.resource()._rid,
       _self: this.resource()._self,
       id: this.id(),

src/Explorer/Tree/Collection.ts

@@ -1,23 +1,28 @@
+import { Resource, StoredProcedureDefinition, TriggerDefinition, UserDefinedFunctionDefinition } from "@azure/cosmos";
 import * as ko from "knockout";
 import Q from "q";
 import * as _ from "underscore";
 import UploadWorker from "worker-loader!../../workers/upload";
 import { AuthType } from "../../AuthType";
 import * as Constants from "../../Common/Constants";
+import { readStoredProcedures } from "../../Common/dataAccess/readStoredProcedures";
+import { readTriggers } from "../../Common/dataAccess/readTriggers";
+import { readUserDefinedFunctions } from "../../Common/dataAccess/readUserDefinedFunctions";
+import { createDocument, readCollectionQuotaInfo, readOffer, readOffers } from "../../Common/DocumentClientUtilityBase";
 import * as Logger from "../../Common/Logger";
+import { configContext } from "../../ConfigContext";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
 import { PlatformType } from "../../PlatformType";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
+import { userContext } from "../../UserContext";
 import * as NotificationConsoleUtils from "../../Utils/NotificationConsoleUtils";
 import { OfferUtils } from "../../Utils/OfferUtils";
 import { StartUploadMessageParams, UploadDetails, UploadDetailsRecord } from "../../workers/upload/definitions";
+import Explorer from "../Explorer";
 import { ConsoleDataType } from "../Menus/NotificationConsole/NotificationConsoleComponent";
 import { CassandraAPIDataClient, CassandraTableKey, CassandraTableKeys } from "../Tables/TableDataClient";
-import ConflictId from "./ConflictId";
-
-import DocumentId from "./DocumentId";
 import ConflictsTab from "../Tabs/ConflictsTab";
 import DocumentsTab from "../Tabs/DocumentsTab";
 import GraphTab from "../Tabs/GraphTab";
@@ -27,21 +32,11 @@ import MongoShellTab from "../Tabs/MongoShellTab";
 import QueryTab from "../Tabs/QueryTab";
 import QueryTablesTab from "../Tabs/QueryTablesTab";
 import SettingsTab from "../Tabs/SettingsTab";
+import ConflictId from "./ConflictId";
+import DocumentId from "./DocumentId";
 import StoredProcedure from "./StoredProcedure";
 import Trigger from "./Trigger";
 import UserDefinedFunction from "./UserDefinedFunction";
-import { configContext } from "../../ConfigContext";
-import Explorer from "../Explorer";
-import {
-  createDocument,
-  readTriggers,
-  readUserDefinedFunctions,
-  readStoredProcedures,
-  readCollectionQuotaInfo,
-  readOffer,
-  readOffers
-} from "../../Common/DocumentClientUtilityBase";
-import { userContext } from "../../UserContext";
 
 export default class Collection implements ViewModels.Collection {
   public nodeKind: string;
@@ -854,21 +849,21 @@ export default class Collection implements ViewModels.Collection {
     Trigger.create(source, event);
   }
 
-  public createStoredProcedureNode(data: DataModels.StoredProcedure): StoredProcedure {
+  public createStoredProcedureNode(data: StoredProcedureDefinition & Resource): StoredProcedure {
     const node = new StoredProcedure(this.container, this, data);
     this.container.selectedNode(node);
     this.children.push(node);
     return node;
   }
 
-  public createUserDefinedFunctionNode(data: DataModels.UserDefinedFunction): UserDefinedFunction {
+  public createUserDefinedFunctionNode(data: UserDefinedFunctionDefinition & Resource): UserDefinedFunction {
     const node = new UserDefinedFunction(this.container, this, data);
     this.container.selectedNode(node);
     this.children.push(node);
     return node;
   }
 
-  public createTriggerNode(data: DataModels.Trigger): Trigger {
+  public createTriggerNode(data: TriggerDefinition & Resource): Trigger {
     const node = new Trigger(this.container, this, data);
     this.container.selectedNode(node);
     this.children.push(node);
@@ -1062,8 +1057,8 @@ export default class Collection implements ViewModels.Collection {
     });
   }
 
-  public loadStoredProcedures(): Q.Promise<any> {
-    return readStoredProcedures(this).then((storedProcedures: DataModels.StoredProcedure[]) => {
+  public loadStoredProcedures(): Promise<any> {
+    return readStoredProcedures(this.databaseId, this.id()).then(storedProcedures => {
       const storedProceduresNodes: ViewModels.TreeNode[] = storedProcedures.map(
         storedProcedure => new StoredProcedure(this.container, this, storedProcedure)
       );
@@ -1073,8 +1068,8 @@ export default class Collection implements ViewModels.Collection {
     });
   }
 
-  public loadUserDefinedFunctions(): Q.Promise<any> {
-    return readUserDefinedFunctions(this).then((userDefinedFunctions: DataModels.UserDefinedFunction[]) => {
+  public loadUserDefinedFunctions(): Promise<any> {
+    return readUserDefinedFunctions(this.databaseId, this.id()).then(userDefinedFunctions => {
       const userDefinedFunctionsNodes: ViewModels.TreeNode[] = userDefinedFunctions.map(
         udf => new UserDefinedFunction(this.container, this, udf)
       );
@@ -1084,8 +1079,8 @@ export default class Collection implements ViewModels.Collection {
     });
   }
 
-  public loadTriggers(): Q.Promise<any> {
-    return readTriggers(this, null /*options*/).then((triggers: DataModels.Trigger[]) => {
+  public loadTriggers(): Promise<any> {
+    return readTriggers(this.databaseId, this.id()).then(triggers => {
       const triggerNodes: ViewModels.TreeNode[] = triggers.map(trigger => new Trigger(this.container, this, trigger));
       const otherNodes = this.children().filter(node => node.nodeKind !== "Trigger");
       const allNodes = otherNodes.concat(triggerNodes);

src/Explorer/Tree/StoredProcedure.ts

@@ -1,13 +1,13 @@
+import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
 import * as ko from "knockout";
-import * as ViewModels from "../../Contracts/ViewModels";
 import * as Constants from "../../Common/Constants";
-import * as DataModels from "../../Contracts/DataModels";
+import { deleteStoredProcedure } from "../../Common/dataAccess/deleteStoredProcedure";
+import { executeStoredProcedure } from "../../Common/DocumentClientUtilityBase";
+import * as ViewModels from "../../Contracts/ViewModels";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
-
-import StoredProcedureTab from "../Tabs/StoredProcedureTab";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import Explorer from "../Explorer";
-import { deleteStoredProcedure, executeStoredProcedure } from "../../Common/DocumentClientUtilityBase";
+import StoredProcedureTab from "../Tabs/StoredProcedureTab";
 import TabsBase from "../Tabs/TabsBase";
 
 const sampleStoredProcedureBody: string = `// SAMPLE STORED PROCEDURE
@@ -47,20 +47,20 @@ export default class StoredProcedure {
   public body: ko.Observable<string>;
   public isExecuteEnabled: boolean;
 
-  constructor(container: Explorer, collection: ViewModels.Collection, data: DataModels.StoredProcedure) {
+  constructor(container: Explorer, collection: ViewModels.Collection, data: StoredProcedureDefinition & Resource) {
     this.nodeKind = "StoredProcedure";
     this.container = container;
     this.collection = collection;
     this.self = data._self;
     this.rid = data._rid;
     this.id = ko.observable(data.id);
-    this.body = ko.observable(data.body);
+    this.body = ko.observable(data.body as string);
     this.isExecuteEnabled = this.container.isFeatureEnabled(Constants.Features.executeSproc);
   }
 
   public static create(source: ViewModels.Collection, event: MouseEvent) {
     const id = source.container.tabsManager.getTabs(ViewModels.CollectionTabKind.StoredProcedures).length + 1;
-    const storedProcedure = <DataModels.StoredProcedure>{
+    const storedProcedure = <StoredProcedureDefinition>{
       id: "",
       body: sampleStoredProcedureBody
     };
@@ -104,7 +104,7 @@ export default class StoredProcedure {
     if (storedProcedureTab) {
       this.container.tabsManager.activateTab(storedProcedureTab);
     } else {
-      const storedProcedureData = <DataModels.StoredProcedure>{
+      const storedProcedureData = <StoredProcedureDefinition>{
         _rid: this.rid,
         _self: this.self,
         id: this.id(),
@@ -137,14 +137,7 @@ export default class StoredProcedure {
       return;
     }
 
-    const storedProcedureData = <DataModels.StoredProcedure>{
-      _rid: this.rid,
-      _self: this.self,
-      id: this.id(),
-      body: this.body()
-    };
-
-    deleteStoredProcedure(this.collection, storedProcedureData).then(
+    deleteStoredProcedure(this.collection.databaseId, this.collection.id(), this.id()).then(
       () => {
         this.container.tabsManager.removeTabByComparator((tab: TabsBase) => tab.node && tab.node.rid === this.rid);
         this.collection.children.remove(this);

src/Explorer/Tree/Trigger.ts

@@ -1,12 +1,12 @@
+import { StoredProcedureDefinition } from "@azure/cosmos";
 import * as ko from "knockout";
-import * as ViewModels from "../../Contracts/ViewModels";
 import * as Constants from "../../Common/Constants";
-import * as DataModels from "../../Contracts/DataModels";
+import { deleteTrigger } from "../../Common/dataAccess/deleteTrigger";
+import * as ViewModels from "../../Contracts/ViewModels";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
-import TriggerTab from "../Tabs/TriggerTab";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import Explorer from "../Explorer";
-import { deleteTrigger } from "../../Common/DocumentClientUtilityBase";
+import TriggerTab from "../Tabs/TriggerTab";
 
 export default class Trigger {
   public nodeKind: string;
@@ -43,7 +43,7 @@ export default class Trigger {
 
   public static create(source: ViewModels.Collection, event: MouseEvent) {
     const id = source.container.tabsManager.getTabs(ViewModels.CollectionTabKind.Triggers).length + 1;
-    const trigger = <DataModels.Trigger>{
+    const trigger = <StoredProcedureDefinition>{
       id: "",
       body: "function trigger(){}",
       triggerOperation: "All",
@@ -79,7 +79,7 @@ export default class Trigger {
     if (triggerTab) {
       this.container.tabsManager.activateTab(triggerTab);
     } else {
-      const triggerData = <DataModels.Trigger>{
+      const triggerData = <StoredProcedureDefinition>{
         _rid: this.rid,
         _self: this.self,
         id: this.id(),
@@ -114,16 +114,7 @@ export default class Trigger {
       return;
     }
 
-    const triggerData = <DataModels.Trigger>{
-      _rid: this.rid,
-      _self: this.self,
-      id: this.id(),
-      body: this.body(),
-      triggerOperation: this.triggerOperation(),
-      triggerType: this.triggerType()
-    };
-
-    deleteTrigger(this.collection, triggerData).then(
+    deleteTrigger(this.collection.databaseId, this.collection.id(), this.id()).then(
       () => {
         this.container.tabsManager.removeTabByComparator(tab => tab.node && tab.node.rid === this.rid);
         this.collection.children.remove(this);

src/Explorer/Tree/UserDefinedFunction.ts

@@ -1,12 +1,12 @@
+import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
 import * as ko from "knockout";
-import * as ViewModels from "../../Contracts/ViewModels";
 import * as Constants from "../../Common/Constants";
-import * as DataModels from "../../Contracts/DataModels";
+import { deleteUserDefinedFunction } from "../../Common/dataAccess/deleteUserDefinedFunction";
+import * as ViewModels from "../../Contracts/ViewModels";
 import { Action, ActionModifiers } from "../../Shared/Telemetry/TelemetryConstants";
-import UserDefinedFunctionTab from "../Tabs/UserDefinedFunctionTab";
 import * as TelemetryProcessor from "../../Shared/Telemetry/TelemetryProcessor";
 import Explorer from "../Explorer";
-import { deleteUserDefinedFunction } from "../../Common/DocumentClientUtilityBase";
+import UserDefinedFunctionTab from "../Tabs/UserDefinedFunctionTab";
 
 export default class UserDefinedFunction {
   public nodeKind: string;
@@ -17,7 +17,7 @@ export default class UserDefinedFunction {
   public id: ko.Observable<string>;
   public body: ko.Observable<string>;
 
-  constructor(container: Explorer, collection: ViewModels.Collection, data: DataModels.UserDefinedFunction) {
+  constructor(container: Explorer, collection: ViewModels.Collection, data: UserDefinedFunctionDefinition & Resource) {
     this.nodeKind = "UserDefinedFunction";
     this.container = container;
 
@@ -25,12 +25,12 @@ export default class UserDefinedFunction {
     this.self = data._self;
     this.rid = data._rid;
     this.id = ko.observable(data.id);
-    this.body = ko.observable(data.body);
+    this.body = ko.observable(data.body as string);
   }
 
   public static create(source: ViewModels.Collection, event: MouseEvent) {
     const id = source.container.tabsManager.getTabs(ViewModels.CollectionTabKind.UserDefinedFunctions).length + 1;
-    const userDefinedFunction = <DataModels.UserDefinedFunction>{
+    const userDefinedFunction = {
       id: "",
       body: "function userDefinedFunction(){}"
     };
@@ -64,7 +64,7 @@ export default class UserDefinedFunction {
     if (userDefinedFunctionTab) {
       this.container.tabsManager.activateTab(userDefinedFunctionTab);
     } else {
-      const userDefinedFunctionData = <DataModels.UserDefinedFunction>{
+      const userDefinedFunctionData = {
         _rid: this.rid,
         _self: this.self,
         id: this.id(),
@@ -107,13 +107,7 @@ export default class UserDefinedFunction {
       return;
     }
 
-    const userDefinedFunctionData = <DataModels.UserDefinedFunction>{
-      _rid: this.rid,
-      _self: this.self,
-      id: this.id(),
-      body: this.body()
-    };
-    deleteUserDefinedFunction(this.collection, userDefinedFunctionData).then(
+    deleteUserDefinedFunction(this.collection.databaseId, this.collection.id(), this.id()).then(
       () => {
         this.container.tabsManager.removeTabByComparator(tab => tab.node && tab.node.rid === this.rid);
         this.collection.children.remove(this);

src/Shared/Telemetry/TelemetryConstants.ts

@@ -70,7 +70,8 @@ export enum Action {
   NotebooksGitHubManualRepoAdd,
   NotebooksGitHubManageRepo,
   NotebooksGitHubCommit,
-  NotebooksGitHubDisconnect
+  NotebooksGitHubDisconnect,
+  OpenTerminal
 }
 
 export const ActionModifiers = {

src/Shared/Telemetry/TelemetryProcessor.ts

@@ -19,7 +19,7 @@ export function trace(action: Action, actionModifier: string = ActionModifiers.M
     }
   });
 
-  appInsights.trackEvent({ name: Action[action] }, getData(data));
+  appInsights.trackEvent({ name: Action[action] }, getData(actionModifier, data));
 }
 
 export function traceStart(action: Action, data?: unknown): number {
@@ -49,7 +49,7 @@ export function traceSuccess(action: Action, data?: unknown, timestamp?: number)
     }
   });
 
-  appInsights.stopTrackEvent(Action[action], getData(data));
+  appInsights.stopTrackEvent(Action[action], getData(ActionModifiers.Success, data));
 }
 
 export function traceFailure(action: Action, data?: unknown, timestamp?: number): void {
@@ -63,7 +63,7 @@ export function traceFailure(action: Action, data?: unknown, timestamp?: number)
     }
   });
 
-  appInsights.stopTrackEvent(Action[action], getData(data));
+  appInsights.stopTrackEvent(Action[action], getData(ActionModifiers.Failed, data));
 }
 
 export function traceCancel(action: Action, data?: unknown, timestamp?: number): void {
@@ -77,7 +77,7 @@ export function traceCancel(action: Action, data?: unknown, timestamp?: number):
     }
   });
 
-  appInsights.stopTrackEvent(Action[action], getData(data));
+  appInsights.stopTrackEvent(Action[action], getData(ActionModifiers.Cancel, data));
 }
 
 export function traceOpen(action: Action, data?: unknown, timestamp?: number): number {
@@ -112,7 +112,7 @@ export function traceMark(action: Action, data?: unknown, timestamp?: number): n
   return validTimestamp;
 }
 
-function getData(data: unknown = {}): { [key: string]: string } | undefined {
+function getData(actionModifier: string, data: unknown = {}): { [key: string]: string } | undefined {
   if (typeof data === "string") {
     data = { message: data };
   }
@@ -124,6 +124,7 @@ function getData(data: unknown = {}): { [key: string]: string } | undefined {
       subscriptionId: userContext.subscriptionId as string,
       platform: configContext.platform,
       env: process.env.NODE_ENV as string,
+      actionModifier,
       ...data
     };
   }

src/Shared/appInsights.ts

@@ -2,8 +2,7 @@ import { ApplicationInsights } from "@microsoft/applicationinsights-web";
 
 const appInsights = new ApplicationInsights({
   config: {
-    instrumentationKey: "fa645d97-6237-4656-9559-0ee0cb55ee49",
-    disableFetchTracking: false
+    instrumentationKey: "fa645d97-6237-4656-9559-0ee0cb55ee49"
   }
 });
 appInsights.loadAppInsights();

src/Terminal/index.ts

@@ -4,6 +4,8 @@ import "@jupyterlab/terminal/style/index.css";
 import "./index.css";
 import { ServerConnection } from "@jupyterlab/services";
 import { JupyterLabAppFactory } from "./JupyterLabAppFactory";
+import { Action } from "../Shared/Telemetry/TelemetryConstants";
+import * as TelemetryProcessor from "../Shared/Telemetry/TelemetryProcessor";
 
 const getUrlVars = (): { [key: string]: string } => {
   const vars: { [key: string]: string } = {};
@@ -14,10 +16,7 @@ const getUrlVars = (): { [key: string]: string } => {
   return vars;
 };
 
-const main = (): void => {
-  const urlVars = getUrlVars();
-  console.log("URL parameters", urlVars);
-
+const createServerSettings = (urlVars: { [key: string]: string }): ServerConnection.ISettings => {
   let body: BodyInit;
   if (urlVars.hasOwnProperty("terminalEndpoint")) {
     body = JSON.stringify({
@@ -39,14 +38,29 @@ const main = (): void => {
       fetch: window.parent.fetch
     };
   }
-  const serverSettings = ServerConnection.makeSettings(options);
 
-  if (urlVars.hasOwnProperty("terminal")) {
-    JupyterLabAppFactory.createTerminalApp(serverSettings);
-    return;
+  return ServerConnection.makeSettings(options);
+};
+
+const main = async (): Promise<void> => {
+  const urlVars = getUrlVars();
+  const serverSettings = createServerSettings(urlVars);
+
+  const startTime = TelemetryProcessor.traceStart(Action.OpenTerminal, {
+    baseUrl: serverSettings.baseUrl
+  });
+
+  try {
+    if (urlVars.hasOwnProperty("terminal")) {
+      await JupyterLabAppFactory.createTerminalApp(serverSettings);
+    } else {
+      throw new Error("Only terminal is supported");
+    }
+
+    TelemetryProcessor.traceSuccess(Action.OpenTerminal, startTime);
+  } catch (error) {
+    TelemetryProcessor.traceFailure(Action.OpenTerminal, startTime);
   }
-
-  throw new Error("Only terminal is supported");
 };
 
 window.addEventListener("load", main);

src/Utils/BlobUtils.ts

@@ -0,0 +1,17 @@
+export const stringToBlob = (data: string, contentType: string, sliceSize = 512): Blob => {
+  const byteArrays = [];
+
+  for (let offset = 0; offset < data.length; offset += sliceSize) {
+    const slice = data.slice(offset, offset + sliceSize);
+
+    const byteNumbers = new Array(slice.length);
+    for (let i = 0; i < slice.length; i++) {
+      byteNumbers[i] = slice.charCodeAt(i);
+    }
+
+    const byteArray = new Uint8Array(byteNumbers);
+    byteArrays.push(byteArray);
+  }
+
+  return new Blob(byteArrays, { type: contentType });
+};

src/Utils/arm/request.ts

@@ -6,11 +6,30 @@ Instead, generate ARM clients that consume this function with stricter typing.
 */
 
 import promiseRetry, { AbortError } from "p-retry";
-import { ErrorResponse } from "./generatedClients/2020-04-01/types";
 import { userContext } from "../../UserContext";
 
-interface ARMError extends Error {
+interface ErrorResponse {
   code: string;
+  message: string;
+}
+
+// ARM sometimes returns an error wrapped in a top level error object
+// Example: 409 Conflict error when trying to delete a locked resource
+interface WrappedErrorResponse {
+  error: ErrorResponse;
+}
+
+type ParsedErrorResponse = ErrorResponse | WrappedErrorResponse;
+
+export class ARMError extends Error {
+  constructor(message: string) {
+    super(message);
+    // Set the prototype explicitly.
+    // https://github.com/Microsoft/TypeScript/wiki/FAQ#why-doesnt-extending-built-ins-like-error-array-and-map-work
+    Object.setPrototypeOf(this, ARMError.prototype);
+  }
+
+  public code: string | number;
 }
 
 interface Options {
@@ -33,9 +52,20 @@ export async function armRequest<T>({ host, path, apiVersion, method, body: requ
     body: requestBody ? JSON.stringify(requestBody) : undefined
   });
   if (!response.ok) {
-    const errorResponse = (await response.json()) as ErrorResponse;
-    const error = new Error(errorResponse.message) as ARMError;
-    error.code = errorResponse.code;
+    let error: ARMError;
+    try {
+      const errorResponse = (await response.json()) as ParsedErrorResponse;
+      if ("error" in errorResponse) {
+        error = new ARMError(errorResponse.error.message);
+        error.code = errorResponse.error.code;
+      } else {
+        error = new ARMError(errorResponse.message);
+        error.code = errorResponse.code;
+      }
+    } catch (error) {
+      throw new Error(await response.text());
+    }
+
     throw error;
   }