Merge branch 'master' into languy-resource-tree-to-react

This changes the public API a bit, so that recording activity (the most common use) is less involved.

.env.example

@@ -3,7 +3,13 @@ PORTAL_RUNNER_PASSWORD=
 PORTAL_RUNNER_SUBSCRIPTION=
 PORTAL_RUNNER_RESOURCE_GROUP=
 PORTAL_RUNNER_DATABASE_ACCOUNT=
+PORTAL_RUNNER_DATABASE_ACCOUNT_KEY=
+PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT=
+PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT_KEY=
 PORTAL_RUNNER_CONNECTION_STRING=
+NOTEBOOKS_TEST_RUNNER_TENANT_ID=
+NOTEBOOKS_TEST_RUNNER_CLIENT_ID=
+NOTEBOOKS_TEST_RUNNER_CLIENT_SECRET=
 CASSANDRA_CONNECTION_STRING=
 MONGO_CONNECTION_STRING=
 TABLES_CONNECTION_STRING=

.eslintignore

@@ -11,16 +11,9 @@ src/Common/CosmosClient.test.ts
 src/Common/CosmosClient.ts
 src/Common/DataAccessUtilityBase.test.ts
 src/Common/DataAccessUtilityBase.ts
-src/Common/DeleteFeedback.ts
-src/Common/DocumentClientUtilityBase.ts
 src/Common/EditableUtility.ts
-src/Common/EnvironmentUtility.ts
 src/Common/HashMap.test.ts
 src/Common/HashMap.ts
-src/Common/HeadersUtility.test.ts
-src/Common/HeadersUtility.ts
-src/Common/IteratorUtilities.test.ts
-src/Common/IteratorUtilities.ts
 src/Common/Logger.test.ts
 src/Common/MessageHandler.test.ts
 src/Common/MessageHandler.ts
@@ -31,7 +24,6 @@ src/Common/ObjectCache.test.ts
 src/Common/ObjectCache.ts
 src/Common/QueriesClient.ts
 src/Common/Splitter.ts
-src/Common/ThemeUtility.ts
 src/Common/UrlUtility.ts
 src/Config.ts
 src/Contracts/ActionContracts.ts
@@ -43,7 +35,6 @@ src/Contracts/ViewModels.ts
 src/Controls/Heatmap/Heatmap.test.ts
 src/Controls/Heatmap/Heatmap.ts
 src/Controls/Heatmap/HeatmapDatatypes.ts
-src/Definitions/adal.d.ts
 src/Definitions/datatables.d.ts
 src/Definitions/gif.d.ts
 src/Definitions/globals.d.ts
@@ -60,8 +51,6 @@ src/Explorer/ComponentRegisterer.test.ts
 src/Explorer/ComponentRegisterer.ts
 src/Explorer/ContextMenuButtonFactory.ts
 src/Explorer/Controls/CollapsiblePanel/CollapsiblePanelComponent.ts
-src/Explorer/Controls/CommandButton/CommandButton.test.ts
-src/Explorer/Controls/CommandButton/CommandButton.ts
 src/Explorer/Controls/DiffEditor/DiffEditorComponent.ts
 src/Explorer/Controls/DynamicList/DynamicList.test.ts
 src/Explorer/Controls/DynamicList/DynamicListComponent.ts
@@ -89,7 +78,7 @@ src/Explorer/DataSamples/ContainerSampleGenerator.test.ts
 src/Explorer/DataSamples/ContainerSampleGenerator.ts
 src/Explorer/DataSamples/DataSamplesUtil.test.ts
 src/Explorer/DataSamples/DataSamplesUtil.ts
-src/Explorer/Explorer.ts
+src/Explorer/Explorer.tsx
 src/Explorer/Graph/GraphExplorerComponent/ArraysByKeyCache.test.ts
 src/Explorer/Graph/GraphExplorerComponent/ArraysByKeyCache.ts
 src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.test.ts
@@ -97,8 +86,6 @@ src/Explorer/Graph/GraphExplorerComponent/D3ForceGraph.ts
 src/Explorer/Graph/GraphExplorerComponent/EdgeInfoCache.ts
 src/Explorer/Graph/GraphExplorerComponent/GraphData.test.ts
 src/Explorer/Graph/GraphExplorerComponent/GraphData.ts
-src/Explorer/Graph/GraphExplorerComponent/GraphUtil.test.ts
-src/Explorer/Graph/GraphExplorerComponent/GraphUtil.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts
 src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.test.ts
@@ -112,7 +99,6 @@ src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.ts
 src/Explorer/Menus/ContextMenu.ts
 src/Explorer/MostRecentActivity/MostRecentActivity.ts
 src/Explorer/Notebook/FileSystemUtil.ts
-src/Explorer/Notebook/NTeractUtil.ts
 src/Explorer/Notebook/NotebookClientV2.ts
 src/Explorer/Notebook/NotebookComponent/NotebookContentProvider.ts
 src/Explorer/Notebook/NotebookComponent/__mocks__/rx-jupyter.ts
@@ -164,7 +150,7 @@ src/Explorer/Panes/Tables/Validators/EntityPropertyValidationCommon.ts
 src/Explorer/Panes/Tables/Validators/EntityPropertyValueValidator.ts
 src/Explorer/Panes/UploadFilePane.ts
 src/Explorer/Panes/UploadItemsPane.ts
-src/Explorer/SplashScreen/SplashScreenComponentAdapter.test.ts
+src/Explorer/SplashScreen/SplashScreen.test.ts
 src/Explorer/Tables/Constants.ts
 src/Explorer/Tables/DataTable/CacheBase.ts
 src/Explorer/Tables/DataTable/DataTableBindingManager.ts
@@ -172,7 +158,6 @@ src/Explorer/Tables/DataTable/DataTableBuilder.ts
 src/Explorer/Tables/DataTable/DataTableContextMenu.ts
 src/Explorer/Tables/DataTable/DataTableOperationManager.ts
 src/Explorer/Tables/DataTable/DataTableOperations.ts
-src/Explorer/Tables/DataTable/DataTableUtilities.ts
 src/Explorer/Tables/DataTable/DataTableViewModel.ts
 src/Explorer/Tables/DataTable/TableCommands.ts
 src/Explorer/Tables/DataTable/TableEntityCache.ts
@@ -181,8 +166,6 @@ src/Explorer/Tables/Entities.ts
 src/Explorer/Tables/QueryBuilder/ClauseGroup.ts
 src/Explorer/Tables/QueryBuilder/ClauseGroupViewModel.ts
 src/Explorer/Tables/QueryBuilder/CustomTimestampHelper.ts
-src/Explorer/Tables/QueryBuilder/DateTimeUtilities.test.ts
-src/Explorer/Tables/QueryBuilder/DateTimeUtilities.ts
 src/Explorer/Tables/QueryBuilder/QueryBuilderViewModel.ts
 src/Explorer/Tables/QueryBuilder/QueryClauseViewModel.ts
 src/Explorer/Tables/QueryBuilder/QueryViewModel.ts
@@ -202,9 +185,6 @@ src/Explorer/Tabs/QueryTab.test.ts
 src/Explorer/Tabs/QueryTab.ts
 src/Explorer/Tabs/QueryTablesTab.ts
 src/Explorer/Tabs/ScriptTabBase.ts
-src/Explorer/Tabs/SettingsTab.test.ts
-src/Explorer/Tabs/SettingsTab.ts
-src/Explorer/Tabs/SparkMasterTab.ts
 src/Explorer/Tabs/StoredProcedureTab.ts
 src/Explorer/Tabs/TabComponents.ts
 src/Explorer/Tabs/TabsBase.ts
@@ -245,9 +225,6 @@ src/Platform/Hosted/Authorization.ts
 src/Platform/Hosted/DataAccessUtility.ts
 src/Platform/Hosted/ExplorerFactory.ts
 src/Platform/Hosted/Helpers/ConnectionStringParser.test.ts
-src/Platform/Hosted/Helpers/ConnectionStringParser.ts
-src/Platform/Hosted/HostedUtils.test.ts
-src/Platform/Hosted/HostedUtils.ts
 src/Platform/Hosted/Main.ts
 src/Platform/Hosted/Maint.test.ts
 src/Platform/Hosted/NotificationsClient.ts
@@ -271,8 +248,6 @@ src/Shared/ExplorerSettings.ts
 src/Shared/PriceEstimateCalculator.ts
 src/Shared/StorageUtility.test.ts
 src/Shared/StorageUtility.ts
-src/Shared/StringUtility.test.ts
-src/Shared/StringUtility.ts
 src/Shared/appInsights.ts
 src/SparkClusterManager/ArcadiaResourceManager.ts
 src/SparkClusterManager/SparkClusterManager.ts
@@ -281,27 +256,14 @@ src/Terminal/NotebookAppContracts.d.ts
 src/Terminal/index.ts
 src/TokenProviders/PortalTokenProvider.ts
 src/TokenProviders/TokenProviderFactory.ts
-src/Utils/AuthorizationUtils.test.ts
-src/Utils/AuthorizationUtils.ts
-src/Utils/AutoPilotUtils.test.ts
-src/Utils/AutoPilotUtils.ts
 src/Utils/DatabaseAccountUtils.test.ts
 src/Utils/DatabaseAccountUtils.ts
-src/Utils/JunoUtils.ts
-src/Utils/MessageValidation.ts
-src/Utils/NotebookConfigurationUtils.ts
-src/Utils/OfferUtils.test.ts
-src/Utils/OfferUtils.ts
 src/Utils/PricingUtils.test.ts
 src/Utils/QueryUtils.test.ts
 src/Utils/QueryUtils.ts
-src/Utils/StringUtils.test.ts
-src/Utils/StringUtils.ts
 src/applyExplorerBindings.ts
 src/global.d.ts
-src/quickstart.ts
 src/setupTests.ts
-src/workers/upload/definitions.ts
 src/workers/upload/index.ts
 src/Explorer/Controls/AccessibleElement/AccessibleElement.tsx
 src/Explorer/Controls/Accordion/AccordionComponent.tsx
@@ -348,15 +310,7 @@ src/Explorer/Graph/GraphExplorerComponent/QueryContainerComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNeighborsComponent.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.test.tsx
 src/Explorer/Graph/GraphExplorerComponent/ReadOnlyNodePropertiesComponent.tsx
-src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx
-src/Explorer/Menus/CommandBar/CommandBarUtil.test.tsx
 src/Explorer/Menus/CommandBar/CommandBarUtil.tsx
-src/Explorer/Menus/CommandBar/MemoryTrackerComponent.tsx
-src/Explorer/Menus/NavBar/ControlBarComponent.tsx
-src/Explorer/Menus/NavBar/ControlBarComponentAdapter.tsx
-src/Explorer/Menus/NavBar/MeControlComponent.test.tsx
-src/Explorer/Menus/NavBar/MeControlComponent.tsx
-src/Explorer/Menus/NavBar/MeControlComponentAdapter.tsx
 src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.test.tsx
 src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx
 src/Explorer/Menus/NotificationConsole/NotificationConsoleComponentAdapter.tsx
@@ -386,8 +340,7 @@ src/Explorer/Notebook/temp/inputs/editor.tsx
 src/Explorer/Notebook/temp/markdown-cell.tsx
 src/Explorer/Notebook/temp/source.tsx
 src/Explorer/Notebook/temp/syntax-highlighter/index.tsx
-src/Explorer/SplashScreen/SplashScreenComponent.tsx
+src/Explorer/SplashScreen/SplashScreen.tsx
-src/Explorer/SplashScreen/SplashScreenComponentApdapter.tsx
 src/Explorer/Tabs/GalleryTab.tsx
 src/Explorer/Tabs/NotebookViewerTab.tsx
 src/Explorer/Tabs/TerminalTab.tsx
@@ -396,19 +349,5 @@ src/Explorer/Tree/ResourceTreeAdapterForResourceToken.tsx
 src/GalleryViewer/Cards/GalleryCardComponent.tsx
 src/GalleryViewer/GalleryViewer.tsx
 src/GalleryViewer/GalleryViewerComponent.tsx
-cypress/integration/dataexplorer/CASSANDRA/addCollection.spec.ts
-cypress/integration/dataexplorer/GRAPH/addCollection.spec.ts
-cypress/integration/dataexplorer/ci-tests/addCollectionPane.spec.ts
-cypress/integration/dataexplorer/ci-tests/createDatabase.spec.ts
-cypress/integration/dataexplorer/ci-tests/deleteCollection.spec.ts
-cypress/integration/dataexplorer/ci-tests/deleteDatabase.spec.ts
-cypress/integration/dataexplorer/MONGO/addCollection.spec.ts
-cypress/integration/dataexplorer/MONGO/addCollectionAutopilot.spec.ts
-cypress/integration/dataexplorer/MONGO/addCollectionExistingDatabase.spec.ts
-cypress/integration/dataexplorer/MONGO/provisionDatabaseThroughput.spec.ts
-cypress/integration/dataexplorer/SQL/addCollection.spec.ts
-cypress/integration/dataexplorer/TABLE/addCollection.spec.ts
-cypress/integration/notebook/newNotebook.spec.ts
-cypress/integration/notebook/resourceTree.spec.ts
 __mocks__/monaco-editor.ts
 src/Explorer/Tree/ResourceTreeAdapterForResourceToken.test.tsx

.eslintrc.js

@@ -1,41 +1,39 @@
 module.exports = {
   env: {
     browser: true,
-    es6: true
+    es6: true,
   },
   plugins: ["@typescript-eslint", "no-null", "prefer-arrow"],
   extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
   globals: {
     Atomics: "readonly",
-    SharedArrayBuffer: "readonly"
+    SharedArrayBuffer: "readonly",
   },
   parser: "@typescript-eslint/parser",
   parserOptions: {
     ecmaFeatures: {
-      jsx: true
+      jsx: true,
     },
     ecmaVersion: 2018,
-    sourceType: "module"
+    sourceType: "module",
   },
   overrides: [
     {
       files: ["**/*.tsx"],
-      env: {
+      extends: ["plugin:react/recommended"], // TODO: Add react-hooks
-        jest: true
+      plugins: ["react"],
-      },
-      extends: ["plugin:react/recommended"],
-      plugins: ["react"]
     },
     {
       files: ["**/*.{test,spec}.{ts,tsx}"],
       env: {
-        jest: true
+        jest: true,
       },
       extends: ["plugin:jest/recommended"],
-      plugins: ["jest"]
+      plugins: ["jest"],
-    }
+    },
   ],
   rules: {
+    "no-console": ["error", { allow: ["error", "warn", "dir"] }],
     curly: "error",
     "@typescript-eslint/no-unused-vars": "error",
     "@typescript-eslint/no-extraneous-class": "error",
@@ -43,12 +41,13 @@ module.exports = {
     "@typescript-eslint/no-explicit-any": "error",
     "prefer-arrow/prefer-arrow-functions": ["error", { allowStandaloneDeclarations: true }],
     eqeqeq: "error",
+    "react/display-name": "off",
     "no-restricted-syntax": [
       "error",
       {
         selector: "CallExpression[callee.object.name='JSON'][callee.property.name='stringify'] Identifier[name=/$err/]",
-        message: "Do not use JSON.stringify(error). It will print '{}'"
+        message: "Do not use JSON.stringify(error). It will print '{}'",
-      }
+      },
-    ]
+    ],
-  }
+  },
 };

.github/workflows/ci.yml

@@ -9,15 +9,29 @@ on:
     branches:
       - master
 jobs:
+  codemetrics:
+    runs-on: ubuntu-latest
+    name: "Log Code Metrics"
+    if: github.ref == 'refs/heads/master'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - run: npm ci
+      - run: node utils/codeMetrics.js
+        env:
+          CODE_METRICS_APP_ID: ${{ secrets.CODE_METRICS_APP_ID }}
   compile:
     runs-on: ubuntu-latest
     name: "Compile TypeScript"
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - run: npm ci
       - run: npm run compile
       - run: npm run compile:strict
@@ -26,10 +40,10 @@ jobs:
     name: "Check Format"
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - run: npm ci
       - run: npm run format:check
   lint:
@@ -37,10 +51,10 @@ jobs:
     name: "Lint"
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - run: npm ci
       - run: npm run lint
   unittest:
@@ -48,10 +62,10 @@ jobs:
     name: "Unit Tests"
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - run: npm ci
       - run: npm run test
   build:
@@ -60,10 +74,10 @@ jobs:
     name: "Build"
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - run: npm ci
       - run: npm run build:contracts
       - name: Restore Build Cache
@@ -79,42 +93,42 @@ jobs:
           name: dist
           path: dist/
   endtoendemulator:
-    name: "End To End Tests | Emulator | SQL"
+    name: "End To End Emulator Tests"
-    needs: [lint, format, compile, unittest]
+    if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/')
     runs-on: windows-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: southpolesteve/cosmos-emulator-github-action@v1
+      - name: Use Node.js 14.x
-      - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
-      - name: Restore Cypress Binary Cache
+      - uses: southpolesteve/cosmos-emulator-github-action@v1
-        uses: actions/cache@v2
-        with:
-          path: ~/.cache/Cypress
-          key: ${{ runner.os }}-cypress-binary-cache
       - name: End to End Tests
         run: |
           npm ci
           npm start &
-          npm ci --prefix ./cypress
+          npm run wait-for-server
-          npm run test:ci --prefix ./cypress -- --spec ./integration/dataexplorer/ci-tests/createDatabase.spec.ts
+          npx jest -c ./jest.config.e2e.js --detectOpenHandles test/sql/container.spec.ts
         shell: bash
         env:
-          EMULATOR_ENDPOINT: https://0.0.0.0:8081/
+          DATA_EXPLORER_ENDPOINT: "https://localhost:1234/explorer.html?platform=Emulator"
+          PLATFORM: "Emulator"
           NODE_TLS_REJECT_UNAUTHORIZED: 0
-          CYPRESS_CACHE_FOLDER: ~/.cache/Cypress
+      - uses: actions/upload-artifact@v2
+        if: failure()
+        with:
+          name: screenshots
+          path: failed-*
   accessibility:
     name: "Accessibility | Hosted"
     needs: [lint, format, compile, unittest]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
       - name: Accessibility Check
         run: |
           # Ubuntu gets mad when webpack runs too many files watchers
@@ -123,43 +137,78 @@ jobs:
           sudo sysctl -p
           npm ci
           npm start &
-          npx wait-on  -i 5000 https-get://0.0.0.0:1234/
+          npx wait-on -i 5000 https-get://0.0.0.0:1234/
           node utils/accesibilityCheck.js
         shell: bash
         env:
           NODE_TLS_REJECT_UNAUTHORIZED: 0
-  endtoendpuppeteer:
+  endtoendhosted:
-    name: "End to end puppeteer tests"
+    name: "End to End Tests"
-    needs: [lint, format, compile, unittest]
+    needs: [cleanupaccounts]
     runs-on: ubuntu-latest
+    env:
+      NODE_TLS_REJECT_UNAUTHORIZED: 0
+      PORTAL_RUNNER_SUBSCRIPTION: ${{ secrets.PORTAL_RUNNER_SUBSCRIPTION }}
+      PORTAL_RUNNER_RESOURCE_GROUP: ${{ secrets.PORTAL_RUNNER_RESOURCE_GROUP }}
+      PORTAL_RUNNER_DATABASE_ACCOUNT: ${{ secrets.PORTAL_RUNNER_DATABASE_ACCOUNT }}
+      PORTAL_RUNNER_DATABASE_ACCOUNT_KEY: ${{ secrets.PORTAL_RUNNER_DATABASE_ACCOUNT_KEY }}
+      PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT: ${{ secrets.PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT }}
+      PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT_KEY: ${{ secrets.PORTAL_RUNNER_MONGO_DATABASE_ACCOUNT_KEY }}
+      NOTEBOOKS_TEST_RUNNER_TENANT_ID: ${{ secrets.NOTEBOOKS_TEST_RUNNER_TENANT_ID }}
+      NOTEBOOKS_TEST_RUNNER_CLIENT_ID: ${{ secrets.NOTEBOOKS_TEST_RUNNER_CLIENT_ID }}
+      NOTEBOOKS_TEST_RUNNER_CLIENT_SECRET: ${{ secrets.NOTEBOOKS_TEST_RUNNER_CLIENT_SECRET }}
+      PORTAL_RUNNER_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_SQL }}
+      MONGO_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_MONGO }}
+      CASSANDRA_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_CASSANDRA }}
+      TABLES_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_TABLE }}
+      DATA_EXPLORER_ENDPOINT: "https://localhost:1234/hostedExplorer.html"
+    strategy:
+      fail-fast: false
+      matrix:
+        test-file:
+          - ./test/cassandra/container.spec.ts
+          - ./test/mongo/mongoIndexPolicy.spec.ts
+          - ./test/notebooks/uploadAndOpenNotebook.spec.ts
+          - ./test/selfServe/selfServeExample.spec.ts
+          - ./test/sql/container.spec.ts
+          - ./test/sql/resourceToken.spec.ts
+          - ./test/tables/container.spec.ts
     steps:
       - uses: actions/checkout@v2
-      - name: Use Node.js 12.x
+      - name: Use Node.js 14.x
         uses: actions/setup-node@v1
         with:
-          node-version: 12.x
+          node-version: 14.x
-      - name: End to End Puppeteer Tests
+      - run: npm ci
-        run: |
+      - run: npm start &
-          npm ci
+      - run: node utils/cleanupDBs.js
-          npm start &
+      - run: npm run wait-for-server
-          npm run wait-for-server
+      - name: ${{ matrix['test-file'] }}
-          npm run test:e2e
+        run: npx jest -c ./jest.config.e2e.js --detectOpenHandles ${{ matrix['test-file'] }}
         shell: bash
-        env:
-          NODE_TLS_REJECT_UNAUTHORIZED: 0
-          PORTAL_RUNNER_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_SQL }}
-          MONGO_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_MONGO }}
-          CASSANDRA_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_CASSANDRA }}
-          TABLES_CONNECTION_STRING: ${{ secrets.CONNECTION_STRING_TABLE }}
-          DATA_EXPLORER_ENDPOINT: "https://localhost:1234/hostedExplorer.html"
       - uses: actions/upload-artifact@v2
+        if: failure()
         with:
           name: screenshots
           path: failed-*
+  cleanupaccounts:
+    name: "Cleanup Test Database Accounts"
+    runs-on: ubuntu-latest
+    env:
+      NOTEBOOKS_TEST_RUNNER_CLIENT_ID: ${{ secrets.NOTEBOOKS_TEST_RUNNER_CLIENT_ID }}
+      NOTEBOOKS_TEST_RUNNER_CLIENT_SECRET: ${{ secrets.NOTEBOOKS_TEST_RUNNER_CLIENT_SECRET }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js 14.x
+        uses: actions/setup-node@v1
+        with:
+          node-version: 14.x
+      - run: npm ci
+      - run: node utils/cleanupDBs.js
   nuget:
     name: Publish Nuget
     if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/')
-    needs: [lint, format, compile, build, unittest, endtoendemulator, endtoendpuppeteer]
+    needs: [build]
     runs-on: ubuntu-latest
     env:
       NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }}
@@ -175,7 +224,7 @@ jobs:
       - run: cp ./configs/prod.json config.json
       - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "GitHub" -Password "$AZURE_DEVOPS_PAT"
       - run: nuget pack -Version "2.0.0-github-${GITHUB_SHA}"
-      - run: nuget push -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
+      - run: nuget push -SkipDuplicate -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
       - uses: actions/upload-artifact@v2
         name: packages
         with:
@@ -183,7 +232,7 @@ jobs:
   nugetmpac:
     name: Publish Nuget MPAC
     if: github.ref == 'refs/heads/master' || contains(github.ref, 'hotfix/') || contains(github.ref, 'release/')
-    needs: [lint, format, compile, build, unittest, endtoendemulator, endtoendpuppeteer]
+    needs: [build]
     runs-on: ubuntu-latest
     env:
       NUGET_SOURCE: ${{ secrets.NUGET_SOURCE }}
@@ -200,7 +249,7 @@ jobs:
       - run: sed -i 's/Azure.Cosmos.DB.Data.Explorer/Azure.Cosmos.DB.Data.Explorer.MPAC/g' DataExplorer.nuspec
       - run: nuget sources add -Name "ADO" -Source "$NUGET_SOURCE" -UserName "GitHub" -Password "$AZURE_DEVOPS_PAT"
       - run: nuget pack -Version "2.0.0-github-${GITHUB_SHA}"
-      - run: nuget push -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
+      - run: nuget push -SkipDuplicate -Source "$NUGET_SOURCE" -ApiKey Az *.nupkg
       - uses: actions/upload-artifact@v2
         name: packages
         with:

.github/workflows/runners.yml

@@ -1,25 +0,0 @@
-name: Runners
-on:
-  schedule:
-    - cron: "0 * 1 * *"
-jobs:
-  sqlcreatecollection:
-    runs-on: ubuntu-latest
-    name: "SQL | Create Collection"
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-      - run: npm ci
-      - run: npm run test:e2e
-        env:
-          PORTAL_RUNNER_APP_INSIGHTS_KEY: ${{ secrets.PORTAL_RUNNER_APP_INSIGHTS_KEY }}
-          PORTAL_RUNNER_USERNAME: ${{ secrets.PORTAL_RUNNER_USERNAME }}
-          PORTAL_RUNNER_PASSWORD: ${{ secrets.PORTAL_RUNNER_PASSWORD }}
-          PORTAL_RUNNER_SUBSCRIPTION: 69e02f2d-f059-4409-9eac-97e8a276ae2c
-          PORTAL_RUNNER_RESOURCE_GROUP: runners
-          PORTAL_RUNNER_DATABASE_ACCOUNT: portal-sql-runner
-      - uses: actions/upload-artifact@v2
-        if: failure()
-        with:
-          name: screenshots
-          path: failure.png

.gitignore

@@ -9,9 +9,6 @@ pkg/DataExplorer/*
 test/out/*
 workers/**/*.js
 *.trx
-cypress/videos
-cypress/screenshots
-cypress/fixtures
 notebookapp/*
 Contracts/*
 .DS_Store

.vscode/settings.json

@@ -1,21 +1,26 @@
 // Place your settings in this file to overwrite default and user settings.
 {
-    "files.exclude": {
+  "files.exclude": {
-        ".vs": true,
+    ".vs": true,
-        ".vscode/**": true,
+    ".vscode/**": true,
-        "*.trx": true,
+    "*.trx": true,
-        "**/.DS_Store": true,
+    "**/.DS_Store": true,
-        "**/.git": true,
+    "**/.git": true,
-        "**/.hg": true,
+    "**/.hg": true,
-        "**/.svn": true,
+    "**/.svn": true,
-        "built/**": true,
+    "built/**": true,
-        "coverage/**": true,
+    "coverage/**": true,
-        "libs/**": true,
+    "libs/**": true,
-        "node_modules/**": true,
+    "node_modules/**": true,
-        "package-lock.json": true,
+    "package-lock.json": true,
-        "quickstart/**": true,
+    "quickstart/**": true,
-        "test/out/**": true,
+    "test/out/**": true,
-        "workers/libs/**": true
+    "workers/libs/**": true
-    },
+  },
-    "typescript.tsdk": "node_modules/typescript/lib"
+  "typescript.tsdk": "node_modules/typescript/lib",
-}
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true,
+    "source.organizeImports": true
+  }
+}

CODING_GUIDELINES.md

@@ -0,0 +1,194 @@
+# Coding Guidelines and Recommendations
+
+Cosmos Explorer has been under constant development for over 5 years. As a result, there are many different patterns and practices in the codebase. This document serves as a guide to how we write code and helps avoid propagating practices which are no longer preferred. Each requirement in this document is labeled and color-coded to show the relative importance. In order from highest to lowest importance:
+
+✅ DO this. If you feel you need an exception, engage with the project owners _prior_ to implementation.
+
+⛔️ DO NOT do this. If you feel you need an exception, engage with the project owners _prior_ to implementation.
+
+☑️ YOU SHOULD strongly consider this but it is not a requirement. If not following this advice, please comment code with why and proactively begin a discussion as part of the PR process.
+
+⚠️ YOU SHOULD NOT strongly consider not doing this. If not following this advice, please comment code with why and proactively begin a discussion as part of the PR process.
+
+💭 YOU MAY consider this advice if appropriate to your situation. Other team members may comment on this as part of PR review, but there is no need to be proactive.
+
+## Development Environment
+
+☑️ YOU SHOULD
+
+- Use VSCode and install the following extensions. This setup will catch most linting/formatting/type errors as you develop:
+  - [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
+  - [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+
+💭 YOU MAY
+
+- Use the [GitHub CLI](https://cli.github.com/). It has helpful workflows for submitting PRs as well as for checking out other team member's PRs.
+- Use Windows, Linux (including WSL), or OSX. We have team members developing on all three environments.
+
+✅ DO
+
+- Maintain cross-platform compatibility when modifying any engineering or build systems
+
+## Code Formatting
+
+✅ DO
+
+- Use [Prettier](https://prettier.io/) to format your code
+  - This will occur automatically if using the recommended editor setup
+  - `npm run format` will also format code
+
+## Linting
+
+✅ DO
+
+- Use [ESLint](https://eslint.org/) to check for code errors.
+  - This will occur automatically if using the recommended editor setup
+  - `npm run lint` will also check for linting errors
+
+💭 YOU MAY
+
+- Consider adding new lint rules.
+  - If you find yourself performing "nits" as part of PR review, consider adding a lint rule that will automatically catch the error in the future
+
+⚠️ YOU SHOULD NOT
+
+- Disable lint rules
+  - Lint rules exist as guidance and to catch common mistakes
+  - You will find places we disable specific lint rules however it should be exceptional.
+  - If a rule does need to be disabled, prefer disabling a specific line instead of the entire file.
+
+⛔️ DO NOT
+
+- Add [TSLint](https://palantir.github.io/tslint/) rules
+  - TSLint has been deprecated and is on track to be removed
+  - Always prefer ESLint rules
+
+## UI Components
+
+☑️ YOU SHOULD
+
+- Write new components using [React](https://reactjs.org/). We are actively migrating Cosmos Explorer off of [Knockout](https://knockoutjs.com/).
+- Use [Fluent](https://developer.microsoft.com/en-us/fluentui#/) components.
+  - Fluent components are designed to be highly accessible and composable
+  - Using Fluent allows us to build upon the work of the Fluent team and leads to a lower total cost of ownership for UI code
+
+### React
+
+☑️ YOU SHOULD
+
+- Use pure functional components when no state is required
+
+💭 YOU MAY
+
+- Use functional (hooks) or class components
+  - The project contains examples of both
+  - Neither is strongly preferred at this time
+
+⛔️ DO NOT
+
+- Use inheritance for sharing component behavior.
+  - React documentation covers this topic in detail https://reactjs.org/docs/composition-vs-inheritance.html
+- Suffix your file or component name with "Component"
+  - Even though the code has examples of it, we are ending the practice.
+
+## Libraries
+
+⚠️ YOU SHOULD NOT
+
+- Add new libraries to package.json.
+  - Adding libraries may bring in code that explodes the bundled size or attempts to run NodeJS code in the browser
+  - Consult with project owners for help with library selection if one is needed
+
+⛔️ DO NOT
+
+- Use underscore.js
+  - Much of this library is now native to JS and will be automatically transpiled
+- Use jQuery
+  - Much of this library is not native to the DOM.
+  - We are planning to remove it
+
+## Testing
+
+⛔️ DO NOT
+
+- Decrease test coverage
+  - Unit/Functional test coverage is checked as part of the CI process
+
+### Unit Tests
+
+✅ DO
+
+- Write unit tests for non-UI and utility code.
+- Write your tests using [Jest](https://jestjs.io/)
+
+☑️ YOU SHOULD
+
+- Abstract non-UI and utility code so it can run either the NodeJS or Browser environment
+
+### Functional(Component) Tests
+
+✅ DO
+
+- Write tests for UI components
+- Write your tests using [Jest](https://jestjs.io/)
+- Use either Enzyme or React Testing Library to perform component tests.
+
+### Mocking
+
+✅ DO
+
+- Use Jest's built-in mocking helpers
+
+☑️ YOU SHOULD
+
+- Write code that does not require mocking
+- Build components that do not require mocking extremely large or difficult to mock objects (like Explorer.ts). Pass _only_ what you need.
+
+⛔️ DO NOT
+
+- Use sinon.js for mocking
+  - Sinon has been deprecated and planned for removal
+
+### End to End Tests
+
+✅ DO
+
+- Use [Puppeteer](https://developers.google.com/web/tools/puppeteer) and [Jest](https://jestjs.io/)
+- Write or modify an existing E2E test that covers the primary use case of any major feature.
+  - Use caution. Do not try to cover every case. End to End tests can be slow and brittle.
+
+☑️ YOU SHOULD
+
+- Write tests that use accessible attributes to perform actions. Role, Title, Label, etc
+  - More information https://testing-library.com/docs/queries/about#priority
+
+⚠️ YOU SHOULD NOT
+
+- Add test specfic `data-*` attributes to dom elements
+  - This is a common current practice, but one we would like to avoid in the future
+  - End to end tests need to use semantic HTML and accesible attributes to be truely end to end
+  - No user or screen reader actually navigates an app using `data-*` attributes
+- Add arbitrary time delays to wait for page to render or element to be ready.
+  - All the time delays add up and slow down testing.
+  - Prefer using the framework's "wait for..." functionality.
+
+### Migrating Knockout to React
+
+✅ DO
+
+- Consult other team members before beginning migration work. There is a significant amount of flux in patterns we are using and it is important we do not propagate incorrect patterns.
+- Start by converting HTML to JSX: https://magic.reactjs.net/htmltojsx.htm. Add functionality as a second step.
+
+☑️ YOU SHOULD
+
+- Write React components that require no dependency on Knockout or observables to trigger rendering.
+
+## Browser Support
+
+✅ DO
+
+- Support all [browsers supported by the Azure Portal](https://docs.microsoft.com/en-us/azure/azure-portal/azure-portal-supported-browsers-devices)
+- Support IE11
+  - In practice, this should not need to be considered as part of a normal development workflow
+  - Polyfills and transpilation are already provided by our engineering systems.
+  - This requirement will be removed on March 30th, 2021 when Azure drops IE11 support.

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Contribution guidelines to Data Explorer
 
-This project welcomes contributions and suggestions.  Most contributions require you to agree to a
+This project welcomes contributions and suggestions. Most contributions require you to agree to a
 Contributor License Agreement (CLA) declaring that you have the right to, and actually do, grant us
 the rights to use your contribution. For details, visit https://cla.microsoft.com.
 
@@ -13,6 +13,7 @@ For more information see the [Code of Conduct FAQ](https://opensource.microsoft.
 contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.
 
 ## Microsoft Open Source Code of Conduct
+
 This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/).
 
 Resources:
@@ -20,33 +21,3 @@ Resources:
 - [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/)
 - [Microsoft Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/)
 - Contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with questions or concerns
-
-## Browser support
-Please make sure to support all modern browsers as well as Internet Explorer 11.
-For IE support, polyfill is preferred over new usage of lodash or underscore. We already polyfill almost everything by importing babel-polyfill at the top of entry points.
-
-
-## Coding guidelines, conventions and recommendations
-### Typescript
-* Follow this [typescript style guide](https://github.com/excelmicro/typescript) which is based on [airbnb's style  guide](https://github.com/airbnb/javascript).
-* Conventions speficic to this project:
-  - Use double-quotes for string
-  - Don't use `null`, use `undefined`
-  - Pascal case for private static readonly fields
-  - Camel case for classnames in markup
-* Don't use class unless necessary
-* Code related to notebooks should be dynamically imported so that it is loaded from a separate bundle only if the account is notebook-enabled. There are already top-level notebook components which are dynamically imported and their dependencies can be statically imported from these files.
-* Prefer using [Fluent UI controls](https://developer.microsoft.com/en-us/fluentui#/controls/web) over creating your own, in order to maintain consistency and support a11y.
-
-### React
-* Prefer using React class components over function components and hooks unless you have a simple component and require no nested functions:
-  * Nested functions may be harder to test independently
-  * Switching from function component to class component later mayb be painful
-
-## Testing
-Any PR should not decrease testing coverage.
-
-## Recommended Tools and VS Code extensions
-* [Bookmarks](https://github.com/alefragnani/vscode-bookmarks)
-* [Bracket pair colorizer](https://github.com/CoenraadS/Bracket-Pair-Colorizer-2)
-* [GitHub Pull Requests and Issues](https://github.com/Microsoft/vscode-pull-request-github)

README.md

@@ -13,29 +13,18 @@ UI for Azure Cosmos DB. Powers the [Azure Portal](https://portal.azure.com/), ht
 
 ### Watch mode
 
-Run `npm run watch` to start the development server and automatically rebuild on changes
+Run `npm start` to start the development server and automatically rebuild on changes
 
-### Specifying Development Platform
+### Hosted Development (https://cosmos.azure.com)
 
-Setting the environment variable `PLATFORM` during the build process will force the explorer to load the specified platform. By default in development it will run in `Hosted` mode. Valid options:
+- Visit: `https://localhost:1234/hostedExplorer.html`
-
+- Local sign in via AAD will NOT work. Connection string only in dev mode. Use the Portal if you need AAD auth.
-- Hosted
+- The default webpack dev server configuration will proxy requests to the production portal backend: `https://main.documentdb.ext.azure.com`. This will allow you to use production connection strings on your local machine.
-- Emulator
-- Portal
-
-`PLATFORM=Emulator npm run watch`
-
-### Hosted Development
-
-The default webpack dev server configuration will proxy requests to the production portal backend: `https://main.documentdb.ext.azure.com`. This will allow you to use production connection strings on your local machine.
-
-To run pure hosted mode, in `webpack.config.js` change index HtmlWebpackPlugin to use hostedExplorer.html and change entry for index to use HostedExplorer.ts.
 
 ### Emulator Development
 
-In a window environment, running `npm run build` will automatically copy the built files from `/dist` over to the default emulator install paths. In a non-windows environment you can specify an alternate endpoint using `EMULATOR_ENDPOINT` and webpack dev server will proxy requests for you.
+- Start the Cosmos Emulator
-
+- Visit: https://localhost:1234/index.html
-`PLATFORM=Emulator EMULATOR_ENDPOINT=https://my-vm.azure.com:8081 npm run watch`
 
 #### Setting up a Remote Emulator
 
@@ -55,16 +44,8 @@ The Cosmos emulator currently only runs in Windows environments. You can still d
 
 ### Portal Development
 
-The Cosmos Portal that consumes this repo is not currently open source. If you have access to this project, `npm run build` will copy the built files over to the portal where they will be loaded by the portal development environment
+- Visit: https://ms.portal.azure.com/?dataExplorerSource=https%3A%2F%2Flocalhost%3A1234%2Fexplorer.html
-
+- You may have to manually visit https://localhost:1234/explorer.html first and click through any SSL certificate warnings
-You can however load a local running instance of data explorer in the production portal.
-
-1. Turn off browser SSL validation for localhost: chrome://flags/#allow-insecure-localhost OR Install valid SSL certs for localhost (on IE, follow these [instructions](https://www.technipages.com/ie-bypass-problem-with-this-websites-security-certificate) to install the localhost certificate in the right place)
-2. Allowlist `https://localhost:1234` domain for CORS in the Azure Cosmos DB portal
-3. Start the project in portal mode: `PLATFORM=Portal npm run watch`
-4. Load the portal using the following link: https://ms.portal.azure.com/?dataExplorerSource=https%3A%2F%2Flocalhost%3A1234%2Fexplorer.html
-
-Live reload will occur, but data explorer will not properly integrate again with the parent iframe. You will have to manually reload the page.
 
 ### Testing
 
@@ -76,17 +57,7 @@ Unit tests are located adjacent to the code under test and run with [Jest](https
 
 #### End to End CI Tests
 
-[Cypress](https://www.cypress.io/) is used for end to end tests and are contained in `cypress/`. Currently, it operates as sub project with its own typescript config and dependencies. It also only operates against the emulator. To run cypress tests:
+Jest and Puppeteer are used for end to end browser based tests and are contained in `test/`. To run these tests locally:
-
-1. Ensure the emulator is running
-2. Start cosmos explorer in emulator mode: `PLATFORM=Emulator npm run watch`
-3. Move into `cypress/` folder: `cd cypress`
-4. Install dependencies: `npm install`
-5. Run cypress headless(`npm run test`) or in interactive mode(`npm run test:debug`)
-
-#### End to End Production Tests
-
-Jest and Puppeteer are used for end to end production runners and are contained in `test/`. To run these tests locally:
 
 1. Copy .env.example to .env
 2. Update the values in .env including your local data explorer endpoint (ask a teammate/codeowner for help with .env values)
@@ -98,6 +69,10 @@ Jest and Puppeteer are used for end to end production runners and are contained
 
 We generally adhere to the release strategy [documented by the Azure SDK Guidelines](https://azure.github.io/azure-sdk/policies_repobranching.html#release-branches). Most releases should happen from the master branch. If master contains commits that cannot be released, you may create a release from a `release/` or `hotfix/` branch. See linked documentation for more details.
 
+### Architechture
+
+[![](https://mermaid.ink/img/eyJjb2RlIjoiZ3JhcGggTFJcbiAgaG9zdGVkKGh0dHBzOi8vY29zbW9zLmF6dXJlLmNvbSlcbiAgcG9ydGFsKFBvcnRhbClcbiAgZW11bGF0b3IoRW11bGF0b3IpXG4gIGFhZFtBQURdXG4gIHJlc291cmNlVG9rZW5bUmVzb3VyY2UgVG9rZW5dXG4gIGNvbm5lY3Rpb25TdHJpbmdbQ29ubmVjdGlvbiBTdHJpbmddXG4gIHBvcnRhbFRva2VuW0VuY3J5cHRlZCBQb3J0YWwgVG9rZW5dXG4gIG1hc3RlcktleVtNYXN0ZXIgS2V5XVxuICBhcm1bQVJNIFJlc291cmNlIFByb3ZpZGVyXVxuICBkYXRhcGxhbmVbRGF0YSBQbGFuZV1cbiAgcHJveHlbUG9ydGFsIEFQSSBQcm94eV1cbiAgc3FsW1NRTF1cbiAgbW9uZ29bTW9uZ29dXG4gIHRhYmxlc1tUYWJsZXNdXG4gIGNhc3NhbmRyYVtDYXNzYW5kcmFdXG4gIGdyYWZbR3JhcGhdXG5cblxuICBlbXVsYXRvciAtLT4gbWFzdGVyS2V5IC0tLS0-IGRhdGFwbGFuZVxuICBwb3J0YWwgLS0-IGFhZFxuICBob3N0ZWQgLS0-IHBvcnRhbFRva2VuICYgcmVzb3VyY2VUb2tlbiAmIGNvbm5lY3Rpb25TdHJpbmcgJiBhYWRcbiAgYWFkIC0tLT4gYXJtXG4gIGFhZCAtLS0-IGRhdGFwbGFuZVxuICBhYWQgLS0tPiBwcm94eVxuICByZXNvdXJjZVRva2VuIC0tLT4gc3FsIC0tPiBkYXRhcGxhbmVcbiAgcG9ydGFsVG9rZW4gLS0tPiBwcm94eVxuICBwcm94eSAtLT4gZGF0YXBsYW5lXG4gIGNvbm5lY3Rpb25TdHJpbmcgLS0-IHNxbCAmIG1vbmdvICYgY2Fzc2FuZHJhICYgZ3JhZiAmIHRhYmxlc1xuICBzcWwgLS0-IGRhdGFwbGFuZVxuICB0YWJsZXMgLS0-IGRhdGFwbGFuZVxuICBtb25nbyAtLT4gcHJveHlcbiAgY2Fzc2FuZHJhIC0tPiBwcm94eVxuICBncmFmIC0tPiBwcm94eVxuXG5cdFx0IiwibWVybWFpZCI6eyJ0aGVtZSI6ImRlZmF1bHQifSwidXBkYXRlRWRpdG9yIjpmYWxzZX0)](https://mermaid-js.github.io/mermaid-live-editor/#/edit/eyJjb2RlIjoiZ3JhcGggTFJcbiAgaG9zdGVkKGh0dHBzOi8vY29zbW9zLmF6dXJlLmNvbSlcbiAgcG9ydGFsKFBvcnRhbClcbiAgZW11bGF0b3IoRW11bGF0b3IpXG4gIGFhZFtBQURdXG4gIHJlc291cmNlVG9rZW5bUmVzb3VyY2UgVG9rZW5dXG4gIGNvbm5lY3Rpb25TdHJpbmdbQ29ubmVjdGlvbiBTdHJpbmddXG4gIHBvcnRhbFRva2VuW0VuY3J5cHRlZCBQb3J0YWwgVG9rZW5dXG4gIG1hc3RlcktleVtNYXN0ZXIgS2V5XVxuICBhcm1bQVJNIFJlc291cmNlIFByb3ZpZGVyXVxuICBkYXRhcGxhbmVbRGF0YSBQbGFuZV1cbiAgcHJveHlbUG9ydGFsIEFQSSBQcm94eV1cbiAgc3FsW1NRTF1cbiAgbW9uZ29bTW9uZ29dXG4gIHRhYmxlc1tUYWJsZXNdXG4gIGNhc3NhbmRyYVtDYXNzYW5kcmFdXG4gIGdyYWZbR3JhcGhdXG5cblxuICBlbXVsYXRvciAtLT4gbWFzdGVyS2V5IC0tLS0-IGRhdGFwbGFuZVxuICBwb3J0YWwgLS0-IGFhZFxuICBob3N0ZWQgLS0-IHBvcnRhbFRva2VuICYgcmVzb3VyY2VUb2tlbiAmIGNvbm5lY3Rpb25TdHJpbmcgJiBhYWRcbiAgYWFkIC0tLT4gYXJtXG4gIGFhZCAtLS0-IGRhdGFwbGFuZVxuICBhYWQgLS0tPiBwcm94eVxuICByZXNvdXJjZVRva2VuIC0tLT4gc3FsIC0tPiBkYXRhcGxhbmVcbiAgcG9ydGFsVG9rZW4gLS0tPiBwcm94eVxuICBwcm94eSAtLT4gZGF0YXBsYW5lXG4gIGNvbm5lY3Rpb25TdHJpbmcgLS0-IHNxbCAmIG1vbmdvICYgY2Fzc2FuZHJhICYgZ3JhZiAmIHRhYmxlc1xuICBzcWwgLS0-IGRhdGFwbGFuZVxuICB0YWJsZXMgLS0-IGRhdGFwbGFuZVxuICBtb25nbyAtLT4gcHJveHlcbiAgY2Fzc2FuZHJhIC0tPiBwcm94eVxuICBncmFmIC0tPiBwcm94eVxuXG5cdFx0IiwibWVybWFpZCI6eyJ0aGVtZSI6ImRlZmF1bHQifSwidXBkYXRlRWRpdG9yIjpmYWxzZX0)
+
 # Contributing
 
 Please read the [contribution guidelines](./CONTRIBUTING.md).

babel.config.js

@@ -1,3 +1,4 @@
 module.exports = {
-  presets: [["@babel/preset-env", { targets: { node: "current" } }], "@babel/preset-react", "@babel/preset-typescript"]
+  presets: [["@babel/preset-env", { targets: { node: "current" } }], "@babel/preset-react", "@babel/preset-typescript"],
+  plugins: [["@babel/plugin-proposal-decorators", { legacy: true }]],
 };

canvas/README.md

@@ -0,0 +1,7 @@
+# Why?
+
+This adds a mock module for `canvas`. Nteract has a ignored require and undeclared dependency on this module. `cavnas` is a server side node module and is not used in browser side code for nteract.
+
+Installing it locally (`npm install canvas`) will resolve the problem, but it is a native module so it is flaky depending on the system, node version, processor arch, etc. This module provides a simpler, more robust solution.
+
+Remove this workaround if [this bug](https://github.com/nteract/any-vega/issues/2) ever gets resolved 

canvas/index.js

@@ -0,0 +1 @@
+module.exports = {}

canvas/package.json

@@ -0,0 +1,11 @@
+{
+  "name": "canvas",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}

cypress/.gitignore

@@ -1,4 +0,0 @@
-cypress.env.json
-cypress/report
-cypress/screenshots
-cypress/videos

cypress/cleanup.js

@@ -1,51 +0,0 @@
-// Cleans up old databases from previous test runs
-const { CosmosClient } = require("@azure/cosmos");
-
-// TODO: Add support for other API connection strings
-const mongoRegex = RegExp("mongodb://.*:(.*)@(.*).mongo.cosmos.azure.com");
-
-async function cleanup() {
-  const connectionString = process.env.CYPRESS_CONNECTION_STRING;
-  if (!connectionString) {
-    throw new Error("Connection string not provided");
-  }
-
-  let client;
-  switch (true) {
-    case connectionString.includes("mongodb://"): {
-      const [, key, accountName] = connectionString.match(mongoRegex);
-      client = new CosmosClient({
-        key,
-        endpoint: `https://${accountName}.documents.azure.com:443/`
-      });
-      break;
-    }
-    // TODO: Add support for other API connection strings
-    default:
-      client = new CosmosClient(connectionString);
-      break;
-  }
-
-  const response = await client.databases.readAll().fetchAll();
-  return Promise.all(
-    response.resources.map(async db => {
-      const dbTimestamp = new Date(db._ts * 1000);
-      const twentyMinutesAgo = new Date(Date.now() - 1000 * 60 * 20);
-      if (dbTimestamp < twentyMinutesAgo) {
-        await client.database(db.id).delete();
-        console.log(`DELETED: ${db.id} | Timestamp: ${dbTimestamp}`);
-      } else {
-        console.log(`SKIPPED: ${db.id} | Timestamp: ${dbTimestamp}`);
-      }
-    })
-  );
-}
-
-cleanup()
-  .then(() => {
-    process.exit(0);
-  })
-  .catch(error => {
-    console.error(error);
-    process.exit(1);
-  });

cypress/cypress.json

@@ -1,15 +0,0 @@
-{
-  "integrationFolder": "./integration",
-  "pluginsFile": false,
-  "fixturesFolder": false,
-  "supportFile": "./support/index.js",
-  "defaultCommandTimeout": 90000,
-  "chromeWebSecurity": false,
-  "reporter": "mochawesome",
-  "reporterOptions": {
-    "reportDir": "cypress/report",
-    "json": true,
-    "overwrite": false,
-    "html": false
-  }
-}

cypress/integration/dataexplorer/CASSANDRA/addCollection.spec.ts

@@ -1,66 +0,0 @@
-// 1. Click on "New Container" on the command bar.
-// 2. Pane with the title "Add Container" should appear on the right side of the screen
-// 3. It includes an input box for the database Id.
-// 4. It includes a checkbox called "Create now".
-// 5. When the checkbox is marked, enter new database id.
-// 3. Create a database WITH "Provision throughput" checked.
-// 4. Enter minimum throughput value of 400.
-// 5. Enter container id to the container id text box.
-// 6. Enter partition key to the partition key text box.
-// 7. Click "OK" to create a new container.
-// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen.
-
-const connectionString = require("../../../utilities/connectionString");
-
-let crypt = require("crypto");
-
-context("Cassandra API Test - createDatabase", () => {
-  beforeEach(() => {
-    connectionString.loginUsingConnectionString(connectionString.constants.cassandra);
-  });
-
-  it("Create a new table in Cassandra API", () => {
-    const keyspaceId = `KeyspaceId${crypt.randomBytes(8).toString("hex")}`;
-    const tableId = `TableId112`;
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body)
-        .find('div[class="commandBarContainer"]')
-        .should("be.visible")
-        .find('button[data-test="New Table"]')
-        .should("be.visible")
-        .click();
-
-      cy.wrap($body)
-        .find('div[class="contextual-pane-in"]')
-        .should("be.visible")
-        .find('span[id="containerTitle"]');
-
-      cy.wrap($body)
-        .find('input[id="keyspace-id"]')
-        .should("be.visible")
-        .type(keyspaceId);
-
-      cy.wrap($body)
-        .find('input[class="textfontclr"]')
-        .type(tableId);
-
-      cy.wrap($body)
-        .find('input[data-test="databaseThroughputValue"]')
-        .should("have.value", "400");
-
-      cy.wrap($body)
-        .find('data-test="addCollection-createCollection"')
-        .click();
-
-      cy.wait(10000);
-
-      cy.wrap($body)
-        .find('div[data-test="resourceTreeId"]')
-        .should("exist")
-        .find('div[class="treeComponent dataResourceTree"]')
-        .should("contain", tableId);
-    });
-  });
-});

cypress/integration/dataexplorer/GRAPH/addCollection.spec.ts

@@ -1,81 +0,0 @@
-// 1. Click on "New Graph" on the command bar.
-// 2. Pane with the title "Add Container" should appear on the right side of the screen
-// 3. It includes an input box for the database Id.
-// 4. It includes a checkbox called "Create now".
-// 5. When the checkbox is marked, enter new database id.
-// 3. Create a database WITH "Provision throughput" checked.
-// 4. Enter minimum throughput value of 400.
-// 5. Enter container id to the container id text box.
-// 6. Enter partition key to the partition key text box.
-// 7. Click "OK" to create a new container.
-// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen.
-
-const connectionString = require("../../../utilities/connectionString");
-
-let crypt = require("crypto");
-
-context("Graph API Test", () => {
-  beforeEach(() => {
-    connectionString.loginUsingConnectionString(connectionString.constants.graph);
-  });
-
-  it("Create a new graph in Graph API", () => {
-    const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`;
-    const graphId = `TestGraph${crypt.randomBytes(8).toString("hex")}`;
-    const partitionKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`;
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body)
-        .find('div[class="commandBarContainer"]')
-        .should("be.visible")
-        .find('button[data-test="New Graph"]')
-        .should("be.visible")
-        .click();
-
-      cy.wrap($body)
-        .find('div[class="contextual-pane-in"]')
-        .should("be.visible")
-        .find('span[id="containerTitle"]');
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createNewDatabase"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-newDatabaseId"]')
-        .should("be.visible")
-        .type(dbId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollectionPane-databaseSharedThroughput"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="databaseThroughputValue"]')
-        .should("have.value", "400");
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-collectionId"]')
-        .type(graphId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-partitionKeyValue"]')
-        .type(partitionKey);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createCollection"]')
-        .click();
-
-      cy.wait(10000);
-
-      cy.wrap($body)
-        .find('div[data-test="resourceTreeId"]')
-        .should("exist")
-        .find('div[class="treeComponent dataResourceTree"]')
-        .should("contain", dbId)
-        .click()
-        .should("contain", graphId);
-    });
-  });
-});

cypress/integration/dataexplorer/MONGO/addCollection.spec.ts

@@ -1,80 +0,0 @@
-// 1. Click on "New Container" on the command bar.
-// 2. Pane with the title "Add Container" should appear on the right side of the screen
-// 3. It includes an input box for the database Id.
-// 4. It includes a checkbox called "Create now".
-// 5. When the checkbox is marked, enter new database id.
-// 3. Create a database WITH "Provision throughput" checked.
-// 4. Enter minimum throughput value of 400.
-// 5. Enter container id to the container id text box.
-// 6. Enter partition key to the partition key text box.
-// 7. Click "OK" to create a new container.
-// // 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen.
-
-const connectionString = require("../../../utilities/connectionString");
-
-let crypt = require("crypto");
-
-context("Mongo API Test - createDatabase", () => {
-  beforeEach(() => {
-    connectionString.loginUsingConnectionString();
-  });
-
-  it("Create a new collection in Mongo API", () => {
-    const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`;
-    const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-    const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`;
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body)
-        .find('div[class="commandBarContainer"]')
-        .should("be.visible")
-        .find('button[data-test="New Collection"]')
-        .should("be.visible")
-        .click();
-
-      cy.wrap($body)
-        .find('div[class="contextual-pane-in"]')
-        .should("be.visible")
-        .find('span[id="containerTitle"]');
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createNewDatabase"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-newDatabaseId"]')
-        .type(dbId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollectionPane-databaseSharedThroughput"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-collectionId"]')
-        .type(collectionId);
-
-      cy.wrap($body)
-        .find('input[data-test="databaseThroughputValue"]')
-        .should("have.value", "400");
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-partitionKeyValue"]')
-        .type(sharedKey);
-
-      cy.wrap($body)
-        .find("#submitBtnAddCollection")
-        .click();
-
-      cy.wait(10000);
-
-      cy.wrap($body)
-        .find('div[data-test="resourceTreeId"]')
-        .should("exist")
-        .find('div[class="treeComponent dataResourceTree"]')
-        .should("contain", dbId)
-        .click()
-        .should("contain", collectionId);
-    });
-  });
-});

cypress/integration/dataexplorer/MONGO/addCollectionAutopilot.spec.ts

@@ -1,96 +0,0 @@
-// 1. Click on "New Container" on the command bar.
-// 2. Pane with the title "Add Container" should appear on the right side of the screen
-// 3. It includes an input box for the database Id.
-// 4. It includes a checkbox called "Create now".
-// 5. When the checkbox is marked, enter new database id.
-// 3. Create a database WITH "Provision throughput" checked.
-// 4. Enter minimum throughput value of 400.
-// 5. Enter container id to the container id text box.
-// 6. Enter partition key to the partition key text box.
-// 7. Click "OK" to create a new container.
-// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen.
-
-const connectionString = require("../../../utilities/connectionString");
-
-let crypt = require("crypto");
-
-context("Mongo API Test", () => {
-  beforeEach(() => {
-    connectionString.loginUsingConnectionString();
-  });
-
-  it.skip("Create a new collection in Mongo API - Autopilot", () => {
-    const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`;
-    const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-    const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`;
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body)
-        .find('div[class="commandBarContainer"]')
-        .should("be.visible")
-        .find('button[data-test="New Collection"]')
-        .should("be.visible")
-        .click();
-
-      cy.wrap($body)
-        .find('div[class="contextual-pane-in"]')
-        .should("be.visible")
-        .find('span[id="containerTitle"]');
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createNewDatabase"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-newDatabaseId"]')
-        .type(dbId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollectionPane-databaseSharedThroughput"]')
-        .check();
-
-      cy.wrap($body)
-        .find('div[class="throughputModeContainer"]')
-        .should("be.visible")
-        .and(input => {
-          expect(input.get(0).textContent, "first item").contains("Autopilot (preview)");
-          expect(input.get(1).textContent, "second item").contains("Manual");
-        });
-
-      cy.wrap($body)
-        .find('input[id="newContainer-databaseThroughput-autoPilotRadio"]')
-        .check();
-
-      cy.wrap($body)
-        .find('select[name="autoPilotTiers"]')
-        //     .eq(1).should('contain', '4,000 RU/s');
-        //    // .select('4,000 RU/s').should('have.value', '1');
-
-        .find('option[value="2"]')
-        .then($element => $element.get(1).setAttribute("selected", "selected"));
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-collectionId"]')
-        .type(collectionId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-partitionKeyValue"]')
-        .type(sharedKey);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createCollection"]')
-        .click();
-
-      cy.wait(10000);
-
-      cy.wrap($body)
-        .find('div[data-test="resourceTreeId"]')
-        .should("exist")
-        .find('div[class="treeComponent dataResourceTree"]')
-        .should("contain", dbId)
-        .click()
-        .should("contain", collectionId);
-    });
-  });
-});

cypress/integration/dataexplorer/MONGO/addCollectionExistingDatabase.spec.ts

@@ -1,67 +0,0 @@
-const connectionString = require("../../../utilities/connectionString");
-
-let crypt = require("crypto");
-
-context("Mongo API Test", () => {
-  beforeEach(() => {
-    connectionString.loginUsingConnectionString();
-  });
-
-  it.skip("Create a new collection in existing database in Mongo API", () => {
-    const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-    const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`;
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-
-      cy.wrap($body)
-        .find('span[class="nodeLabel"]')
-        .should("be.visible")
-        .then($span => {
-          const dbId1 = $span.text();
-          cy.log("DBBB", dbId1);
-
-          cy.wrap($body)
-            .find('div[class="commandBarContainer"]')
-            .should("be.visible")
-            .find('button[data-test="New Collection"]')
-            .should("be.visible")
-            .click();
-
-          cy.wrap($body)
-            .find('div[class="contextual-pane-in"]')
-            .should("be.visible")
-            .find('span[id="containerTitle"]');
-
-          cy.wrap($body)
-            .find('input[data-test="addCollection-existingDatabase"]')
-            .check();
-
-          cy.wrap($body)
-            .find('input[data-test="addCollection-existingDatabase"]')
-            .type(dbId1);
-
-          cy.wrap($body)
-            .find('input[data-test="addCollection-collectionId"]')
-            .type(collectionId);
-
-          cy.wrap($body)
-            .find('input[data-test="addCollection-partitionKeyValue"]')
-            .type(sharedKey);
-
-          cy.wrap($body)
-            .find('input[data-test="addCollection-createCollection"]')
-            .click();
-
-          cy.wait(10000);
-
-          cy.wrap($body)
-            .find('div[data-test="resourceTreeId"]')
-            .should("exist")
-            .find('div[class="treeComponent dataResourceTree"]')
-            .click()
-            .should("contain", collectionId);
-        });
-    });
-  });
-});

cypress/integration/dataexplorer/MONGO/provisionDatabaseThroughput.spec.ts

@@ -1,203 +0,0 @@
-const connectionString = require("../../../utilities/connectionString");
-
-let crypt = require("crypto");
-
-context.skip("Mongo API Test", () => {
-  beforeEach(() => {
-    connectionString.loginUsingConnectionString();
-  });
-
-  it("Create a new collection in Mongo API - Provision database throughput", () => {
-    const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`;
-    const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-    const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`;
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body)
-        .find('div[class="commandBarContainer"]')
-        .should("be.visible")
-        .find('button[data-test="New Collection"]')
-        .should("be.visible")
-        .click();
-
-      cy.wrap($body)
-        .find('div[class="contextual-pane-in"]')
-        .should("be.visible")
-        .find('span[id="containerTitle"]');
-
-      cy.wrap($body)
-        .find(".createNewDatabaseOrUseExisting")
-        .should("have.length", 2)
-        .and(input => {
-          expect(input.get(0).textContent, "first item").contains("Create new");
-          expect(input.get(1).textContent, "second item").contains("Use existing");
-        });
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createNewDatabase"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollectionPane-databaseSharedThroughput"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-newDatabaseId"]')
-        .type(dbId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollectionPane-databaseSharedThroughput"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="databaseThroughputValue"]')
-        .should("have.value", "400");
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-collectionId"]')
-        .type(collectionId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-partitionKeyValue"]')
-        .type(sharedKey);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createCollection"]')
-        .click();
-
-      cy.wait(10000);
-
-      cy.wrap($body)
-        .find('div[data-test="resourceTreeId"]')
-        .should("exist")
-        .find('div[class="treeComponent dataResourceTree"]')
-        .should("contain", dbId)
-        .click()
-        .should("contain", collectionId);
-    });
-  });
-
-  it("Create a new collection - without provision database throughput", () => {
-    const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`;
-    const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-    const collectionIdTitle = `Add Collection`;
-    const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`;
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body)
-        .find('div[class="commandBarContainer"]')
-        .should("be.visible")
-        .find('button[data-test="New Collection"]')
-        .should("be.visible")
-        .click();
-
-      cy.wrap($body)
-        .find('div[class="contextual-pane-in"]')
-        .should("be.visible")
-        .find('span[id="containerTitle"]');
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createNewDatabase"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-newDatabaseId"]')
-        .type(dbId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollectionPane-databaseSharedThroughput"]')
-        .uncheck();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-collectionId"]')
-        .type(collectionId);
-
-      cy.wrap($body)
-        .find('input[id="tab2"]')
-        .check({ force: true });
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-partitionKeyValue"]')
-        .type(sharedKey);
-
-      cy.wrap($body)
-        .find('input[data-test="databaseThroughputValue"]')
-        .should("have.value", "400");
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createCollection"]')
-        .click();
-
-      cy.wait(10000);
-
-      cy.wrap($body)
-        .find('div[data-test="resourceTreeId"]')
-        .should("exist")
-        .find('div[class="treeComponent dataResourceTree"]')
-        .should("contain", dbId)
-        .click()
-        .should("contain", collectionId);
-    });
-  });
-
-  it("Create a new collection - without provision database throughput Fixed Storage Capacity", () => {
-    const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`;
-    const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-    const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`;
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body)
-        .find('div[class="commandBarContainer"]')
-        .should("be.visible")
-        .find('button[data-test="New Collection"]')
-        .should("be.visible")
-        .click();
-
-      cy.wrap($body)
-        .find('div[class="contextual-pane-in"]')
-        .should("be.visible")
-        .find('span[id="containerTitle"]');
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createNewDatabase"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-newDatabaseId"]')
-        .type(dbId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollectionPane-databaseSharedThroughput"]')
-        .uncheck();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-collectionId"]')
-        .type(collectionId);
-
-      cy.wrap($body)
-        .find('input[id="tab1"]')
-        .check({ force: true });
-
-      cy.wrap($body)
-        .find('input[data-test="databaseThroughputValue"]')
-        .should("have.value", "400");
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createCollection"]')
-        .click();
-
-      cy.wait(10000);
-
-      cy.wrap($body)
-        .find('div[data-test="resourceTreeId"]')
-        .should("exist")
-        .find('div[class="treeComponent dataResourceTree"]')
-        .should("contain", dbId)
-        .click()
-        .should("contain", collectionId);
-    });
-  });
-});

cypress/integration/dataexplorer/SQL/addCollection.spec.ts

@@ -1,79 +0,0 @@
-// 1. Click on "New Container" on the command bar.
-// 2. Pane with the title "Add Container" should appear on the right side of the screen
-// 3. It includes an input box for the database Id.
-// 4. It includes a checkbox called "Create now".
-// 5. When the checkbox is marked, enter new database id.
-// 3. Create a database WITH "Provision throughput" checked.
-// 4. Enter minimum throughput value of 400.
-// 5. Enter container id to the container id text box.
-// 6. Enter partition key to the partition key text box.
-// 7. Click "OK" to create a new container.
-// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen.
-
-const connectionString = require("../../../utilities/connectionString");
-
-let crypt = require("crypto");
-
-context("SQL API Test", () => {
-  beforeEach(() => {
-    connectionString.loginUsingConnectionString();
-  });
-
-  it("Create a new container in SQL API", () => {
-    const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`;
-    const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-    const sharedKey = `SharedKey${crypt.randomBytes(8).toString("hex")}`;
-    connectionString.loginUsingConnectionString();
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body)
-        .find('div[class="commandBarContainer"]')
-        .should("be.visible")
-        .find('button[data-test="New Container"]')
-        .should("be.visible")
-        .click();
-
-      cy.wrap($body)
-        .find('div[class="contextual-pane-in"]')
-        .should("be.visible")
-        .find('span[id="containerTitle"]');
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createNewDatabase"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollectionPane-databaseSharedThroughput"]')
-        .check();
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-newDatabaseId"]')
-        .type(dbId);
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-collectionId"]')
-        .type(collectionId);
-
-      cy.wrap($body)
-        .find('input[data-test="databaseThroughputValue"]')
-        .should("have.value", "400");
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-partitionKeyValue"]')
-        .type(sharedKey);
-
-      cy.wrap($body)
-        .find("#submitBtnAddCollection")
-        .click();
-
-      cy.wait(10000);
-
-      cy.wrap($body)
-        .find('div[data-test="resourceTreeId"]')
-        .should("exist")
-        .find('div[class="treeComponent dataResourceTree"]')
-        .should("contain", dbId);
-    });
-  });
-});

cypress/integration/dataexplorer/TABLE/addCollection.spec.ts

@@ -1,60 +0,0 @@
-// 1. Click on "New Container" on the command bar.
-// 2. Pane with the title "Add Container" should appear on the right side of the screen
-// 3. It includes an input box for the database Id.
-// 4. It includes a checkbox called "Create now".
-// 5. When the checkbox is marked, enter new database id.
-// 3. Create a database WITH "Provision throughput" checked.
-// 4. Enter minimum throughput value of 400.
-// 5. Enter container id to the container id text box.
-// 6. Enter partition key to the partition key text box.
-// 7. Click "OK" to create a new container.
-// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen.
-
-const connectionString = require("../../../utilities/connectionString");
-
-let crypt = require("crypto");
-
-context("Table API Test", () => {
-  beforeEach(() => {
-    connectionString.loginUsingConnectionString(connectionString.constants.table);
-  });
-
-  it("Create a new table in Table API", () => {
-    const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-      cy.wrap($body)
-        .find('div[class="commandBarContainer"]')
-        .should("be.visible")
-        .find('button[data-test="New Table"]')
-        .should("be.visible")
-        .click();
-
-      cy.wrap($body)
-        .find('div[class="contextual-pane-in"]')
-        .should("be.visible")
-        .find('span[id="containerTitle"]');
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-collectionId"]')
-        .type(collectionId);
-
-      cy.wrap($body)
-        .find('input[data-test="databaseThroughputValue"]')
-        .should("have.value", "400");
-
-      cy.wrap($body)
-        .find('input[data-test="addCollection-createCollection"]')
-        .click();
-
-      cy.wait(10000);
-
-      cy.wrap($body)
-        .find('div[data-test="resourceTreeId"]')
-        .should("exist")
-        .find('div[class="treeComponent dataResourceTree"]')
-        .should("contain", collectionId);
-    });
-  });
-});

cypress/integration/dataexplorer/ci-tests/addCollectionPane.spec.ts

@@ -1,55 +0,0 @@
-// 1. Click on "New Container" on the command bar.
-// 2. Pane with the title "Add Container" should appear on the right side of the screen
-// 3. It includes an input box for the database Id.
-// 4. It includes a checkbox called "Create now".
-// 5. When the checkbox is marked, enter new database id.
-// 3. Create a database WITH "Provision throughput" checked.
-// 4. Enter minimum throughput value of 400.
-// 5. Enter container id to the container id text box.
-// 6. Enter partition key to the partition key text box.
-// 7. Click "OK" to create a new container.
-// 8. Verify the new container is created along with the database id and should appead in the Data Explorer list in the left side of the screen.
-
-let crypt = require("crypto");
-
-context("Emulator - createDatabase", () => {
-  beforeEach(() => {
-    cy.visit("http://localhost:1234/explorer.html");
-  });
-
-  const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`;
-  const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-  const collectionIdTitle = `Add Collection`;
-  const partitionKey = `PartitionKey${crypt.randomBytes(8).toString("hex")}`;
-
-  it("Create a new collection", () => {
-    cy.contains("New Container").click();
-
-    // cy.contains(collectionIdTitle);
-
-    cy.get(".createNewDatabaseOrUseExisting")
-      .should("have.length", 2)
-      .and(input => {
-        expect(input.get(0).textContent, "first item").contains("Create new");
-        expect(input.get(1).textContent, "second item").contains("Use existing");
-      });
-
-    cy.get('input[data-test="addCollection-createNewDatabase"]').check();
-
-    cy.get('input[data-test="addCollection-newDatabaseId"]').type(dbId);
-
-    cy.get('input[data-test="addCollection-collectionId"]').type(collectionId);
-
-    cy.get('input[data-test="databaseThroughputValue"]').should("have.value", "400");
-
-    cy.get('input[data-test="addCollection-partitionKeyValue"]').type(partitionKey);
-
-    cy.get('input[data-test="addCollection-createCollection"]').click();
-
-    cy.get('div[data-test="resourceTreeId"]').should("exist");
-
-    cy.get('div[data-test="resourceTree-collectionsTree"]').should("contain", dbId);
-
-    cy.get('div[data-test="databaseList"]').should("contain", collectionId);
-  });
-});

cypress/integration/dataexplorer/ci-tests/createDatabase.spec.ts

@@ -1,65 +0,0 @@
-// 1. Click on "New Database" on the command bar
-// 2. a Pane with the title "Add Database" should appear on the right side of the screen
-//     i. It includes an input box for the database Id.
-//     ii. It includes a checkbox called "Provision throughput".
-//     iii. Whe the checkbox is marked, a new input with a throughput control let's you customize RU at the database level
-// 3. Create a database WITHOUT "Provision throughput" checked.
-// 4. It should appear in the Data Explorer list.
-// 5. Repeat steps 1-3 but create a database WITH "Provision throughput" with the default RU value.
-// 6. It should appear in the Data Explorer list.
-// 7. If expanded, it should have the list item called "Scale", that once clicked, it should show the "Scale" tab.
-// 8. Inside that tab, a throughput control will let you change the RU value within the permited range.
-// 9. If you change the value, it should enable the "Save" button.
-// 10. Click "Save" and verify that the process completes without error.
-// 11. Close the tab and reopen it and verify that the input contains the last saved value.%
-
-const crypto = require("crypto");
-const client = require("../../../utilities/cosmosClient");
-const randomString = crypto.randomBytes(2).toString("hex");
-const databaseId = `TestDB-${randomString}`;
-const collectionId = `TestColl-${randomString}`;
-
-context("Emulator - Create database -> container -> item", () => {
-  beforeEach(async () => {
-    const { resources } = await client.databases.readAll().fetchAll();
-    for (const database of resources) {
-      await client.database(database.id).delete();
-    }
-  });
-
-  it("creates a new database", () => {
-    cy.visit("https://0.0.0.0:1234/explorer.html?platform=Emulator");
-    cy.contains("New Container").click();
-    cy.get("[data-test=addCollection-newDatabaseId]").click();
-    cy.get("[data-test=addCollection-newDatabaseId]").type(databaseId);
-    cy.get("[data-test=addCollection-collectionId]").click();
-    cy.get("[data-test=addCollection-collectionId]").type(collectionId);
-    cy.get("[data-test=addCollection-partitionKeyValue]").click();
-    cy.get("[data-test=addCollection-partitionKeyValue]").type("/pk");
-    cy.get('input[name="createCollection"]').click();
-    cy.get(".dataResourceTree").should("contain", databaseId);
-    cy.get(".dataResourceTree")
-      .contains(databaseId)
-      .click();
-    cy.get(".dataResourceTree").should("contain", collectionId);
-    cy.get(".dataResourceTree")
-      .contains(collectionId)
-      .click();
-    cy.get(".dataResourceTree")
-      .contains("Items")
-      .click();
-    cy.get(".dataResourceTree")
-      .contains("Items")
-      .click();
-    cy.wait(1000); // React rendering inside KO causes some weird async rendering that makes this test flaky without waiting
-    cy.get(".commandBarContainer")
-      .contains("New Item")
-      .click();
-    cy.wait(1000); // React rendering inside KO causes some weird async rendering that makes this test flaky without waiting
-    cy.get(".commandBarContainer")
-      .contains("Save")
-      .click();
-    cy.wait(1000); // React rendering inside KO causes some weird async rendering that makes this test flaky without waiting
-    cy.get(".documentsGridHeaderContainer").should("contain", "replace_with_new_document_id");
-  });
-});

cypress/integration/dataexplorer/ci-tests/deleteCollection.spec.ts

@@ -1,46 +0,0 @@
-// 1. Click last database in the resource tree
-// 2. Click the last collection within the database
-// 3. Select the context menu within the collection
-// 4. Select "Delete Container" option in the dropdown
-// 5. On Selection, Delete Container pane opens on the right side
-// 6. Enter the same collection id that is to be deleted and click ok
-// 7. Now, the resource tree refreshes, the deleted collection should not appear under the database
-
-let crypt = require("crypto");
-
-context("Emulator - deleteCollection", () => {
-  beforeEach(() => {
-    cy.visit("http://localhost:1234/explorer.html");
-  });
-
-  it("Delete a collection", () => {
-    cy.get(".databaseId")
-      .last()
-      .click();
-
-    cy.get(".collectionList")
-      .last()
-      .then($id => {
-        const collectionId = $id.text();
-
-        cy.get('span[data-test="collectionEllipsisMenu"]').should("exist");
-
-        cy.get('span[data-test="collectionEllipsisMenu"]')
-          .invoke("show")
-          .last()
-          .click();
-
-        cy.get('div[data-test="collectionContextMenu"]')
-          .contains("Delete Container")
-          .click({ force: true });
-
-        cy.get('input[data-test="confirmCollectionId"]').type(collectionId.trim());
-
-        cy.get('input[data-test="deleteCollection"]').click();
-
-        cy.get('div[data-test="databaseList"]').should("not.contain", collectionId);
-
-        cy.get('div[data-test="databaseMenu"]').should("not.contain", collectionId);
-      });
-  });
-});

cypress/integration/dataexplorer/ci-tests/deleteDatabase.spec.ts

@@ -1,83 +0,0 @@
-// 1. Click last database in the resource tree
-// 2. Select the context menu within the database
-// 4. Select "Delete Database" option in the dropdown
-// 5. On Selection, Delete Database pane opens on the right side
-// 6. Enter the same database id that is to be deleted and click ok
-// 7. Now, the resource tree refreshes, the deleted database should not appear in the resource tree
-
-let crypt = require("crypto");
-
-context("Emulator - deleteDatabase", () => {
-  beforeEach(() => {
-    const dbId = `TestDatabase${crypt.randomBytes(8).toString("hex")}`;
-    const collectionId = `TestCollection${crypt.randomBytes(8).toString("hex")}`;
-    let db_rid = "";
-    const date = new Date().toUTCString();
-    let authToken = "";
-    cy.visit("http://localhost:1234/explorer.html");
-
-    // Creating auth token for collection creation
-    cy.request({
-      method: "GET",
-      url: "https://localhost:8081/_explorer/authorization/post/dbs/",
-      headers: {
-        "x-ms-date": date,
-        authorization: "-"
-      }
-    })
-      .then(response => {
-        authToken = response.body.Token; // Getting auth token for collection creation
-        return new Cypress.Promise((resolve, reject) => {
-          return resolve();
-        });
-      })
-      .then(() => {
-        cy.request({
-          method: "POST",
-          url: "https://localhost:8081/dbs",
-          headers: {
-            "x-ms-date": date,
-            authorization: authToken,
-            "x-ms-version": "2018-12-31"
-          },
-          body: {
-            id: dbId
-          }
-        }).then(response => {
-          cy.log("Response", response);
-          db_rid = response.body._rid;
-          return new Cypress.Promise((resolve, reject) => {
-            cy.log("Rid", db_rid);
-            return resolve();
-          });
-        });
-      });
-  });
-
-  it("Delete a database", () => {
-    cy.get('span[data-test="refreshTree"]').click();
-
-    cy.get(".databaseId")
-      .last()
-      .then($id => {
-        const dbId = $id.text();
-
-        cy.get('span[data-test="databaseEllipsisMenu"]').should("exist");
-
-        cy.get('span[data-test="databaseEllipsisMenu"]')
-          .invoke("show")
-          .last()
-          .click();
-
-        cy.get('div[data-test="databaseContextMenu"]')
-          .contains("Delete Database")
-          .click({ force: true });
-
-        cy.get('input[data-test="confirmDatabaseId"]').type(dbId.trim());
-
-        cy.get('input[data-test="deleteDatabase"]').click();
-
-        cy.get('div[data-test="databaseList"]').should("not.contain", dbId);
-      });
-  });
-});

cypress/integration/notebook/README.md

@@ -1,35 +0,0 @@
-# Notebook end-to-end tests
-This describes how to run the tests locally
-
-## Stand up a local notebook container instance:
-Instructions on how to build and run the container [here](https://microsoft.sharepoint.com/teams/DocDB/_layouts/OneNote.aspx?id=%2Fteams%2FDocDB%2FSiteAssets%2FDocDB%20Team%20Notebook&wd=target%28Tools%20_%20SDK%2FPortal%2FDevelopment.one%7CF800BE8E-1E31-48FE-90D7-EF698EF88112%2FHow%20to%20build%20notebook%20service%7C4BAA153B-422C-41E2-B997-F3FCE02CD743%2F%29)
-
-## Run a local data explorer
-Instructions are in [`DataExplorer/README.md`](https://msdata.visualstudio.com/CosmosDB/_git/cosmosdb-dataexplorer?path=%2FProduct%2FPortal%2FDataExplorer%2FREADME.md&_a=preview).
-
-Make sure you can run Data Explorer locally from the web browser.
-
-## Run cypress tests
-1. Edit the URL for your DataExplorer in the `.spec.ts` file
-2. Run the test:
-```bash
-cd DataExplorer/cypress
-npm i
- npm t -- --spec 'integration/notebook/newNotebook.spec.ts'
-```
-
-To run in Debug mode:
-```
-npm run test:debug
-```
-This opens Cypress UI
-
-## Troubleshooting
-* The tests are recorded in the `videos` folder.
-* Cypress does not support hover: workarounds [here](https://docs.cypress.io/api/commands/hover.html#Workarounds).
-
-
-## References
-* [Cypress API](https://docs.cypress.io/api/api/table-of-contents.html)
-* [Cypress cookbook](https://docs.cypress.io/faq/questions/using-cypress-faq.html#How-do-I-get-an-element%E2%80%99s-text-contents)
-* [Cypress best practices](https://docs.cypress.io/guides/references/best-practices.html#Selecting-Elements)

cypress/integration/notebook/newNotebook.spec.ts

@@ -1,93 +0,0 @@
-// THIS ADDS A NEW NOTEBOOK TO YOUR NOTEBOOKS
-context("New Notebook smoke test", () => {
-  const timeout = 15000; // in ms
-  const explorerUrl =
-    "https://localhost:1234/explorer.html?feature.notebookserverurl=https%3A%2F%2Flocalhost%3A10001%2F12345%2Fnotebook&feature.notebookServerToken=token&feature.enablenotebooks=true";
-
-  /**
-   * Wait for UI to be ready
-   */
-  const waitForReady = () => {
-    cy.get(".splashScreenContainer", { timeout }).should("be.visible");
-  };
-
-  beforeEach(() => {
-    cy.visit(explorerUrl);
-    waitForReady();
-  });
-
-  it("Create a new notebook and run some code", () => {
-    // Create new notebook
-    cy.contains("New Notebook").click();
-
-    // Check tab name
-    cy.get("li.tabList .tabNavText").should($span => {
-      const text = $span.text();
-      expect(text).to.match(/^Untitled.*\.ipynb$/);
-    });
-
-    // Wait for python3 | idle status
-    cy.get('[data-test="notebookStatusBar"] [data-test="kernelStatus"]', { timeout }).should($p => {
-      const text = $p.text();
-      expect(text).to.match(/^python3.*idle$/);
-    });
-
-    // Click on a cell
-    cy.get(".cell-container")
-      .as("cellContainer")
-      .click();
-
-    // Type in some code
-    cy.get("@cellContainer").type("2+4");
-
-    // Execute
-    cy.get('[data-test="Run"]')
-      .first()
-      .click();
-
-    // Verify results
-    cy.get("@cellContainer").within(() => {
-      cy.get("pre code span").should("contain", "6");
-    });
-
-    // Restart kernel
-    cy.get('[data-test="Run"] button')
-      .eq(-1)
-      .click();
-    cy.get("li")
-      .contains("Restart Kernel")
-      .click();
-
-    // Wait for python3 | restarting status
-    cy.get('[data-test="notebookStatusBar"] [data-test="kernelStatus"]', { timeout }).should($p => {
-      const text = $p.text();
-      expect(text).to.match(/^python3.*restarting$/);
-    });
-
-    // Wait for python3 | idle status
-    cy.get('[data-test="notebookStatusBar"] [data-test="kernelStatus"]', { timeout }).should($p => {
-      const text = $p.text();
-      expect(text).to.match(/^python3.*idle$/);
-    });
-
-    // Click on a cell
-    cy.get(".cell-container")
-      .as("cellContainer")
-      .find(".input")
-      .as("codeInput")
-      .click();
-
-    // Type in some code
-    cy.get("@codeInput").type("{backspace}{backspace}{backspace}4+5");
-
-    // Execute
-    cy.get('[data-test="Run"]')
-      .first()
-      .click();
-
-    // Verify results
-    cy.get("@cellContainer").within(() => {
-      cy.get("pre code span").should("contain", "9");
-    });
-  });
-});

cypress/integration/notebook/resourceTree.spec.ts

@@ -1,172 +0,0 @@
-context("Resource tree notebook file manipulation", () => {
-  const timeout = 15000; // in ms
-  const explorerUrl =
-    "https://localhost:1234/explorer.html?feature.notebookserverurl=https%3A%2F%2Flocalhost%3A10001%2F12345%2Fnotebook&feature.notebookServerToken=token&feature.enablenotebooks=true";
-
-  /**
-   * Wait for UI to be ready
-   */
-  const waitForReady = () => {
-    cy.get(".splashScreenContainer", { timeout }).should("be.visible");
-  };
-
-  const clickContextMenuAndSelectOption = (nodeLabel, option) => {
-    cy.get(`.treeNodeHeader[data-test="${nodeLabel}"]`)
-      .find("button.treeMenuEllipsis")
-      .click();
-    cy.get('[data-test="treeComponentMenuItemContainer"]')
-      .contains(option)
-      .click();
-  };
-
-  const createFolder = folder => {
-    clickContextMenuAndSelectOption("My Notebooks/", "New Directory");
-
-    cy.get("#stringInputPane").within(() => {
-      cy.get('input[name="collectionIdConfirmation"]').type(folder);
-      cy.get("form").submit();
-    });
-  };
-
-  const deleteItem = nodeName => {
-    clickContextMenuAndSelectOption(`${nodeName}`, "Delete");
-    cy.get(".ms-Dialog-main")
-      .contains("Delete")
-      .click();
-  };
-
-  beforeEach(() => {
-    cy.visit(explorerUrl);
-    waitForReady();
-  });
-
-  it("Create and remove a directory", () => {
-    const folder = "e2etest_folder1";
-    createFolder(folder);
-    cy.get(`.treeNodeHeader[data-test="${folder}/"]`).should("exist");
-    deleteItem(`${folder}/`);
-    cy.get(`.treeNodeHeader[data-test="${folder}/"]`).should("not.exist");
-  });
-
-  it("Create and rename a directory", () => {
-    const folder = "e2etest_folder2";
-    const renamedFolder = "e2etest_folder2_renamed";
-    createFolder(folder);
-
-    // Rename
-    clickContextMenuAndSelectOption(`${folder}/`, "Rename");
-    cy.get("#stringInputPane").within(() => {
-      cy.get('input[name="collectionIdConfirmation"]')
-        .clear()
-        .type(renamedFolder);
-      cy.get("form").submit();
-    });
-    cy.get(`.treeNodeHeader[data-test="${renamedFolder}/"]`).should("exist");
-    cy.get(`.treeNodeHeader[data-test="${folder}/"]`).should("not.exist");
-
-    deleteItem(`${renamedFolder}/`);
-    cy.get(`.treeNodeHeader[data-test="${renamedFolder}/"]`).should("not.exist");
-  });
-
-  it("Create a notebook inside a directory", () => {
-    const folder = "e2etest_folder3";
-    const newNotebookName = "Untitled.ipynb";
-    createFolder(folder);
-    clickContextMenuAndSelectOption(`${folder}/`, "New Notebook");
-
-    // Verify tab is open
-    cy.get(".tabList")
-      .contains(newNotebookName)
-      .should("exist");
-
-    // Close tab
-    cy.get(`.tabList[title="notebooks/${folder}/${newNotebookName}"]`)
-      .find(".cancelButton")
-      .click();
-    // When running from command line, closing the tab is too fast
-    cy.get("body").then($body => {
-      if ($body.find(".ms-Dialog-main").length) {
-        // For some reason, this does not work
-        // cy.get(".ms-Dialog-main").contains("Close").click();
-        cy.get(".ms-Dialog-main .ms-Button--primary").click();
-      }
-    });
-
-    // Expand folder node
-    cy.get(`.treeNodeHeader[data-test="${folder}/"]`).click();
-    cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`).should("exist");
-
-    // Delete notebook
-    cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`)
-      .find("button.treeMenuEllipsis")
-      .click();
-    cy.get('[data-test="treeComponentMenuItemContainer"]')
-      .contains("Delete")
-      .click();
-
-    // Confirm
-    cy.get(".ms-Dialog-main")
-      .contains("Delete")
-      .click();
-    cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`).should("not.exist");
-
-    deleteItem(`${folder}/`);
-  });
-
-  it("Create and rename a notebook inside a directory", () => {
-    const folder = "e2etest_folder4";
-    const newNotebookName = "Untitled.ipynb";
-    const renamedNotebookName = "mynotebook.ipynb";
-    createFolder(folder);
-    clickContextMenuAndSelectOption(`${folder}/`, "New Notebook");
-
-    // Close tab
-    cy.get(`.tabList[title="notebooks/${folder}/${newNotebookName}"]`)
-      .find(".cancelButton")
-      .click();
-    cy.get("body").then($body => {
-      if ($body.find(".ms-Dialog-main").length) {
-        // For some reason, this does not work
-        // cy.get(".ms-Dialog-main").contains("Close").click();
-        cy.get(".ms-Dialog-main .ms-Button--primary").click();
-      }
-    });
-
-    // Expand folder node
-    cy.get(`.treeNodeHeader[data-test="${folder}/"]`).click();
-    cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`).should("exist");
-
-    // Rename notebook
-    cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`)
-      .find("button.treeMenuEllipsis")
-      .click();
-    cy.get('[data-test="treeComponentMenuItemContainer"]')
-      .contains("Rename")
-      .click();
-
-    cy.get("#stringInputPane").within(() => {
-      cy.get('input[name="collectionIdConfirmation"]')
-        .clear()
-        .type(renamedNotebookName);
-      cy.get("form").submit();
-    });
-    cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${newNotebookName}"]`).should("not.exist");
-    cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${renamedNotebookName}"]`).should("exist");
-
-    // Delete notebook
-    cy.get(`.nodeChildren[data-test="${folder}/"] .treeNodeHeader[data-test="${renamedNotebookName}"]`)
-      .find("button.treeMenuEllipsis")
-      .click();
-    cy.get('[data-test="treeComponentMenuItemContainer"]')
-      .contains("Delete")
-      .click();
-
-    // Confirm
-    cy.get(".ms-Dialog-main")
-      .contains("Delete")
-      .click();
-    // Give it time to settle
-    cy.wait(1000);
-    deleteItem(`${folder}/`);
-  });
-});

cypress/package.json

@@ -1,25 +0,0 @@
-{
-  "name": "cosmos-explorer-cypress",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "test": "cypress run",
-    "wait-for-server": "wait-on -t 240000 -i 5000 -v https-get://0.0.0.0:1234/",
-    "test:sql": "cypress run --browser chrome --spec \"./integration/dataexplorer/SQL/*\"",
-    "test:ci": "wait-on -t 240000 -i 5000 -v https-get://0.0.0.0:1234/ https-get://0.0.0.0:8081/_explorer/index.html && cypress run --browser edge --headless",
-    "test:debug": "cypress open"
-  },
-  "devDependencies": {
-    "cypress": "^4.8.0",
-    "mocha": "^7.0.1",
-    "mochawesome": "^4.1.0",
-    "mochawesome-merge": "^4.0.1",
-    "mochawesome-report-generator": "^4.1.0",
-    "typescript": "3.4.3",
-    "wait-on": "^4.0.2"
-  },
-  "dependencies": {
-    "@microsoft/applicationinsights-web": "^2.5.2"
-  }
-}

cypress/support/index.js

@@ -1,23 +0,0 @@
-let appInsightsLib = require("@microsoft/applicationinsights-web");
-
-const appInsights = new appInsightsLib.ApplicationInsights({
-  config: {
-    instrumentationKey: "fe61c39f-7d32-4488-a191-b13621965315"
-    /* ...Other Configuration Options... */
-  }
-});
-
-appInsights.loadAppInsights();
-
-Cypress.on("fail", (error, runnable) => {
-    // App Insights will record the fail tests for Create Collection
-    let message = JSON.stringify(runnable.title);
-    appInsights.trackTrace({
-      message: `${message}`,
-      properties: {
-        passed: false,
-        error: error
-      }
-    });
-    throw error; // throw error to have test still fail
-});

cypress/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "compilerOptions": {
-    "strict": true,
-    "noEmit": true,
-    "module": "commonjs",
-    "target": "es5",
-    "lib": ["es5", "dom", "es6"],
-    "types": ["cypress", "node"]
-  },
-  "include": ["**/*.ts", "**/*.spec.ts"]
-}

cypress/utilities/connectionString.js

@@ -1,41 +0,0 @@
-module.exports = {
-  loginUsingConnectionString: function() {
-    const prodUrl = Cypress.env("TEST_ENDPOINT") || "https://localhost:1234/hostedExplorer.html";
-    const timeout = 15000;
-
-    cy.visit(prodUrl);
-    cy.get('iframe[id="explorerMenu"]').should("be.visible");
-
-    cy.get("iframe").then($element => {
-      const $body = $element.contents().find("body");
-
-      cy.wrap($body)
-        .find("#connectExplorer")
-        .should("exist")
-        .find("div[class='connectExplorer']")
-        .should("exist")
-        .find("p[class='welcomeText']")
-        .should("exist");
-
-      cy.wrap($body.find("div > p.switchConnectTypeText"))
-        .should("exist")
-        .last()
-        .click({ force: true });
-
-      const secret = Cypress.env("CONNECTION_STRING");
-
-      cy.wrap($body)
-        .find("input[class='inputToken']")
-        .should("exist")
-        .type(secret, {
-          force: true
-        });
-
-      cy.wrap($body.find("input[value='Connect']"), { timeout })
-        .first()
-        .click({ force: true });
-
-      cy.wait(15000);
-    });
-  }
-};

cypress/utilities/cosmosClient.js

@@ -1,6 +0,0 @@
-const { CosmosClient } = require("@azure/cosmos");
-
-module.exports = new CosmosClient({
-  endpoint: "https://0.0.0.0:8081",
-  key: "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw=="
-});

images/notebook/publish_content.svg

@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.31449 2.01439L4.00103 5.31963L3.26105 4.57965L7.8407 0L12.4203 4.57965L11.6804 5.31963L8.36691 2.01439V12.8428H7.31449V2.01439ZM13.629 12.8428H14.6814V16H1V12.8428H2.05242V14.9476H13.629V12.8428Z" fill="#0078D4"/>
+</svg>

jest-puppeteer.config.js

@@ -6,6 +6,6 @@ module.exports = {
     slowMo: 55,
     defaultViewport: null,
     ignoreHTTPSErrors: true,
-    args: ["--disable-web-security"]
+    args: ["--disable-web-security"],
-  }
+  },
 };

jest.config.e2e.js

@@ -1,5 +1,5 @@
 module.exports = {
   preset: "jest-puppeteer",
   testMatch: ["<rootDir>/test/**/*.spec.[jt]s?(x)"],
-  setupFiles: ["dotenv/config"]
+  setupFiles: ["dotenv/config"],
 };

jest.config.js

@@ -39,11 +39,11 @@ module.exports = {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 20,
+      branches: 22,
-      functions: 24,
+      functions: 28,
-      lines: 30,
+      lines: 33,
-      statements: 29.0
+      statements: 31,
-    }
+    },
   },
 
   // Make calling deprecated APIs throw helpful error messages
@@ -76,7 +76,7 @@ module.exports = {
     "office-ui-fabric-react/lib/(.*)$": "office-ui-fabric-react/lib-commonjs/$1", // https://github.com/OfficeDev/office-ui-fabric-react/wiki/Fabric-6-Release-Notes
     "^dnd-core$": "dnd-core/dist/cjs",
     "^react-dnd$": "react-dnd/dist/cjs",
-    "^react-dnd-html5-backend$": "react-dnd-html5-backend/dist/cjs"
+    "^react-dnd-html5-backend$": "react-dnd-html5-backend/dist/cjs",
   },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
@@ -164,11 +164,11 @@ module.exports = {
   // A map from regular expressions to paths to transformers
   transform: {
     "^.+\\.html?$": "html-loader-jest",
-    "^.+\\.[t|j]sx?$": "babel-jest"
+    "^.+\\.[t|j]sx?$": "babel-jest",
   },
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
-  transformIgnorePatterns: ["/node_modules/", "/externals/"]
+  transformIgnorePatterns: ["/node_modules/", "/externals/"],
 
   // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
   // unmockedModulePathPatterns: undefined,

less/Common/Constants.less

@@ -3,8 +3,8 @@
 /******************************************************************************/
 
 @font-face {
-    font-family: wf_segoe-ui_normal;
+  font-family: wf_segoe-ui_normal;
-    src: url('../../fonts/segoe-ui/west-european/normal/latest.woff');
+  src: url("../../fonts/segoe-ui/west-european/normal/latest.woff");
 }
 
 @DataExplorerFont: wf_segoe-ui_normal, "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
@@ -20,26 +20,26 @@
                                 COLORS
 /******************************************************************************/
 
-@AccentMediumHigh: #0058AD;
+@AccentMediumHigh: #0058ad;
-@AccentMedium: #004E87;
+@AccentMedium: #004e87;
-@AccentHigh: #1EBAED;
+@AccentHigh: #1ebaed;
-@AccentExtraHigh: #55B3FF;
+@AccentExtraHigh: #55b3ff;
-@AccentLow: #EDF6FF;
+@AccentLow: #edf6ff;
-@AccentMediumLow: #DDEEFE;
+@AccentMediumLow: #ddeefe;
-@AccentLight: #EEF7FF;
+@AccentLight: #eef7ff;
-@AccentExtra: #DDF0FF;
+@AccentExtra: #ddf0ff;
 
-@SelectionHigh: #B91F26;
+@SelectionHigh: #b91f26;
-@BaseLight: #FFFFFF;
+@BaseLight: #ffffff;
 @BaseDark: #000000;
-@NotificationLow: #FFF4CE;
+@NotificationLow: #fff4ce;
-@NotificationHigh: #F9E9B0;
+@NotificationHigh: #f9e9b0;
-@Purple1: #8A2DA5;
+@Purple1: #8a2da5;
 @Dirty: #9b4f96;
 
-@BaseLow: #F2F2F2;
+@BaseLow: #f2f2f2;
-@BaseMediumLow: #E6E6E6;
+@BaseMediumLow: #e6e6e6;
-@BaseMedium: #CCCCCC;
+@BaseMedium: #cccccc;
 @BaseMediumHigh: #767676;
 @BaseHigh: #393939;
 
@@ -53,10 +53,17 @@
 
 @ErrorColor: @SelectionHigh;
 
-@SelectionColor: #3074B0;
+@SelectionColor: #3074b0;
 
 @FocusColor: #605e5c;
 
+@GalleryBackgroundColor: #fdfdfd;
+
+//Icons
+@InfoIconColor: #0072c6;
+@WarningIconColor: #db7500;
+@ErrorIconColor: #b91f26;
+
 /******************************************************************************
                                 METRICS
 /******************************************************************************/
@@ -80,7 +87,7 @@
 @ImgWidth: 14px;
 @ImgHeight: 14px;
 
-@toggleFontWeight:700;
+@toggleFontWeight: 700;
 
 //Resource Tree
 @TreeLineHeight: 17px;
@@ -144,16 +151,16 @@
 /**********************************************************************************/
 
 .flex-display(@display: flex) {
-	display: ~"-webkit-@{display}";
+  display: ~"-webkit-@{display}";
-	display: ~"-ms-@{display}box"; // IE10 uses -ms-flexbox
+  display: ~"-ms-@{display}box"; // IE10 uses -ms-flexbox
-	display: ~"-ms-@{display}"; // IE11
+  display: ~"-ms-@{display}"; // IE11
-	display: @display;
+  display: @display;
 }
 
 .flex-direction(@direction: column) {
   -webkit-flex-direction: @direction;
-      -ms-flex-direction: @direction;
+  -ms-flex-direction: @direction;
-          flex-direction: @direction;
+  flex-direction: @direction;
 }
 
 /*************************************************************************************
@@ -161,32 +168,31 @@
 **************************************************************************************/
 
 @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) {
-    .selectedRadio,
+  .selectedRadio,
-    .selectedRadio:hover,
+  .selectedRadio:hover,
-    .selectedRadio:active,
+  .selectedRadio:active,
-    .selectedRadio.dirty,
+  .selectedRadio.dirty,
-    .tab [type=radio]:checked ~ label,
+  .tab [type="radio"]:checked ~ label,
-    .tab [type=radio]:checked ~ label:hover {
+  .tab [type="radio"]:checked ~ label:hover {
-        -ms-high-contrast-adjust: none;
+    -ms-high-contrast-adjust: none;
-        -webkit-text-fill-color: HighlightText;
+    -webkit-text-fill-color: HighlightText;
-        color: HighlightText;
+    color: HighlightText;
-        border-color: HighlightText;
+    border-color: HighlightText;
-        background-color: Highlight;
+    background-color: Highlight;
-    }
+  }
-
+
-    .queryMetricsSummaryTuple {
+  .queryMetricsSummaryTuple {
-
+    th,
-        th, td {
+    td {
-
+      &:nth-child(2) {
-            &:nth-child(2) {
+        width: @IETableDataWidth;
-                width: @IETableDataWidth;
+      }
-            }
+
-
+      &:nth-child(3) {
-            &:nth-child(3) {
+        width: 50%;
-                width: 50%;
+      }
-            }
-        }
     }
+  }
 }
 
 /********************************************************************************************
@@ -194,15 +200,15 @@
 *********************************************************************************************/
 
 .hover() {
-    background-color: @AccentLight;
+  background-color: @AccentLight;
 }
 
 .active() {
-    background-color: @AccentExtra;
+  background-color: @AccentExtra;
 }
 
 .focus() {
-    outline: 1px dashed @FocusColor;
+  outline: 1px dashed @FocusColor;
 }
 
 /************************************************************************************************
@@ -212,63 +218,87 @@
 @ToggleWidth: 180px;
 
 .toggleSwitch() {
-    max-width: 100%;
+  max-width: 100%;
-    margin-bottom: @SmallSpace;
+  margin-bottom: @SmallSpace;
-    padding: @SmallSpace;
+  padding: @SmallSpace;
-    cursor: pointer;
+  cursor: pointer;
-    color: @BaseHigh;
+  color: @BaseHigh;
-    font-weight: 400;
+  font-weight: 400;
-    font-size: @mediumFontSize;
+  font-size: @mediumFontSize;
-    font-family: @DataExplorerFont;
+  font-family: @DataExplorerFont;
 }
 
 .selectedToggle() {
-    border-bottom: 2px solid @BaseHigh;
+  border-bottom: 2px solid @BaseHigh;
 }
 
 .unselectedToggle() {
-    color: @AccentMediumHigh;
+  color: @AccentMediumHigh;
 }
 
 /********************************************************************************************************
                              Common Data Explorer Icons
 *********************************************************************************************************/
 .dataExplorerIcons() {
-    cursor: pointer;
+  cursor: pointer;
-    width: @ImgWidth;
+  width: @ImgWidth;
-    height: @ImgHeight;
+  height: @ImgHeight;
 }
 
 /*********************************************************************************************************
                             Info Tooltip
 **********************************************************************************************************/
 .infoTooltip() {
-    position: relative;
+  position: relative;
-    display: inline-block;
+  display: inline-block;
 }
 
 .tooltipText(@textColor: @BaseLight, @backgroundColor: @BaseHigh) {
-    visibility: hidden;
+  visibility: hidden;
-    background-color: @backgroundColor;
+  background-color: @backgroundColor;
-    color: @textColor;
+  color: @textColor;
-    position: absolute;
+  position: absolute;
-    z-index: 1;
+  z-index: 1;
-    left: @MediumSpace;
+  left: @MediumSpace;
-    padding: @MediumSpace;
+  padding: @MediumSpace;
 }
 
 .tooltipTextAfter(@color: @BaseDark) {
-    content: "";
+  content: "";
-    position: absolute;
+  position: absolute;
-    right: 100%;
+  right: 100%;
-    border-style: solid;
+  border-style: solid;
-    border-color: transparent @color transparent transparent;
+  border-color: transparent @color transparent transparent;
-    left: 0px;
+  left: 0px;
-    width: 0;
+  width: 0;
-    height: 0;
+  height: 0;
-    border-color: @InfoPointerColor transparent;
+  border-color: @InfoPointerColor transparent;
 }
 
 .tooltipVisible() {
-    visibility: visible;
+  visibility: visible;
+}
+
+.inputTooltip() {
+  position: relative;
+}
+
+.inputTooltipText(@textColor: @BaseLight, @backgroundColor: @BaseHigh) {
+  background-color: @backgroundColor;
+  color: @textColor;
+  position: absolute;
+  z-index: 1;
+  padding: @MediumSpace;
+}
+
+.inputTooltipTextAfter(@color: @BaseDark) {
+  content: "";
+  position: absolute;
+  right: 100%;
+  border-style: solid;
+  border-color: transparent @color transparent transparent;
+  left: 10px;
+  width: 0;
+  height: 0;
+  border-color: @InfoPointerColor transparent;
 }

less/hostedexplorer.less

@@ -13,6 +13,11 @@
 @NavMediumSpace: 10px;
 @NavLargeSpace: 15px;
 
+.skip-link {
+    position: fixed;
+    top: -200px;
+}
+
 html {
     font-family: wf_segoe-ui_normal, "Segoe UI", "Segoe WP", Tahoma, Arial, sans-serif;
     padding: 0px;

less/tree.less

@@ -1,20 +1,13 @@
 @import "./Common/Constants";
 
-.main {
-    width: 100%;
-    float: left;
-    transition: all .0s ease-in-out;
-    -ms-transition: all 0s ease-in-out;
-    -webkit-transition: all 0s ease-in-out;
-    -moz-transition: all .0s ease-in-out;
-    height: 100%;
-    background-color: white;
-    border-left: 0px solid white;
-}
 
 .resourceTree {
     height: 100%;
     flex: 0 0 auto;
+    .main {
+        height: 100%;
+    }
+    border-right: 1px solid @BaseMedium;
 }
 
 .resourceTreeScroll {

package.json

@@ -4,12 +4,17 @@
   "description": "Cosmos Explorer",
   "main": "index.js",
   "dependencies": {
+    "@azure/arm-cosmosdb": "9.1.0",
     "@azure/cosmos": "3.9.0",
-    "@azure/cosmos-language-service": "0.0.4",
+    "@azure/cosmos-language-service": "0.0.5",
-    "@jupyterlab/services": "6.0.0-rc.2",
+    "@azure/identity": "1.2.1",
-    "@jupyterlab/terminal": "3.0.0-rc.2",
+    "@azure/ms-rest-nodeauth": "3.0.7",
+    "@babel/plugin-proposal-class-properties": "7.12.1",
+    "@babel/plugin-proposal-decorators": "7.12.12",
+    "@jupyterlab/services": "6.0.2",
+    "@jupyterlab/terminal": "3.0.3",
     "@microsoft/applicationinsights-web": "2.5.9",
-    "@nteract/commutable": "7.3.2",
+    "@nteract/commutable": "7.4.2",
     "@nteract/connected-components": "6.8.2",
     "@nteract/core": "15.1.0",
     "@nteract/data-explorer": "8.0.3",
@@ -34,6 +39,7 @@
     "@nteract/transform-vega": "7.0.6",
     "@octokit/rest": "17.9.2",
     "@phosphor/widgets": "1.9.3",
+    "@testing-library/jest-dom": "5.11.9",
     "@types/mkdirp": "1.0.1",
     "@types/node-fetch": "2.5.7",
     "@uifabric/react-cards": "0.109.110",
@@ -42,8 +48,9 @@
     "applicationinsights": "1.8.0",
     "babel-polyfill": "6.26.0",
     "bootstrap": "3.4.1",
-    "canvas": "2.6.1",
+    "canvas": "file:./canvas",
     "clean-webpack-plugin": "0.1.19",
+    "clipboard-copy": "4.0.1",
     "copy-webpack-plugin": "6.0.2",
     "crossroads": "0.12.2",
     "css-element-queries": "1.1.1",
@@ -59,6 +66,9 @@
     "eslint-plugin-react": "7.20.0",
     "hasher": "1.2.0",
     "html2canvas": "1.0.0-rc.5",
+    "i18next": "19.8.4",
+    "i18next-browser-languagedetector": "6.0.1",
+    "i18next-http-backend": "1.0.23",
     "immutable": "4.0.0-rc.12",
     "is-ci": "2.0.0",
     "jquery": "3.5.1",
@@ -66,7 +76,9 @@
     "jquery-ui-dist": "1.12.1",
     "knockout": "3.5.1",
     "mkdirp": "1.0.4",
-    "monaco-editor": "0.15.6",
+    "monaco-editor": "0.18.1",
+    "ms": "2.1.3",
+    "msal": "1.4.4",
     "object.entries": "1.1.0",
     "office-ui-fabric-react": "7.134.1",
     "p-retry": "4.2.0",
@@ -78,14 +90,17 @@
     "react-animate-height": "2.0.8",
     "react-dnd": "9.4.0",
     "react-dnd-html5-backend": "9.4.0",
-    "react-dom": "16.9.0",
+    "react-dom": "16.13.1",
     "react-hotkeys": "2.0.0",
+    "react-i18next": "11.8.5",
     "react-notification-system": "0.2.17",
     "react-redux": "7.1.3",
     "redux": "4.0.4",
+    "reflect-metadata": "0.1.13",
     "rx-jupyter": "5.5.12",
     "rxjs": "6.6.3",
     "styled-components": "4.3.2",
+    "swr": "0.4.0",
     "text-encoding": "0.7.0",
     "underscore": "1.9.1",
     "url-polyfill": "1.1.7",
@@ -99,6 +114,7 @@
     "@babel/preset-env": "7.9.0",
     "@babel/preset-react": "7.9.4",
     "@babel/preset-typescript": "7.9.0",
+    "@testing-library/react": "11.2.3",
     "@types/applicationinsights-js": "1.0.7",
     "@types/codemirror": "0.0.56",
     "@types/crossroads": "0.0.30",
@@ -107,7 +123,7 @@
     "@types/enzyme-adapter-react-16": "1.0.6",
     "@types/expect-puppeteer": "4.4.3",
     "@types/hasher": "0.0.31",
-    "@types/jest": "23.3.10",
+    "@types/jest": "26.0.20",
     "@types/jest-environment-puppeteer": "4.3.2",
     "@types/memoize-one": "4.1.1",
     "@types/node": "12.11.1",
@@ -115,8 +131,8 @@
     "@types/prop-types": "15.5.8",
     "@types/puppeteer": "3.0.1",
     "@types/q": "1.5.1",
-    "@types/react": "16.9.49",
+    "@types/react": "17.0.0",
-    "@types/react-dom": "16.0.7",
+    "@types/react-dom": "17.0.0",
     "@types/react-notification-system": "0.2.39",
     "@types/react-redux": "7.1.7",
     "@types/sinon": "2.3.3",
@@ -126,7 +142,6 @@
     "@types/webfontloader": "1.6.29",
     "@typescript-eslint/eslint-plugin": "4.0.1",
     "@typescript-eslint/parser": "4.0.1",
-    "adal-angular": "1.0.15",
     "axe-puppeteer": "1.1.0",
     "babel-jest": "24.9.0",
     "babel-loader": "8.1.0",
@@ -141,7 +156,9 @@
     "eslint-cli": "1.1.1",
     "eslint-plugin-no-null": "1.0.2",
     "eslint-plugin-prefer-arrow": "1.2.2",
+    "eslint-plugin-react-hooks": "4.2.0",
     "expose-loader": "0.7.5",
+    "fast-glob": "3.2.5",
     "file-loader": "2.0.0",
     "fs-extra": "7.0.0",
     "html-loader": "0.5.5",
@@ -158,7 +175,7 @@
     "mini-css-extract-plugin": "0.4.3",
     "monaco-editor-webpack-plugin": "1.7.0",
     "node-fetch": "2.6.1",
-    "prettier": "1.19.1",
+    "prettier": "2.2.1",
     "puppeteer": "4.0.0",
     "raw-loader": "0.5.1",
     "rimraf": "3.0.0",
@@ -194,8 +211,8 @@
     "compile": "tsc",
     "compile:contracts": "tsc -p ./tsconfig.contracts.json",
     "compile:strict": "tsc -p ./tsconfig.strict.json",
-    "format": "prettier --write \"{src,cypress,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"",
+    "format": "prettier --write \"{src,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"",
-    "format:check": "prettier --check \"{src,cypress,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"",
+    "format:check": "prettier --check \"{src,test}/**/*.{ts,tsx,html}\" \"*.{js,html}\"",
     "lint": "tslint --project tsconfig.json && eslint \"**/*.{ts,tsx}\"",
     "build:contracts": "npm run compile:contracts",
     "strictEligibleFiles": "node ./strict-migration-tools/index.js",

sampleData/gremlinSampleData.json

@@ -3,7 +3,7 @@
   "offerThroughput": 400,
   "databaseLevelThroughput": false,
   "collectionId": "Persons",
-  "rupmEnabled": false,
+  "createNewDatabase": true,
   "partitionKey": { "kind": "Hash", "paths": ["/name"] },
   "data": [
     "g.addV('person').property(id, '1').property('name', 'Eva').property('age', 44)",
@@ -13,4 +13,4 @@
     "g.V('1').addE('knows').to(g.V('2')).outV().addE('knows').to(g.V('3'))",
     "g.V('3').addE('knows').to(g.V('4'))"
   ]
-}
+}

src/AuthType.ts

@@ -1,6 +1,7 @@
-export enum AuthType {
+export enum AuthType {
-  AAD = "aad",
+  AAD = "aad",
-  EncryptedToken = "encryptedtoken",
+  EncryptedToken = "encryptedtoken",
-  MasterKey = "masterkey",
+  MasterKey = "masterkey",
-  ResourceToken = "resourcetoken"
+  ResourceToken = "resourcetoken",
-}
+  ConnectionString = "connectionstring",
+}

src/Bindings/BindingHandlersRegisterer.ts

@@ -1,21 +1,22 @@
-import * as ko from "knockout";
+import * as ko from "knockout";
-import * as ReactBindingHandler from "./ReactBindingHandler";
+import * as ReactBindingHandler from "./ReactBindingHandler";
-
+import "../Explorer/Tables/DataTable/DataTableBindingManager";
-export class BindingHandlersRegisterer {
+
-  public static registerBindingHandlers() {
+export class BindingHandlersRegisterer {
-    ko.bindingHandlers.setTemplateReady = {
+  public static registerBindingHandlers() {
-      init(
+    ko.bindingHandlers.setTemplateReady = {
-        element: any,
+      init(
-        wrappedValueAccessor: () => any,
+        element: any,
-        allBindings?: ko.AllBindings,
+        wrappedValueAccessor: () => any,
-        viewModel?: any,
+        allBindings?: ko.AllBindings,
-        bindingContext?: ko.BindingContext
+        viewModel?: any,
-      ) {
+        bindingContext?: ko.BindingContext
-        const value = ko.unwrap(wrappedValueAccessor());
+      ) {
-        bindingContext?.$data.isTemplateReady(value);
+        const value = ko.unwrap(wrappedValueAccessor());
-      }
+        bindingContext?.$data.isTemplateReady(value);
-    } as ko.BindingHandler;
+      },
-
+    } as ko.BindingHandler;
-    ReactBindingHandler.Registerer.register();
+
-  }
+    ReactBindingHandler.Registerer.register();
-}
+  }
+}

src/Bindings/ReactBindingHandler.ts

@@ -42,7 +42,7 @@ export class Registerer {
 
         // Initial rendering at mount point
         ReactDOM.render(adapter.renderComponent(), element);
-      }
+      },
     } as ko.BindingHandler;
   }
 }

src/Common/ArrayHashMap.ts

@@ -40,7 +40,7 @@ export class ArrayHashMap<T> {
   public forEach(key: string, iteratorFct: (value: T) => void) {
     const values = this.store.get(key);
     if (values) {
-      values.forEach(value => iteratorFct(value));
+      values.forEach((value) => iteratorFct(value));
     }
   }
 

src/Common/Constants.ts

@@ -1,439 +1,417 @@
-import { HashMap } from "./HashMap";
+export class CodeOfConductEndpoints {
-
+  public static privacyStatement: string = "https://aka.ms/ms-privacy-policy";
-export class AuthorizationEndpoints {
+  public static codeOfConduct: string = "https://aka.ms/cosmos-code-of-conduct";
-  public static arm: string = "https://management.core.windows.net/";
+  public static termsOfUse: string = "https://aka.ms/ms-terms-of-use";
-  public static common: string = "https://login.windows.net/";
+}
-}
+
-
+export class EndpointsRegex {
-export class CodeOfConductEndpoints {
+  public static readonly cassandra = [
-  public static privacyStatement: string = "https://aka.ms/ms-privacy-policy";
+    "AccountEndpoint=(.*).cassandra.cosmosdb.azure.com",
-  public static codeOfConduct: string = "https://aka.ms/cosmos-code-of-conduct";
+    "HostName=(.*).cassandra.cosmos.azure.com",
-  public static termsOfUse: string = "https://aka.ms/ms-terms-of-use";
+  ];
-}
+  public static readonly mongo = "mongodb://.*:(.*)@(.*).documents.azure.com";
-
+  public static readonly mongoCompute = "mongodb://.*:(.*)@(.*).mongo.cosmos.azure.com";
-export class EndpointsRegex {
+  public static readonly sql = "AccountEndpoint=https://(.*).documents.azure.com";
-  public static readonly cassandra = [
+  public static readonly table = "TableEndpoint=https://(.*).table.cosmosdb.azure.com";
-    "AccountEndpoint=(.*).cassandra.cosmosdb.azure.com",
+}
-    "HostName=(.*).cassandra.cosmos.azure.com"
+
-  ];
+export class ApiEndpoints {
-  public static readonly mongo = "mongodb://.*:(.*)@(.*).documents.azure.com";
+  public static runtimeProxy: string = "/api/RuntimeProxy";
-  public static readonly mongoCompute = "mongodb://.*:(.*)@(.*).mongo.cosmos.azure.com";
+  public static guestRuntimeProxy: string = "/api/guest/RuntimeProxy";
-  public static readonly sql = "AccountEndpoint=https://(.*).documents.azure.com";
+}
-  public static readonly table = "TableEndpoint=https://(.*).table.cosmosdb.azure.com";
+
-}
+export class ServerIds {
-
+  public static localhost: string = "localhost";
-export class ApiEndpoints {
+  public static blackforest: string = "blackforest";
-  public static runtimeProxy: string = "/api/RuntimeProxy";
+  public static fairfax: string = "fairfax";
-  public static guestRuntimeProxy: string = "/api/guest/RuntimeProxy";
+  public static mooncake: string = "mooncake";
-}
+  public static productionPortal: string = "prod";
-
+  public static dev: string = "dev";
-export class ServerIds {
+}
-  public static localhost: string = "localhost";
+
-  public static blackforest: string = "blackforest";
+export class ArmApiVersions {
-  public static fairfax: string = "fairfax";
+  public static readonly documentDB: string = "2015-11-06";
-  public static mooncake: string = "mooncake";
+  public static readonly arcadia: string = "2019-06-01-preview";
-  public static productionPortal: string = "prod";
+  public static readonly arcadiaLivy: string = "2019-11-01-preview";
-  public static dev: string = "dev";
+  public static readonly arm: string = "2015-11-01";
-}
+  public static readonly armFeatures: string = "2014-08-01-preview";
-
+  public static readonly publicVersion = "2020-04-01";
-export class ArmApiVersions {
+}
-  public static readonly documentDB: string = "2015-11-06";
+
-  public static readonly arcadia: string = "2019-06-01-preview";
+export class ArmResourceTypes {
-  public static readonly arcadiaLivy: string = "2019-11-01-preview";
+  public static readonly notebookWorkspaces = "Microsoft.DocumentDB/databaseAccounts/notebookWorkspaces";
-  public static readonly arm: string = "2015-11-01";
+  public static readonly synapseWorkspaces = "Microsoft.Synapse/workspaces";
-  public static readonly armFeatures: string = "2014-08-01-preview";
+}
-  public static readonly publicVersion = "2020-04-01";
+
-}
+export class BackendDefaults {
-
+  public static partitionKeyKind: string = "Hash";
-export class ArmResourceTypes {
+  public static singlePartitionStorageInGb: string = "10";
-  public static readonly notebookWorkspaces = "Microsoft.DocumentDB/databaseAccounts/notebookWorkspaces";
+  public static multiPartitionStorageInGb: string = "100";
-  public static readonly synapseWorkspaces = "Microsoft.Synapse/workspaces";
+  public static maxChangeFeedRetentionDuration: number = 10;
-}
+  public static partitionKeyVersion = 2;
-
+}
-export class BackendDefaults {
+
-  public static partitionKeyKind: string = "Hash";
+export class ClientDefaults {
-  public static singlePartitionStorageInGb: string = "10";
+  public static requestTimeoutMs: number = 60000;
-  public static multiPartitionStorageInGb: string = "100";
+  public static portalCacheTimeoutMs: number = 10000;
-  public static maxChangeFeedRetentionDuration: number = 10;
+  public static errorNotificationTimeoutMs: number = 5000;
-  public static partitionKeyVersion = 2;
+  public static copyHelperTimeoutMs: number = 2000;
-}
+  public static waitForDOMElementMs: number = 500;
-
+  public static cacheBustingTimeoutMs: number =
-export class ClientDefaults {
+    10 /** minutes **/ * 60 /** to seconds **/ * 1000 /** to milliseconds **/;
-  public static requestTimeoutMs: number = 60000;
+  public static databaseThroughputIncreaseFactor: number = 100;
-  public static portalCacheTimeoutMs: number = 10000;
+  public static readonly arcadiaTokenRefreshInterval: number =
-  public static errorNotificationTimeoutMs: number = 5000;
+    20 /** minutes **/ * 60 /** to seconds **/ * 1000 /** to milliseconds **/;
-  public static copyHelperTimeoutMs: number = 2000;
+  public static readonly arcadiaTokenRefreshIntervalPaddingMs: number = 2000;
-  public static waitForDOMElementMs: number = 500;
+}
-  public static cacheBustingTimeoutMs: number =
+
-    10 /** minutes **/ * 60 /** to seconds **/ * 1000 /** to milliseconds **/;
+export class AccountKind {
-  public static databaseThroughputIncreaseFactor: number = 100;
+  public static DocumentDB: string = "DocumentDB";
-  public static readonly arcadiaTokenRefreshInterval: number =
+  public static MongoDB: string = "MongoDB";
-    20 /** minutes **/ * 60 /** to seconds **/ * 1000 /** to milliseconds **/;
+  public static Parse: string = "Parse";
-  public static readonly arcadiaTokenRefreshIntervalPaddingMs: number = 2000;
+  public static GlobalDocumentDB: string = "GlobalDocumentDB";
-}
+  public static Default: string = AccountKind.DocumentDB;
-
+}
-export class AccountKind {
+
-  public static DocumentDB: string = "DocumentDB";
+export class CorrelationBackend {
-  public static MongoDB: string = "MongoDB";
+  public static Url: string = "https://aka.ms/cosmosdbanalytics";
-  public static Parse: string = "Parse";
+}
-  public static GlobalDocumentDB: string = "GlobalDocumentDB";
+
-  public static Default: string = AccountKind.DocumentDB;
+export class DefaultAccountExperience {
-}
+  public static DocumentDB: string = "DocumentDB";
-
+  public static Graph: string = "Graph";
-export class CorrelationBackend {
+  public static MongoDB: string = "MongoDB";
-  public static Url: string = "https://aka.ms/cosmosdbanalytics";
+  public static ApiForMongoDB: string = "Azure Cosmos DB for MongoDB API";
-}
+  public static Table: string = "Table";
-
+  public static Cassandra: string = "Cassandra";
-export class DefaultAccountExperience {
+  public static Default: string = DefaultAccountExperience.DocumentDB;
-  public static DocumentDB: string = "DocumentDB";
+}
-  public static Graph: string = "Graph";
+
-  public static MongoDB: string = "MongoDB";
+export class CapabilityNames {
-  public static ApiForMongoDB: string = "Azure Cosmos DB for MongoDB API";
+  public static EnableTable: string = "EnableTable";
-  public static Table: string = "Table";
+  public static EnableGremlin: string = "EnableGremlin";
-  public static Cassandra: string = "Cassandra";
+  public static EnableCassandra: string = "EnableCassandra";
-  public static Default: string = DefaultAccountExperience.DocumentDB;
+  public static EnableAutoScale: string = "EnableAutoScale";
-}
+  public static readonly EnableNotebooks: string = "EnableNotebooks";
-
+  public static readonly EnableStorageAnalytics: string = "EnableStorageAnalytics";
-export class CapabilityNames {
+  public static readonly EnableMongo: string = "EnableMongo";
-  public static EnableTable: string = "EnableTable";
+  public static readonly EnableServerless: string = "EnableServerless";
-  public static EnableGremlin: string = "EnableGremlin";
+}
-  public static EnableCassandra: string = "EnableCassandra";
+
-  public static EnableAutoScale: string = "EnableAutoScale";
+export class Features {
-  public static readonly EnableNotebooks: string = "EnableNotebooks";
+  public static readonly cosmosdb = "cosmosdb";
-  public static readonly EnableStorageAnalytics: string = "EnableStorageAnalytics";
+  public static readonly enableChangeFeedPolicy = "enablechangefeedpolicy";
-  public static readonly EnableMongo: string = "EnableMongo";
+  public static readonly executeSproc = "dataexplorerexecutesproc";
-  public static readonly EnableServerless: string = "EnableServerless";
+  public static readonly hostedDataExplorer = "hosteddataexplorerenabled";
-}
+  public static readonly enableTtl = "enablettl";
-
+  public static readonly enableNotebooks = "enablenotebooks";
-export class Features {
+  public static readonly enableSpark = "enablespark";
-  public static readonly cosmosdb = "cosmosdb";
+  public static readonly livyEndpoint = "livyendpoint";
-  public static readonly enableChangeFeedPolicy = "enablechangefeedpolicy";
+  public static readonly notebookServerUrl = "notebookserverurl";
-  public static readonly enableRupm = "enablerupm";
+  public static readonly notebookServerToken = "notebookservertoken";
-  public static readonly executeSproc = "dataexplorerexecutesproc";
+  public static readonly notebookBasePath = "notebookbasepath";
-  public static readonly hostedDataExplorer = "hosteddataexplorerenabled";
+  public static readonly canExceedMaximumValue = "canexceedmaximumvalue";
-  public static readonly enableTtl = "enablettl";
+  public static readonly enableFixedCollectionWithSharedThroughput = "enablefixedcollectionwithsharedthroughput";
-  public static readonly enableNotebooks = "enablenotebooks";
+  public static readonly ttl90Days = "ttl90days";
-  public static readonly enableGalleryPublish = "enablegallerypublish";
+  public static readonly enableRightPanelV2 = "enablerightpanelv2";
-  public static readonly enableCodeOfConduct = "enablecodeofconduct";
+  public static readonly enableSchema = "enableschema";
-  public static readonly enableLinkInjection = "enablelinkinjection";
+  public static readonly enableSDKoperations = "enablesdkoperations";
-  public static readonly enableSpark = "enablespark";
+  public static readonly showMinRUSurvey = "showminrusurvey";
-  public static readonly livyEndpoint = "livyendpoint";
+  public static readonly enableDatabaseSettingsTabV1 = "enabledbsettingsv1";
-  public static readonly notebookServerUrl = "notebookserverurl";
+  public static readonly selfServeType = "selfservetype";
-  public static readonly notebookServerToken = "notebookservertoken";
+  public static readonly enableKOPanel = "enablekopanel";
-  public static readonly notebookBasePath = "notebookbasepath";
+}
-  public static readonly canExceedMaximumValue = "canexceedmaximumvalue";
+
-  public static readonly enableFixedCollectionWithSharedThroughput = "enablefixedcollectionwithsharedthroughput";
+// flight names returned from the portal are always lowercase
-  public static readonly ttl90Days = "ttl90days";
+export class Flights {
-  public static readonly enableRightPanelV2 = "enablerightpanelv2";
+  public static readonly SettingsV2 = "settingsv2";
-  public static readonly enableSDKoperations = "enablesdkoperations";
+  public static readonly MongoIndexEditor = "mongoindexeditor";
-}
+  public static readonly MongoIndexing = "mongoindexing";
-
+  public static readonly AutoscaleTest = "autoscaletest";
-// flight names returned from the portal are always lowercase
+}
-export class Flights {
+
-  public static readonly SettingsV2 = "settingsv2";
+export class AfecFeatures {
-  public static readonly MongoIndexEditor = "mongoindexeditor";
+  public static readonly Spark = "spark-public-preview";
-}
+  public static readonly Notebooks = "sparknotebooks-public-preview";
-
+  public static readonly StorageAnalytics = "storageanalytics-public-preview";
-export class AfecFeatures {
+}
-  public static readonly Spark = "spark-public-preview";
+
-  public static readonly Notebooks = "sparknotebooks-public-preview";
+export class TagNames {
-  public static readonly StorageAnalytics = "storageanalytics-public-preview";
+  public static defaultExperience: string = "defaultExperience";
-}
+}
-
+
-export class Spark {
+export class MongoDBAccounts {
-  public static readonly MaxWorkerCount = 10;
+  public static protocol: string = "https";
-  public static readonly SKUs: HashMap<string> = new HashMap({
+  public static defaultPort: string = "10255";
-    "Cosmos.Spark.D1s": "D1s / 1 core / 4GB RAM",
+}
-    "Cosmos.Spark.D2s": "D2s / 2 cores / 8GB RAM",
+
-    "Cosmos.Spark.D4s": "D4s / 4 cores / 16GB RAM",
+export enum MongoBackendEndpointType {
-    "Cosmos.Spark.D8s": "D8s / 8 cores / 32GB RAM",
+  local,
-    "Cosmos.Spark.D16s": "D16s / 16 cores / 64GB RAM",
+  remote,
-    "Cosmos.Spark.D32s": "D32s / 32 cores / 128GB RAM",
+}
-    "Cosmos.Spark.D64s": "D64s / 64 cores / 256GB RAM"
+
-  });
+// TODO: 435619 Add default endpoints per cloud and use regional only when available
-}
+export class CassandraBackend {
-
+  public static readonly createOrDeleteApi: string = "api/cassandra/createordelete";
-export class TagNames {
+  public static readonly guestCreateOrDeleteApi: string = "api/guest/cassandra/createordelete";
-  public static defaultExperience: string = "defaultExperience";
+  public static readonly queryApi: string = "api/cassandra";
-}
+  public static readonly guestQueryApi: string = "api/guest/cassandra";
-
+  public static readonly keysApi: string = "api/cassandra/keys";
-export class MongoDBAccounts {
+  public static readonly guestKeysApi: string = "api/guest/cassandra/keys";
-  public static protocol: string = "https";
+  public static readonly schemaApi: string = "api/cassandra/schema";
-  public static defaultPort: string = "10255";
+  public static readonly guestSchemaApi: string = "api/guest/cassandra/schema";
-}
+}
-
+
-export enum MongoBackendEndpointType {
+export class Queries {
-  local,
+  public static CustomPageOption: string = "custom";
-  remote
+  public static UnlimitedPageOption: string = "unlimited";
-}
+  public static itemsPerPage: number = 100;
-
+  public static unlimitedItemsPerPage: number = 100; // TODO: Figure out appropriate value so it works for accounts with a large number of partitions
-// TODO: 435619 Add default endpoints per cloud and use regional only when available
+
-export class CassandraBackend {
+  public static QueryEditorMinHeightRatio: number = 0.1;
-  public static readonly createOrDeleteApi: string = "api/cassandra/createordelete";
+  public static QueryEditorMaxHeightRatio: number = 0.4;
-  public static readonly guestCreateOrDeleteApi: string = "api/guest/cassandra/createordelete";
+  public static readonly DefaultMaxDegreeOfParallelism = 6;
-  public static readonly queryApi: string = "api/cassandra";
+}
-  public static readonly guestQueryApi: string = "api/guest/cassandra";
+
-  public static readonly keysApi: string = "api/cassandra/keys";
+export class SavedQueries {
-  public static readonly guestKeysApi: string = "api/guest/cassandra/keys";
+  public static readonly CollectionName: string = "___Query";
-  public static readonly schemaApi: string = "api/cassandra/schema";
+  public static readonly DatabaseName: string = "___Cosmos";
-  public static readonly guestSchemaApi: string = "api/guest/cassandra/schema";
+  public static readonly OfferThroughput: number = 400;
-}
+  public static readonly PartitionKeyProperty: string = "id";
-
+}
-export class RUPMStates {
+
-  public static on: string = "on";
+export class DocumentsGridMetrics {
-  public static off: string = "off";
+  public static DocumentsPerPage: number = 100;
-}
+  public static IndividualRowHeight: number = 34;
-
+  public static BufferHeight: number = 28;
-export class Queries {
+  public static SplitterMinWidth: number = 200;
-  public static CustomPageOption: string = "custom";
+  public static SplitterMaxWidth: number = 360;
-  public static UnlimitedPageOption: string = "unlimited";
+
-  public static itemsPerPage: number = 100;
+  public static DocumentEditorMinWidthRatio: number = 0.2;
-  public static unlimitedItemsPerPage: number = 100; // TODO: Figure out appropriate value so it works for accounts with a large number of partitions
+  public static DocumentEditorMaxWidthRatio: number = 0.4;
-
+}
-  public static QueryEditorMinHeightRatio: number = 0.1;
+
-  public static QueryEditorMaxHeightRatio: number = 0.4;
+export class ExplorerMetrics {
-  public static readonly DefaultMaxDegreeOfParallelism = 6;
+  public static SplitterMinWidth: number = 240;
-}
+  public static SplitterMaxWidth: number = 400;
-
+  public static CollapsedResourceTreeWidth: number = 36;
-export class SavedQueries {
+}
-  public static readonly CollectionName: string = "___Query";
+
-  public static readonly DatabaseName: string = "___Cosmos";
+export class SplitterMetrics {
-  public static readonly OfferThroughput: number = 400;
+  public static CollapsedPositionLeft: number = ExplorerMetrics.CollapsedResourceTreeWidth;
-  public static readonly PartitionKeyProperty: string = "id";
+}
-}
+
-
+export class Areas {
-export class DocumentsGridMetrics {
+  public static ResourceTree: string = "Resource Tree";
-  public static DocumentsPerPage: number = 100;
+  public static ContextualPane: string = "Contextual Pane";
-  public static IndividualRowHeight: number = 34;
+  public static Tab: string = "Tab";
-  public static BufferHeight: number = 28;
+  public static ShareDialog: string = "Share Access Dialog";
-  public static SplitterMinWidth: number = 200;
+  public static Notebook: string = "Notebook";
-  public static SplitterMaxWidth: number = 360;
+}
-
+
-  public static DocumentEditorMinWidthRatio: number = 0.2;
+export class HttpHeaders {
-  public static DocumentEditorMaxWidthRatio: number = 0.4;
+  public static activityId: string = "x-ms-activity-id";
-}
+  public static apiType: string = "x-ms-cosmos-apitype";
-
+  public static authorization: string = "authorization";
-export class ExplorerMetrics {
+  public static collectionIndexTransformationProgress: string =
-  public static SplitterMinWidth: number = 240;
+    "x-ms-documentdb-collection-index-transformation-progress";
-  public static SplitterMaxWidth: number = 400;
+  public static continuation: string = "x-ms-continuation";
-  public static CollapsedResourceTreeWidth: number = 36;
+  public static correlationRequestId: string = "x-ms-correlation-request-id";
-}
+  public static enableScriptLogging: string = "x-ms-documentdb-script-enable-logging";
-
+  public static guestAccessToken: string = "x-ms-encrypted-auth-token";
-export class SplitterMetrics {
+  public static getReadOnlyKey: string = "x-ms-get-read-only-key";
-  public static CollapsedPositionLeft: number = ExplorerMetrics.CollapsedResourceTreeWidth;
+  public static connectionString: string = "x-ms-connection-string";
-}
+  public static msDate: string = "x-ms-date";
-
+  public static location: string = "Location";
-export class Areas {
+  public static contentType: string = "Content-Type";
-  public static ResourceTree: string = "Resource Tree";
+  public static offerReplacePending: string = "x-ms-offer-replace-pending";
-  public static ContextualPane: string = "Contextual Pane";
+  public static user: string = "x-ms-user";
-  public static Tab: string = "Tab";
+  public static populatePartitionStatistics: string = "x-ms-documentdb-populatepartitionstatistics";
-  public static ShareDialog: string = "Share Access Dialog";
+  public static queryMetrics: string = "x-ms-documentdb-query-metrics";
-  public static Notebook: string = "Notebook";
+  public static requestCharge: string = "x-ms-request-charge";
-}
+  public static resourceQuota: string = "x-ms-resource-quota";
-
+  public static resourceUsage: string = "x-ms-resource-usage";
-export class HttpHeaders {
+  public static retryAfterMs: string = "x-ms-retry-after-ms";
-  public static activityId: string = "x-ms-activity-id";
+  public static scriptLogResults: string = "x-ms-documentdb-script-log-results";
-  public static apiType: string = "x-ms-cosmos-apitype";
+  public static populateCollectionThroughputInfo = "x-ms-documentdb-populatecollectionthroughputinfo";
-  public static authorization: string = "authorization";
+  public static supportSpatialLegacyCoordinates = "x-ms-documentdb-supportspatiallegacycoordinates";
-  public static collectionIndexTransformationProgress: string =
+  public static usePolygonsSmallerThanAHemisphere = "x-ms-documentdb-usepolygonssmallerthanahemisphere";
-    "x-ms-documentdb-collection-index-transformation-progress";
+  public static autoPilotThroughput = "autoscaleSettings";
-  public static continuation: string = "x-ms-continuation";
+  public static autoPilotThroughputSDK = "x-ms-cosmos-offer-autopilot-settings";
-  public static correlationRequestId: string = "x-ms-correlation-request-id";
+  public static partitionKey: string = "x-ms-documentdb-partitionkey";
-  public static enableScriptLogging: string = "x-ms-documentdb-script-enable-logging";
+  public static migrateOfferToManualThroughput: string = "x-ms-cosmos-migrate-offer-to-manual-throughput";
-  public static guestAccessToken: string = "x-ms-encrypted-auth-token";
+  public static migrateOfferToAutopilot: string = "x-ms-cosmos-migrate-offer-to-autopilot";
-  public static getReadOnlyKey: string = "x-ms-get-read-only-key";
+}
-  public static connectionString: string = "x-ms-connection-string";
+
-  public static msDate: string = "x-ms-date";
+export class ApiType {
-  public static location: string = "Location";
+  // Mapped to hexadecimal values in the backend
-  public static contentType: string = "Content-Type";
+  public static readonly MongoDB: number = 1;
-  public static offerReplacePending: string = "x-ms-offer-replace-pending";
+  public static readonly Gremlin: number = 2;
-  public static user: string = "x-ms-user";
+  public static readonly Cassandra: number = 4;
-  public static populatePartitionStatistics: string = "x-ms-documentdb-populatepartitionstatistics";
+  public static readonly Table: number = 8;
-  public static queryMetrics: string = "x-ms-documentdb-query-metrics";
+  public static readonly SQL: number = 16;
-  public static requestCharge: string = "x-ms-request-charge";
+}
-  public static resourceQuota: string = "x-ms-resource-quota";
+
-  public static resourceUsage: string = "x-ms-resource-usage";
+export class HttpStatusCodes {
-  public static retryAfterMs: string = "x-ms-retry-after-ms";
+  public static readonly OK: number = 200;
-  public static scriptLogResults: string = "x-ms-documentdb-script-log-results";
+  public static readonly Created: number = 201;
-  public static populateCollectionThroughputInfo = "x-ms-documentdb-populatecollectionthroughputinfo";
+  public static readonly Accepted: number = 202;
-  public static supportSpatialLegacyCoordinates = "x-ms-documentdb-supportspatiallegacycoordinates";
+  public static readonly NoContent: number = 204;
-  public static usePolygonsSmallerThanAHemisphere = "x-ms-documentdb-usepolygonssmallerthanahemisphere";
+  public static readonly NotModified: number = 304;
-  public static autoPilotThroughput = "autoscaleSettings";
+  public static readonly Unauthorized: number = 401;
-  public static autoPilotThroughputSDK = "x-ms-cosmos-offer-autopilot-settings";
+  public static readonly Forbidden: number = 403;
-  public static partitionKey: string = "x-ms-documentdb-partitionkey";
+  public static readonly NotFound: number = 404;
-  public static migrateOfferToManualThroughput: string = "x-ms-cosmos-migrate-offer-to-manual-throughput";
+  public static readonly TooManyRequests: number = 429;
-  public static migrateOfferToAutopilot: string = "x-ms-cosmos-migrate-offer-to-autopilot";
+  public static readonly Conflict: number = 409;
-}
+
-
+  public static readonly InternalServerError: number = 500;
-export class ApiType {
+  public static readonly BadGateway: number = 502;
-  // Mapped to hexadecimal values in the backend
+  public static readonly ServiceUnavailable: number = 503;
-  public static readonly MongoDB: number = 1;
+  public static readonly GatewayTimeout: number = 504;
-  public static readonly Gremlin: number = 2;
+
-  public static readonly Cassandra: number = 4;
+  public static readonly RetryableStatusCodes: number[] = [
-  public static readonly Table: number = 8;
+    HttpStatusCodes.TooManyRequests,
-  public static readonly SQL: number = 16;
+    HttpStatusCodes.InternalServerError, // TODO: Handle all 500s on Portal backend and remove from retries list
-}
+    HttpStatusCodes.BadGateway,
-
+    HttpStatusCodes.ServiceUnavailable,
-export class HttpStatusCodes {
+    HttpStatusCodes.GatewayTimeout,
-  public static readonly OK: number = 200;
+  ];
-  public static readonly Created: number = 201;
+}
-  public static readonly Accepted: number = 202;
+
-  public static readonly NoContent: number = 204;
+export class Urls {
-  public static readonly NotModified: number = 304;
+  public static feedbackEmail = "https://aka.ms/cosmosdbfeedback?subject=Cosmos%20DB%20Data%20Explorer%20Feedback";
-  public static readonly Unauthorized: number = 401;
+  public static autoscaleMigration = "https://aka.ms/cosmos-autoscale-migration";
-  public static readonly Forbidden: number = 403;
+  public static freeTierInformation = "https://aka.ms/cosmos-free-tier";
-  public static readonly NotFound: number = 404;
+  public static cosmosPricing = "https://aka.ms/azure-cosmos-db-pricing";
-  public static readonly TooManyRequests: number = 429;
+}
-  public static readonly Conflict: number = 409;
+
-
+export class HashRoutePrefixes {
-  public static readonly InternalServerError: number = 500;
+  public static databases: string = "/dbs/{db_id}";
-  public static readonly BadGateway: number = 502;
+  public static collections: string = "/dbs/{db_id}/colls/{coll_id}";
-  public static readonly ServiceUnavailable: number = 503;
+  public static sprocHash: string = "/sprocs/";
-  public static readonly GatewayTimeout: number = 504;
+  public static sprocs: string = HashRoutePrefixes.collections + HashRoutePrefixes.sprocHash + "{sproc_id}";
-
+  public static docs: string = HashRoutePrefixes.collections + "/docs/{doc_id}/";
-  public static readonly RetryableStatusCodes: number[] = [
+  public static conflicts: string = HashRoutePrefixes.collections + "/conflicts";
-    HttpStatusCodes.TooManyRequests,
+
-    HttpStatusCodes.InternalServerError, // TODO: Handle all 500s on Portal backend and remove from retries list
+  public static databasesWithId(databaseId: string): string {
-    HttpStatusCodes.BadGateway,
+    return this.databases.replace("{db_id}", databaseId).replace("/", ""); // strip the first slash since hasher adds it
-    HttpStatusCodes.ServiceUnavailable,
+  }
-    HttpStatusCodes.GatewayTimeout
+
-  ];
+  public static collectionsWithIds(databaseId: string, collectionId: string): string {
-}
+    const transformedDatabasePrefix: string = this.collections.replace("{db_id}", databaseId);
-
+
-export class Urls {
+    return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("/", ""); // strip the first slash since hasher adds it
-  public static feedbackEmail = "https://aka.ms/cosmosdbfeedback?subject=Cosmos%20DB%20Data%20Explorer%20Feedback";
+  }
-  public static autoscaleMigration = "https://aka.ms/cosmos-autoscale-migration";
+
-  public static freeTierInformation = "https://aka.ms/cosmos-free-tier";
+  public static sprocWithIds(
-  public static cosmosPricing = "https://aka.ms/azure-cosmos-db-pricing";
+    databaseId: string,
-}
+    collectionId: string,
-
+    sprocId: string,
-export class HashRoutePrefixes {
+    stripFirstSlash: boolean = true
-  public static databases: string = "/dbs/{db_id}";
+  ): string {
-  public static collections: string = "/dbs/{db_id}/colls/{coll_id}";
+    const transformedDatabasePrefix: string = this.sprocs.replace("{db_id}", databaseId);
-  public static sprocHash: string = "/sprocs/";
+
-  public static sprocs: string = HashRoutePrefixes.collections + HashRoutePrefixes.sprocHash + "{sproc_id}";
+    const transformedSprocRoute: string = transformedDatabasePrefix
-  public static docs: string = HashRoutePrefixes.collections + "/docs/{doc_id}/";
+      .replace("{coll_id}", collectionId)
-  public static conflicts: string = HashRoutePrefixes.collections + "/conflicts";
+      .replace("{sproc_id}", sprocId);
-
+    if (!!stripFirstSlash) {
-  public static databasesWithId(databaseId: string): string {
+      return transformedSprocRoute.replace("/", ""); // strip the first slash since hasher adds it
-    return this.databases.replace("{db_id}", databaseId).replace("/", ""); // strip the first slash since hasher adds it
+    }
-  }
+
-
+    return transformedSprocRoute;
-  public static collectionsWithIds(databaseId: string, collectionId: string): string {
+  }
-    const transformedDatabasePrefix: string = this.collections.replace("{db_id}", databaseId);
+
-
+  public static conflictsWithIds(databaseId: string, collectionId: string) {
-    return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("/", ""); // strip the first slash since hasher adds it
+    const transformedDatabasePrefix: string = this.conflicts.replace("{db_id}", databaseId);
-  }
+
-
+    return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("/", ""); // strip the first slash since hasher adds it;
-  public static sprocWithIds(
+  }
-    databaseId: string,
+
-    collectionId: string,
+  public static docsWithIds(databaseId: string, collectionId: string, docId: string) {
-    sprocId: string,
+    const transformedDatabasePrefix: string = this.docs.replace("{db_id}", databaseId);
-    stripFirstSlash: boolean = true
+
-  ): string {
+    return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("{doc_id}", docId).replace("/", ""); // strip the first slash since hasher adds it
-    const transformedDatabasePrefix: string = this.sprocs.replace("{db_id}", databaseId);
+  }
-
+}
-    const transformedSprocRoute: string = transformedDatabasePrefix
+
-      .replace("{coll_id}", collectionId)
+export class ConfigurationOverridesValues {
-      .replace("{sproc_id}", sprocId);
+  public static IsBsonSchemaV2: string = "true";
-    if (!!stripFirstSlash) {
+}
-      return transformedSprocRoute.replace("/", ""); // strip the first slash since hasher adds it
+
-    }
+export class KeyCodes {
-
+  public static Space: number = 32;
-    return transformedSprocRoute;
+  public static Enter: number = 13;
-  }
+  public static Escape: number = 27;
-
+  public static UpArrow: number = 38;
-  public static conflictsWithIds(databaseId: string, collectionId: string) {
+  public static DownArrow: number = 40;
-    const transformedDatabasePrefix: string = this.conflicts.replace("{db_id}", databaseId);
+  public static LeftArrow: number = 37;
-
+  public static RightArrow: number = 39;
-    return transformedDatabasePrefix.replace("{coll_id}", collectionId).replace("/", ""); // strip the first slash since hasher adds it;
+  public static Tab: number = 9;
-  }
+}
-
+
-  public static docsWithIds(databaseId: string, collectionId: string, docId: string) {
+// Normalized per: https://www.w3.org/TR/uievents-key/#named-key-attribute-values
-    const transformedDatabasePrefix: string = this.docs.replace("{db_id}", databaseId);
+export class NormalizedEventKey {
-
+  public static readonly Space = " ";
-    return transformedDatabasePrefix
+  public static readonly Enter = "Enter";
-      .replace("{coll_id}", collectionId)
+  public static readonly Escape = "Escape";
-      .replace("{doc_id}", docId)
+  public static readonly UpArrow = "ArrowUp";
-      .replace("/", ""); // strip the first slash since hasher adds it
+  public static readonly DownArrow = "ArrowDown";
-  }
+  public static readonly LeftArrow = "ArrowLeft";
-}
+  public static readonly RightArrow = "ArrowRight";
-
+}
-export class ConfigurationOverridesValues {
+
-  public static IsBsonSchemaV2: string = "true";
+export class TryCosmosExperience {
-}
+  public static extendUrl: string = "https://trycosmosdb.azure.com/api/resource/extendportal?userId={0}";
-
+  public static deleteUrl: string = "https://trycosmosdb.azure.com/api/resource/deleteportal?userId={0}";
-export class KeyCodes {
+  public static collectionsPerAccount: number = 3;
-  public static Space: number = 32;
+  public static maxRU: number = 5000;
-  public static Enter: number = 13;
+  public static defaultRU: number = 3000;
-  public static Escape: number = 27;
+}
-  public static UpArrow: number = 38;
+
-  public static DownArrow: number = 40;
+export class OfferVersions {
-  public static LeftArrow: number = 37;
+  public static V1: string = "V1";
-  public static RightArrow: number = 39;
+  public static V2: string = "V2";
-  public static Tab: number = 9;
+}
-}
+
-
+export enum ConflictOperationType {
-// Normalized per: https://www.w3.org/TR/uievents-key/#named-key-attribute-values
+  Replace = "replace",
-export class NormalizedEventKey {
+  Create = "create",
-  public static readonly Space = " ";
+  Delete = "delete",
-  public static readonly Enter = "Enter";
+}
-  public static readonly Escape = "Escape";
+
-  public static readonly UpArrow = "ArrowUp";
+export const EmulatorMasterKey =
-  public static readonly DownArrow = "ArrowDown";
+  //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
-  public static readonly LeftArrow = "ArrowLeft";
+  "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
-  public static readonly RightArrow = "ArrowRight";
+
-}
+// A variable @MyVariable defined in Constants.less is accessible as StyleConstants.MyVariable
-
+export const StyleConstants = require("less-vars-loader!../../less/Common/Constants.less");
-export class TryCosmosExperience {
+
-  public static extendUrl: string = "https://trycosmosdb.azure.com/api/resource/extendportal?userId={0}";
+export class Notebook {
-  public static deleteUrl: string = "https://trycosmosdb.azure.com/api/resource/deleteportal?userId={0}";
+  public static readonly defaultBasePath = "./notebooks";
-  public static collectionsPerAccount: number = 3;
+  public static readonly heartbeatDelayMs = 5000;
-  public static maxRU: number = 5000;
+  public static readonly kernelRestartInitialDelayMs = 1000;
-  public static defaultRU: number = 3000;
+  public static readonly kernelRestartMaxDelayMs = 20000;
-}
+  public static readonly autoSaveIntervalMs = 120000;
-
+
-export class OfferVersions {
+  public static readonly MyNotebooksTitle = "My Notebooks";
-  public static V1: string = "V1";
+  public static readonly GitHubReposTitle = "GitHub repos";
-  public static V2: string = "V2";
+}
-}
+
-
+export class SparkLibrary {
-export enum ConflictOperationType {
+  public static readonly nameMinLength = 3;
-  Replace = "replace",
+  public static readonly nameMaxLength = 63;
-  Create = "create",
+}
-  Delete = "delete"
+
-}
+export class AnalyticalStorageTtl {
-
+  public static readonly Days90: number = 7776000;
-export const EmulatorMasterKey =
+  public static readonly Infinite: number = -1;
-  //[SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Well known public masterKey for emulator")]
+  public static readonly Disabled: number = 0;
-  "C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==";
+}
-
+
-// A variable @MyVariable defined in Constants.less is accessible as StyleConstants.MyVariable
+export class TerminalQueryParams {
-export const StyleConstants = require("less-vars-loader!../../less/Common/Constants.less");
+  public static readonly Terminal = "terminal";
-
+  public static readonly Server = "server";
-export class Notebook {
+  public static readonly Token = "token";
-  public static readonly defaultBasePath = "./notebooks";
+  public static readonly SubscriptionId = "subscriptionId";
-  public static readonly heartbeatDelayMs = 5000;
+  public static readonly TerminalEndpoint = "terminalEndpoint";
-  public static readonly kernelRestartInitialDelayMs = 1000;
+}
-  public static readonly kernelRestartMaxDelayMs = 20000;
-  public static readonly autoSaveIntervalMs = 120000;
-}
-
-export class SparkLibrary {
-  public static readonly nameMinLength = 3;
-  public static readonly nameMaxLength = 63;
-}
-
-export class AnalyticalStorageTtl {
-  public static readonly Days90: number = 7776000;
-  public static readonly Infinite: number = -1;
-  public static readonly Disabled: number = 0;
-}
-
-export class TerminalQueryParams {
-  public static readonly Terminal = "terminal";
-  public static readonly Server = "server";
-  public static readonly Token = "token";
-  public static readonly SubscriptionId = "subscriptionId";
-  public static readonly TerminalEndpoint = "terminalEndpoint";
-}

src/Common/CosmosClient.test.ts

@@ -10,17 +10,17 @@ describe("tokenProvider", () => {
     resourceId: "",
     resourceType: "dbs" as ResourceType,
     headers: {},
-    getAuthorizationTokenUsingMasterKey: () => ""
+    getAuthorizationTokenUsingMasterKey: () => "",
   };
 
   beforeEach(() => {
     updateConfigContext({
-      BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+      BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
     });
     window.fetch = jest.fn().mockImplementation(() => {
       return {
         json: () => "{}",
-        headers: new Map()
+        headers: new Map(),
       };
     });
   });
@@ -36,7 +36,7 @@ describe("tokenProvider", () => {
 
   it("does not call the auth service if a master key is set", async () => {
     updateUserContext({
-      masterKey: "foo"
+      masterKey: "foo",
     });
     await tokenProvider(options);
     expect((window.fetch as any).mock.calls.length).toBe(0);
@@ -50,7 +50,7 @@ describe("getTokenFromAuthService", () => {
     window.fetch = jest.fn().mockImplementation(() => {
       return {
         json: () => "{}",
-        headers: new Map()
+        headers: new Map(),
       };
     });
   });
@@ -61,7 +61,7 @@ describe("getTokenFromAuthService", () => {
 
   it("builds the correct URL in production", () => {
     updateConfigContext({
-      BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+      BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
     });
     getTokenFromAuthService("GET", "dbs", "foo");
     expect(window.fetch).toHaveBeenCalledWith(
@@ -72,7 +72,7 @@ describe("getTokenFromAuthService", () => {
 
   it("builds the correct URL in dev", () => {
     updateConfigContext({
-      BACKEND_ENDPOINT: "https://localhost:1234"
+      BACKEND_ENDPOINT: "https://localhost:1234",
     });
     getTokenFromAuthService("GET", "dbs", "foo");
     expect(window.fetch).toHaveBeenCalledWith(
@@ -96,15 +96,15 @@ describe("endpoint", () => {
           documentEndpoint: "bar",
           gremlinEndpoint: "foo",
           tableEndpoint: "foo",
-          cassandraEndpoint: "foo"
+          cassandraEndpoint: "foo",
-        }
+        },
-      }
+      },
     });
     expect(endpoint()).toEqual("bar");
   });
   it("uses _endpoint if set", () => {
     updateUserContext({
-      endpoint: "baz"
+      endpoint: "baz",
     });
     expect(endpoint()).toEqual("baz");
   });
@@ -121,7 +121,7 @@ describe("requestPlugin", () => {
       updateConfigContext({
         platform: Platform.Hosted,
         BACKEND_ENDPOINT: "https://localhost:1234",
-        PROXY_PATH: "/proxy"
+        PROXY_PATH: "/proxy",
       });
       const headers = {};
       const endpoint = "https://docs.azure.com";

src/Common/CosmosClient.ts

@@ -1,10 +1,10 @@
 import * as Cosmos from "@azure/cosmos";
 import { RequestInfo, setAuthorizationTokenHeaderUsingMasterKey } from "@azure/cosmos";
 import { configContext, Platform } from "../ConfigContext";
-import { getErrorMessage } from "./ErrorHandlingUtils";
+import { userContext } from "../UserContext";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
 import { EmulatorMasterKey, HttpHeaders } from "./Constants";
-import { userContext } from "../UserContext";
+import { getErrorMessage } from "./ErrorHandlingUtils";
 
 const _global = typeof self === "undefined" ? window : self;
 
@@ -58,13 +58,13 @@ export async function getTokenFromAuthService(verb: string, resourceType: string
       method: "POST",
       headers: {
         "content-type": "application/json",
-        "x-ms-encrypted-auth-token": userContext.accessToken
+        "x-ms-encrypted-auth-token": userContext.accessToken,
       },
       body: JSON.stringify({
         verb,
         resourceType,
-        resourceId
+        resourceId,
-      })
+      }),
     });
     //TODO I am not sure why we have to parse the JSON again here. fetch should do it for us when we call .json()
     const result = JSON.parse(await response.json());
@@ -77,13 +77,13 @@ export async function getTokenFromAuthService(verb: string, resourceType: string
 
 export function client(): Cosmos.CosmosClient {
   const options: Cosmos.CosmosClientOptions = {
-    endpoint: endpoint() || " ", // CosmosClient gets upset if we pass a falsy value here
+    endpoint: endpoint() || "https://cosmos.azure.com", // CosmosClient gets upset if we pass a bad URL. This should never actually get called
     key: userContext.masterKey,
     tokenProvider,
     connectionPolicy: {
-      enableEndpointDiscovery: false
+      enableEndpointDiscovery: false,
     },
-    userAgentSuffix: "Azure Portal"
+    userAgentSuffix: "Azure Portal",
   };
 
   if (configContext.PROXY_PATH !== undefined) {

src/Common/DataAccessUtilityBase.ts

@@ -1,182 +0,0 @@
-import {
-  ConflictDefinition,
-  FeedOptions,
-  ItemDefinition,
-  OfferDefinition,
-  QueryIterator,
-  Resource
-} from "@azure/cosmos";
-import { RequestOptions } from "@azure/cosmos/dist-esm";
-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);
-  options = options || {};
-  options.populateQueryMetrics = true;
-  options.enableScanInQuery = options.enableScanInQuery || true;
-  if (!options.partitionKey) {
-    options.forceQueryPlan = true;
-  }
-  options.maxItemCount =
-    options.maxItemCount ||
-    (storedItemPerPageSetting !== undefined && storedItemPerPageSetting) ||
-    Constants.Queries.itemsPerPage;
-  options.maxDegreeOfParallelism = LocalStorageUtility.getEntryNumber(StorageKey.MaxDegreeOfParellism);
-
-  return options;
-}
-
-export function queryDocuments(
-  databaseId: string,
-  containerId: string,
-  query: string,
-  options: any
-): Q.Promise<QueryIterator<ItemDefinition & Resource>> {
-  options = getCommonQueryOptions(options);
-  const documentsIterator = client()
-    .database(databaseId)
-    .container(containerId)
-    .items.query(query, options);
-  return Q(documentsIterator);
-}
-
-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 executeStoredProcedure(
-  collection: ViewModels.Collection,
-  storedProcedure: StoredProcedure,
-  partitionKeyValue: any,
-  params: any[]
-): Q.Promise<any> {
-  // TODO remove this deferred. Kept it because of timeout code at bottom of function
-  const deferred = Q.defer<any>();
-
-  client()
-    .database(collection.databaseId)
-    .container(collection.id())
-    .scripts.storedProcedure(storedProcedure.id())
-    .execute(partitionKeyValue, params, { enableScriptLogging: true })
-    .then(response =>
-      deferred.resolve({
-        result: response.resource,
-        scriptLogs: response.headers[Constants.HttpHeaders.scriptLogResults]
-      })
-    )
-    .catch(error => deferred.reject(error));
-
-  return deferred.promise.timeout(
-    Constants.ClientDefaults.requestTimeoutMs,
-    `Request timed out while executing stored procedure ${storedProcedure.id()}`
-  );
-}
-
-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;
-
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .item(documentId.id(), partitionKey)
-      .read()
-      .then(response => response.resource)
-  );
-}
-
-export function deleteDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
-  const partitionKey = documentId.partitionKeyValue;
-
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .item(documentId.id(), partitionKey)
-      .delete()
-  );
-}
-
-export function deleteConflict(
-  collection: ViewModels.CollectionBase,
-  conflictId: ConflictId,
-  options: any = {}
-): Q.Promise<any> {
-  options.partitionKey = options.partitionKey || getPartitionKeyHeaderForConflict(conflictId);
-
-  return Q(
-    client()
-      .database(collection.databaseId)
-      .container(collection.id())
-      .conflict(conflictId.id())
-      .delete(options)
-  );
-}
-
-export function queryConflicts(
-  databaseId: string,
-  containerId: string,
-  query: string,
-  options: any
-): Q.Promise<QueryIterator<ConflictDefinition & Resource>> {
-  const documentsIterator = client()
-    .database(databaseId)
-    .container(containerId)
-    .conflicts.query(query, options);
-  return Q(documentsIterator);
-}

src/Common/DocumentClientUtilityBase.ts

@@ -1,217 +0,0 @@
-import { ConflictDefinition, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
-import Q from "q";
-import * as ViewModels from "../Contracts/ViewModels";
-import ConflictId from "../Explorer/Tree/ConflictId";
-import DocumentId from "../Explorer/Tree/DocumentId";
-import StoredProcedure from "../Explorer/Tree/StoredProcedure";
-import { logConsoleInfo, logConsoleProgress } from "../Utils/NotificationConsoleUtils";
-import * as Constants from "./Constants";
-import * as DataAccessUtilityBase from "./DataAccessUtilityBase";
-import { MinimalQueryIterator, nextPage } from "./IteratorUtilities";
-import { handleError } from "./ErrorHandlingUtils";
-
-// TODO: Log all promise resolutions and errors with verbosity levels
-export function queryDocuments(
-  databaseId: string,
-  containerId: string,
-  query: string,
-  options: any
-): Q.Promise<QueryIterator<ItemDefinition & Resource>> {
-  return DataAccessUtilityBase.queryDocuments(databaseId, containerId, query, options);
-}
-
-export function queryConflicts(
-  databaseId: string,
-  containerId: string,
-  query: string,
-  options: any
-): Q.Promise<QueryIterator<ConflictDefinition & Resource>> {
-  return DataAccessUtilityBase.queryConflicts(databaseId, containerId, query, options);
-}
-
-export function getEntityName() {
-  const defaultExperience =
-    window.dataExplorer && window.dataExplorer.defaultExperience && window.dataExplorer.defaultExperience();
-  if (defaultExperience === Constants.DefaultAccountExperience.MongoDB) {
-    return "document";
-  }
-  return "item";
-}
-
-export function executeStoredProcedure(
-  collection: ViewModels.Collection,
-  storedProcedure: StoredProcedure,
-  partitionKeyValue: any,
-  params: any[]
-): Q.Promise<any> {
-  var deferred = Q.defer<any>();
-
-  const clearMessage = logConsoleProgress(`Executing stored procedure ${storedProcedure.id()}`);
-  DataAccessUtilityBase.executeStoredProcedure(collection, storedProcedure, partitionKeyValue, params)
-    .then(
-      (response: any) => {
-        deferred.resolve(response);
-        logConsoleInfo(
-          `Finished executing stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}`
-        );
-      },
-      (error: any) => {
-        handleError(
-          error,
-          "ExecuteStoredProcedure",
-          `Failed to execute stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}`
-        );
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      clearMessage();
-    });
-
-  return deferred.promise;
-}
-
-export function queryDocumentsPage(
-  resourceName: string,
-  documentsIterator: MinimalQueryIterator,
-  firstItemIndex: number,
-  options: any
-): Q.Promise<ViewModels.QueryResults> {
-  var deferred = Q.defer<ViewModels.QueryResults>();
-  const entityName = getEntityName();
-  const clearMessage = logConsoleProgress(`Querying ${entityName} for container ${resourceName}`);
-  Q(nextPage(documentsIterator, firstItemIndex))
-    .then(
-      (result: ViewModels.QueryResults) => {
-        const itemCount = (result.documents && result.documents.length) || 0;
-        logConsoleInfo(`Successfully fetched ${itemCount} ${entityName} for container ${resourceName}`);
-        deferred.resolve(result);
-      },
-      (error: any) => {
-        handleError(error, "QueryDocumentsPage", `Failed to query ${entityName} for container ${resourceName}`);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      clearMessage();
-    });
-
-  return deferred.promise;
-}
-
-export function readDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
-  var deferred = Q.defer<any>();
-  const entityName = getEntityName();
-  const clearMessage = logConsoleProgress(`Reading ${entityName} ${documentId.id()}`);
-  DataAccessUtilityBase.readDocument(collection, documentId)
-    .then(
-      (document: any) => {
-        deferred.resolve(document);
-      },
-      (error: any) => {
-        handleError(error, "ReadDocument", `Failed to read ${entityName} ${documentId.id()}`);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      clearMessage();
-    });
-
-  return deferred.promise;
-}
-
-export function updateDocument(
-  collection: ViewModels.CollectionBase,
-  documentId: DocumentId,
-  newDocument: any
-): Q.Promise<any> {
-  var deferred = Q.defer<any>();
-  const entityName = getEntityName();
-  const clearMessage = logConsoleProgress(`Updating ${entityName} ${documentId.id()}`);
-  DataAccessUtilityBase.updateDocument(collection, documentId, newDocument)
-    .then(
-      (updatedDocument: any) => {
-        logConsoleInfo(`Successfully updated ${entityName} ${documentId.id()}`);
-        deferred.resolve(updatedDocument);
-      },
-      (error: any) => {
-        handleError(error, "UpdateDocument", `Failed to update ${entityName} ${documentId.id()}`);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      clearMessage();
-    });
-
-  return deferred.promise;
-}
-
-export function createDocument(collection: ViewModels.CollectionBase, newDocument: any): Q.Promise<any> {
-  var deferred = Q.defer<any>();
-  const entityName = getEntityName();
-  const clearMessage = logConsoleProgress(`Creating new ${entityName} for container ${collection.id()}`);
-  DataAccessUtilityBase.createDocument(collection, newDocument)
-    .then(
-      (savedDocument: any) => {
-        logConsoleInfo(`Successfully created new ${entityName} for container ${collection.id()}`);
-        deferred.resolve(savedDocument);
-      },
-      (error: any) => {
-        handleError(error, "CreateDocument", `Error while creating new ${entityName} for container ${collection.id()}`);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      clearMessage();
-    });
-
-  return deferred.promise;
-}
-
-export function deleteDocument(collection: ViewModels.CollectionBase, documentId: DocumentId): Q.Promise<any> {
-  var deferred = Q.defer<any>();
-  const entityName = getEntityName();
-  const clearMessage = logConsoleProgress(`Deleting ${entityName} ${documentId.id()}`);
-  DataAccessUtilityBase.deleteDocument(collection, documentId)
-    .then(
-      (response: any) => {
-        logConsoleInfo(`Successfully deleted ${entityName} ${documentId.id()}`);
-        deferred.resolve(response);
-      },
-      (error: any) => {
-        handleError(error, "DeleteDocument", `Error while deleting ${entityName} ${documentId.id()}`);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      clearMessage();
-    });
-
-  return deferred.promise;
-}
-
-export function deleteConflict(
-  collection: ViewModels.CollectionBase,
-  conflictId: ConflictId,
-  options?: any
-): Q.Promise<any> {
-  var deferred = Q.defer<any>();
-
-  const clearMessage = logConsoleProgress(`Deleting conflict ${conflictId.id()}`);
-  DataAccessUtilityBase.deleteConflict(collection, conflictId, options)
-    .then(
-      (response: any) => {
-        logConsoleInfo(`Successfully deleted conflict ${conflictId.id()}`);
-        deferred.resolve(response);
-      },
-      (error: any) => {
-        handleError(error, "DeleteConflict", `Error while deleting conflict ${conflictId.id()}`);
-        deferred.reject(error);
-      }
-    )
-    .finally(() => {
-      clearMessage();
-    });
-
-  return deferred.promise;
-}

src/Common/DocumentUtility.ts

@@ -0,0 +1,10 @@
+import { DefaultAccountExperienceType } from "../DefaultAccountExperienceType";
+import { userContext } from "../UserContext";
+
+export const getEntityName = (): string => {
+  if (userContext.defaultExperience === DefaultAccountExperienceType.MongoDB) {
+    return "document";
+  }
+
+  return "item";
+};

src/Common/EditableUtility.ts

@@ -1,94 +1,94 @@
-import * as ko from "knockout";
+import * as ko from "knockout";
-import * as ViewModels from "../Contracts/ViewModels";
+import * as ViewModels from "../Contracts/ViewModels";
-
+
-export default class EditableUtility {
+export default class EditableUtility {
-  public static observable<T>(initialValue?: T): ViewModels.Editable<T> {
+  public static observable<T>(initialValue?: T): ViewModels.Editable<T> {
-    var observable: ViewModels.Editable<T> = <ViewModels.Editable<T>>ko.observable<T>(initialValue);
+    var observable: ViewModels.Editable<T> = <ViewModels.Editable<T>>ko.observable<T>(initialValue);
-
+
-    observable.edits = ko.observableArray<T>([initialValue]);
+    observable.edits = ko.observableArray<T>([initialValue]);
-    observable.validations = ko.observableArray<(value: T) => boolean>([]);
+    observable.validations = ko.observableArray<(value: T) => boolean>([]);
-
+
-    observable.setBaseline = (baseline: T) => {
+    observable.setBaseline = (baseline: T) => {
-      observable(baseline);
+      observable(baseline);
-      observable.edits([baseline]);
+      observable.edits([baseline]);
-    };
+    };
-
+
-    observable.getEditableCurrentValue = ko.computed<T>(() => {
+    observable.getEditableCurrentValue = ko.computed<T>(() => {
-      const edits = (observable.edits && observable.edits()) || [];
+      const edits = (observable.edits && observable.edits()) || [];
-      if (edits.length === 0) {
+      if (edits.length === 0) {
-        return undefined;
+        return undefined;
-      }
+      }
-
+
-      return edits[edits.length - 1];
+      return edits[edits.length - 1];
-    });
+    });
-
+
-    observable.getEditableOriginalValue = ko.computed<T>(() => {
+    observable.getEditableOriginalValue = ko.computed<T>(() => {
-      const edits = (observable.edits && observable.edits()) || [];
+      const edits = (observable.edits && observable.edits()) || [];
-      if (edits.length === 0) {
+      if (edits.length === 0) {
-        return undefined;
+        return undefined;
-      }
+      }
-
+
-      return edits[0];
+      return edits[0];
-    });
+    });
-
+
-    observable.editableIsDirty = ko.computed<boolean>(() => {
+    observable.editableIsDirty = ko.computed<boolean>(() => {
-      const edits = (observable.edits && observable.edits()) || [];
+      const edits = (observable.edits && observable.edits()) || [];
-      if (edits.length <= 1) {
+      if (edits.length <= 1) {
-        return false;
+        return false;
-      }
+      }
-
+
-      let current: any = observable.getEditableCurrentValue();
+      let current: any = observable.getEditableCurrentValue();
-      let original: any = observable.getEditableOriginalValue();
+      let original: any = observable.getEditableOriginalValue();
-
+
-      switch (typeof current) {
+      switch (typeof current) {
-        case "string":
+        case "string":
-        case "undefined":
+        case "undefined":
-        case "number":
+        case "number":
-        case "boolean":
+        case "boolean":
-          current = current && current.toString();
+          current = current && current.toString();
-          break;
+          break;
-
+
-        default:
+        default:
-          current = JSON.stringify(current);
+          current = JSON.stringify(current);
-          break;
+          break;
-      }
+      }
-
+
-      switch (typeof original) {
+      switch (typeof original) {
-        case "string":
+        case "string":
-        case "undefined":
+        case "undefined":
-        case "number":
+        case "number":
-        case "boolean":
+        case "boolean":
-          original = original && original.toString();
+          original = original && original.toString();
-          break;
+          break;
-
+
-        default:
+        default:
-          original = JSON.stringify(original);
+          original = JSON.stringify(original);
-          break;
+          break;
-      }
+      }
-
+
-      if (current !== original) {
+      if (current !== original) {
-        return true;
+        return true;
-      }
+      }
-
+
-      return false;
+      return false;
-    });
+    });
-
+
-    observable.subscribe(edit => {
+    observable.subscribe((edit) => {
-      var edits = observable.edits && observable.edits();
+      var edits = observable.edits && observable.edits();
-      if (!edits) {
+      if (!edits) {
-        return;
+        return;
-      }
+      }
-      edits.push(edit);
+      edits.push(edit);
-      observable.edits(edits);
+      observable.edits(edits);
-    });
+    });
-
+
-    observable.editableIsValid = ko.observable<boolean>(true);
+    observable.editableIsValid = ko.observable<boolean>(true);
-    observable.subscribe(value => {
+    observable.subscribe((value) => {
-      const validations: ((value: T) => boolean)[] = (observable.validations && observable.validations()) || [];
+      const validations: ((value: T) => boolean)[] = (observable.validations && observable.validations()) || [];
-      const isValid = validations.every(validate => validate(value));
+      const isValid = validations.every((validate) => validate(value));
-      observable.editableIsValid(isValid);
+      observable.editableIsValid(isValid);
-    });
+    });
-
+
-    return observable;
+    return observable;
-  }
+  }
-}
+}

src/Common/EnvironmentUtility.ts

@@ -1,8 +1,6 @@
-export default class EnvironmentUtility {
+export function normalizeArmEndpoint(uri: string): string {
-  public static normalizeArmEndpointUri(uri: string): string {
+  if (uri && uri.slice(-1) !== "/") {
-    if (uri && uri.slice(-1) !== "/") {
+    return `${uri}/`;
-      return `${uri}/`;
+  }
-    }
+  return uri;
-    return uri;
+}
-  }
-}

src/Common/ErrorHandlingUtils.ts

@@ -1,8 +1,9 @@
-import { ARMError } from "../Utils/arm/request";
-import { HttpStatusCodes } from "./Constants";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
-import { SubscriptionType } from "../Contracts/ViewModels";
+import { SubscriptionType } from "../Contracts/SubscriptionType";
+import { userContext } from "../UserContext";
+import { ARMError } from "../Utils/arm/request";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
+import { HttpStatusCodes } from "./Constants";
 import { logError } from "./Logger";
 import { sendMessage } from "./MessageHandler";
 
@@ -21,7 +22,7 @@ export const handleError = (error: string | ARMError | Error, area: string, cons
   sendNotificationForError(errorMessage, errorCode);
 };
 
-export const getErrorMessage = (error: string | Error): string => {
+export const getErrorMessage = (error: string | Error = ""): string => {
   const errorMessage = typeof error === "string" ? error : error.message;
   return replaceKnownError(errorMessage);
 };
@@ -37,18 +38,18 @@ const sendNotificationForError = (errorMessage: string, errorCode: number | stri
     }
     sendMessage({
       type: MessageTypes.ForbiddenError,
-      reason: errorMessage
+      reason: errorMessage,
     });
   }
 };
 
 const replaceKnownError = (errorMessage: string): string => {
   if (
-    window.dataExplorer?.subscriptionType() === SubscriptionType.Internal &&
+    userContext.subscriptionType === SubscriptionType.Internal &&
-    errorMessage.indexOf("SharedOffer is Disabled for your account") >= 0
+    errorMessage?.indexOf("SharedOffer is Disabled for your account") >= 0
   ) {
     return "Database throughput is not supported for internal subscriptions.";
-  } else if (errorMessage.indexOf("Partition key paths must contain only valid") >= 0) {
+  } else if (errorMessage?.indexOf("Partition key paths must contain only valid") >= 0) {
     return "Partition key paths must contain only valid characters and not contain a trailing slash or wildcard character.";
   }
 

src/Common/HeadersUtility.test.ts

@@ -1,25 +1,25 @@
-import * as HeadersUtility from "./HeadersUtility";
+import * as HeadersUtility from "./HeadersUtility";
-import { ExplorerSettings } from "../Shared/ExplorerSettings";
+import { ExplorerSettings } from "../Shared/ExplorerSettings";
-import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";
+import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";
-
+
-describe("Headers Utility", () => {
+describe("Headers Utility", () => {
-  describe("shouldEnableCrossPartitionKeyForResourceWithPartitionKey()", () => {
+  describe("shouldEnableCrossPartitionKeyForResourceWithPartitionKey()", () => {
-    beforeEach(() => {
+    beforeEach(() => {
-      ExplorerSettings.createDefaultSettings();
+      ExplorerSettings.createDefaultSettings();
-    });
+    });
-
+
-    it("should return true by default", () => {
+    it("should return true by default", () => {
-      expect(HeadersUtility.shouldEnableCrossPartitionKey()).toBe(true);
+      expect(HeadersUtility.shouldEnableCrossPartitionKey()).toBe(true);
-    });
+    });
-
+
-    it("should return false if the enable cross partition key feed option is false", () => {
+    it("should return false if the enable cross partition key feed option is false", () => {
-      LocalStorageUtility.setEntryString(StorageKey.IsCrossPartitionQueryEnabled, "false");
+      LocalStorageUtility.setEntryString(StorageKey.IsCrossPartitionQueryEnabled, "false");
-      expect(HeadersUtility.shouldEnableCrossPartitionKey()).toBe(false);
+      expect(HeadersUtility.shouldEnableCrossPartitionKey()).toBe(false);
-    });
+    });
-
+
-    it("should return true if the enable cross partition key feed option is true", () => {
+    it("should return true if the enable cross partition key feed option is true", () => {
-      LocalStorageUtility.setEntryString(StorageKey.IsCrossPartitionQueryEnabled, "true");
+      LocalStorageUtility.setEntryString(StorageKey.IsCrossPartitionQueryEnabled, "true");
-      expect(HeadersUtility.shouldEnableCrossPartitionKey()).toBe(true);
+      expect(HeadersUtility.shouldEnableCrossPartitionKey()).toBe(true);
-    });
+    });
-  });
+  });
-});
+});

src/Common/HeadersUtility.ts

@@ -1,28 +1,5 @@
-import * as Constants from "./Constants";
+import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";
-
+
-import { LocalStorageUtility, StorageKey } from "../Shared/StorageUtility";
+export function shouldEnableCrossPartitionKey(): boolean {
-
+  return LocalStorageUtility.getEntryString(StorageKey.IsCrossPartitionQueryEnabled) === "true";
-// x-ms-resource-quota: databases = 100; collections = 5000; users = 500000; permissions = 2000000;
+}
-export function getQuota(responseHeaders: any): any {
-  return responseHeaders && responseHeaders[Constants.HttpHeaders.resourceQuota]
-    ? parseStringIntoObject(responseHeaders[Constants.HttpHeaders.resourceQuota])
-    : null;
-}
-
-export function shouldEnableCrossPartitionKey(): boolean {
-  return LocalStorageUtility.getEntryString(StorageKey.IsCrossPartitionQueryEnabled) === "true";
-}
-
-function parseStringIntoObject(resourceString: string) {
-  var entityObject: any = {};
-
-  if (resourceString) {
-    var entitiesArray: string[] = resourceString.split(";");
-    for (var i: any = 0; i < entitiesArray.length; i++) {
-      var entity: string[] = entitiesArray[i].split("=");
-      entityObject[entity[0]] = entity[1];
-    }
-  }
-
-  return entityObject;
-}

src/Common/IteratorUtilities.test.ts

@@ -11,8 +11,8 @@ describe("nextPage", () => {
           queryMetrics: {},
           requestCharge: 1,
           headers: {},
-          activityId: "foo"
+          activityId: "foo",
-        })
+        }),
     };
 
     expect(await nextPage(fakeIterator, 10)).toMatchSnapshot();

src/Common/IteratorUtilities.ts

@@ -1,6 +1,8 @@
 import { QueryResults } from "../Contracts/ViewModels";
 
 interface QueryResponse {
+  // [Todo] remove any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   resources: any[];
   hasMoreResults: boolean;
   activityId: string;
@@ -14,8 +16,9 @@ export interface MinimalQueryIterator {
 // Pick<QueryIterator<any>, "fetchNext">;
 
 export function nextPage(documentsIterator: MinimalQueryIterator, firstItemIndex: number): Promise<QueryResults> {
-  return documentsIterator.fetchNext().then(response => {
+  return documentsIterator.fetchNext().then((response) => {
     const documents = response.resources;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const headers = (response as any).headers || {}; // TODO this is a private key. Remove any
     const itemCount = (documents && documents.length) || 0;
     return {
@@ -26,7 +29,7 @@ export function nextPage(documentsIterator: MinimalQueryIterator, firstItemIndex
       lastItemIndex: Number(firstItemIndex) + Number(itemCount),
       headers,
       activityId: response.activityId,
-      requestCharge: response.requestCharge
+      requestCharge: response.requestCharge,
     };
   });
 }

src/Common/Logger.test.ts

@@ -1,26 +1,26 @@
-jest.mock("./MessageHandler");
+jest.mock("./MessageHandler");
-import { LogEntryLevel } from "../Contracts/Diagnostics";
+import { LogEntryLevel } from "../Contracts/Diagnostics";
-import * as Logger from "./Logger";
+import * as Logger from "./Logger";
-import { MessageTypes } from "../Contracts/ExplorerContracts";
+import { MessageTypes } from "../Contracts/ExplorerContracts";
-import { sendMessage } from "./MessageHandler";
+import { sendMessage } from "./MessageHandler";
-
+
-describe("Logger", () => {
+describe("Logger", () => {
-  beforeEach(() => {
+  beforeEach(() => {
-    jest.resetAllMocks();
+    jest.resetAllMocks();
-  });
+  });
-
+
-  it("should log info messages", () => {
+  it("should log info messages", () => {
-    Logger.logInfo("Test info", "DocDB");
+    Logger.logInfo("Test info", "DocDB");
-    expect(sendMessage).toBeCalled();
+    expect(sendMessage).toBeCalled();
-  });
+  });
-
+
-  it("should log error messages", () => {
+  it("should log error messages", () => {
-    Logger.logError("Test error", "DocDB");
+    Logger.logError("Test error", "DocDB");
-    expect(sendMessage).toBeCalled();
+    expect(sendMessage).toBeCalled();
-  });
+  });
-
+
-  it("should log warnings", () => {
+  it("should log warnings", () => {
-    Logger.logWarning("Test warning", "DocDB");
+    Logger.logWarning("Test warning", "DocDB");
-    expect(sendMessage).toBeCalled();
+    expect(sendMessage).toBeCalled();
-  });
+  });
-});
+});

src/Common/Logger.ts

@@ -29,7 +29,7 @@ export function logError(errorMessage: string, area: string, code?: number | str
 function _logEntry(entry: Diagnostics.LogEntry): void {
   sendMessage({
     type: MessageTypes.LogInfo,
-    data: JSON.stringify(entry)
+    data: JSON.stringify(entry),
   });
 
   const severityLevel = ((level: Diagnostics.LogEntryLevel): SeverityLevel => {
@@ -60,6 +60,6 @@ function _generateLogEntry(
     level,
     message,
     area,
-    code
+    code,
   };
 }

src/Common/MessageHandler.test.ts

@@ -1,28 +1,28 @@
-import Q from "q";
+import Q from "q";
-import * as MessageHandler from "./MessageHandler";
+import * as MessageHandler from "./MessageHandler";
-
+
-describe("Message Handler", () => {
+describe("Message Handler", () => {
-  it("should handle cached message", async () => {
+  it("should handle cached message", async () => {
-    let mockPromise = {
+    let mockPromise = {
-      id: "123",
+      id: "123",
-      startTime: new Date(),
+      startTime: new Date(),
-      deferred: Q.defer<any>()
+      deferred: Q.defer<any>(),
-    };
+    };
-    let mockMessage = { message: { id: "123", data: "{}" } };
+    let mockMessage = { message: { id: "123", data: "{}" } };
-    MessageHandler.RequestMap[mockPromise.id] = mockPromise;
+    MessageHandler.RequestMap[mockPromise.id] = mockPromise;
-    MessageHandler.handleCachedDataMessage(mockMessage);
+    MessageHandler.handleCachedDataMessage(mockMessage);
-    expect(mockPromise.deferred.promise.isFulfilled()).toBe(true);
+    expect(mockPromise.deferred.promise.isFulfilled()).toBe(true);
-  });
+  });
-
+
-  it("should delete fulfilled promises on running the garbage collector", async () => {
+  it("should delete fulfilled promises on running the garbage collector", async () => {
-    let message = {
+    let message = {
-      id: "123",
+      id: "123",
-      startTime: new Date(),
+      startTime: new Date(),
-      deferred: Q.defer<any>()
+      deferred: Q.defer<any>(),
-    };
+    };
-
+
-    MessageHandler.handleCachedDataMessage(message);
+    MessageHandler.handleCachedDataMessage(message);
-    MessageHandler.runGarbageCollector();
+    MessageHandler.runGarbageCollector();
-    expect(MessageHandler.RequestMap["123"]).toBeUndefined();
+    expect(MessageHandler.RequestMap["123"]).toBeUndefined();
-  });
+  });
-});
+});

src/Common/MessageHandler.ts

@@ -35,7 +35,7 @@ export function sendCachedDataMessage<TResponseDataModel>(
   let cachedDataPromise: CachedDataPromise<TResponseDataModel> = {
     deferred: Q.defer<TResponseDataModel>(),
     startTime: new Date(),
-    id: _.uniqueId()
+    id: _.uniqueId(),
   };
   RequestMap[cachedDataPromise.id] = cachedDataPromise;
   sendMessage({ type: messageType, params: params, id: cachedDataPromise.id });
@@ -54,7 +54,7 @@ export function sendMessage(data: any): void {
     portalChildWindow.parent.postMessage(
       {
         signature: "pcIframe",
-        data: data
+        data: data,
       },
       portalChildWindow.document.referrer
     );

src/Common/MongoProxyClient.test.ts

@@ -14,7 +14,7 @@ const fetchMock = () => {
     ok: true,
     text: () => "{}",
     json: () => "{}",
-    headers: new Map()
+    headers: new Map(),
   });
 };
 
@@ -27,8 +27,8 @@ const collection = {
   partitionKey: {
     paths: ["/pk"],
     kind: "Hash",
-    version: 1
+    version: 1,
-  }
+  },
 } as Collection;
 
 const documentId = ({
@@ -38,8 +38,8 @@ const documentId = ({
   partitionKey: {
     paths: ["/pk"],
     kind: "Hash",
-    version: 1
+    version: 1,
-  }
+  },
 } as unknown) as DocumentId;
 
 const databaseAccount = {
@@ -52,8 +52,8 @@ const databaseAccount = {
     documentEndpoint: "bar",
     gremlinEndpoint: "foo",
     tableEndpoint: "foo",
-    cassandraEndpoint: "foo"
+    cassandraEndpoint: "foo",
-  }
+  },
 } as DatabaseAccount;
 
 describe("MongoProxyClient", () => {
@@ -61,10 +61,10 @@ describe("MongoProxyClient", () => {
     beforeEach(() => {
       resetConfigContext();
       updateUserContext({
-        databaseAccount
+        databaseAccount,
       });
       updateConfigContext({
-        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -93,10 +93,10 @@ describe("MongoProxyClient", () => {
     beforeEach(() => {
       resetConfigContext();
       updateUserContext({
-        databaseAccount
+        databaseAccount,
       });
       updateConfigContext({
-        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -125,10 +125,10 @@ describe("MongoProxyClient", () => {
     beforeEach(() => {
       resetConfigContext();
       updateUserContext({
-        databaseAccount
+        databaseAccount,
       });
       updateConfigContext({
-        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -157,10 +157,10 @@ describe("MongoProxyClient", () => {
     beforeEach(() => {
       resetConfigContext();
       updateUserContext({
-        databaseAccount
+        databaseAccount,
       });
       updateConfigContext({
-        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -189,10 +189,10 @@ describe("MongoProxyClient", () => {
     beforeEach(() => {
       resetConfigContext();
       updateUserContext({
-        databaseAccount
+        databaseAccount,
       });
       updateConfigContext({
-        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -220,12 +220,11 @@ describe("MongoProxyClient", () => {
   describe("getEndpoint", () => {
     beforeEach(() => {
       resetConfigContext();
-      delete window.authType;
       updateUserContext({
-        databaseAccount
+        databaseAccount,
       });
       updateConfigContext({
-        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com"
+        BACKEND_ENDPOINT: "https://main.documentdb.ext.azure.com",
       });
     });
 
@@ -241,7 +240,9 @@ describe("MongoProxyClient", () => {
     });
 
     it("returns a guest endpoint", () => {
-      window.authType = AuthType.EncryptedToken;
+      updateUserContext({
+        authType: AuthType.EncryptedToken,
+      });
       const endpoint = getEndpoint();
       expect(endpoint).toEqual("https://main.documentdb.ext.azure.com/api/guest/mongo/explorer");
     });

src/Common/MongoProxyClient.ts

@@ -16,11 +16,11 @@ import { sendMessage } from "./MessageHandler";
 const defaultHeaders = {
   [HttpHeaders.apiType]: ApiType.MongoDB.toString(),
   [CosmosSDKConstants.HttpHeaders.MaxEntityCount]: "100",
-  [CosmosSDKConstants.HttpHeaders.Version]: "2017-11-15"
+  [CosmosSDKConstants.HttpHeaders.Version]: "2017-11-15",
 };
 
 function authHeaders() {
-  if (window.authType === AuthType.EncryptedToken) {
+  if (userContext.authType === AuthType.EncryptedToken) {
     return { [HttpHeaders.guestAccessToken]: userContext.accessToken };
   } else {
     return { [HttpHeaders.authorization]: userContext.authorizationToken };
@@ -31,7 +31,7 @@ export function queryIterator(databaseId: string, collection: Collection, query:
   let continuationToken: string;
   return {
     fetchNext: () => {
-      return queryDocuments(databaseId, collection, false, query).then(response => {
+      return queryDocuments(databaseId, collection, false, query).then((response) => {
         continuationToken = response.continuationToken;
         const headers: { [key: string]: string | number } = {};
         response.headers.forEach((value, key) => {
@@ -42,10 +42,10 @@ export function queryIterator(databaseId: string, collection: Collection, query:
           headers,
           requestCharge: Number(headers[CosmosSDKConstants.HttpHeaders.RequestCharge]),
           activityId: String(headers[CosmosSDKConstants.HttpHeaders.ActivityId]),
-          hasMoreResults: !!continuationToken
+          hasMoreResults: !!continuationToken,
         };
       });
-    }
+    },
   };
 }
 
@@ -74,7 +74,9 @@ export function queryDocuments(
     rg: userContext.resourceGroup,
     dba: databaseAccount.name,
     pk:
-      collection && collection.partitionKey && !collection.partitionKey.systemKey ? collection.partitionKeyProperty : ""
+      collection && collection.partitionKey && !collection.partitionKey.systemKey
+        ? collection.partitionKeyProperty
+        : "",
   };
 
   const endpoint = getEndpoint() || "";
@@ -87,7 +89,7 @@ export function queryDocuments(
     [CosmosSDKConstants.HttpHeaders.EnableScanInQuery]: "true",
     [CosmosSDKConstants.HttpHeaders.EnableCrossPartitionQuery]: "true",
     [CosmosSDKConstants.HttpHeaders.ParallelizeCrossPartitionQuery]: "true",
-    [HttpHeaders.contentType]: "application/query+json"
+    [HttpHeaders.contentType]: "application/query+json",
   };
 
   if (continuationToken) {
@@ -100,14 +102,14 @@ export function queryDocuments(
     .fetch(`${endpoint}${path}?${queryString.stringify(params)}`, {
       method: "POST",
       body: JSON.stringify({ query }),
-      headers
+      headers,
     })
-    .then(async response => {
+    .then(async (response) => {
       if (response.ok) {
         return {
           continuationToken: response.headers.get(CosmosSDKConstants.HttpHeaders.Continuation),
           documents: (await response.json()).Documents as DataModels.DocumentId[],
-          headers: response.headers
+          headers: response.headers,
         };
       }
       errorHandling(response, "querying documents", params);
@@ -135,7 +137,9 @@ export function readDocument(
     rg: userContext.resourceGroup,
     dba: databaseAccount.name,
     pk:
-      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey ? documentId.partitionKeyProperty : ""
+      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey
+        ? documentId.partitionKeyProperty
+        : "",
   };
 
   const endpoint = getEndpoint();
@@ -147,10 +151,10 @@ export function readDocument(
         ...authHeaders(),
         [CosmosSDKConstants.HttpHeaders.PartitionKey]: encodeURIComponent(
           JSON.stringify(documentId.partitionKeyHeader())
-        )
+        ),
-      }
+      },
     })
-    .then(response => {
+    .then((response) => {
       if (response.ok) {
         return response.json();
       }
@@ -175,7 +179,7 @@ export function createDocument(
     sid: userContext.subscriptionId,
     rg: userContext.resourceGroup,
     dba: databaseAccount.name,
-    pk: collection && collection.partitionKey && !collection.partitionKey.systemKey ? partitionKeyProperty : ""
+    pk: collection && collection.partitionKey && !collection.partitionKey.systemKey ? partitionKeyProperty : "",
   };
 
   const endpoint = getEndpoint();
@@ -186,10 +190,10 @@ export function createDocument(
       body: JSON.stringify(documentContent),
       headers: {
         ...defaultHeaders,
-        ...authHeaders()
+        ...authHeaders(),
-      }
+      },
     })
-    .then(response => {
+    .then((response) => {
       if (response.ok) {
         return response.json();
       }
@@ -218,7 +222,9 @@ export function updateDocument(
     rg: userContext.resourceGroup,
     dba: databaseAccount.name,
     pk:
-      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey ? documentId.partitionKeyProperty : ""
+      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey
+        ? documentId.partitionKeyProperty
+        : "",
   };
   const endpoint = getEndpoint();
 
@@ -230,10 +236,10 @@ export function updateDocument(
         ...defaultHeaders,
         ...authHeaders(),
         [HttpHeaders.contentType]: "application/json",
-        [CosmosSDKConstants.HttpHeaders.PartitionKey]: JSON.stringify(documentId.partitionKeyHeader())
+        [CosmosSDKConstants.HttpHeaders.PartitionKey]: JSON.stringify(documentId.partitionKeyHeader()),
-      }
+      },
     })
-    .then(response => {
+    .then((response) => {
       if (response.ok) {
         return response.json();
       }
@@ -257,7 +263,9 @@ export function deleteDocument(databaseId: string, collection: Collection, docum
     rg: userContext.resourceGroup,
     dba: databaseAccount.name,
     pk:
-      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey ? documentId.partitionKeyProperty : ""
+      documentId && documentId.partitionKey && !documentId.partitionKey.systemKey
+        ? documentId.partitionKeyProperty
+        : "",
   };
   const endpoint = getEndpoint();
 
@@ -268,10 +276,10 @@ export function deleteDocument(databaseId: string, collection: Collection, docum
         ...defaultHeaders,
         ...authHeaders(),
         [HttpHeaders.contentType]: "application/json",
-        [CosmosSDKConstants.HttpHeaders.PartitionKey]: JSON.stringify(documentId.partitionKeyHeader())
+        [CosmosSDKConstants.HttpHeaders.PartitionKey]: JSON.stringify(documentId.partitionKeyHeader()),
-      }
+      },
     })
-    .then(response => {
+    .then((response) => {
       if (response.ok) {
         return undefined;
       }
@@ -299,7 +307,7 @@ export function createMongoCollectionWithProxy(
     rg: userContext.resourceGroup,
     dba: databaseAccount.name,
     isAutoPilot: !!params.autoPilotMaxThroughput,
-    autoPilotThroughput: params.autoPilotMaxThroughput?.toString()
+    autoPilotThroughput: params.autoPilotMaxThroughput?.toString(),
   };
 
   const endpoint = getEndpoint();
@@ -314,11 +322,11 @@ export function createMongoCollectionWithProxy(
         headers: {
           ...defaultHeaders,
           ...authHeaders(),
-          [HttpHeaders.contentType]: "application/json"
+          [HttpHeaders.contentType]: "application/json",
-        }
+        },
       }
     )
-    .then(response => {
+    .then((response) => {
       if (response.ok) {
         return response.json();
       }
@@ -329,7 +337,7 @@ export function createMongoCollectionWithProxy(
 export function getEndpoint(): string {
   let url = (configContext.MONGO_BACKEND_ENDPOINT || configContext.BACKEND_ENDPOINT) + "/api/mongo/explorer";
 
-  if (window.authType === AuthType.EncryptedToken) {
+  if (userContext.authType === AuthType.EncryptedToken) {
     url = url.replace("api/mongo", "api/guest/mongo");
   }
   return url;

src/Common/MongoUtility.ts

@@ -1,168 +1,168 @@
-/*    Copyright 2013 10gen Inc.
+/*    Copyright 2013 10gen Inc.
- *
+ *
- *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
+ *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
+ *    You may obtain a copy of the License at
- *
+ *
- *    http://www.apache.org/licenses/LICENSE-2.0
+ *    http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
- *    Unless required by applicable law or agreed to in writing, software
+ *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
+ *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ *    limitations under the License.
- */
+ */
-
+
-export default class MongoUtility {
+export default class MongoUtility {
-  public static tojson = function(x: any, indent: string, nolint: boolean) {
+  public static tojson = function (x: any, indent: string, nolint: boolean) {
-    if (x === null || x === undefined) {
+    if (x === null || x === undefined) {
-      return String(x);
+      return String(x);
-    }
+    }
-    indent = indent || "";
+    indent = indent || "";
-
+
-    switch (typeof x) {
+    switch (typeof x) {
-      case "string":
+      case "string":
-        var out = new Array(x.length + 1);
+        var out = new Array(x.length + 1);
-        out[0] = '"';
+        out[0] = '"';
-        for (var i = 0; i < x.length; i++) {
+        for (var i = 0; i < x.length; i++) {
-          if (x[i] === '"') {
+          if (x[i] === '"') {
-            out[out.length] = '\\"';
+            out[out.length] = '\\"';
-          } else if (x[i] === "\\") {
+          } else if (x[i] === "\\") {
-            out[out.length] = "\\\\";
+            out[out.length] = "\\\\";
-          } else if (x[i] === "\b") {
+          } else if (x[i] === "\b") {
-            out[out.length] = "\\b";
+            out[out.length] = "\\b";
-          } else if (x[i] === "\f") {
+          } else if (x[i] === "\f") {
-            out[out.length] = "\\f";
+            out[out.length] = "\\f";
-          } else if (x[i] === "\n") {
+          } else if (x[i] === "\n") {
-            out[out.length] = "\\n";
+            out[out.length] = "\\n";
-          } else if (x[i] === "\r") {
+          } else if (x[i] === "\r") {
-            out[out.length] = "\\r";
+            out[out.length] = "\\r";
-          } else if (x[i] === "\t") {
+          } else if (x[i] === "\t") {
-            out[out.length] = "\\t";
+            out[out.length] = "\\t";
-          } else {
+          } else {
-            var code = x.charCodeAt(i);
+            var code = x.charCodeAt(i);
-            if (code < 0x20) {
+            if (code < 0x20) {
-              out[out.length] = (code < 0x10 ? "\\u000" : "\\u00") + code.toString(16);
+              out[out.length] = (code < 0x10 ? "\\u000" : "\\u00") + code.toString(16);
-            } else {
+            } else {
-              out[out.length] = x[i];
+              out[out.length] = x[i];
-            }
+            }
-          }
+          }
-        }
+        }
-        return out.join("") + '"';
+        return out.join("") + '"';
-      case "number":
+      case "number":
-      /* falls through */
+      /* falls through */
-      case "boolean":
+      case "boolean":
-        return "" + x;
+        return "" + x;
-      case "object":
+      case "object":
-        var func = $.isArray(x) ? MongoUtility.tojsonArray : MongoUtility.tojsonObject;
+        var func = $.isArray(x) ? MongoUtility.tojsonArray : MongoUtility.tojsonObject;
-        var s = func(x, indent, nolint);
+        var s = func(x, indent, nolint);
-        if (
+        if (
-          (nolint === null || nolint === undefined || nolint === true) &&
+          (nolint === null || nolint === undefined || nolint === true) &&
-          s.length < 80 &&
+          s.length < 80 &&
-          (indent === null || indent.length === 0)
+          (indent === null || indent.length === 0)
-        ) {
+        ) {
-          s = s.replace(/[\t\r\n]+/gm, " ");
+          s = s.replace(/[\t\r\n]+/gm, " ");
-        }
+        }
-        return s;
+        return s;
-      case "function":
+      case "function":
-        return x.toString();
+        return x.toString();
-      default:
+      default:
-        throw new Error("tojson can't handle type " + typeof x);
+        throw new Error("tojson can't handle type " + typeof x);
-    }
+    }
-  };
+  };
-
+
-  private static tojsonObject = function(x: any, indent: string, nolint: boolean) {
+  private static tojsonObject = function (x: any, indent: string, nolint: boolean) {
-    var lineEnding = nolint ? " " : "\n";
+    var lineEnding = nolint ? " " : "\n";
-    var tabSpace = nolint ? "" : "\t";
+    var tabSpace = nolint ? "" : "\t";
-    indent = indent || "";
+    indent = indent || "";
-
+
-    if (typeof x.tojson === "function" && x.tojson !== MongoUtility.tojson) {
+    if (typeof x.tojson === "function" && x.tojson !== MongoUtility.tojson) {
-      return x.tojson(indent, nolint);
+      return x.tojson(indent, nolint);
-    }
+    }
-
+
-    if (x.constructor && typeof x.constructor.tojson === "function" && x.constructor.tojson !== MongoUtility.tojson) {
+    if (x.constructor && typeof x.constructor.tojson === "function" && x.constructor.tojson !== MongoUtility.tojson) {
-      return x.constructor.tojson(x, indent, nolint);
+      return x.constructor.tojson(x, indent, nolint);
-    }
+    }
-
+
-    if (MongoUtility.hasDefinedProperty(x, "toString") && !$.isArray(x)) {
+    if (MongoUtility.hasDefinedProperty(x, "toString") && !$.isArray(x)) {
-      return x.toString();
+      return x.toString();
-    }
+    }
-
+
-    if (x instanceof Error) {
+    if (x instanceof Error) {
-      return x.toString();
+      return x.toString();
-    }
+    }
-
+
-    if (MongoUtility.isObjectId(x)) {
+    if (MongoUtility.isObjectId(x)) {
-      return 'ObjectId("' + x.$oid + '")';
+      return 'ObjectId("' + x.$oid + '")';
-    }
+    }
-
+
-    // push one level of indent
+    // push one level of indent
-    indent += tabSpace;
+    indent += tabSpace;
-    var s = "{";
+    var s = "{";
-
+
-    var pairs = [];
+    var pairs = [];
-    for (var k in x) {
+    for (var k in x) {
-      if (x.hasOwnProperty(k)) {
+      if (x.hasOwnProperty(k)) {
-        var val = x[k];
+        var val = x[k];
-        var pair = '"' + k + '" : ' + MongoUtility.tojson(val, indent, nolint);
+        var pair = '"' + k + '" : ' + MongoUtility.tojson(val, indent, nolint);
-
+
-        if (k === "_id") {
+        if (k === "_id") {
-          pairs.unshift(pair);
+          pairs.unshift(pair);
-        } else {
+        } else {
-          pairs.push(pair);
+          pairs.push(pair);
-        }
+        }
-      }
+      }
-    }
+    }
-    // Add proper line endings, indents, and commas to each line
+    // Add proper line endings, indents, and commas to each line
-    s += $.map(pairs, function(pair) {
+    s += $.map(pairs, function (pair) {
-      return lineEnding + indent + pair;
+      return lineEnding + indent + pair;
-    }).join(",");
+    }).join(",");
-    s += lineEnding;
+    s += lineEnding;
-
+
-    // pop one level of indent
+    // pop one level of indent
-    indent = indent.substring(1);
+    indent = indent.substring(1);
-    return s + indent + "}";
+    return s + indent + "}";
-  };
+  };
-
+
-  private static tojsonArray = function(a: any, indent: string, nolint: boolean) {
+  private static tojsonArray = function (a: any, indent: string, nolint: boolean) {
-    if (a.length === 0) {
+    if (a.length === 0) {
-      return "[ ]";
+      return "[ ]";
-    }
+    }
-
+
-    var lineEnding = nolint ? " " : "\n";
+    var lineEnding = nolint ? " " : "\n";
-    if (!indent || nolint) {
+    if (!indent || nolint) {
-      indent = "";
+      indent = "";
-    }
+    }
-
+
-    var s = "[" + lineEnding;
+    var s = "[" + lineEnding;
-    indent += "\t";
+    indent += "\t";
-    for (var i = 0; i < a.length; i++) {
+    for (var i = 0; i < a.length; i++) {
-      s += indent + MongoUtility.tojson(a[i], indent, nolint);
+      s += indent + MongoUtility.tojson(a[i], indent, nolint);
-      if (i < a.length - 1) {
+      if (i < a.length - 1) {
-        s += "," + lineEnding;
+        s += "," + lineEnding;
-      }
+      }
-    }
+    }
-    if (a.length === 0) {
+    if (a.length === 0) {
-      s += indent;
+      s += indent;
-    }
+    }
-
+
-    indent = indent.substring(1);
+    indent = indent.substring(1);
-    s += lineEnding + indent + "]";
+    s += lineEnding + indent + "]";
-    return s;
+    return s;
-  };
+  };
-
+
-  private static hasDefinedProperty = function(obj: any, prop: string): boolean {
+  private static hasDefinedProperty = function (obj: any, prop: string): boolean {
-    if (Object.getPrototypeOf === undefined || Object.getPrototypeOf(obj) === null) {
+    if (Object.getPrototypeOf === undefined || Object.getPrototypeOf(obj) === null) {
-      return false;
+      return false;
-    } else if (obj.hasOwnProperty(prop)) {
+    } else if (obj.hasOwnProperty(prop)) {
-      return true;
+      return true;
-    } else {
+    } else {
-      return MongoUtility.hasDefinedProperty(Object.getPrototypeOf(obj), prop);
+      return MongoUtility.hasDefinedProperty(Object.getPrototypeOf(obj), prop);
-    }
+    }
-  };
+  };
-
+
-  private static isObjectId(obj: any): boolean {
+  private static isObjectId(obj: any): boolean {
-    var keys = Object.keys(obj);
+    var keys = Object.keys(obj);
-    return keys.length === 1 && keys[0] === "$oid" && typeof obj.$oid === "string" && /^[0-9a-f]{24}$/.test(obj.$oid);
+    return keys.length === 1 && keys[0] === "$oid" && typeof obj.$oid === "string" && /^[0-9a-f]{24}$/.test(obj.$oid);
-  }
+  }
-}
+}

src/Common/OfferUtility.test.ts

@@ -0,0 +1,64 @@
+import * as OfferUtility from "./OfferUtility";
+import { SDKOfferDefinition, Offer } from "../Contracts/DataModels";
+import { OfferResponse } from "@azure/cosmos";
+
+describe("parseSDKOfferResponse", () => {
+  it("manual throughput", () => {
+    const mockOfferDefinition = {
+      content: {
+        offerThroughput: 500,
+        collectionThroughputInfo: {
+          minimumRUForCollection: 400,
+          numPhysicalPartitions: 1,
+        },
+      },
+      id: "test",
+    } as SDKOfferDefinition;
+
+    const mockResponse = {
+      resource: mockOfferDefinition,
+    } as OfferResponse;
+
+    const expectedResult: Offer = {
+      manualThroughput: 500,
+      autoscaleMaxThroughput: undefined,
+      minimumThroughput: 400,
+      id: "test",
+      offerDefinition: mockOfferDefinition,
+      offerReplacePending: false,
+    };
+
+    expect(OfferUtility.parseSDKOfferResponse(mockResponse)).toEqual(expectedResult);
+  });
+
+  it("autoscale throughput", () => {
+    const mockOfferDefinition = {
+      content: {
+        offerThroughput: 400,
+        collectionThroughputInfo: {
+          minimumRUForCollection: 400,
+          numPhysicalPartitions: 1,
+        },
+        offerAutopilotSettings: {
+          maxThroughput: 5000,
+        },
+      },
+      id: "test",
+    } as SDKOfferDefinition;
+
+    const mockResponse = {
+      resource: mockOfferDefinition,
+    } as OfferResponse;
+
+    const expectedResult: Offer = {
+      manualThroughput: undefined,
+      autoscaleMaxThroughput: 5000,
+      minimumThroughput: 400,
+      id: "test",
+      offerDefinition: mockOfferDefinition,
+      offerReplacePending: false,
+    };
+
+    expect(OfferUtility.parseSDKOfferResponse(mockResponse)).toEqual(expectedResult);
+  });
+});

src/Common/OfferUtility.ts

@@ -0,0 +1,37 @@
+import { Offer, SDKOfferDefinition } from "../Contracts/DataModels";
+import { OfferResponse } from "@azure/cosmos";
+import { HttpHeaders } from "./Constants";
+
+export const parseSDKOfferResponse = (offerResponse: OfferResponse): Offer | undefined => {
+  const offerDefinition: SDKOfferDefinition | undefined = offerResponse?.resource;
+  if (!offerDefinition) {
+    return undefined;
+  }
+  const offerContent = offerDefinition.content;
+  if (!offerContent) {
+    return undefined;
+  }
+
+  const minimumThroughput = offerContent.collectionThroughputInfo?.minimumRUForCollection;
+  const autopilotSettings = offerContent.offerAutopilotSettings;
+
+  if (autopilotSettings && autopilotSettings.maxThroughput && minimumThroughput) {
+    return {
+      id: offerDefinition.id,
+      autoscaleMaxThroughput: autopilotSettings.maxThroughput,
+      manualThroughput: undefined,
+      minimumThroughput,
+      offerDefinition,
+      offerReplacePending: offerResponse.headers?.[HttpHeaders.offerReplacePending] === "true",
+    };
+  }
+
+  return {
+    id: offerDefinition.id,
+    autoscaleMaxThroughput: undefined,
+    manualThroughput: offerContent.offerThroughput,
+    minimumThroughput,
+    offerDefinition,
+    offerReplacePending: offerResponse.headers?.[HttpHeaders.offerReplacePending] === "true",
+  };
+};

src/Common/PortalNotifications.ts

@@ -16,7 +16,7 @@ const notificationsPath = () => {
 };
 
 export const fetchPortalNotifications = async (): Promise<DataModels.Notification[]> => {
-  if (configContext.platform === Platform.Emulator) {
+  if (configContext.platform === Platform.Emulator || configContext.platform === Platform.Hosted) {
     return [];
   }
 
@@ -30,7 +30,7 @@ export const fetchPortalNotifications = async (): Promise<DataModels.Notificatio
   const headers = { [authorizationHeader.header]: authorizationHeader.token };
 
   const response = await window.fetch(url, {
-    headers
+    headers,
   });
 
   if (!response.ok) {

src/Common/QueriesClient.ts

@@ -1,253 +1,219 @@
-import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
+import { ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
-import * as _ from "underscore";
+import * as _ from "underscore";
-import * as DataModels from "../Contracts/DataModels";
+import * as DataModels from "../Contracts/DataModels";
-import * as ViewModels from "../Contracts/ViewModels";
+import * as ViewModels from "../Contracts/ViewModels";
-import Explorer from "../Explorer/Explorer";
+import Explorer from "../Explorer/Explorer";
-import { ConsoleDataType } from "../Explorer/Menus/NotificationConsole/NotificationConsoleComponent";
+import DocumentsTab from "../Explorer/Tabs/DocumentsTab";
-import DocumentsTab from "../Explorer/Tabs/DocumentsTab";
+import DocumentId from "../Explorer/Tree/DocumentId";
-import DocumentId from "../Explorer/Tree/DocumentId";
+import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
-import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
+import { QueryUtils } from "../Utils/QueryUtils";
-import { QueryUtils } from "../Utils/QueryUtils";
+import { BackendDefaults, HttpStatusCodes, SavedQueries } from "./Constants";
-import { BackendDefaults, HttpStatusCodes, SavedQueries } from "./Constants";
+import { userContext } from "../UserContext";
-import { userContext } from "../UserContext";
+import { queryDocumentsPage } from "./dataAccess/queryDocumentsPage";
-import { createDocument, deleteDocument, queryDocuments, queryDocumentsPage } from "./DocumentClientUtilityBase";
+import { createCollection } from "./dataAccess/createCollection";
-import { createCollection } from "./dataAccess/createCollection";
+import { handleError } from "./ErrorHandlingUtils";
-import { handleError } from "./ErrorHandlingUtils";
+import { createDocument } from "./dataAccess/createDocument";
-
+import { deleteDocument } from "./dataAccess/deleteDocument";
-export class QueriesClient {
+import { queryDocuments } from "./dataAccess/queryDocuments";
-  private static readonly PartitionKey: DataModels.PartitionKey = {
+
-    paths: [`/${SavedQueries.PartitionKeyProperty}`],
+export class QueriesClient {
-    kind: BackendDefaults.partitionKeyKind,
+  private static readonly PartitionKey: DataModels.PartitionKey = {
-    version: BackendDefaults.partitionKeyVersion
+    paths: [`/${SavedQueries.PartitionKeyProperty}`],
-  };
+    kind: BackendDefaults.partitionKeyKind,
-  private static readonly FetchQuery: string = "SELECT * FROM c";
+    version: BackendDefaults.partitionKeyVersion,
-  private static readonly FetchMongoQuery: string = "{}";
+  };
-
+  private static readonly FetchQuery: string = "SELECT * FROM c";
-  public constructor(private container: Explorer) {}
+  private static readonly FetchMongoQuery: string = "{}";
-
+
-  public async setupQueriesCollection(): Promise<DataModels.Collection> {
+  public constructor(private container: Explorer) {}
-    const queriesCollection: ViewModels.Collection = this.findQueriesCollection();
+
-    if (queriesCollection) {
+  public async setupQueriesCollection(): Promise<DataModels.Collection> {
-      return Promise.resolve(queriesCollection.rawDataModel);
+    const queriesCollection: ViewModels.Collection = this.findQueriesCollection();
-    }
+    if (queriesCollection) {
-
+      return Promise.resolve(queriesCollection.rawDataModel);
-    const id = NotificationConsoleUtils.logConsoleMessage(
+    }
-      ConsoleDataType.InProgress,
+
-      "Setting up account for saving queries"
+    const clearMessage = NotificationConsoleUtils.logConsoleProgress("Setting up account for saving queries");
-    );
+    return createCollection({
-    return createCollection({
+      collectionId: SavedQueries.CollectionName,
-      collectionId: SavedQueries.CollectionName,
+      createNewDatabase: true,
-      createNewDatabase: true,
+      databaseId: SavedQueries.DatabaseName,
-      databaseId: SavedQueries.DatabaseName,
+      partitionKey: QueriesClient.PartitionKey,
-      partitionKey: QueriesClient.PartitionKey,
+      offerThroughput: SavedQueries.OfferThroughput,
-      offerThroughput: SavedQueries.OfferThroughput,
+      databaseLevelThroughput: false,
-      databaseLevelThroughput: false
+    })
-    })
+      .then(
-      .then(
+        (collection: DataModels.Collection) => {
-        (collection: DataModels.Collection) => {
+          NotificationConsoleUtils.logConsoleInfo("Successfully set up account for saving queries");
-          NotificationConsoleUtils.logConsoleMessage(
+          return Promise.resolve(collection);
-            ConsoleDataType.Info,
+        },
-            "Successfully set up account for saving queries"
+        (error: any) => {
-          );
+          handleError(error, "setupQueriesCollection", "Failed to set up account for saving queries");
-          return Promise.resolve(collection);
+          return Promise.reject(error);
-        },
+        }
-        (error: any) => {
+      )
-          handleError(error, "setupQueriesCollection", "Failed to set up account for saving queries");
+      .finally(() => clearMessage());
-          return Promise.reject(error);
+  }
-        }
+
-      )
+  public async saveQuery(query: DataModels.Query): Promise<void> {
-      .finally(() => NotificationConsoleUtils.clearInProgressMessageWithId(id));
+    const queriesCollection = this.findQueriesCollection();
-  }
+    if (!queriesCollection) {
-
+      const errorMessage: string = "Account not set up to perform saved query operations";
-  public async saveQuery(query: DataModels.Query): Promise<void> {
+      NotificationConsoleUtils.logConsoleError(`Failed to save query ${query.queryName}: ${errorMessage}`);
-    const queriesCollection = this.findQueriesCollection();
+      return Promise.reject(errorMessage);
-    if (!queriesCollection) {
+    }
-      const errorMessage: string = "Account not set up to perform saved query operations";
+
-      NotificationConsoleUtils.logConsoleMessage(
+    try {
-        ConsoleDataType.Error,
+      this.validateQuery(query);
-        `Failed to save query ${query.queryName}: ${errorMessage}`
+    } catch (error) {
-      );
+      const errorMessage: string = "Invalid query specified";
-      return Promise.reject(errorMessage);
+      NotificationConsoleUtils.logConsoleError(`Failed to save query ${query.queryName}: ${errorMessage}`);
-    }
+      return Promise.reject(errorMessage);
-
+    }
-    try {
+
-      this.validateQuery(query);
+    const clearMessage = NotificationConsoleUtils.logConsoleProgress(`Saving query ${query.queryName}`);
-    } catch (error) {
+    query.id = query.queryName;
-      const errorMessage: string = "Invalid query specified";
+    return createDocument(queriesCollection, query)
-      NotificationConsoleUtils.logConsoleMessage(
+      .then(
-        ConsoleDataType.Error,
+        (savedQuery: DataModels.Query) => {
-        `Failed to save query ${query.queryName}: ${errorMessage}`
+          NotificationConsoleUtils.logConsoleInfo(`Successfully saved query ${query.queryName}`);
-      );
+          return Promise.resolve();
-      return Promise.reject(errorMessage);
+        },
-    }
+        (error: any) => {
-
+          if (error.code === HttpStatusCodes.Conflict.toString()) {
-    const id = NotificationConsoleUtils.logConsoleMessage(
+            error = `Query ${query.queryName} already exists`;
-      ConsoleDataType.InProgress,
+          }
-      `Saving query ${query.queryName}`
+          handleError(error, "saveQuery", `Failed to save query ${query.queryName}`);
-    );
+          return Promise.reject(error);
-    query.id = query.queryName;
+        }
-    return createDocument(queriesCollection, query)
+      )
-      .then(
+      .finally(() => clearMessage());
-        (savedQuery: DataModels.Query) => {
+  }
-          NotificationConsoleUtils.logConsoleMessage(
+
-            ConsoleDataType.Info,
+  public async getQueries(): Promise<DataModels.Query[]> {
-            `Successfully saved query ${query.queryName}`
+    const queriesCollection = this.findQueriesCollection();
-          );
+    if (!queriesCollection) {
-          return Promise.resolve();
+      const errorMessage: string = "Account not set up to perform saved query operations";
-        },
+      NotificationConsoleUtils.logConsoleError(`Failed to fetch saved queries: ${errorMessage}`);
-        (error: any) => {
+      return Promise.reject(errorMessage);
-          if (error.code === HttpStatusCodes.Conflict.toString()) {
+    }
-            error = `Query ${query.queryName} already exists`;
+
-          }
+    const options: any = { enableCrossPartitionQuery: true };
-          handleError(error, "saveQuery", `Failed to save query ${query.queryName}`);
+    const clearMessage = NotificationConsoleUtils.logConsoleProgress("Fetching saved queries");
-          return Promise.reject(error);
+    const queryIterator: QueryIterator<ItemDefinition & Resource> = queryDocuments(
-        }
+      SavedQueries.DatabaseName,
-      )
+      SavedQueries.CollectionName,
-      .finally(() => NotificationConsoleUtils.clearInProgressMessageWithId(id));
+      this.fetchQueriesQuery(),
-  }
+      options
-
+    );
-  public async getQueries(): Promise<DataModels.Query[]> {
+    const fetchQueries = async (firstItemIndex: number): Promise<ViewModels.QueryResults> =>
-    const queriesCollection = this.findQueriesCollection();
+      await queryDocumentsPage(queriesCollection.id(), queryIterator, firstItemIndex);
-    if (!queriesCollection) {
+    return QueryUtils.queryAllPages(fetchQueries)
-      const errorMessage: string = "Account not set up to perform saved query operations";
+      .then(
-      NotificationConsoleUtils.logConsoleMessage(
+        (results: ViewModels.QueryResults) => {
-        ConsoleDataType.Error,
+          let queries: DataModels.Query[] = _.map(results.documents, (document: DataModels.Query) => {
-        `Failed to fetch saved queries: ${errorMessage}`
+            if (!document) {
-      );
+              return undefined;
-      return Promise.reject(errorMessage);
+            }
-    }
+            const { id, resourceId, query, queryName } = document;
-
+            const parsedQuery: DataModels.Query = {
-    const options: any = { enableCrossPartitionQuery: true };
+              resourceId: resourceId,
-    const id = NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.InProgress, "Fetching saved queries");
+              queryName: queryName,
-    return queryDocuments(SavedQueries.DatabaseName, SavedQueries.CollectionName, this.fetchQueriesQuery(), options)
+              query: query,
-      .then(
+              id: id,
-        (queryIterator: QueryIterator<ItemDefinition & Resource>) => {
+            };
-          const fetchQueries = (firstItemIndex: number): Q.Promise<ViewModels.QueryResults> =>
+            try {
-            queryDocumentsPage(queriesCollection.id(), queryIterator, firstItemIndex, options);
+              this.validateQuery(parsedQuery);
-          return QueryUtils.queryAllPages(fetchQueries).then(
+              return parsedQuery;
-            (results: ViewModels.QueryResults) => {
+            } catch (error) {
-              let queries: DataModels.Query[] = _.map(results.documents, (document: DataModels.Query) => {
+              return undefined;
-                if (!document) {
+            }
-                  return undefined;
+          });
-                }
+          queries = _.reject(queries, (parsedQuery: DataModels.Query) => !parsedQuery);
-                const { id, resourceId, query, queryName } = document;
+          NotificationConsoleUtils.logConsoleInfo("Successfully fetched saved queries");
-                const parsedQuery: DataModels.Query = {
+          return Promise.resolve(queries);
-                  resourceId: resourceId,
+        },
-                  queryName: queryName,
+        (error: any) => {
-                  query: query,
+          handleError(error, "getSavedQueries", "Failed to fetch saved queries");
-                  id: id
+          return Promise.reject(error);
-                };
+        }
-                try {
+      )
-                  this.validateQuery(parsedQuery);
+      .finally(() => clearMessage());
-                  return parsedQuery;
+  }
-                } catch (error) {
+
-                  return undefined;
+  public async deleteQuery(query: DataModels.Query): Promise<void> {
-                }
+    const queriesCollection = this.findQueriesCollection();
-              });
+    if (!queriesCollection) {
-              queries = _.reject(queries, (parsedQuery: DataModels.Query) => !parsedQuery);
+      const errorMessage: string = "Account not set up to perform saved query operations";
-              NotificationConsoleUtils.logConsoleMessage(ConsoleDataType.Info, "Successfully fetched saved queries");
+      NotificationConsoleUtils.logConsoleError(`Failed to fetch saved queries: ${errorMessage}`);
-              return Promise.resolve(queries);
+      return Promise.reject(errorMessage);
-            },
+    }
-            (error: any) => {
+
-              handleError(error, "getSavedQueries", "Failed to fetch saved queries");
+    try {
-              return Promise.reject(error);
+      this.validateQuery(query);
-            }
+    } catch (error) {
-          );
+      const errorMessage: string = "Invalid query specified";
-        },
+      NotificationConsoleUtils.logConsoleError(`Failed to delete query ${query.queryName}: ${errorMessage}`);
-        (error: any) => {
+    }
-          // should never get into this state but we handle this regardless
+
-          handleError(error, "getSavedQueries", "Failed to fetch saved queries");
+    const clearMessage = NotificationConsoleUtils.logConsoleProgress(`Deleting query ${query.queryName}`);
-          return Promise.reject(error);
+    query.id = query.queryName;
-        }
+    const documentId = new DocumentId(
-      )
+      {
-      .finally(() => NotificationConsoleUtils.clearInProgressMessageWithId(id));
+        partitionKey: QueriesClient.PartitionKey,
-  }
+        partitionKeyProperty: "id",
-
+      } as DocumentsTab,
-  public async deleteQuery(query: DataModels.Query): Promise<void> {
+      query,
-    const queriesCollection = this.findQueriesCollection();
+      query.queryName
-    if (!queriesCollection) {
+    ); // TODO: Remove DocumentId's dependency on DocumentsTab
-      const errorMessage: string = "Account not set up to perform saved query operations";
+    const options: any = { partitionKey: query.resourceId };
-      NotificationConsoleUtils.logConsoleMessage(
+    return deleteDocument(queriesCollection, documentId)
-        ConsoleDataType.Error,
+      .then(
-        `Failed to fetch saved queries: ${errorMessage}`
+        () => {
-      );
+          NotificationConsoleUtils.logConsoleInfo(`Successfully deleted query ${query.queryName}`);
-      return Promise.reject(errorMessage);
+          return Promise.resolve();
-    }
+        },
-
+        (error: any) => {
-    try {
+          handleError(error, "deleteQuery", `Failed to delete query ${query.queryName}`);
-      this.validateQuery(query);
+          return Promise.reject(error);
-    } catch (error) {
+        }
-      const errorMessage: string = "Invalid query specified";
+      )
-      NotificationConsoleUtils.logConsoleMessage(
+      .finally(() => clearMessage());
-        ConsoleDataType.Error,
+  }
-        `Failed to delete query ${query.queryName}: ${errorMessage}`
+
-      );
+  public getResourceId(): string {
-    }
+    const databaseAccount = userContext.databaseAccount;
-
+    const databaseAccountName = (databaseAccount && databaseAccount.name) || "";
-    const id = NotificationConsoleUtils.logConsoleMessage(
+    const subscriptionId = userContext.subscriptionId || "";
-      ConsoleDataType.InProgress,
+    const resourceGroup = userContext.resourceGroup || "";
-      `Deleting query ${query.queryName}`
+
-    );
+    return `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.DocumentDb/databaseAccounts/${databaseAccountName}`;
-    query.id = query.queryName;
+  }
-    const documentId = new DocumentId(
+
-      {
+  private findQueriesCollection(): ViewModels.Collection {
-        partitionKey: QueriesClient.PartitionKey,
+    const queriesDatabase: ViewModels.Database = _.find(
-        partitionKeyProperty: "id"
+      this.container.databases(),
-      } as DocumentsTab,
+      (database: ViewModels.Database) => database.id() === SavedQueries.DatabaseName
-      query,
+    );
-      query.queryName
+    if (!queriesDatabase) {
-    ); // TODO: Remove DocumentId's dependency on DocumentsTab
+      return undefined;
-    const options: any = { partitionKey: query.resourceId };
+    }
-    return deleteDocument(queriesCollection, documentId)
+    return _.find(
-      .then(
+      queriesDatabase.collections(),
-        () => {
+      (collection: ViewModels.Collection) => collection.id() === SavedQueries.CollectionName
-          NotificationConsoleUtils.logConsoleMessage(
+    );
-            ConsoleDataType.Info,
+  }
-            `Successfully deleted query ${query.queryName}`
+
-          );
+  private validateQuery(query: DataModels.Query): void {
-          return Promise.resolve();
+    if (!query || query.queryName == null || query.query == null || query.resourceId == null) {
-        },
+      throw new Error("Invalid query specified");
-        (error: any) => {
+    }
-          handleError(error, "deleteQuery", `Failed to delete query ${query.queryName}`);
+  }
-          return Promise.reject(error);
+
-        }
+  private fetchQueriesQuery(): string {
-      )
+    if (this.container.isPreferredApiMongoDB()) {
-      .finally(() => NotificationConsoleUtils.clearInProgressMessageWithId(id));
+      return QueriesClient.FetchMongoQuery;
-  }
+    }
-
+    return QueriesClient.FetchQuery;
-  public getResourceId(): string {
+  }
-    const databaseAccount = userContext.databaseAccount;
+}
-    const databaseAccountName = (databaseAccount && databaseAccount.name) || "";
-    const subscriptionId = userContext.subscriptionId || "";
-    const resourceGroup = userContext.resourceGroup || "";
-
-    return `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.DocumentDb/databaseAccounts/${databaseAccountName}`;
-  }
-
-  private findQueriesCollection(): ViewModels.Collection {
-    const queriesDatabase: ViewModels.Database = _.find(
-      this.container.databases(),
-      (database: ViewModels.Database) => database.id() === SavedQueries.DatabaseName
-    );
-    if (!queriesDatabase) {
-      return undefined;
-    }
-    return _.find(
-      queriesDatabase.collections(),
-      (collection: ViewModels.Collection) => collection.id() === SavedQueries.CollectionName
-    );
-  }
-
-  private validateQuery(query: DataModels.Query): void {
-    if (!query || query.queryName == null || query.query == null || query.resourceId == null) {
-      throw new Error("Invalid query specified");
-    }
-  }
-
-  private fetchQueriesQuery(): string {
-    if (this.container.isPreferredApiMongoDB()) {
-      return QueriesClient.FetchMongoQuery;
-    }
-    return QueriesClient.FetchQuery;
-  }
-}

src/Common/Splitter.ts

@@ -1,108 +1,107 @@
-import * as ko from "knockout";
+import * as ko from "knockout";
-
+
-import { SplitterMetrics } from "./Constants";
+import { SplitterMetrics } from "./Constants";
-
+
-export enum SplitterDirection {
+export enum SplitterDirection {
-  Horizontal = "horizontal",
+  Horizontal = "horizontal",
-  Vertical = "vertical"
+  Vertical = "vertical",
-}
+}
-
+
-export interface SplitterBounds {
+export interface SplitterBounds {
-  max: number;
+  max: number;
-  min: number;
+  min: number;
-}
+}
-
+
-export interface SplitterOptions {
+export interface SplitterOptions {
-  splitterId: string;
+  splitterId: string;
-  leftId: string;
+  leftId: string;
-  bounds: SplitterBounds;
+  bounds: SplitterBounds;
-  direction: SplitterDirection;
+  direction: SplitterDirection;
-}
+}
-
+
-export class Splitter {
+export class Splitter {
-  public splitterId: string;
+  public splitterId: string;
-  public leftSideId: string;
+  public leftSideId: string;
-
+
-  public splitter: HTMLElement;
+  public splitter!: HTMLElement;
-  public leftSide: HTMLElement;
+  public leftSide!: HTMLElement;
-  public lastX: number;
+  public lastX!: number;
-  public lastWidth: number;
+  public lastWidth!: number;
-
+
-  private isCollapsed: ko.Observable<boolean>;
+  private isCollapsed: ko.Observable<boolean>;
-  private bounds: SplitterBounds;
+  private bounds: SplitterBounds;
-  private direction: SplitterDirection;
+  private direction: SplitterDirection;
-
+
-  constructor(options: SplitterOptions) {
+  constructor(options: SplitterOptions) {
-    this.splitterId = options.splitterId;
+    this.splitterId = options.splitterId;
-    this.leftSideId = options.leftId;
+    this.leftSideId = options.leftId;
-    this.isCollapsed = ko.observable<boolean>(false);
+    this.isCollapsed = ko.observable<boolean>(false);
-    this.bounds = options.bounds;
+    this.bounds = options.bounds;
-    this.direction = options.direction;
+    this.direction = options.direction;
-    this.initialize();
+    this.initialize();
-  }
+  }
-
+
-  public initialize() {
+  public initialize() {
-    this.splitter = document.getElementById(this.splitterId);
+    if (document.getElementById(this.splitterId) !== null && document.getElementById(this.leftSideId) != null) {
-    this.leftSide = document.getElementById(this.leftSideId);
+      this.splitter = <HTMLElement>document.getElementById(this.splitterId);
-
+      this.leftSide = <HTMLElement>document.getElementById(this.leftSideId);
-    const isVerticalSplitter: boolean = this.direction === SplitterDirection.Vertical;
+    }
-    const splitterOptions: JQueryUI.ResizableOptions = {
+    const isVerticalSplitter: boolean = this.direction === SplitterDirection.Vertical;
-      animate: true,
+    const splitterOptions: JQueryUI.ResizableOptions = {
-      animateDuration: "fast",
+      animate: true,
-      start: this.onResizeStart,
+      animateDuration: "fast",
-      stop: this.onResizeStop
+      start: this.onResizeStart,
-    };
+      stop: this.onResizeStop,
-
+    };
-    if (isVerticalSplitter) {
+
-      $(this.leftSide).css("width", this.bounds.min);
+    if (isVerticalSplitter) {
-      $(this.splitter).css("height", "100%");
+      $(this.leftSide).css("width", this.bounds.min);
-
+      $(this.splitter).css("height", "100%");
-      splitterOptions.maxWidth = this.bounds.max;
+
-      splitterOptions.minWidth = this.bounds.min;
+      splitterOptions.maxWidth = this.bounds.max;
-      splitterOptions.handles = { e: "#" + this.splitterId };
+      splitterOptions.minWidth = this.bounds.min;
-    } else {
+      splitterOptions.handles = { e: "#" + this.splitterId };
-      $(this.leftSide).css("height", this.bounds.min);
+    } else {
-      $(this.splitter).css("width", "100%");
+      $(this.leftSide).css("height", this.bounds.min);
-
+      $(this.splitter).css("width", "100%");
-      splitterOptions.maxHeight = this.bounds.max;
+
-      splitterOptions.minHeight = this.bounds.min;
+      splitterOptions.maxHeight = this.bounds.max;
-      splitterOptions.handles = { s: "#" + this.splitterId };
+      splitterOptions.minHeight = this.bounds.min;
-    }
+      splitterOptions.handles = { s: "#" + this.splitterId };
-
+    }
-    $(this.leftSide).resizable(splitterOptions);
+
-  }
+    $(this.leftSide).resizable(splitterOptions);
-
+  }
-  private onResizeStart: JQueryUI.ResizableEvent = (e: Event, ui: JQueryUI.ResizableUIParams) => {
+
-    if (this.direction === SplitterDirection.Vertical) {
+  private onResizeStart: JQueryUI.ResizableEvent = (e: Event, ui: JQueryUI.ResizableUIParams) => {
-      $(".ui-resizable-helper").height("100%");
+    if (this.direction === SplitterDirection.Vertical) {
-    } else {
+      $(".ui-resizable-helper").height("100%");
-      $(".ui-resizable-helper").width("100%");
+    } else {
-    }
+      $(".ui-resizable-helper").width("100%");
-    $("iframe").css("pointer-events", "none");
+    }
-  };
+    $("iframe").css("pointer-events", "none");
-
+  };
-  private onResizeStop: JQueryUI.ResizableEvent = (e: Event, ui: JQueryUI.ResizableUIParams) => {
+
-    $("iframe").css("pointer-events", "auto");
+  private onResizeStop: JQueryUI.ResizableEvent = (e: Event, ui: JQueryUI.ResizableUIParams) => {
-  };
+    $("iframe").css("pointer-events", "auto");
-
+  };
-  public collapseLeft() {
+
-    this.lastX = $(this.splitter).position().left;
+  public collapseLeft() {
-    this.lastWidth = $(this.leftSide).width();
+    this.lastX = $(this.splitter).position().left;
-    $(this.splitter).css("left", SplitterMetrics.CollapsedPositionLeft);
+    this.lastWidth = $(this.leftSide).width();
-    $(this.leftSide).css("width", "");
+    $(this.splitter).css("left", SplitterMetrics.CollapsedPositionLeft);
-    $(this.leftSide)
+    $(this.leftSide).css("width", "");
-      .resizable("option", "disabled", true)
+    $(this.leftSide).resizable("option", "disabled", true).removeClass("ui-resizable-disabled"); // remove class so splitter is visible
-      .removeClass("ui-resizable-disabled"); // remove class so splitter is visible
+    $(this.splitter).removeClass("ui-resizable-e");
-    $(this.splitter).removeClass("ui-resizable-e");
+    this.isCollapsed(true);
-    this.isCollapsed(true);
+  }
-  }
+
-
+  public expandLeft() {
-  public expandLeft() {
+    $(this.splitter).addClass("ui-resizable-e");
-    $(this.splitter).addClass("ui-resizable-e");
+    $(this.leftSide).css("width", this.lastWidth);
-    $(this.leftSide).css("width", this.lastWidth);
+    $(this.splitter).css("left", this.lastX);
-    $(this.splitter).css("left", this.lastX);
+    $(this.splitter).css("left", ""); // this ensures the splitter's position is not fixed and enables movement during resizing
-    $(this.splitter).css("left", ""); // this ensures the splitter's position is not fixed and enables movement during resizing
+    $(this.leftSide).resizable("enable");
-    $(this.leftSide).resizable("enable");
+    this.isCollapsed(false);
-    this.isCollapsed(false);
+  }
-  }
+}
-}

src/Common/ThemeUtility.ts

@@ -2,18 +2,16 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *----------------------------------------------------------*/
 
-export default class ThemeUtility {
+export function getMonacoTheme(theme: string): string {
-  public static getMonacoTheme(theme: string): string {
+  switch (theme) {
-    switch (theme) {
+    case "default":
-      case "default":
+    case "hc-white":
-      case "hc-white":
+      return "vs";
-        return "vs";
+    case "dark":
-      case "dark":
+      return "vs-dark";
-        return "vs-dark";
+    case "hc-black":
-      case "hc-black":
+      return "hc-black";
-        return "hc-black";
+    default:
-      default:
+      return "vs";
-        return "vs";
-    }
   }
 }

src/Common/UrlUtility.ts

@@ -32,8 +32,8 @@ export default class UrlUtility {
       type: type,
       objectBody: {
         id: id,
-        self: resourcePath
+        self: resourcePath,
-      }
+      },
     };
 
     return result;

src/Common/dataAccess/createCollection.test.ts

@@ -1,6 +1,5 @@
 jest.mock("../../Utils/arm/request");
 jest.mock("../CosmosClient");
-jest.mock("../DataAccessUtilityBase");
 import { AuthType } from "../../AuthType";
 import { CreateCollectionParams, DatabaseAccount } from "../../Contracts/DataModels";
 import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType";
@@ -15,38 +14,42 @@ describe("createCollection", () => {
     collectionId: "testContainer",
     databaseId: "testDatabase",
     databaseLevelThroughput: true,
-    offerThroughput: 400
+    offerThroughput: 400,
   };
 
   beforeAll(() => {
     updateUserContext({
       databaseAccount: {
-        name: "test"
+        name: "test",
       } as DatabaseAccount,
-      defaultExperience: DefaultAccountExperienceType.DocumentDB
+      defaultExperience: DefaultAccountExperienceType.DocumentDB,
     });
   });
 
   it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
+    updateUserContext({
+      authType: AuthType.AAD,
+    });
     await createCollection(createCollectionParams);
     expect(armRequest).toHaveBeenCalled();
   });
 
   it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
+    updateUserContext({
+      authType: AuthType.MasterKey,
+    });
     (client as jest.Mock).mockReturnValue({
       databases: {
         createIfNotExists: () => {
           return {
             database: {
               containers: {
-                create: () => ({})
+                create: () => ({}),
-              }
+              },
-            }
+            },
           };
-        }
+        },
-      }
+      },
     });
     await createCollection(createCollectionParams);
     expect(client).toHaveBeenCalled();
@@ -60,7 +63,7 @@ describe("createCollection", () => {
       collectionId: "testContainer",
       databaseId: "testDatabase",
       databaseLevelThroughput: false,
-      offerThroughput: 400
+      offerThroughput: 400,
     };
     expect(constructRpOptions(manualThroughputParams)).toEqual({ throughput: 400 });
 
@@ -70,12 +73,12 @@ describe("createCollection", () => {
       databaseId: "testDatabase",
       databaseLevelThroughput: false,
       offerThroughput: 400,
-      autoPilotMaxThroughput: 4000
+      autoPilotMaxThroughput: 4000,
     };
     expect(constructRpOptions(autoPilotThroughputParams)).toEqual({
       autoscaleSettings: {
-        maxThroughput: 4000
+        maxThroughput: 4000,
-      }
+      },
     });
   });
 });

src/Common/dataAccess/createCollection.ts

@@ -11,15 +11,15 @@ import { createMongoCollectionWithProxy } from "../MongoProxyClient";
 import { createUpdateSqlContainer, getSqlContainer } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import {
   createUpdateCassandraTable,
-  getCassandraTable
+  getCassandraTable,
 } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
 import {
   createUpdateMongoDBCollection,
-  getMongoDBCollection
+  getMongoDBCollection,
 } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
 import {
   createUpdateGremlinGraph,
-  getGremlinGraph
+  getGremlinGraph,
 } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
 import { createUpdateTable, getTable } from "../../Utils/arm/generatedClients/2020-04-01/tableResources";
 import { logConsoleProgress, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
@@ -35,13 +35,13 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
   );
   try {
     let collection: DataModels.Collection;
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
       if (params.createNewDatabase) {
         const createDatabaseParams: DataModels.CreateDatabaseParams = {
           autoPilotMaxThroughput: params.autoPilotMaxThroughput,
           databaseId: params.databaseId,
           databaseLevelThroughput: params.databaseLevelThroughput,
-          offerThroughput: params.offerThroughput
+          offerThroughput: params.offerThroughput,
         };
         await createDatabase(createDatabaseParams);
       }
@@ -100,7 +100,7 @@ const createSqlContainer = async (params: DataModels.CreateCollectionParams): Pr
 
   const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
   const resource: ARMTypes.SqlContainerResource = {
-    id: params.collectionId
+    id: params.collectionId,
   };
   if (params.analyticalStorageTtl) {
     resource.analyticalStorageTtl = params.analyticalStorageTtl;
@@ -118,8 +118,8 @@ const createSqlContainer = async (params: DataModels.CreateCollectionParams): Pr
   const rpPayload: ARMTypes.SqlDatabaseCreateUpdateParameters = {
     properties: {
       resource,
-      options
+      options,
-    }
+    },
   };
 
   const createResponse = await createUpdateSqlContainer(
@@ -154,7 +154,7 @@ const createMongoCollection = async (params: DataModels.CreateCollectionParams):
 
   const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
   const resource: ARMTypes.MongoDBCollectionResource = {
-    id: params.collectionId
+    id: params.collectionId,
   };
   if (params.analyticalStorageTtl) {
     resource.analyticalStorageTtl = params.analyticalStorageTtl;
@@ -170,8 +170,8 @@ const createMongoCollection = async (params: DataModels.CreateCollectionParams):
   const rpPayload: ARMTypes.MongoDBCollectionCreateUpdateParameters = {
     properties: {
       resource,
-      options
+      options,
-    }
+    },
   };
 
   const createResponse = await createUpdateMongoDBCollection(
@@ -185,7 +185,7 @@ const createMongoCollection = async (params: DataModels.CreateCollectionParams):
 
   if (params.createMongoWildcardIndex) {
     TelemetryProcessor.trace(Action.CreateMongoCollectionWithWildcardIndex, ActionModifiers.Mark, {
-      message: "Mongo Collection created with wildcard index on all fields."
+      message: "Mongo Collection created with wildcard index on all fields.",
     });
   }
 
@@ -212,7 +212,7 @@ const createCassandraTable = async (params: DataModels.CreateCollectionParams):
 
   const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
   const resource: ARMTypes.CassandraTableResource = {
-    id: params.collectionId
+    id: params.collectionId,
   };
   if (params.analyticalStorageTtl) {
     resource.analyticalStorageTtl = params.analyticalStorageTtl;
@@ -221,8 +221,8 @@ const createCassandraTable = async (params: DataModels.CreateCollectionParams):
   const rpPayload: ARMTypes.CassandraTableCreateUpdateParameters = {
     properties: {
       resource,
-      options
+      options,
-    }
+    },
   };
 
   const createResponse = await createUpdateCassandraTable(
@@ -256,7 +256,7 @@ const createGraph = async (params: DataModels.CreateCollectionParams): Promise<D
 
   const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
   const resource: ARMTypes.GremlinGraphResource = {
-    id: params.collectionId
+    id: params.collectionId,
   };
 
   if (params.indexingPolicy) {
@@ -272,8 +272,8 @@ const createGraph = async (params: DataModels.CreateCollectionParams): Promise<D
   const rpPayload: ARMTypes.GremlinGraphCreateUpdateParameters = {
     properties: {
       resource,
-      options
+      options,
-    }
+    },
   };
 
   const createResponse = await createUpdateGremlinGraph(
@@ -306,14 +306,14 @@ const createTable = async (params: DataModels.CreateCollectionParams): Promise<D
 
   const options: ARMTypes.CreateUpdateOptions = constructRpOptions(params);
   const resource: ARMTypes.TableResource = {
-    id: params.collectionId
+    id: params.collectionId,
   };
 
   const rpPayload: ARMTypes.TableCreateUpdateParameters = {
     properties: {
       resource,
-      options
+      options,
-    }
+    },
   };
 
   const createResponse = await createUpdateTable(
@@ -334,13 +334,13 @@ export const constructRpOptions = (params: DataModels.CreateDatabaseParams): ARM
   if (params.autoPilotMaxThroughput) {
     return {
       autoscaleSettings: {
-        maxThroughput: params.autoPilotMaxThroughput
+        maxThroughput: params.autoPilotMaxThroughput,
-      }
+      },
     };
   }
 
   return {
-    throughput: params.offerThroughput
+    throughput: params.offerThroughput,
   };
 };
 
@@ -350,7 +350,7 @@ const createCollectionWithSDK = async (params: DataModels.CreateCollectionParams
     partitionKey: params.partitionKey || undefined,
     indexingPolicy: params.indexingPolicy || undefined,
     uniqueKeyPolicy: params.uniqueKeyPolicy || undefined,
-    analyticalStorageTtl: params.analyticalStorageTtl
+    analyticalStorageTtl: params.analyticalStorageTtl,
   } as ContainerRequest; // TODO: remove cast when https://github.com/Azure/azure-cosmos-js/issues/423 is fixed
   const collectionOptions: RequestOptions = {};
   const createDatabaseBody: DatabaseRequest = { id: params.databaseId };

src/Common/dataAccess/createDatabase.ts

@@ -8,21 +8,21 @@ import {
   GremlinDatabaseCreateUpdateParameters,
   MongoDBDatabaseCreateUpdateParameters,
   SqlDatabaseCreateUpdateParameters,
-  CreateUpdateOptions
+  CreateUpdateOptions,
 } from "../../Utils/arm/generatedClients/2020-04-01/types";
 import { client } from "../CosmosClient";
 import { createUpdateSqlDatabase, getSqlDatabase } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import {
   createUpdateCassandraKeyspace,
-  getCassandraKeyspace
+  getCassandraKeyspace,
 } from "../../Utils/arm/generatedClients/2020-04-01/cassandraResources";
 import {
   createUpdateMongoDBDatabase,
-  getMongoDBDatabase
+  getMongoDBDatabase,
 } from "../../Utils/arm/generatedClients/2020-04-01/mongoDBResources";
 import {
   createUpdateGremlinDatabase,
-  getGremlinDatabase
+  getGremlinDatabase,
 } from "../../Utils/arm/generatedClients/2020-04-01/gremlinResources";
 import { handleError } from "../ErrorHandlingUtils";
 import { logConsoleProgress, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
@@ -34,7 +34,7 @@ export async function createDatabase(params: DataModels.CreateDatabaseParams): P
     if (userContext.defaultExperience === DefaultAccountExperienceType.Table) {
       throw new Error("Creating database resources is not allowed for tables accounts");
     }
-    const database: DataModels.Database = await (window.authType === AuthType.AAD && !userContext.useSDKOperations
+    const database: DataModels.Database = await (userContext.authType === AuthType.AAD && !userContext.useSDKOperations
       ? createDatabaseWithARM(params)
       : createDatabaseWithSDK(params));
 
@@ -85,10 +85,10 @@ async function createSqlDatabase(params: DataModels.CreateDatabaseParams): Promi
   const rpPayload: SqlDatabaseCreateUpdateParameters = {
     properties: {
       resource: {
-        id: params.databaseId
+        id: params.databaseId,
       },
-      options
+      options,
-    }
+    },
   };
   const createResponse = await createUpdateSqlDatabase(
     userContext.subscriptionId,
@@ -121,10 +121,10 @@ async function createMongoDatabase(params: DataModels.CreateDatabaseParams): Pro
   const rpPayload: MongoDBDatabaseCreateUpdateParameters = {
     properties: {
       resource: {
-        id: params.databaseId
+        id: params.databaseId,
       },
-      options
+      options,
-    }
+    },
   };
   const createResponse = await createUpdateMongoDBDatabase(
     userContext.subscriptionId,
@@ -157,10 +157,10 @@ async function createCassandraKeyspace(params: DataModels.CreateDatabaseParams):
   const rpPayload: CassandraKeyspaceCreateUpdateParameters = {
     properties: {
       resource: {
-        id: params.databaseId
+        id: params.databaseId,
       },
-      options
+      options,
-    }
+    },
   };
   const createResponse = await createUpdateCassandraKeyspace(
     userContext.subscriptionId,
@@ -193,10 +193,10 @@ async function createGremlineDatabase(params: DataModels.CreateDatabaseParams):
   const rpPayload: GremlinDatabaseCreateUpdateParameters = {
     properties: {
       resource: {
-        id: params.databaseId
+        id: params.databaseId,
       },
-      options
+      options,
-    }
+    },
   };
   const createResponse = await createUpdateGremlinDatabase(
     userContext.subscriptionId,
@@ -231,12 +231,12 @@ function constructRpOptions(params: DataModels.CreateDatabaseParams): CreateUpda
   if (params.autoPilotMaxThroughput) {
     return {
       autoscaleSettings: {
-        maxThroughput: params.autoPilotMaxThroughput
+        maxThroughput: params.autoPilotMaxThroughput,
-      }
+      },
     };
   }
 
   return {
-    throughput: params.offerThroughput
+    throughput: params.offerThroughput,
   };
 }

src/Common/dataAccess/createDocument.ts

@@ -0,0 +1,25 @@
+import { CollectionBase } from "../../Contracts/ViewModels";
+import { client } from "../CosmosClient";
+import { getEntityName } from "../DocumentUtility";
+import { handleError } from "../ErrorHandlingUtils";
+import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+
+export const createDocument = async (collection: CollectionBase, newDocument: unknown): Promise<unknown> => {
+  const entityName = getEntityName();
+  const clearMessage = logConsoleProgress(`Creating new ${entityName} for container ${collection.id()}`);
+
+  try {
+    const response = await client()
+      .database(collection.databaseId)
+      .container(collection.id())
+      .items.create(newDocument);
+
+    logConsoleInfo(`Successfully created new ${entityName} for container ${collection.id()}`);
+    return response?.resource;
+  } catch (error) {
+    handleError(error, "CreateDocument", `Error while creating new ${entityName} for container ${collection.id()}`);
+    throw error;
+  } finally {
+    clearMessage();
+  }
+};

src/Common/dataAccess/createStoredProcedure.ts

@@ -3,12 +3,12 @@ import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType
 import { Resource, StoredProcedureDefinition } from "@azure/cosmos";
 import {
   SqlStoredProcedureCreateUpdateParameters,
-  SqlStoredProcedureResource
+  SqlStoredProcedureResource,
 } from "../../Utils/arm/generatedClients/2020-04-01/types";
 import { client } from "../CosmosClient";
 import {
   createUpdateSqlStoredProcedure,
-  getSqlStoredProcedure
+  getSqlStoredProcedure,
 } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { handleError } from "../ErrorHandlingUtils";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
@@ -22,7 +22,7 @@ export async function createStoredProcedure(
   const clearMessage = logConsoleProgress(`Creating stored procedure ${storedProcedure.id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {
@@ -49,8 +49,8 @@ export async function createStoredProcedure(
       const createSprocParams: SqlStoredProcedureCreateUpdateParameters = {
         properties: {
           resource: storedProcedure as SqlStoredProcedureResource,
-          options: {}
+          options: {},
-        }
+        },
       };
       const rpResponse = await createUpdateSqlStoredProcedure(
         userContext.subscriptionId,

src/Common/dataAccess/createTrigger.ts

@@ -3,7 +3,7 @@ import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType
 import { Resource, TriggerDefinition } from "@azure/cosmos";
 import {
   SqlTriggerCreateUpdateParameters,
-  SqlTriggerResource
+  SqlTriggerResource,
 } from "../../Utils/arm/generatedClients/2020-04-01/types";
 import { client } from "../CosmosClient";
 import { createUpdateSqlTrigger, getSqlTrigger } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
@@ -19,7 +19,7 @@ export async function createTrigger(
   const clearMessage = logConsoleProgress(`Creating trigger ${trigger.id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {
@@ -44,8 +44,8 @@ export async function createTrigger(
       const createTriggerParams: SqlTriggerCreateUpdateParameters = {
         properties: {
           resource: trigger as SqlTriggerResource,
-          options: {}
+          options: {},
-        }
+        },
       };
       const rpResponse = await createUpdateSqlTrigger(
         userContext.subscriptionId,
@@ -59,10 +59,7 @@ export async function createTrigger(
       return rpResponse && (rpResponse.properties?.resource as TriggerDefinition & Resource);
     }
 
-    const response = await client()
+    const response = await client().database(databaseId).container(collectionId).scripts.triggers.create(trigger);
-      .database(databaseId)
-      .container(collectionId)
-      .scripts.triggers.create(trigger);
     return response.resource;
   } catch (error) {
     handleError(error, "CreateTrigger", `Error while creating trigger ${trigger.id}`);

src/Common/dataAccess/createUserDefinedFunction.ts

@@ -3,12 +3,12 @@ import { DefaultAccountExperienceType } from "../../DefaultAccountExperienceType
 import { Resource, UserDefinedFunctionDefinition } from "@azure/cosmos";
 import {
   SqlUserDefinedFunctionCreateUpdateParameters,
-  SqlUserDefinedFunctionResource
+  SqlUserDefinedFunctionResource,
 } from "../../Utils/arm/generatedClients/2020-04-01/types";
 import { client } from "../CosmosClient";
 import {
   createUpdateSqlUserDefinedFunction,
-  getSqlUserDefinedFunction
+  getSqlUserDefinedFunction,
 } from "../../Utils/arm/generatedClients/2020-04-01/sqlResources";
 import { handleError } from "../ErrorHandlingUtils";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
@@ -22,7 +22,7 @@ export async function createUserDefinedFunction(
   const clearMessage = logConsoleProgress(`Creating user defined function ${userDefinedFunction.id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {
@@ -49,8 +49,8 @@ export async function createUserDefinedFunction(
       const createUDFParams: SqlUserDefinedFunctionCreateUpdateParameters = {
         properties: {
           resource: userDefinedFunction as SqlUserDefinedFunctionResource,
-          options: {}
+          options: {},
-        }
+        },
       };
       const rpResponse = await createUpdateSqlUserDefinedFunction(
         userContext.subscriptionId,

src/Common/dataAccess/deleteCollection.test.ts

@@ -13,30 +13,34 @@ describe("deleteCollection", () => {
   beforeAll(() => {
     updateUserContext({
       databaseAccount: {
-        name: "test"
+        name: "test",
       } as DatabaseAccount,
-      defaultExperience: DefaultAccountExperienceType.DocumentDB
+      defaultExperience: DefaultAccountExperienceType.DocumentDB,
     });
   });
 
   it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
+    updateUserContext({
+      authType: AuthType.AAD,
+    });
     await deleteCollection("database", "collection");
     expect(armRequest).toHaveBeenCalled();
   });
 
   it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
+    updateUserContext({
+      authType: AuthType.MasterKey,
+    });
     (client as jest.Mock).mockReturnValue({
       database: () => {
         return {
           container: () => {
             return {
-              delete: (): unknown => undefined
+              delete: (): unknown => undefined,
             };
-          }
+          },
         };
-      }
+      },
     });
     await deleteCollection("database", "collection");
     expect(client).toHaveBeenCalled();

src/Common/dataAccess/deleteCollection.ts

@@ -13,13 +13,10 @@ import { client } from "../CosmosClient";
 export async function deleteCollection(databaseId: string, collectionId: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting container ${collectionId}`);
   try {
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
       await deleteCollectionWithARM(databaseId, collectionId);
     } else {
-      await client()
+      await client().database(databaseId).container(collectionId).delete();
-        .database(databaseId)
-        .container(collectionId)
-        .delete();
     }
     logConsoleInfo(`Successfully deleted container ${collectionId}`);
   } catch (error) {

src/Common/dataAccess/deleteConflict.ts

@@ -0,0 +1,36 @@
+import ConflictId from "../../Explorer/Tree/ConflictId";
+import { CollectionBase } from "../../Contracts/ViewModels";
+import { RequestOptions } from "@azure/cosmos";
+import { client } from "../CosmosClient";
+import { handleError } from "../ErrorHandlingUtils";
+import { logConsoleProgress, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
+
+export const deleteConflict = async (collection: CollectionBase, conflictId: ConflictId): Promise<void> => {
+  const clearMessage = logConsoleProgress(`Deleting conflict ${conflictId.id()}`);
+
+  try {
+    const options = {
+      partitionKey: getPartitionKeyHeaderForConflict(conflictId),
+    };
+
+    await client()
+      .database(collection.databaseId)
+      .container(collection.id())
+      .conflict(conflictId.id())
+      .delete(options as RequestOptions);
+    logConsoleInfo(`Successfully deleted conflict ${conflictId.id()}`);
+  } catch (error) {
+    handleError(error, "DeleteConflict", `Error while deleting conflict ${conflictId.id()}`);
+    throw error;
+  } finally {
+    clearMessage();
+  }
+};
+
+const getPartitionKeyHeaderForConflict = (conflictId: ConflictId): unknown => {
+  if (!conflictId.partitionKey) {
+    return undefined;
+  }
+
+  return conflictId.partitionKeyValue === undefined ? [{}] : [conflictId.partitionKeyValue];
+};

src/Common/dataAccess/deleteDatabase.test.ts

@@ -13,26 +13,30 @@ describe("deleteDatabase", () => {
   beforeAll(() => {
     updateUserContext({
       databaseAccount: {
-        name: "test"
+        name: "test",
       } as DatabaseAccount,
-      defaultExperience: DefaultAccountExperienceType.DocumentDB
+      defaultExperience: DefaultAccountExperienceType.DocumentDB,
     });
   });
 
   it("should call ARM if logged in with AAD", async () => {
-    window.authType = AuthType.AAD;
+    updateUserContext({
+      authType: AuthType.AAD,
+    });
     await deleteDatabase("database");
     expect(armRequest).toHaveBeenCalled();
   });
 
   it("should call SDK if not logged in with non-AAD method", async () => {
-    window.authType = AuthType.MasterKey;
+    updateUserContext({
+      authType: AuthType.MasterKey,
+    });
     (client as jest.Mock).mockReturnValue({
       database: () => {
         return {
-          delete: (): unknown => undefined
+          delete: (): unknown => undefined,
         };
-      }
+      },
     });
     await deleteDatabase("database");
     expect(client).toHaveBeenCalled();

src/Common/dataAccess/deleteDatabase.ts

@@ -16,12 +16,10 @@ export async function deleteDatabase(databaseId: string): Promise<void> {
     if (userContext.defaultExperience === DefaultAccountExperienceType.Table) {
       throw new Error("Deleting database resources is not allowed for tables accounts");
     }
-    if (window.authType === AuthType.AAD && !userContext.useSDKOperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.useSDKOperations) {
       await deleteDatabaseWithARM(databaseId);
     } else {
-      await client()
+      await client().database(databaseId).delete();
-        .database(databaseId)
-        .delete();
     }
     logConsoleInfo(`Successfully deleted database ${databaseId}`);
   } catch (error) {

src/Common/dataAccess/deleteDocument.ts

@@ -0,0 +1,25 @@
+import { CollectionBase } from "../../Contracts/ViewModels";
+import { client } from "../CosmosClient";
+import { getEntityName } from "../DocumentUtility";
+import { handleError } from "../ErrorHandlingUtils";
+import { logConsoleInfo, logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
+import DocumentId from "../../Explorer/Tree/DocumentId";
+
+export const deleteDocument = async (collection: CollectionBase, documentId: DocumentId): Promise<void> => {
+  const entityName: string = getEntityName();
+  const clearMessage = logConsoleProgress(`Deleting ${entityName} ${documentId.id()}`);
+
+  try {
+    await client()
+      .database(collection.databaseId)
+      .container(collection.id())
+      .item(documentId.id(), documentId.partitionKeyValue)
+      .delete();
+    logConsoleInfo(`Successfully deleted ${entityName} ${documentId.id()}`);
+  } catch (error) {
+    handleError(error, "DeleteDocument", `Error while deleting ${entityName} ${documentId.id()}`);
+    throw error;
+  } finally {
+    clearMessage();
+  }
+};

src/Common/dataAccess/deleteStoredProcedure.ts

@@ -14,7 +14,7 @@ export async function deleteStoredProcedure(
   const clearMessage = logConsoleProgress(`Deleting stored procedure ${storedProcedureId}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {
@@ -27,11 +27,7 @@ export async function deleteStoredProcedure(
         storedProcedureId
       );
     } else {
-      await client()
+      await client().database(databaseId).container(collectionId).scripts.storedProcedure(storedProcedureId).delete();
-        .database(databaseId)
-        .container(collectionId)
-        .scripts.storedProcedure(storedProcedureId)
-        .delete();
     }
   } catch (error) {
     handleError(error, "DeleteStoredProcedure", `Error while deleting stored procedure ${storedProcedureId}`);

src/Common/dataAccess/deleteTrigger.ts

@@ -10,7 +10,7 @@ export async function deleteTrigger(databaseId: string, collectionId: string, tr
   const clearMessage = logConsoleProgress(`Deleting trigger ${triggerId}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {
@@ -23,11 +23,7 @@ export async function deleteTrigger(databaseId: string, collectionId: string, tr
         triggerId
       );
     } else {
-      await client()
+      await client().database(databaseId).container(collectionId).scripts.trigger(triggerId).delete();
-        .database(databaseId)
-        .container(collectionId)
-        .scripts.trigger(triggerId)
-        .delete();
     }
   } catch (error) {
     handleError(error, "DeleteTrigger", `Error while deleting trigger ${triggerId}`);

src/Common/dataAccess/deleteUserDefinedFunction.ts

@@ -10,7 +10,7 @@ export async function deleteUserDefinedFunction(databaseId: string, collectionId
   const clearMessage = logConsoleProgress(`Deleting user defined function ${id}`);
   try {
     if (
-      window.authType === AuthType.AAD &&
+      userContext.authType === AuthType.AAD &&
       !userContext.useSDKOperations &&
       userContext.defaultExperience === DefaultAccountExperienceType.DocumentDB
     ) {
@@ -23,11 +23,7 @@ export async function deleteUserDefinedFunction(databaseId: string, collectionId
         id
       );
     } else {
-      await client()
+      await client().database(databaseId).container(collectionId).scripts.userDefinedFunction(id).delete();
-        .database(databaseId)
-        .container(collectionId)
-        .scripts.userDefinedFunction(id)
-        .delete();
     }
   } catch (error) {
     handleError(error, "DeleteUserDefinedFunction", `Error while deleting user defined function ${id}`);

src/Common/dataAccess/executeStoredProcedure.ts

@@ -0,0 +1,48 @@
+import { Collection } from "../../Contracts/ViewModels";
+import { ClientDefaults, HttpHeaders } from "../Constants";
+import { client } from "../CosmosClient";
+import { handleError } from "../ErrorHandlingUtils";
+import { logConsoleProgress, logConsoleInfo } from "../../Utils/NotificationConsoleUtils";
+import StoredProcedure from "../../Explorer/Tree/StoredProcedure";
+
+export interface ExecuteSprocResult {
+  result: StoredProcedure;
+  scriptLogs: string;
+}
+
+export const executeStoredProcedure = async (
+  collection: Collection,
+  storedProcedure: StoredProcedure,
+  partitionKeyValue: string,
+  params: string[]
+): Promise<ExecuteSprocResult> => {
+  const clearMessage = logConsoleProgress(`Executing stored procedure ${storedProcedure.id()}`);
+  const timeout = setTimeout(() => {
+    throw Error(`Request timed out while executing stored procedure ${storedProcedure.id()}`);
+  }, ClientDefaults.requestTimeoutMs);
+
+  try {
+    const response = await client()
+      .database(collection.databaseId)
+      .container(collection.id())
+      .scripts.storedProcedure(storedProcedure.id())
+      .execute(partitionKeyValue, params, { enableScriptLogging: true });
+    clearTimeout(timeout);
+    logConsoleInfo(
+      `Finished executing stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}`
+    );
+    return {
+      result: response.resource,
+      scriptLogs: response.headers[HttpHeaders.scriptLogResults] as string,
+    };
+  } catch (error) {
+    handleError(
+      error,
+      "ExecuteStoredProcedure",
+      `Failed to execute stored procedure ${storedProcedure.id()} for container ${storedProcedure.collection.id()}`
+    );
+    throw error;
+  } finally {
+    clearMessage();
+  }
+};