cloudshell screenshot fix

* Acquire token for NoSQL account prior to running tests.

* Change client id to user assigned managed identity.

* Change to use managed identity. Add token variables for gremlin and
tables.

* Add RBAC details to test README.

* Add token for SQL readonly database. Skip resource token tests when RBAC
enabled.

* Use hardcoded account name for sql readonly.

* Use specific tag for sql readonly.

* Remove comment.

.eslintignore

@@ -23,8 +23,6 @@ src/Common/MongoUtility.ts
 src/Common/NotificationsClientBase.ts
 src/Common/QueriesClient.ts
 src/Common/Splitter.ts
-src/Controls/Heatmap/Heatmap.test.ts
-src/Controls/Heatmap/Heatmap.ts
 src/Definitions/datatables.d.ts
 src/Definitions/gif.d.ts
 src/Definitions/globals.d.ts

.github/workflows/ci.yml

@@ -177,9 +177,27 @@ jobs:
       - name: "Az CLI login"
         uses: Azure/login@v2
         with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          client-id: ${{ secrets.E2E_TESTS_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
+      # We can't use MSAL within playwright so we acquire tokens prior to running the tests
+      - name: "Acquire RBAC tokens for test accounts"
+        uses: azure/cli@v2
+        with:
+          azcliversion: latest
+          inlineScript: |
+            NOSQL_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-sql.documents.azure.com/.default" -o tsv --query accessToken)
+            echo "::add-mask::$NOSQL_TESTACCOUNT_TOKEN"
+            echo NOSQL_TESTACCOUNT_TOKEN=$NOSQL_TESTACCOUNT_TOKEN >> $GITHUB_ENV
+            NOSQL_READONLY_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-sql-readonly.documents.azure.com/.default" -o tsv --query accessToken)
+            echo "::add-mask::$NOSQL_READONLY_TESTACCOUNT_TOKEN"
+            echo NOSQL_READONLY_TESTACCOUNT_TOKEN=$NOSQL_READONLY_TESTACCOUNT_TOKEN >> $GITHUB_ENV
+            TABLE_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-tables.documents.azure.com/.default" -o tsv --query accessToken)
+            echo "::add-mask::$TABLE_TESTACCOUNT_TOKEN"
+            echo TABLE_TESTACCOUNT_TOKEN=$TABLE_TESTACCOUNT_TOKEN >> $GITHUB_ENV
+            GREMLIN_TESTACCOUNT_TOKEN=$(az account get-access-token --scope "https://github-e2etests-gremlin.documents.azure.com/.default" -o tsv --query accessToken)
+            echo "::add-mask::$GREMLIN_TESTACCOUNT_TOKEN"
+            echo GREMLIN_TESTACCOUNT_TOKEN=$GREMLIN_TESTACCOUNT_TOKEN >> $GITHUB_ENV
       - name: Run test shard ${{ matrix['shardIndex'] }} of ${{ matrix['shardTotal']}}
         run: npx playwright test --shard=${{ matrix.shardIndex }}/${{ matrix.shardTotal }} --workers=3
       - name: Upload blob report to GitHub Actions Artifacts

.github/workflows/cleanup.yml

@@ -27,7 +27,7 @@ jobs:
       - name: "Az CLI login"
         uses: azure/login@v1
         with:
-          client-id: ${{ secrets.AZURE_CLIENT_ID }}
+          client-id: ${{ secrets.E2E_TESTS_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}
           subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 

.npmrc

@@ -1,4 +1,4 @@
 save-exact=true
 
 # Ignore peer dependency conflicts
-force=true # TODO: Remove this when we update to React 17 or higher!
+force=true # TODO: Remove this when we update to React 17 or higher!

.vscode/settings.json

@@ -24,8 +24,5 @@
     "source.organizeImports": "explicit"
   },
   "typescript.preferences.importModuleSpecifier": "non-relative",
-  "editor.defaultFormatter": "esbenp.prettier-vscode",
-  "[typescriptreact]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
-  }
+  "editor.defaultFormatter": "esbenp.prettier-vscode"
 }

configs/mpac.json

@@ -1,5 +1,4 @@
 {
   "JUNO_ENDPOINT": "https://tools.cosmos.azure.com",
-  "isTerminalEnabled": true,
   "isPhoenixEnabled": true
-}
+}

configs/prod.json

@@ -1,5 +1,4 @@
 {
- "JUNO_ENDPOINT": "https://tools.cosmos.azure.com",
- "isTerminalEnabled" : false,
- "isPhoenixEnabled" : false
-}
+    "JUNO_ENDPOINT": "https://tools.cosmos.azure.com",
+    "isPhoenixEnabled": false
+}

package-lock.json

@@ -10,7 +10,7 @@
       "hasInstallScript": true,
       "dependencies": {
         "@azure/arm-cosmosdb": "9.1.0",
-        "@azure/cosmos": "4.3.0",
+        "@azure/cosmos": "4.5.0",
         "@azure/cosmos-language-service": "0.0.5",
         "@azure/identity": "4.5.0",
         "@azure/msal-browser": "2.14.2",
@@ -391,24 +391,25 @@
       "license": "0BSD"
     },
     "node_modules/@azure/cosmos": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.3.0.tgz",
-      "integrity": "sha512-0Ls3l1uWBBSphx6YRhnM+w7rSvq8qVugBCdO6kSiNuRYXEf6+YWLjbzz4e7L2kkz/6ScFdZIOJYP+XtkiRYOhA==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@azure/cosmos/-/cosmos-4.5.0.tgz",
+      "integrity": "sha512-JsTh4twb6FcwP7rJwxQiNZQ/LGtuF6gmciaxY9Rnp6/A325Lhsw/SH4R2ArpT0yCvozbZpweIwdPfUkXVBtp5w==",
+      "license": "MIT",
       "dependencies": {
-        "@azure/abort-controller": "^2.0.0",
-        "@azure/core-auth": "^1.7.1",
-        "@azure/core-rest-pipeline": "^1.15.1",
-        "@azure/core-tracing": "^1.1.1",
-        "@azure/core-util": "^1.8.1",
-        "@azure/keyvault-keys": "^4.8.0",
+        "@azure/abort-controller": "^2.1.2",
+        "@azure/core-auth": "^1.9.0",
+        "@azure/core-rest-pipeline": "^1.19.1",
+        "@azure/core-tracing": "^1.2.0",
+        "@azure/core-util": "^1.11.0",
+        "@azure/keyvault-keys": "^4.9.0",
+        "@azure/logger": "^1.1.4",
         "fast-json-stable-stringify": "^2.1.0",
-        "jsbi": "^4.3.0",
         "priorityqueuejs": "^2.0.0",
         "semaphore": "^1.1.0",
-        "tslib": "^2.6.2"
+        "tslib": "^2.8.1"
       },
       "engines": {
-        "node": ">=18.0.0"
+        "node": ">=20.0.0"
       }
     },
     "node_modules/@azure/cosmos-language-service": {
@@ -438,8 +439,9 @@
       }
     },
     "node_modules/@azure/cosmos/node_modules/tslib": {
-      "version": "2.6.2",
-      "license": "0BSD"
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
     "node_modules/@azure/identity": {
       "version": "4.5.0",
@@ -27178,11 +27180,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/jsbi": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-4.3.0.tgz",
-      "integrity": "sha512-SnZNcinB4RIcnEyZqFPdGPVgrg2AcnykiBy0sHVJQKHYeaLUvi3Exj+iaPpLnFVkDPZIV4U0yvgC9/R4uEAZ9g=="
-    },
     "node_modules/jsbn": {
       "version": "0.1.1",
       "license": "MIT"

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "dependencies": {
     "@azure/arm-cosmosdb": "9.1.0",
-    "@azure/cosmos": "4.3.0",
+    "@azure/cosmos": "4.5.0",
     "@azure/cosmos-language-service": "0.0.5",
     "@azure/identity": "4.5.0",
     "@azure/msal-browser": "2.14.2",

src/Common/Constants.ts

@@ -138,15 +138,6 @@ export enum MongoBackendEndpointType {
   remote,
 }
 
-export class BackendApi {
-  public static readonly GenerateToken: string = "GenerateToken";
-  public static readonly PortalSettings: string = "PortalSettings";
-  public static readonly AccountRestrictions: string = "AccountRestrictions";
-  public static readonly RuntimeProxy: string = "RuntimeProxy";
-  public static readonly DisallowedLocations: string = "DisallowedLocations";
-  public static readonly SampleData: string = "SampleData";
-}
-
 export class PortalBackendEndpoints {
   public static readonly Development: string = "https://localhost:7235";
   public static readonly Mpac: string = "https://cdb-ms-mpac-pbe.cosmos.azure.com";

src/Common/CosmosClient.ts

@@ -4,12 +4,12 @@ import { CosmosDbArtifactType } from "Contracts/FabricMessagesContract";
 import { AuthorizationToken } from "Contracts/FabricMessageTypes";
 import { checkDatabaseResourceTokensValidity, isFabricMirroredKey } from "Platform/Fabric/FabricUtil";
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
+import { useDataplaneRbacAuthorization } from "Utils/AuthorizationUtils";
 import { AuthType } from "../AuthType";
 import { PriorityLevel } from "../Common/Constants";
 import * as Logger from "../Common/Logger";
 import { Platform, configContext } from "../ConfigContext";
 import { FabricArtifactInfo, updateUserContext, userContext } from "../UserContext";
-import { isDataplaneRbacSupported } from "../Utils/APITypeUtils";
 import { logConsoleError } from "../Utils/NotificationConsoleUtils";
 import * as PriorityBasedExecutionUtils from "../Utils/PriorityBasedExecutionUtils";
 import { EmulatorMasterKey, HttpHeaders } from "./Constants";
@@ -20,8 +20,7 @@ const _global = typeof self === "undefined" ? window : self;
 export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
   const { verb, resourceId, resourceType, headers } = requestInfo;
 
-  const dataPlaneRBACOptionEnabled = userContext.dataPlaneRbacEnabled && isDataplaneRbacSupported(userContext.apiType);
-  if (userContext.features.enableAadDataPlane || dataPlaneRBACOptionEnabled) {
+  if (useDataplaneRbacAuthorization(userContext)) {
     Logger.logInfo(
       `AAD Data Plane Feature flag set to ${userContext.features.enableAadDataPlane} for account with disable local auth ${userContext.databaseAccount.properties.disableLocalAuth} `,
       "Explorer/tokenProvider",

src/Common/MongoProxyClient.test.ts

@@ -65,7 +65,6 @@ describe("MongoProxyClient", () => {
       });
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: MongoProxyEndpoints.Prod,
-        globallyEnabledMongoAPIs: [],
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -84,7 +83,6 @@ describe("MongoProxyClient", () => {
     it("builds the correct proxy URL in development", () => {
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: "https://localhost:1234",
-        globallyEnabledMongoAPIs: [],
       });
       queryDocuments(databaseId, collection, true, "{}");
       expect(window.fetch).toHaveBeenCalledWith(
@@ -101,7 +99,6 @@ describe("MongoProxyClient", () => {
       });
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: MongoProxyEndpoints.Prod,
-        globallyEnabledMongoAPIs: [],
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -120,7 +117,6 @@ describe("MongoProxyClient", () => {
     it("builds the correct proxy URL in development", () => {
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: "https://localhost:1234",
-        globallyEnabledMongoAPIs: [],
       });
       readDocument(databaseId, collection, documentId);
       expect(window.fetch).toHaveBeenCalledWith(
@@ -137,7 +133,6 @@ describe("MongoProxyClient", () => {
       });
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: MongoProxyEndpoints.Prod,
-        globallyEnabledMongoAPIs: [],
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -156,7 +151,6 @@ describe("MongoProxyClient", () => {
     it("builds the correct proxy URL in development", () => {
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: "https://localhost:1234",
-        globallyEnabledMongoAPIs: [],
       });
       readDocument(databaseId, collection, documentId);
       expect(window.fetch).toHaveBeenCalledWith(
@@ -173,7 +167,6 @@ describe("MongoProxyClient", () => {
       });
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: MongoProxyEndpoints.Prod,
-        globallyEnabledMongoAPIs: [],
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -197,7 +190,6 @@ describe("MongoProxyClient", () => {
       });
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: MongoProxyEndpoints.Prod,
-        globallyEnabledMongoAPIs: [],
       });
       window.fetch = jest.fn().mockImplementation(fetchMock);
     });
@@ -216,7 +208,6 @@ describe("MongoProxyClient", () => {
     it("builds the correct proxy URL in development", () => {
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: "https://localhost:1234",
-        globallyEnabledMongoAPIs: [],
       });
       deleteDocuments(databaseId, collection, [documentId]);
       expect(window.fetch).toHaveBeenCalledWith(
@@ -233,7 +224,6 @@ describe("MongoProxyClient", () => {
       });
       updateConfigContext({
         MONGO_PROXY_ENDPOINT: MongoProxyEndpoints.Prod,
-        globallyEnabledMongoAPIs: [],
       });
     });
 

src/Common/dataAccess/__snapshots__/queryDocuments.test.ts.snap

@@ -2,7 +2,6 @@
 
 exports[`getCommonQueryOptions builds the correct default options objects 1`] = `
 {
-  "disableNonStreamingOrderByQuery": true,
   "enableQueryControl": false,
   "enableScanInQuery": true,
   "forceQueryPlan": true,
@@ -14,7 +13,6 @@ exports[`getCommonQueryOptions builds the correct default options objects 1`] =
 
 exports[`getCommonQueryOptions reads from localStorage 1`] = `
 {
-  "disableNonStreamingOrderByQuery": true,
   "enableQueryControl": false,
   "enableScanInQuery": true,
   "forceQueryPlan": true,

src/Common/dataAccess/getCollectionDataUsageSize.ts

@@ -1,3 +1,4 @@
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import { configContext } from "../../ConfigContext";
 import { userContext } from "../../UserContext";
@@ -41,7 +42,7 @@ interface MetricsResponse {
 }
 
 export const getCollectionUsageSizeInKB = async (databaseName: string, containerName: string): Promise<number> => {
-  if (userContext.authType !== AuthType.AAD) {
+  if (userContext.authType !== AuthType.AAD || isFabricNative()) {
     return undefined;
   }
 

src/Common/dataAccess/queryDocuments.ts

@@ -1,5 +1,4 @@
 import { FeedOptions, ItemDefinition, QueryIterator, Resource } from "@azure/cosmos";
-import { isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { LocalStorageUtility, StorageKey } from "../../Shared/StorageUtility";
 import { Queries } from "../Constants";
 import { client } from "../CosmosClient";
@@ -28,6 +27,5 @@ export const getCommonQueryOptions = (options: FeedOptions): FeedOptions => {
     Queries.itemsPerPage;
   options.enableQueryControl = LocalStorageUtility.getEntryBoolean(StorageKey.QueryControlEnabled);
   options.maxDegreeOfParallelism = LocalStorageUtility.getEntryNumber(StorageKey.MaxDegreeOfParellism);
-  options.disableNonStreamingOrderByQuery = !isVectorSearchEnabled();
   return options;
 };

src/Common/dataAccess/readCollections.ts

@@ -126,12 +126,5 @@ async function readCollectionsWithARM(databaseId: string): Promise<DataModels.Co
       throw new Error(`Unsupported default experience type: ${apiType}`);
   }
 
-  // TO DO: Remove when we get RP API Spec with materializedViews
-  /* eslint-disable @typescript-eslint/no-explicit-any */
-  return rpResponse?.value?.map((collection: any) => {
-    const collectionDataModel: DataModels.Collection = collection.properties?.resource as DataModels.Collection;
-    collectionDataModel.materializedViews = collection.properties?.resource?.materializedViews;
-    collectionDataModel.materializedViewDefinition = collection.properties?.resource?.materializedViewDefinition;
-    return collectionDataModel;
-  });
+  return rpResponse?.value?.map((collection) => collection.properties?.resource as DataModels.Collection);
 }

src/ConfigContext.ts

@@ -1,21 +1,15 @@
+import { CassandraProxyEndpoints, JunoEndpoints, MongoProxyEndpoints, PortalBackendEndpoints } from "Common/Constants";
 import {
-  BackendApi,
-  CassandraProxyEndpoints,
-  JunoEndpoints,
-  MongoProxyEndpoints,
-  PortalBackendEndpoints,
-} from "Common/Constants";
-import {
-  allowedAadEndpoints,
   allowedArcadiaEndpoints,
   allowedEmulatorEndpoints,
-  allowedGraphEndpoints,
   allowedHostedExplorerEndpoints,
   allowedJunoOrigins,
   allowedMsalRedirectEndpoints,
+  defaultAllowedAadEndpoints,
   defaultAllowedArmEndpoints,
   defaultAllowedBackendEndpoints,
   defaultAllowedCassandraProxyEndpoints,
+  defaultAllowedGraphEndpoints,
   defaultAllowedMongoProxyEndpoints,
   validateEndpoint,
 } from "Utils/EndpointUtils";
@@ -29,6 +23,8 @@ export enum Platform {
 
 export interface ConfigContext {
   platform: Platform;
+  allowedAadEndpoints: ReadonlyArray<string>;
+  allowedGraphEndpoints: ReadonlyArray<string>;
   allowedArmEndpoints: ReadonlyArray<string>;
   allowedBackendEndpoints: ReadonlyArray<string>;
   allowedCassandraProxyEndpoints: ReadonlyArray<string>;
@@ -37,10 +33,8 @@ export interface ConfigContext {
   gitSha?: string;
   proxyPath?: string;
   AAD_ENDPOINT: string;
-  ARM_AUTH_AREA: string;
   ARM_ENDPOINT: string;
   EMULATOR_ENDPOINT?: string;
-  ARM_API_VERSION: string;
   GRAPH_ENDPOINT: string;
   GRAPH_API_VERSION: string;
   // This is the endpoint to get offering Ids to be used to fetch prices. Refer to this doc: https://learn.microsoft.com/en-us/rest/api/marketplacecatalog/dataplane/skus/list?view=rest-marketplacecatalog-dataplane-2023-05-01-preview&tabs=HTTP
@@ -50,27 +44,24 @@ export interface ConfigContext {
   ARCADIA_ENDPOINT: string;
   ARCADIA_LIVY_ENDPOINT_DNS_ZONE: string;
   PORTAL_BACKEND_ENDPOINT: string;
-  NEW_BACKEND_APIS?: BackendApi[];
   MONGO_PROXY_ENDPOINT: string;
   CASSANDRA_PROXY_ENDPOINT: string;
-  NEW_CASSANDRA_APIS?: string[];
   PROXY_PATH?: string;
   JUNO_ENDPOINT: string;
   GITHUB_CLIENT_ID: string;
   GITHUB_TEST_ENV_CLIENT_ID: string;
   GITHUB_CLIENT_SECRET?: string; // No need to inject secret for prod. Juno already knows it.
-  isTerminalEnabled: boolean;
   isPhoenixEnabled: boolean;
   hostedExplorerURL: string;
   armAPIVersion?: string;
   msalRedirectURI?: string;
-  globallyEnabledCassandraAPIs?: string[];
-  globallyEnabledMongoAPIs?: string[];
 }
 
 // Default configuration
 let configContext: Readonly<ConfigContext> = {
   platform: Platform.Portal,
+  allowedAadEndpoints: defaultAllowedAadEndpoints,
+  allowedGraphEndpoints: defaultAllowedGraphEndpoints,
   allowedArmEndpoints: defaultAllowedArmEndpoints,
   allowedBackendEndpoints: defaultAllowedBackendEndpoints,
   allowedCassandraProxyEndpoints: defaultAllowedCassandraProxyEndpoints,
@@ -85,17 +76,12 @@ let configContext: Readonly<ConfigContext> = {
     `^https:\\/\\/cosmos-db-dataexplorer-germanycentral\\.azurewebsites\\.de$`,
     `^https:\\/\\/.*\\.fabric\\.microsoft\\.com$`,
     `^https:\\/\\/.*\\.powerbi\\.com$`,
-    `^https:\\/\\/.*\\.analysis-df\\.net$`,
-    `^https:\\/\\/.*\\.analysis-df\\.windows\\.net$`,
-    `^https:\\/\\/.*\\.azure-test\\.net$`,
     `^https:\\/\\/dataexplorer-preview\\.azurewebsites\\.net$`,
   ], // Webpack injects this at build time
   gitSha: process.env.GIT_SHA,
   hostedExplorerURL: "https://cosmos.azure.com/",
   AAD_ENDPOINT: "https://login.microsoftonline.com/",
-  ARM_AUTH_AREA: "https://management.azure.com/",
   ARM_ENDPOINT: "https://management.azure.com/",
-  ARM_API_VERSION: "2016-06-01",
   GRAPH_ENDPOINT: "https://graph.microsoft.com",
   GRAPH_API_VERSION: "1.6",
   CATALOG_ENDPOINT: "https://catalogapi.azure.com/",
@@ -109,11 +95,7 @@ let configContext: Readonly<ConfigContext> = {
   PORTAL_BACKEND_ENDPOINT: PortalBackendEndpoints.Prod,
   MONGO_PROXY_ENDPOINT: MongoProxyEndpoints.Prod,
   CASSANDRA_PROXY_ENDPOINT: CassandraProxyEndpoints.Prod,
-  NEW_CASSANDRA_APIS: ["postQuery", "createOrDelete", "getKeys", "getSchema"],
-  isTerminalEnabled: false,
   isPhoenixEnabled: false,
-  globallyEnabledCassandraAPIs: [],
-  globallyEnabledMongoAPIs: [],
 };
 
 export function resetConfigContext(): void {
@@ -128,19 +110,21 @@ export function updateConfigContext(newContext: Partial<ConfigContext>): void {
     return;
   }
 
-  if (!validateEndpoint(newContext.ARM_ENDPOINT, configContext.allowedArmEndpoints || defaultAllowedArmEndpoints)) {
-    delete newContext.ARM_ENDPOINT;
+  if (!validateEndpoint(newContext.AAD_ENDPOINT, configContext.allowedAadEndpoints || defaultAllowedAadEndpoints)) {
+    delete newContext.AAD_ENDPOINT;
   }
 
-  if (!validateEndpoint(newContext.AAD_ENDPOINT, allowedAadEndpoints)) {
-    delete newContext.AAD_ENDPOINT;
+  if (!validateEndpoint(newContext.ARM_ENDPOINT, configContext.allowedArmEndpoints || defaultAllowedArmEndpoints)) {
+    delete newContext.ARM_ENDPOINT;
   }
 
   if (!validateEndpoint(newContext.EMULATOR_ENDPOINT, allowedEmulatorEndpoints)) {
     delete newContext.EMULATOR_ENDPOINT;
   }
 
-  if (!validateEndpoint(newContext.GRAPH_ENDPOINT, allowedGraphEndpoints)) {
+  if (
+    !validateEndpoint(newContext.GRAPH_ENDPOINT, configContext.allowedGraphEndpoints || defaultAllowedGraphEndpoints)
+  ) {
     delete newContext.GRAPH_ENDPOINT;
   }
 
@@ -148,6 +132,15 @@ export function updateConfigContext(newContext: Partial<ConfigContext>): void {
     delete newContext.ARCADIA_ENDPOINT;
   }
 
+  if (
+    !validateEndpoint(
+      newContext.PORTAL_BACKEND_ENDPOINT,
+      configContext.allowedBackendEndpoints || defaultAllowedBackendEndpoints,
+    )
+  ) {
+    delete newContext.PORTAL_BACKEND_ENDPOINT;
+  }
+
   if (
     !validateEndpoint(
       newContext.MONGO_PROXY_ENDPOINT,

src/Contracts/ActionContracts.ts

@@ -23,6 +23,7 @@ export enum PaneKind {
   GlobalSettings,
   AdHocAccess,
   SwitchDirectory,
+  QuickStart,
 }
 
 /**

src/Contracts/DataModels.ts

@@ -7,6 +7,7 @@ export interface ArmEntity {
   type: string;
   kind: string;
   tags?: Tags;
+  resourceGroup?: string;
 }
 
 export interface DatabaseAccount extends ArmEntity {
@@ -388,7 +389,7 @@ export interface VectorEmbeddingPolicy {
 }
 
 export interface VectorEmbedding {
-  dataType: "float16" | "float32" | "uint8" | "int8";
+  dataType: "float32" | "uint8" | "int8";
   dimensions: number;
   distanceFunction: "euclidean" | "cosine" | "dotproduct";
   path: string;

src/Contracts/ViewModels.ts

@@ -443,6 +443,7 @@ export interface DataExplorerInputsFrame {
     [key: string]: string;
   };
   feedbackPolicies?: any;
+  aadToken?: string;
 }
 
 export interface SelfServeFrameInputs {

src/Controls/Heatmap/Heatmap.html

@@ -1,11 +0,0 @@
-<!doctype html>
-<html class="no-js" lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="data:," />
-  </head>
-
-  <body>
-    <div id="heatmap"></div>
-  </body>
-</html>

src/Controls/Heatmap/Heatmap.less

@@ -1,55 +0,0 @@
-@import "../../../less/Common/Constants";
-html {
-  font-family: @DataExplorerFont;
-  padding: 0px;
-  margin: 0px;
-  border: 0px;
-  overflow: hidden;
-  position: fixed;
-  width: 100%;
-  height: 100%;
-}
-
-body {
-  font-family: @DataExplorerFont;
-  padding: 0px;
-  margin: 0px;
-  border: 0px;
-  overflow: hidden;
-}
-
-#heatmap {
-  .dark-theme {
-    color: @BaseLight;
-  }
-
-  .chartTitle {
-    position: absolute;
-    top: 5px;
-    left: 3px;
-    font-size: 13px;
-  }
-
-  .noDataMessage {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    position: absolute;
-    z-index: 10000;
-    height: 100%;
-    width: 100%;
-    top: 0;
-    left: 0;
-    opacity: 0.97;
-    div {
-      border-color: rgba(204, 204, 204, 0.8);
-      box-shadow: 0 4px 6px 0 rgba(0, 0, 0, 0.12);
-      padding: 15px 10px;
-      width: calc(55% - 40px);
-      font-size: 13px;
-      text-align: center;
-      border-width: 1px;
-      border-style: solid;
-    }
-  }
-}

src/Controls/Heatmap/Heatmap.test.ts

@@ -1,143 +0,0 @@
-import dayjs from "dayjs";
-import { handleMessage, Heatmap, isDarkTheme } from "./Heatmap";
-import { PortalTheme } from "./HeatmapDatatypes";
-
-describe("The Heatmap Control", () => {
-  const dataPoints = {
-    "1": {
-      "2019-06-19T00:59:10Z": {
-        "Normalized Throughput": 0.35,
-      },
-      "2019-06-19T00:48:10Z": {
-        "Normalized Throughput": 0.25,
-      },
-    },
-  };
-
-  const chartCaptions = {
-    chartTitle: "chart title",
-    yAxisTitle: "YAxisTitle",
-    tooltipText: "Tooltip text",
-    timeWindow: 123456789,
-  };
-
-  let heatmap: Heatmap;
-  const theme: PortalTheme = 1;
-  const divElement = `<div id="${Heatmap.elementId}"></div>`;
-
-  describe("drawHeatmap rendering", () => {
-    beforeEach(() => {
-      heatmap = new Heatmap(dataPoints, chartCaptions, theme);
-      document.body.innerHTML = divElement;
-    });
-
-    afterEach(() => {
-      document.body.innerHTML = ``;
-    });
-
-    it("should call _getChartSettings when drawHeatmap is invoked", () => {
-      const _getChartSettings = jest.spyOn(heatmap, "_getChartSettings");
-      heatmap.drawHeatmap();
-      expect(_getChartSettings).toHaveBeenCalled();
-    });
-
-    it("should call _getLayoutSettings when drawHeatmap is invoked", () => {
-      const _getLayoutSettings = jest.spyOn(heatmap, "_getLayoutSettings");
-      heatmap.drawHeatmap();
-      expect(_getLayoutSettings).toHaveBeenCalled();
-    });
-
-    it("should call _getChartDisplaySettings when drawHeatmap is invoked", () => {
-      const _getChartDisplaySettings = jest.spyOn(heatmap, "_getChartDisplaySettings");
-      heatmap.drawHeatmap();
-      expect(_getChartDisplaySettings).toHaveBeenCalled();
-    });
-
-    it("drawHeatmap should render a Heatmap inside the div element", () => {
-      heatmap.drawHeatmap();
-      expect(document.body.innerHTML).not.toEqual(divElement);
-    });
-  });
-
-  describe("generateMatrixFromMap", () => {
-    it("should massage input data to match output expected", () => {
-      expect(heatmap.generateMatrixFromMap(dataPoints).yAxisPoints).toEqual(["1"]);
-      expect(heatmap.generateMatrixFromMap(dataPoints).dataPoints).toEqual([[0.25, 0.35]]);
-      expect(heatmap.generateMatrixFromMap(dataPoints).xAxisPoints.length).toEqual(2);
-    });
-
-    it("should output the date format to ISO8601 string format", () => {
-      expect(heatmap.generateMatrixFromMap(dataPoints).xAxisPoints[0].slice(10, 11)).toEqual("T");
-      expect(heatmap.generateMatrixFromMap(dataPoints).xAxisPoints[0].slice(-1)).toEqual("Z");
-    });
-
-    it("should convert the time to the user's local time", () => {
-      if (dayjs().utcOffset()) {
-        expect(heatmap.generateMatrixFromMap(dataPoints).xAxisPoints).not.toEqual([
-          "2019-06-19T00:48:10Z",
-          "2019-06-19T00:59:10Z",
-        ]);
-      } else {
-        expect(heatmap.generateMatrixFromMap(dataPoints).xAxisPoints).toEqual([
-          "2019-06-19T00:48:10Z",
-          "2019-06-19T00:59:10Z",
-        ]);
-      }
-    });
-  });
-
-  describe("isDarkTheme", () => {
-    it("isDarkTheme should return the correct result", () => {
-      expect(isDarkTheme(PortalTheme.dark)).toEqual(true);
-      expect(isDarkTheme(PortalTheme.azure)).not.toEqual(true);
-    });
-  });
-});
-
-describe("iframe rendering when there is no data", () => {
-  afterEach(() => {
-    document.body.innerHTML = ``;
-  });
-
-  it("should show a no data message with a dark theme", () => {
-    const data = {
-      data: {
-        signature: "pcIframe",
-        data: {
-          chartData: {},
-          chartSettings: {},
-          theme: 4,
-        },
-      },
-      origin: "http://localhost",
-    };
-
-    const divElement = `<div id="${Heatmap.elementId}"></div>`;
-    document.body.innerHTML = divElement;
-
-    handleMessage(data as MessageEvent);
-    expect(document.body.innerHTML).toContain("dark-theme");
-    expect(document.body.innerHTML).toContain("noDataMessage");
-  });
-
-  it("should show a no data message with a white theme", () => {
-    const data = {
-      data: {
-        signature: "pcIframe",
-        data: {
-          chartData: {},
-          chartSettings: {},
-          theme: 2,
-        },
-      },
-      origin: "http://localhost",
-    };
-
-    const divElement = `<div id="${Heatmap.elementId}"></div>`;
-    document.body.innerHTML = divElement;
-
-    handleMessage(data as MessageEvent);
-    expect(document.body.innerHTML).not.toContain("dark-theme");
-    expect(document.body.innerHTML).toContain("noDataMessage");
-  });
-});

src/Controls/Heatmap/Heatmap.ts

@@ -1,272 +0,0 @@
-import dayjs from "dayjs";
-import * as Plotly from "plotly.js-cartesian-dist-min";
-import { sendCachedDataMessage, sendReadyMessage } from "../../Common/MessageHandler";
-import { StyleConstants } from "../../Common/StyleConstants";
-import { MessageTypes } from "../../Contracts/ExplorerContracts";
-import { isInvalidParentFrameOrigin } from "../../Utils/MessageValidation";
-import "./Heatmap.less";
-import {
-  ChartSettings,
-  DataPayload,
-  DisplaySettings,
-  FontSettings,
-  HeatmapCaptions,
-  HeatmapData,
-  LayoutSettings,
-  PartitionTimeStampToData,
-  PortalTheme,
-} from "./HeatmapDatatypes";
-
-export class Heatmap {
-  public static readonly elementId: string = "heatmap";
-
-  private _chartData: HeatmapData;
-  private _heatmapCaptions: HeatmapCaptions;
-  private _theme: PortalTheme;
-  private _defaultFontColor: string;
-
-  constructor(data: DataPayload, heatmapCaptions: HeatmapCaptions, theme: PortalTheme) {
-    this._theme = theme;
-    this._defaultFontColor = StyleConstants.BaseDark;
-    this._setThemeColorForChart();
-    this._chartData = this.generateMatrixFromMap(data);
-    this._heatmapCaptions = heatmapCaptions;
-  }
-
-  private _setThemeColorForChart() {
-    if (isDarkTheme(this._theme)) {
-      this._defaultFontColor = StyleConstants.BaseLight;
-    }
-  }
-
-  private _getFontStyles(size: number = StyleConstants.MediumFontSize, color = "#838383"): FontSettings {
-    return {
-      family: StyleConstants.DataExplorerFont,
-      size,
-      color,
-    };
-  }
-
-  public generateMatrixFromMap(data: DataPayload): HeatmapData {
-    // all keys in data payload, sorted...
-    const rows: string[] = Object.keys(data).sort((a: string, b: string) => {
-      if (parseInt(a) < parseInt(b)) {
-        return -1;
-      } else {
-        if (parseInt(a) > parseInt(b)) {
-          return 1;
-        } else {
-          return 0;
-        }
-      }
-    });
-    const output: HeatmapData = {
-      yAxisPoints: [],
-      dataPoints: [],
-      xAxisPoints: Object.keys(data[rows[0]]).sort((a: string, b: string) => {
-        if (a < b) {
-          return -1;
-        } else {
-          if (a > b) {
-            return 1;
-          } else {
-            return 0;
-          }
-        }
-      }),
-    };
-    // go thru all rows and create 2d matrix for heatmap...
-    for (let i = 0; i < rows.length; i++) {
-      output.yAxisPoints.push(rows[i]);
-      const dataPoints: number[] = [];
-      for (let a = 0; a < output.xAxisPoints.length; a++) {
-        const row: PartitionTimeStampToData = data[rows[i]];
-        dataPoints.push(row[output.xAxisPoints[a]]["Normalized Throughput"]);
-      }
-      output.dataPoints.push(dataPoints);
-    }
-    for (let a = 0; a < output.xAxisPoints.length; a++) {
-      const dateTime = output.xAxisPoints[a];
-      // convert to local users timezone...
-      const day = dayjs(new Date(dateTime)).format("YYYY-MM-DD");
-      const hour = dayjs(new Date(dateTime)).format("HH:mm:ss");
-      // coerce to ISOString format since that is what plotly wants...
-      output.xAxisPoints[a] = `${day}T${hour}Z`;
-    }
-    return output;
-  }
-
-  // public for testing purposes
-  public _getChartSettings(): ChartSettings[] {
-    return [
-      {
-        z: this._chartData.dataPoints,
-        type: "heatmap",
-        zmin: 0,
-        zmid: 50,
-        zmax: 100,
-        colorscale: [
-          [0.0, "#1FD338"],
-          [0.1, "#1CAD2F"],
-          [0.2, "#50A527"],
-          [0.3, "#719F21"],
-          [0.4, "#95991B"],
-          [0.5, "#CE8F11"],
-          [0.6, "#E27F0F"],
-          [0.7, "#E46612"],
-          [0.8, "#E64914"],
-          [0.9, "#B80016"],
-          [1.0, "#B80016"],
-        ],
-        name: "",
-        hovertemplate: this._heatmapCaptions.tooltipText,
-        colorbar: {
-          thickness: 15,
-          outlinewidth: 0,
-          tickcolor: StyleConstants.BaseDark,
-          tickfont: this._getFontStyles(10, this._defaultFontColor),
-        },
-        y: this._chartData.yAxisPoints,
-        x: this._chartData.xAxisPoints,
-      },
-    ];
-  }
-
-  // public for testing purposes
-  public _getLayoutSettings(): LayoutSettings {
-    return {
-      margin: {
-        l: 40,
-        r: 10,
-        b: 35,
-        t: 30,
-        pad: 0,
-      },
-      paper_bgcolor: "transparent",
-      plot_bgcolor: "transparent",
-      width: 462,
-      height: 240,
-      yaxis: {
-        title: this._heatmapCaptions.yAxisTitle,
-        titlefont: this._getFontStyles(11),
-        autorange: true,
-        showgrid: false,
-        zeroline: false,
-        showline: false,
-        autotick: true,
-        fixedrange: true,
-        ticks: "",
-        showticklabels: false,
-      },
-      xaxis: {
-        fixedrange: true,
-        title: "*White area in heatmap indicates there is no available data",
-        titlefont: this._getFontStyles(11),
-        autorange: true,
-        showgrid: false,
-        zeroline: false,
-        showline: false,
-        autotick: true,
-        tickformat: this._heatmapCaptions.timeWindow > 7 ? "%I:%M %p" : "%b %e",
-        showticklabels: true,
-        tickfont: this._getFontStyles(10),
-      },
-      title: {
-        text: this._heatmapCaptions.chartTitle,
-        x: 0.01,
-        font: this._getFontStyles(13, this._defaultFontColor),
-      },
-    };
-  }
-
-  // public for testing purposes
-  public _getChartDisplaySettings(): DisplaySettings {
-    return {
-      /* heatmap can be fully responsive however the min-height needed in that case is greater than the iframe portal height, hence explicit width + height have been set in _getLayoutSettings
-      responsive: true,*/
-      displayModeBar: false,
-    };
-  }
-
-  public drawHeatmap(): void {
-    // todo - create random elementId generator so multiple heatmaps can be created - ticket # 431469
-    Plotly.plot(
-      Heatmap.elementId,
-      this._getChartSettings(),
-      this._getLayoutSettings(),
-      this._getChartDisplaySettings(),
-    );
-    const plotDiv: any = document.getElementById(Heatmap.elementId);
-    plotDiv.on("plotly_click", (data: any) => {
-      let timeSelected: string = data.points[0].x;
-      timeSelected = timeSelected.replace(" ", "T");
-      timeSelected = `${timeSelected}Z`;
-      let xAxisIndex = 0;
-      for (let i = 0; i < this._chartData.xAxisPoints.length; i++) {
-        if (this._chartData.xAxisPoints[i] === timeSelected) {
-          xAxisIndex = i;
-          break;
-        }
-      }
-      const output = [];
-      for (let i = 0; i < this._chartData.dataPoints.length; i++) {
-        output.push(this._chartData.dataPoints[i][xAxisIndex]);
-      }
-      sendCachedDataMessage(MessageTypes.LogInfo, output);
-    });
-  }
-}
-
-export function isDarkTheme(theme: PortalTheme) {
-  return theme === PortalTheme.dark;
-}
-
-export function handleMessage(event: MessageEvent) {
-  if (isInvalidParentFrameOrigin(event)) {
-    return;
-  }
-
-  if (typeof event.data !== "object" || event.data["signature"] !== "pcIframe") {
-    return;
-  }
-  if (
-    typeof event.data.data !== "object" ||
-    !("chartData" in event.data.data) ||
-    !("chartSettings" in event.data.data)
-  ) {
-    return;
-  }
-  Plotly.purge(Heatmap.elementId);
-
-  document.getElementById(Heatmap.elementId)!.innerHTML = "";
-  const data = event.data.data;
-  const chartData: DataPayload = data.chartData;
-  const chartSettings: HeatmapCaptions = data.chartSettings;
-  const chartTheme: PortalTheme = data.theme;
-  if (Object.keys(chartData).length) {
-    new Heatmap(chartData, chartSettings, chartTheme).drawHeatmap();
-  } else {
-    const chartTitleElement = document.createElement("div");
-    chartTitleElement.innerHTML = data.chartSettings.chartTitle;
-    chartTitleElement.classList.add("chartTitle");
-
-    const noDataMessageElement = document.createElement("div");
-    noDataMessageElement.classList.add("noDataMessage");
-    const noDataMessageContent = document.createElement("div");
-    noDataMessageContent.innerHTML = data.errorMessage;
-
-    noDataMessageElement.appendChild(noDataMessageContent);
-
-    if (isDarkTheme(chartTheme)) {
-      chartTitleElement.classList.add("dark-theme");
-      noDataMessageElement.classList.add("dark-theme");
-      noDataMessageContent.classList.add("dark-theme");
-    }
-
-    document.getElementById(Heatmap.elementId)!.appendChild(chartTitleElement);
-    document.getElementById(Heatmap.elementId)!.appendChild(noDataMessageElement);
-  }
-}
-
-window.addEventListener("message", handleMessage, false);
-sendReadyMessage();

src/Controls/Heatmap/HeatmapDatatypes.ts

@@ -1,106 +0,0 @@
-type dataPoint = string | number;
-
-export interface DataPayload {
-  [id: string]: PartitionTimeStampToData;
-}
-
-export enum PortalTheme {
-  blue = 1,
-  azure,
-  light,
-  dark,
-}
-
-export interface HeatmapData {
-  yAxisPoints: string[];
-  xAxisPoints: string[];
-  dataPoints: dataPoint[][];
-}
-
-export interface HeatmapCaptions {
-  chartTitle: string;
-  yAxisTitle: string;
-  tooltipText: string;
-  timeWindow: number;
-}
-
-export interface FontSettings {
-  family: string;
-  size: number;
-  color: string;
-}
-
-export interface LayoutSettings {
-  paper_bgcolor?: string;
-  plot_bgcolor?: string;
-  margin?: {
-    l: number;
-    r: number;
-    b: number;
-    t: number;
-    pad: number;
-  };
-  width?: number;
-  height?: number;
-  yaxis?: {
-    fixedrange: boolean;
-    title: HeatmapCaptions["yAxisTitle"];
-    titlefont: FontSettings;
-    autorange: boolean;
-    showgrid: boolean;
-    zeroline: boolean;
-    showline: boolean;
-    autotick: boolean;
-    ticks: "";
-    showticklabels: boolean;
-  };
-  xaxis?: {
-    fixedrange: boolean;
-    title: string;
-    titlefont: FontSettings;
-    autorange: boolean;
-    showgrid: boolean;
-    zeroline: boolean;
-    showline: boolean;
-    autotick: boolean;
-    showticklabels: boolean;
-    tickformat: string;
-    tickfont: FontSettings;
-  };
-  title?: {
-    text: HeatmapCaptions["chartTitle"];
-    x: number;
-    font?: FontSettings;
-  };
-  font?: FontSettings;
-}
-
-export interface ChartSettings {
-  z: HeatmapData["dataPoints"];
-  type: "heatmap";
-  zmin: number;
-  zmid: number;
-  zmax: number;
-  colorscale: [number, string][];
-  name: string;
-  hovertemplate: HeatmapCaptions["tooltipText"];
-  colorbar: {
-    thickness: number;
-    outlinewidth: number;
-    tickcolor: string;
-    tickfont: FontSettings;
-  };
-  y: HeatmapData["yAxisPoints"];
-  x: HeatmapData["xAxisPoints"];
-}
-
-export interface DisplaySettings {
-  displayModeBar: boolean;
-  responsive?: boolean;
-}
-
-export interface PartitionTimeStampToData {
-  [timeSeriesDates: string]: {
-    [NormalizedThroughput: string]: number;
-  };
-}

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

@@ -559,26 +559,81 @@ export class ThroughputInputAutoPilotV3Component extends React.Component<
   private getThroughputTextField = (): JSX.Element => (
     <>
       {this.props.isAutoPilotSelected ? (
-        <TextField
-          label="Maximum RU/s required by this resource"
-          required
-          type="number"
-          id="autopilotInput"
-          key="auto pilot throughput input"
-          styles={getTextFieldStyles(this.props.maxAutoPilotThroughput, this.props.maxAutoPilotThroughputBaseline)}
-          disabled={this.overrideWithProvisionedThroughputSettings()}
-          step={AutoPilotUtils.autoPilotIncrementStep}
-          value={this.overrideWithProvisionedThroughputSettings() ? "" : this.props.maxAutoPilotThroughput?.toString()}
-          onChange={this.onAutoPilotThroughputChange}
-          min={autoPilotThroughput1K}
-          onGetErrorMessage={(value: string) => {
-            const sanitizedValue = getSanitizedInputValue(value);
-            return sanitizedValue % 1000
-              ? "Throughput value must be in increments of 1000"
-              : this.props.throughputError;
-          }}
-          validateOnLoad={false}
-        />
+        <Stack horizontal verticalAlign="end" tokens={{ childrenGap: 8 }}>
+          {/* Column 1: Minimum RU/s */}
+          <Stack tokens={{ childrenGap: 4 }}>
+            <Stack horizontal verticalAlign="center" tokens={{ childrenGap: 4 }}>
+              <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }}>
+                Minimum RU/s
+              </Text>
+              <FontIcon iconName="Info" style={{ fontSize: 12, color: "#666" }} />
+            </Stack>
+            <Text
+              style={{
+                fontFamily: "Segoe UI",
+                width: 70,
+                height: 28,
+                border: "none",
+                fontSize: 14,
+                backgroundColor: "transparent",
+                fontWeight: 400,
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+                boxSizing: "border-box",
+              }}
+            >
+              {AutoPilotUtils.getMinRUsBasedOnUserInput(this.props.maxAutoPilotThroughput)}
+            </Text>
+          </Stack>
+
+          {/* Column 2: "x 10 =" Text */}
+          <Text
+            style={{
+              fontFamily: "Segoe UI",
+              fontSize: 12,
+              fontWeight: 400,
+              paddingBottom: 6,
+            }}
+          >
+            x 10 =
+          </Text>
+
+          {/* Column 3: Maximum RU/s */}
+          <Stack tokens={{ childrenGap: 4 }}>
+            <Stack horizontal verticalAlign="center" tokens={{ childrenGap: 4 }}>
+              <Text variant="small" style={{ lineHeight: "20px", fontWeight: 600 }}>
+                Maximum RU/s
+              </Text>
+              <FontIcon iconName="Info" style={{ fontSize: 12, color: "#666" }} />
+            </Stack>
+            <TextField
+              required
+              type="number"
+              id="autopilotInput"
+              key="auto pilot throughput input"
+              styles={{
+                ...getTextFieldStyles(this.props.maxAutoPilotThroughput, this.props.maxAutoPilotThroughputBaseline),
+                fieldGroup: { width: 100, height: 28 },
+                field: { fontSize: 14, fontWeight: 400 },
+              }}
+              disabled={this.overrideWithProvisionedThroughputSettings()}
+              step={AutoPilotUtils.autoPilotIncrementStep}
+              value={
+                this.overrideWithProvisionedThroughputSettings() ? "" : this.props.maxAutoPilotThroughput?.toString()
+              }
+              onChange={this.onAutoPilotThroughputChange}
+              min={autoPilotThroughput1K}
+              onGetErrorMessage={(value: string) => {
+                const sanitizedValue = getSanitizedInputValue(value);
+                return sanitizedValue % 1000
+                  ? "Throughput value must be in increments of 1000"
+                  : this.props.throughputError;
+              }}
+              validateOnLoad={false}
+            />
+          </Stack>
+        </Stack>
       ) : (
         <TextField
           required

src/Explorer/Controls/Settings/SettingsSubComponents/ThroughputInputComponents/__snapshots__/ThroughputInputAutoPilotV3Component.test.tsx.snap

@@ -157,35 +157,148 @@ exports[`ThroughputInputAutoPilotV3Component autopilot input visible 1`] = `
           }
         }
       >
-        <StyledTextFieldBase
-          disabled={true}
-          id="autopilotInput"
-          key="auto pilot throughput input"
-          label="Maximum RU/s required by this resource"
-          min={1000}
-          onChange={[Function]}
-          onGetErrorMessage={[Function]}
-          required={true}
-          step={1000}
-          styles={
+        <Stack
+          horizontal={true}
+          tokens={
             {
-              "fieldGroup": {
-                "borderColor": "",
-                "height": 25,
-                "selectors": {
-                  ":disabled": {
-                    "backgroundColor": undefined,
-                    "borderColor": undefined,
-                  },
-                },
-                "width": 300,
-              },
+              "childrenGap": 8,
             }
           }
-          type="number"
-          validateOnLoad={false}
-          value=""
-        />
+          verticalAlign="end"
+        >
+          <Stack
+            tokens={
+              {
+                "childrenGap": 4,
+              }
+            }
+          >
+            <Stack
+              horizontal={true}
+              tokens={
+                {
+                  "childrenGap": 4,
+                }
+              }
+              verticalAlign="center"
+            >
+              <Text
+                style={
+                  {
+                    "fontWeight": 600,
+                    "lineHeight": "20px",
+                  }
+                }
+                variant="small"
+              >
+                Minimum RU/s
+              </Text>
+              <FontIcon
+                iconName="Info"
+                style={
+                  {
+                    "color": "#666",
+                    "fontSize": 12,
+                  }
+                }
+              />
+            </Stack>
+            <Text
+              style={
+                {
+                  "alignItems": "center",
+                  "backgroundColor": "transparent",
+                  "border": "none",
+                  "boxSizing": "border-box",
+                  "display": "flex",
+                  "fontFamily": "Segoe UI",
+                  "fontSize": 14,
+                  "fontWeight": 400,
+                  "height": 28,
+                  "justifyContent": "center",
+                  "width": 70,
+                }
+              }
+            >
+              400
+            </Text>
+          </Stack>
+          <Text
+            style={
+              {
+                "fontFamily": "Segoe UI",
+                "fontSize": 12,
+                "fontWeight": 400,
+                "paddingBottom": 6,
+              }
+            }
+          >
+            x 10 =
+          </Text>
+          <Stack
+            tokens={
+              {
+                "childrenGap": 4,
+              }
+            }
+          >
+            <Stack
+              horizontal={true}
+              tokens={
+                {
+                  "childrenGap": 4,
+                }
+              }
+              verticalAlign="center"
+            >
+              <Text
+                style={
+                  {
+                    "fontWeight": 600,
+                    "lineHeight": "20px",
+                  }
+                }
+                variant="small"
+              >
+                Maximum RU/s
+              </Text>
+              <FontIcon
+                iconName="Info"
+                style={
+                  {
+                    "color": "#666",
+                    "fontSize": 12,
+                  }
+                }
+              />
+            </Stack>
+            <StyledTextFieldBase
+              disabled={true}
+              id="autopilotInput"
+              key="auto pilot throughput input"
+              min={1000}
+              onChange={[Function]}
+              onGetErrorMessage={[Function]}
+              required={true}
+              step={1000}
+              styles={
+                {
+                  "field": {
+                    "fontSize": 14,
+                    "fontWeight": 400,
+                  },
+                  "fieldGroup": {
+                    "height": 28,
+                    "width": 100,
+                  },
+                }
+              }
+              type="number"
+              validateOnLoad={false}
+              value=""
+            />
+          </Stack>
+        </Stack>
         <Stack>
           <Stack>
             <Stack

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

@@ -5,13 +5,13 @@ import { useDatabases } from "Explorer/useDatabases";
 import React, { FunctionComponent, useEffect, useState } from "react";
 import * as Constants from "../../../Common/Constants";
 import { InfoTooltip } from "../../../Common/Tooltip/InfoTooltip";
+import { isFabricNative } from "../../../Platform/Fabric/FabricUtil";
 import * as SharedConstants from "../../../Shared/Constants";
 import { userContext } from "../../../UserContext";
 import { getCollectionName } from "../../../Utils/APITypeUtils";
 import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import * as PricingUtils from "../../../Utils/PricingUtils";
 import "./ThroughputInput.less";
-import { isFabricNative } from "../../../Platform/Fabric/FabricUtil";
 
 export interface ThroughputInputProps {
   isDatabase: boolean;
@@ -41,11 +41,12 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
   let defaultThroughput: number;
   const workloadType: Constants.WorkloadType = getWorkloadType();
 
-  if (
+  if (isFabricNative()) {
+    defaultThroughput = AutoPilotUtils.autoPilotThroughput5K;
+  } else if (
     isFreeTier ||
     isQuickstart ||
-    [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(workloadType) ||
-    isFabricNative()
+    [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(workloadType)
   ) {
     defaultThroughput = AutoPilotUtils.autoPilotThroughput1K;
   } else if (workloadType === Constants.WorkloadType.Production) {

src/Explorer/DataSamples/ContainerSampleGenerator.ts

@@ -1,3 +1,4 @@
+import { useDataplaneRbacAuthorization } from "Utils/AuthorizationUtils";
 import { createCollection } from "../../Common/dataAccess/createCollection";
 import { createDocument } from "../../Common/dataAccess/createDocument";
 import { createDocument as createMongoDocument } from "../../Common/MongoProxyClient";
@@ -90,12 +91,13 @@ export class ContainerSampleGenerator {
       }
       const { databaseAccount: account } = userContext;
       const databaseId = collection.databaseId;
+
       const gremlinClient = new GremlinClient();
       gremlinClient.initialize({
         endpoint: `wss://${GraphTab.getGremlinEndpoint(account)}`,
         databaseId: databaseId,
         collectionId: collection.id(),
-        masterKey: userContext.masterKey || "",
+        password: useDataplaneRbacAuthorization(userContext) ? userContext.aadToken : userContext.masterKey || "",
         maxResultSize: 100,
       });
 

src/Explorer/Explorer.tsx

@@ -8,7 +8,12 @@ import { MessageTypes } from "Contracts/ExplorerContracts";
 import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane";
 import { getCopilotEnabled, isCopilotFeatureRegistered } from "Explorer/QueryCopilot/Shared/QueryCopilotClient";
 import { IGalleryItem } from "Juno/JunoClient";
-import { isFabricMirrored, isFabricMirroredKey, scheduleRefreshFabricToken } from "Platform/Fabric/FabricUtil";
+import {
+  isFabricMirrored,
+  isFabricMirroredKey,
+  isFabricNative,
+  scheduleRefreshFabricToken,
+} from "Platform/Fabric/FabricUtil";
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { acquireMsalTokenForAccount } from "Utils/AuthorizationUtils";
 import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointUtils";
@@ -284,14 +289,40 @@ export default class Explorer {
     }
   }
 
-  public openInVsCode(): void {
+  /**
+   * Generates a VS Code DocumentDB connection URL using the current user's MongoDB connection parameters.
+   * Double-encodes the updated connection string for safe usage in VS Code URLs.
+   *
+   * The DocumentDB VS Code extension requires double encoding for connection strings.
+   * See: https://microsoft.github.io/vscode-documentdb/manual/how-to-construct-url.html#double-encoding
+   *
+   * @returns {string} The encoded VS Code DocumentDB connection URL.
+   */
+  private getDocumentDbUrl() {
+    const { adminLogin: adminLoginuserName = "", connectionString = "" } = userContext.vcoreMongoConnectionParams;
+    const updatedConnectionString = connectionString.replace(/<(user|username)>:<password>/i, adminLoginuserName);
+    const encodedUpdatedConnectionString = encodeURIComponent(encodeURIComponent(updatedConnectionString));
+    const documentDbUrl = `vscode://ms-azuretools.vscode-documentdb?connectionString=${encodedUpdatedConnectionString}`;
+    return documentDbUrl;
+  }
+
+  private getCosmosDbUrl() {
     const activeTab = useTabs.getState().activeTab;
     const resourceId = encodeURIComponent(userContext.databaseAccount.id);
     const database = encodeURIComponent(activeTab?.collection?.databaseId);
     const container = encodeURIComponent(activeTab?.collection?.id());
     const baseUrl = `vscode://ms-azuretools.vscode-cosmosdb?resourceId=${resourceId}`;
     const vscodeUrl = activeTab ? `${baseUrl}&database=${database}&container=${container}` : baseUrl;
+    return vscodeUrl;
+  }
 
+  private getVSCodeUrl(): string {
+    const isvCore = (userContext.apiType || userContext.databaseAccount.kind) === "VCoreMongo";
+    return isvCore ? this.getDocumentDbUrl() : this.getCosmosDbUrl();
+  }
+
+  public openInVsCode(): void {
+    const vscodeUrl = this.getVSCodeUrl();
     const openVSCodeDialogProps: DialogProps = {
       linkProps: {
         linkText: "Download Visual Studio Code",
@@ -1149,7 +1180,10 @@ export default class Explorer {
         ? this.refreshDatabaseForResourceToken()
         : await this.refreshAllDatabases(); // await: we rely on the databases to be loaded before restoring the tabs further in the flow
     }
-    await useNotebook.getState().refreshNotebooksEnabledStateForAccount();
+
+    if (!isFabricNative()) {
+      await useNotebook.getState().refreshNotebooksEnabledStateForAccount();
+    }
 
     // TODO: remove reference to isNotebookEnabled and isNotebooksEnabledForAccount
     const isNotebookEnabled =
@@ -1171,7 +1205,7 @@ export default class Explorer {
       await this.initNotebooks(userContext.databaseAccount);
     }
 
-    if (userContext.authType === AuthType.AAD && userContext.apiType === "SQL") {
+    if (userContext.authType === AuthType.AAD && userContext.apiType === "SQL" && !isFabricNative()) {
       const throughputBucketsEnabled = await featureRegistered(userContext.subscriptionId, "ThroughputBucketing");
       updateUserContext({ throughputBucketsEnabled });
     }

src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.test.tsx

@@ -163,8 +163,7 @@ describe("GraphExplorer", () => {
       graphBackendEndpoint: "graphBackendEndpoint",
       databaseId: "databaseId",
       collectionId: "collectionId",
-      masterKey: "masterKey",
-
+      password: "password",
       onLoadStartKey: 0,
       onLoadStartKeyChange: (newKey: number): void => {},
       resourceId: "resourceId",

src/Explorer/Graph/GraphExplorerComponent/GraphExplorer.tsx

@@ -59,7 +59,7 @@ export interface GraphExplorerProps {
   graphBackendEndpoint: string;
   databaseId: string;
   collectionId: string;
-  masterKey: string;
+  password: string;
 
   onLoadStartKey: number;
   onLoadStartKeyChange: (newKey: number) => void;
@@ -1300,7 +1300,7 @@ export class GraphExplorer extends React.Component<GraphExplorerProps, GraphExpl
       endpoint: `wss://${this.props.graphBackendEndpoint}`,
       databaseId: this.props.databaseId,
       collectionId: this.props.collectionId,
-      masterKey: this.props.masterKey,
+      password: this.props.password,
       maxResultSize: GraphExplorer.MAX_RESULT_SIZE,
     });
   }

src/Explorer/Graph/GraphExplorerComponent/GremlinClient.test.ts

@@ -8,28 +8,28 @@ describe("Gremlin Client", () => {
     endpoint: null,
     collectionId: null,
     databaseId: null,
-    masterKey: null,
     maxResultSize: 10000,
+    password: null,
   };
 
-  it("should use databaseId, collectionId and masterKey to authenticate", () => {
+  it("should use databaseId, collectionId and password to authenticate", () => {
     const collectionId = "collectionId";
     const databaseId = "databaseId";
-    const masterKey = "masterKey";
+    const testPassword = "password";
     const gremlinClient = new GremlinClient();
 
     gremlinClient.initialize({
       endpoint: null,
       collectionId,
       databaseId,
-      masterKey,
       maxResultSize: 0,
+      password: testPassword,
     });
 
     // User must includes these values
     expect(gremlinClient.client.params.user.indexOf(collectionId)).not.toBe(-1);
     expect(gremlinClient.client.params.user.indexOf(databaseId)).not.toBe(-1);
-    expect(gremlinClient.client.params.password).toEqual(masterKey);
+    expect(gremlinClient.client.params.password).toEqual(testPassword);
   });
 
   it("should aggregate RU charges across multiple responses", (done) => {

src/Explorer/Graph/GraphExplorerComponent/GremlinClient.ts

@@ -11,8 +11,8 @@ export interface GremlinClientParameters {
   endpoint: string;
   databaseId: string;
   collectionId: string;
-  masterKey: string;
   maxResultSize: number;
+  password: string;
 }
 
 export interface GremlinRequestResult {
@@ -43,7 +43,7 @@ export class GremlinClient {
     this.client = new GremlinSimpleClient({
       endpoint: params.endpoint,
       user: `/dbs/${params.databaseId}/colls/${params.collectionId}`,
-      password: params.masterKey,
+      password: params.password,
       successCallback: (result: Result) => {
         this.storePendingResult(result);
         this.flushResult(result.requestId);

src/Explorer/Graph/GraphExplorerComponent/GremlinSimpleClient.test.ts

@@ -5,11 +5,11 @@
 
 import * as sinon from "sinon";
 import {
+  GremlinRequestMessage,
+  GremlinResponseMessage,
   GremlinSimpleClient,
   GremlinSimpleClientParameters,
   Result,
-  GremlinRequestMessage,
-  GremlinResponseMessage,
 } from "./GremlinSimpleClient";
 
 describe("Gremlin Simple Client", () => {

src/Explorer/Graph/NewVertexComponent/NewVertexComponent.less

@@ -95,3 +95,10 @@
     white-space: nowrap;
   }
 }
+
+@media (max-width: 768px) {
+  .newVertexComponent {
+    padding: 0;
+    width: 100%;
+  }
+}

src/Explorer/OpenActions/OpenActions.tsx

@@ -188,6 +188,11 @@ function openPane(action: ActionContracts.OpenPane, explorer: Explorer) {
     action.paneKind === ActionContracts.PaneKind[ActionContracts.PaneKind.AddCollection]
   ) {
     explorer.onNewCollectionClicked();
+  } else if (
+    action.paneKind === ActionContracts.PaneKind.QuickStart ||
+    action.paneKind === ActionContracts.PaneKind[ActionContracts.PaneKind.QuickStart]
+  ) {
+    explorer.onNewCollectionClicked({ isQuickstart: true });
   } else if (
     action.paneKind === ActionContracts.PaneKind.CassandraAddCollection ||
     action.paneKind === ActionContracts.PaneKind[ActionContracts.PaneKind.CassandraAddCollection]

src/Explorer/Panes/AddCollectionPanel/AddCollectionPanel.tsx

@@ -52,6 +52,7 @@ import { getCollectionName } from "Utils/APITypeUtils";
 import { isCapabilityEnabled, isServerlessAccount, isVectorSearchEnabled } from "Utils/CapabilityUtils";
 import { getUpsellMessage } from "Utils/PricingUtils";
 import { ValidCosmosDbIdDescription, ValidCosmosDbIdInputPattern } from "Utils/ValidationUtils";
+import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 import { CollapsibleSectionComponent } from "../../Controls/CollapsiblePanel/CollapsibleSectionComponent";
 import { ThroughputInput } from "../../Controls/ThroughputInput/ThroughputInput";
 import { ContainerSampleGenerator } from "../../DataSamples/ContainerSampleGenerator";
@@ -60,7 +61,6 @@ import { useDatabases } from "../../useDatabases";
 import { PanelFooterComponent } from "../PanelFooterComponent";
 import { PanelInfoErrorComponent } from "../PanelInfoErrorComponent";
 import { PanelLoadingScreen } from "../PanelLoadingScreen";
-import * as AutoPilotUtils from "../../../Utils/AutoPilotUtils";
 
 export interface AddCollectionPanelProps {
   explorer: Explorer;
@@ -123,7 +123,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
       isSharded: userContext.apiType !== "Tables",
       partitionKey: getPartitionKey(props.isQuickstart),
       subPartitionKeys: [],
-      enableDedicatedThroughput: false,
+      enableDedicatedThroughput: isFabricNative(), // Dedicated throughput is only enabled in Fabric Native by default
       createMongoWildCardIndex:
         isCapabilityEnabled("EnableMongo") && !isCapabilityEnabled("EnableMongo16MBDocumentSupport"),
       useHashV1: false,
@@ -336,7 +336,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                     size={40}
                     className="panelTextField"
                     aria-label="New database id, Type a new database id"
-                    autoFocus
                     tabIndex={0}
                     value={this.state.newDatabaseId}
                     onChange={(event: React.ChangeEvent<HTMLInputElement>) =>
@@ -407,9 +406,9 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                   responsiveMode={999}
                 />
               )}
+              <Separator className="panelSeparator" style={{ marginTop: -4, marginBottom: -4 }} />
             </Stack>
           )}
-          <Separator className="panelSeparator" style={{ marginTop: -4, marginBottom: -4 }} />
 
           <Stack>
             <Stack horizontal style={{ marginTop: -5, marginBottom: 1 }}>
@@ -449,8 +448,9 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                 this.setState({ collectionId: event.target.value })
               }
             />
+            <Separator className="panelSeparator" style={{ marginTop: -5, marginBottom: -5 }} />
           </Stack>
-          <Separator className="panelSeparator" style={{ marginTop: -5, marginBottom: -5 }} />
+
           {this.shouldShowIndexingOptionsForFreeTierAccount() && (
             <Stack>
               <Stack horizontal style={{ marginTop: -4, marginBottom: -5 }}>
@@ -645,7 +645,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                     </Stack>
                   );
                 })}
-              {!isFabricNative() && userContext.apiType === "SQL" && (
+              {userContext.apiType === "SQL" && (
                 <Stack className="panelGroupSpacing">
                   <DefaultButton
                     styles={{ root: { padding: 0, width: 200, height: 30 }, label: { fontSize: 12 } }}
@@ -709,7 +709,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
             </Stack>
           )}
 
-          {this.shouldShowCollectionThroughputInput() && (
+          {this.shouldShowCollectionThroughputInput() && !isFabricNative() && (
             <ThroughputInput
               showFreeTierExceedThroughputTooltip={isFreeTierAccount() && !isFirstResourceCreated}
               isDatabase={false}
@@ -742,7 +742,6 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                           : "Comma separated paths e.g. /firstName,/address/zipCode"
                       }
                       className="panelTextField"
-                      autoFocus
                       value={uniqueKey}
                       onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
                         const uniqueKeys = this.state.uniqueKeys.map((uniqueKey: string, j: number) => {
@@ -777,7 +776,9 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
             </Stack>
           )}
 
-          <Separator className="panelSeparator" style={{ marginTop: -15, marginBottom: -4 }} />
+          {!isFabricNative() && userContext.apiType === "SQL" && (
+            <Separator className="panelSeparator" style={{ marginTop: -15, marginBottom: -4 }} />
+          )}
 
           {shouldShowAnalyticalStoreOptions() && (
             <Stack className="panelGroupSpacing" style={{ marginTop: -4 }}>
@@ -1133,7 +1134,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
   // }
 
   private shouldShowCollectionThroughputInput(): boolean {
-    if (isFabricNative() || isServerlessAccount()) {
+    if (isServerlessAccount()) {
       return false;
     }
 
@@ -1354,8 +1355,8 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
 
     // Throughput
     if (isFabricNative()) {
-      // Fabric Native accounts are always autoscale and have a fixed throughput of 1K
-      autoPilotMaxThroughput = AutoPilotUtils.autoPilotThroughput1K;
+      // Fabric Native accounts are always autoscale and have a fixed throughput of 5K
+      autoPilotMaxThroughput = AutoPilotUtils.autoPilotThroughput5K;
       offerThroughput = undefined;
     } else if (databaseLevelThroughput) {
       if (this.state.createNewDatabase) {

src/Explorer/Panes/AddCollectionPanel/__snapshots__/AddCollectionPanel.test.tsx.snap

@@ -93,7 +93,6 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
           aria-label="New database id, Type a new database id"
           aria-required={true}
           autoComplete="off"
-          autoFocus={true}
           className="panelTextField"
           id="newDatabaseId"
           name="newDatabaseId"
@@ -143,16 +142,16 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
           </StyledTooltipHostBase>
         </Stack>
       </Stack>
-    </Stack>
-    <Separator
-      className="panelSeparator"
-      style={
-        {
-          "marginBottom": -4,
-          "marginTop": -4,
+      <Separator
+        className="panelSeparator"
+        style={
+          {
+            "marginBottom": -4,
+            "marginTop": -4,
+          }
         }
-      }
-    />
+      />
+    </Stack>
     <Stack>
       <Stack
         horizontal={true}
@@ -203,16 +202,16 @@ exports[`AddCollectionPanel should render Default properly 1`] = `
         type="text"
         value=""
       />
-    </Stack>
-    <Separator
-      className="panelSeparator"
-      style={
-        {
-          "marginBottom": -5,
-          "marginTop": -5,
+      <Separator
+        className="panelSeparator"
+        style={
+          {
+            "marginBottom": -5,
+            "marginTop": -5,
+          }
         }
-      }
-    />
+      />
+    </Stack>
     <Stack>
       <Stack
         horizontal={true}

src/Explorer/Panes/PanelComponent.less

@@ -11,10 +11,10 @@
     margin: 20px 0;
     overflow-x: hidden;
 
-    & > :not(.collapsibleSection) {
+    &> :not(.collapsibleSection) {
       margin-bottom: @DefaultSpace;
 
-      & > :not(:last-child) {
+      &> :not(:last-child) {
         margin-bottom: @DefaultSpace;
       }
     }
@@ -56,6 +56,14 @@
       transform: translate(-50%, -50%);
     }
   }
+
+  @media (max-width: 768px) {
+    .panelMainContent {
+      padding: 0 24px;
+      margin: 0;
+      overflow-x: auto;
+    }
+  }
 }
 
 .panelHeader {
@@ -113,70 +121,87 @@
 .deleteCollectionFeedback {
   margin-top: 12px;
 }
+
 .addRemoveIcon {
   margin-left: 4px !important;
 }
+
 .addRemoveIconLabel {
   margin-top: 28px;
   margin-left: 4px !important;
 }
+
 .addRemoveIcon [alt="editEntity"]:focus,
 .addRemoveIconLabel [alt="editEntity"]:focus {
   border: 1px dashed #605e5c;
 }
+
 .addNewParamStyle {
   margin-top: 5px;
   margin-left: 5px !important;
   cursor: pointer;
 }
 
-.panelGroupSpacing > :not(:last-child) {
+.panelGroupSpacing> :not(:last-child) {
   margin-bottom: @DefaultSpace;
 }
+
 .fileUpload {
   display: none !important;
 }
+
 .customFileUpload {
   padding: 25px 0px 0px 10px;
   cursor: pointer;
   display: flex;
 }
+
 .fileIcon {
   align-self: center;
 }
+
 .panelAddIconLabel {
   font-size: 20px;
   width: 20px;
   margin: 30px 0 0 10px;
   cursor: default;
 }
+
 .panelAddIcon {
   font-size: 20px;
   width: 20px;
   margin: 30px 0 0 10px;
   cursor: default;
 }
+
 .removeIcon {
   color: @InfoIconColor;
 }
+
 .backImageIcon {
   margin-top: 8px;
 }
+
 [alt="back"]:focus {
   border: 1px solid #605e5c;
 }
+
 .addEntityDatePicker {
   max-width: 145px;
 }
+
 .addEntityTextField {
   width: 237px;
 }
+
 .addButtonEntiy {
   width: 25%;
 }
+
 .column-select-view {
   margin: 20px 0px 0px 0px;
 }
+
 .panelSeparator::before {
   background-color: #edebe9;
-}
+}

src/Explorer/Panes/SettingsPane/SettingsPane.tsx

@@ -433,9 +433,6 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
       );
     }
 
-    logConsoleInfo(
-      `Updated query setting to ${LocalStorageUtility.getEntryString(StorageKey.SetPartitionKeyUndefined)}`,
-    );
     refreshExplorer && (await explorer.refreshExplorer());
     closeSidePanel();
   };

src/Explorer/Tabs/CloudShellTab/CloudShellTerminalCore.tsx

@@ -22,6 +22,7 @@ import { formatErrorMessage, formatInfoMessage, formatWarningMessage } from "./U
 
 // Constants
 const DEFAULT_CLOUDSHELL_REGION = "westus";
+const DEFAULT_FAIRFAX_CLOUDSHELL_REGION = "usgovvirginia";
 const POLLING_INTERVAL_MS = 2000;
 const MAX_RETRY_COUNT = 10;
 const MAX_PING_COUNT = 120 * 60; // 120 minutes (60 seconds/minute)
@@ -44,32 +45,26 @@ export const startCloudShellTerminal = async (terminal: Terminal, shellType: Ter
 
     resolvedRegion = determineCloudShellRegion();
 
-    resolvedRegion = determineCloudShellRegion();
-
     terminal.writeln(formatWarningMessage("⚠️  IMPORTANT: Azure Cloud Shell Region Notice ⚠️"));
     terminal.writeln(
       formatInfoMessage(
         "The Cloud Shell environment will operate in a region that may differ from your database's region.",
       ),
     );
-    terminal.writeln(formatInfoMessage("This has two potential implications:"));
+    terminal.writeln(formatInfoMessage("By using this feature, you acknowledge and agree to the following"));
     terminal.writeln(formatInfoMessage("1. Performance Impact:"));
     terminal.writeln(
       formatInfoMessage("   Commands may experience higher latency due to geographic distance between regions."),
     );
-    terminal.writeln(formatInfoMessage("2. Data Compliance Considerations:"));
+    terminal.writeln(formatInfoMessage("2. Data Transfers:"));
     terminal.writeln(
       formatInfoMessage(
-        "   Data processed through this shell could temporarily reside in a different geographic region,",
+        "   Data processed through this Cloud Shell service can be processed outside of your tenant's geographical region, compliance boundary or national cloud instance.",
       ),
     );
-    terminal.writeln(
-      formatInfoMessage("   which may affect compliance with data residency requirements or regulations specific"),
-    );
-    terminal.writeln(formatInfoMessage("   to your organization."));
     terminal.writeln("");
 
-    terminal.writeln("\x1b[94mFor more information on Azure Cosmos DB data governance and compliance, please visit:");
+    terminal.writeln("\x1b[94mFor more information on Azure Cosmos DB data residency, please visit:");
     terminal.writeln("\x1b[94mhttps://learn.microsoft.com/en-us/azure/cosmos-db/data-residency\x1b[0m");
 
     // Ask for user consent for region
@@ -159,7 +154,9 @@ export const ensureCloudShellProviderRegistered = async (): Promise<void> => {
  * Determines the appropriate CloudShell region
  */
 export const determineCloudShellRegion = (): string => {
-  return getNormalizedRegion(userContext.databaseAccount?.location, DEFAULT_CLOUDSHELL_REGION);
+  const defaultRegion =
+    userContext.portalEnv === "fairfax" ? DEFAULT_FAIRFAX_CLOUDSHELL_REGION : DEFAULT_CLOUDSHELL_REGION;
+  return getNormalizedRegion(userContext.databaseAccount?.location, defaultRegion);
 };
 
 /**

src/Explorer/Tabs/CloudShellTab/README.md

@@ -258,14 +258,7 @@ Key limitations:
 
 ### Data Residency
 
-Data residency requirements may not be fully satisfied when using CloudShell due to limited regional availability. CloudShell services are currently available in the following regions:
-
-| Geography | Regions |
-|-----------|---------|
-| Americas | East US, West US 2, South Central US, West Central US |
-| Europe | West Europe, North Europe |
-| Asia Pacific | Southeast Asia, Japan East, Australia East |
-| Middle East | UAE North |
+Data residency requirements may not be fully satisfied when using CloudShell due to limited regional availability. 
 
 **Note:** For up-to-date supported regions, refer to the region configuration in:
 `src/Explorer/CloudShell/Configuration/RegionConfig.ts`

src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.test.tsx

@@ -1,4 +1,4 @@
-import { AbstractShellHandler, DISABLE_HISTORY, START_MARKER, EXIT_COMMAND } from "./AbstractShellHandler";
+import { AbstractShellHandler, DISABLE_HISTORY, EXIT_COMMAND, START_MARKER } from "./AbstractShellHandler";
 
 // Mock implementation for testing
 class MockShellHandler extends AbstractShellHandler {
@@ -18,8 +18,8 @@ class MockShellHandler extends AbstractShellHandler {
     return "mock-endpoint";
   }
 
-  getTerminalSuppressedData(): string {
-    return "suppressed-data";
+  getTerminalSuppressedData(): string[] {
+    return ["suppressed-data"];
   }
 }
 
@@ -90,7 +90,7 @@ describe("AbstractShellHandler", () => {
     });
 
     it("should return the terminal suppressed data", () => {
-      expect(shellHandler.getTerminalSuppressedData()).toBe("suppressed-data");
+      expect(shellHandler.getTerminalSuppressedData()).toEqual(["suppressed-data"]);
     });
   });
 });

src/Explorer/Tabs/CloudShellTab/ShellTypes/AbstractShellHandler.tsx

@@ -13,7 +13,13 @@ export const DISABLE_HISTORY = `set +o history`;
  * Command that displays an error message and exits the shell session.
  * Used when shell initialization or connection fails.
  */
-export const EXIT_COMMAND = ` printf "\\033[1;31mSession ended. Please close this tab and initiate a new shell session if needed.\\033[0m\\n" && exit`;
+export const EXIT_COMMAND = ` printf "\\033[1;31mSession ended. Please close this tab and initiate a new shell session if needed.\\033[0m\\n" && disown -a && exit`;
+
+/**
+ * This command runs mongosh in no-database and quiet mode,
+ * and evaluates the `disableTelemetry()` function to turn off telemetry collection.
+ */
+export const DISABLE_TELEMETRY_COMMAND = `mongosh --nodb --quiet --eval "disableTelemetry()"`;
 
 /**
  * Abstract class that defines the interface for shell-specific handlers
@@ -31,7 +37,8 @@ export abstract class AbstractShellHandler {
   abstract getShellName(): string;
   abstract getSetUpCommands(): string[];
   abstract getConnectionCommand(): string;
-  abstract getTerminalSuppressedData(): string;
+  abstract getTerminalSuppressedData(): string[];
+  updateTerminalData?(data: string): string;
 
   /**
    * Constructs the complete initialization command sequence for the shell.
@@ -77,7 +84,7 @@ export abstract class AbstractShellHandler {
    * is not already present in the environment.
    */
   protected mongoShellSetupCommands(): string[] {
-    const PACKAGE_VERSION: string = "2.5.0";
+    const PACKAGE_VERSION: string = "2.5.5";
     return [
       "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
       `if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
@@ -85,7 +92,7 @@ export abstract class AbstractShellHandler {
       `if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh/bin && mv mongosh-${PACKAGE_VERSION}-linux-x64/bin/mongosh ~/mongosh/bin/  && chmod +x ~/mongosh/bin/mongosh; fi`,
       `if ! command -v mongosh &> /dev/null; then rm -rf mongosh-${PACKAGE_VERSION}-linux-x64 mongosh-${PACKAGE_VERSION}-linux-x64.tgz; fi`,
       "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
-      "source ~/.bashrc",
+      "if ! command -v mongosh &> /dev/null; then source ~/.bashrc; fi",
     ];
   }
 }

src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.test.tsx

@@ -94,7 +94,7 @@ describe("CassandraShellHandler", () => {
     });
 
     test("should return the correct terminal suppressed data", () => {
-      expect(handler.getTerminalSuppressedData()).toBe("");
+      expect(handler.getTerminalSuppressedData()).toEqual([""]);
     });
 
     test("should include the correct package version in setup commands", () => {

src/Explorer/Tabs/CloudShellTab/ShellTypes/CassandraShellHandler.tsx

@@ -41,7 +41,7 @@ export class CassandraShellHandler extends AbstractShellHandler {
     return `cqlsh ${getHostFromUrl(this._endpoint)} 10350 -u ${dbName} -p ${this._key} --ssl`;
   }
 
-  public getTerminalSuppressedData(): string {
-    return "";
+  public getTerminalSuppressedData(): string[] {
+    return [""];
   }
 }

src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.test.tsx

@@ -33,6 +33,7 @@ jest.mock("../../../../UserContext", () => ({
 }));
 
 jest.mock("../Utils/CommonUtils", () => ({
+  ...jest.requireActual("../Utils/CommonUtils"),
   getHostFromUrl: jest.fn().mockReturnValue("test-mongo.documents.azure.com"),
 }));
 
@@ -69,7 +70,7 @@ describe("MongoShellHandler", () => {
 
       expect(Array.isArray(commands)).toBe(true);
       expect(commands.length).toBe(7);
-      expect(commands[1]).toContain("mongosh-2.5.0-linux-x64.tgz");
+      expect(commands[1]).toContain("mongosh-2.5.5-linux-x64.tgz");
     });
   });
 
@@ -91,7 +92,7 @@ describe("MongoShellHandler", () => {
       const command = mongoShellHandler.getConnectionCommand();
 
       expect(command).toBe(
-        "mongosh mongodb://test-mongo.documents.azure.com:10255?appName=CosmosExplorerTerminal --username test-account --password test-key --tls --tlsAllowInvalidCertificates",
+        'mongosh --nodb --quiet --eval "disableTelemetry()" && mongosh mongodb://test-mongo.documents.azure.com:10255?appName=CosmosExplorerTerminal --username test-account --password test-key --tls --tlsAllowInvalidCertificates',
       );
       expect(CommonUtils.getHostFromUrl).toHaveBeenCalledWith("https://test-mongo.documents.azure.com:443/");
 
@@ -124,7 +125,10 @@ describe("MongoShellHandler", () => {
 
   describe("getTerminalSuppressedData", () => {
     it("should return the correct warning message", () => {
-      expect(mongoShellHandler.getTerminalSuppressedData()).toBe("Warning: Non-Genuine MongoDB Detected");
+      expect(mongoShellHandler.getTerminalSuppressedData()).toEqual([
+        "Warning: Non-Genuine MongoDB Detected",
+        "Telemetry is now disabled.",
+      ]);
     });
   });
 });

src/Explorer/Tabs/CloudShellTab/ShellTypes/MongoShellHandler.tsx

@@ -1,10 +1,11 @@
 import { userContext } from "../../../../UserContext";
-import { getHostFromUrl } from "../Utils/CommonUtils";
-import { AbstractShellHandler } from "./AbstractShellHandler";
+import { filterAndCleanTerminalOutput, getHostFromUrl, getMongoShellRemoveInfoText } from "../Utils/CommonUtils";
+import { AbstractShellHandler, DISABLE_TELEMETRY_COMMAND } from "./AbstractShellHandler";
 
 export class MongoShellHandler extends AbstractShellHandler {
   private _key: string;
   private _endpoint: string | undefined;
+  private _removeInfoText: string[] = getMongoShellRemoveInfoText();
   constructor(private key: string) {
     super();
     this._key = key;
@@ -29,6 +30,8 @@ export class MongoShellHandler extends AbstractShellHandler {
       return "echo 'Database name not found.'";
     }
     return (
+      DISABLE_TELEMETRY_COMMAND +
+      " && " +
       "mongosh mongodb://" +
       getHostFromUrl(this._endpoint) +
       ":10255?appName=" +
@@ -41,7 +44,11 @@ export class MongoShellHandler extends AbstractShellHandler {
     );
   }
 
-  public getTerminalSuppressedData(): string {
-    return "Warning: Non-Genuine MongoDB Detected";
+  public getTerminalSuppressedData(): string[] {
+    return ["Warning: Non-Genuine MongoDB Detected", "Telemetry is now disabled."];
+  }
+
+  updateTerminalData(data: string): string {
+    return filterAndCleanTerminalOutput(data, this._removeInfoText);
   }
 }

src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.test.tsx

@@ -58,7 +58,7 @@ describe("PostgresShellHandler", () => {
     });
 
     it("should return empty string for terminal suppressed data", () => {
-      expect(postgresShellHandler.getTerminalSuppressedData()).toBe("");
+      expect(postgresShellHandler.getTerminalSuppressedData()).toEqual([""]);
     });
   });
 });

src/Explorer/Tabs/CloudShellTab/ShellTypes/PostgresShellHandler.tsx

@@ -57,7 +57,7 @@ export class PostgresShellHandler extends AbstractShellHandler {
     return `psql -h "${this._endpoint}" -p 5432 -d "citus" -U "${loginName}" --set=sslmode=require --set=application_name=${this.APP_NAME}`;
   }
 
-  public getTerminalSuppressedData(): string {
-    return "";
+  public getTerminalSuppressedData(): string[] {
+    return [""];
   }
 }

src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.test.tsx

@@ -45,7 +45,7 @@ describe("VCoreMongoShellHandler", () => {
 
       expect(Array.isArray(commands)).toBe(true);
       expect(commands.length).toBe(7);
-      expect(commands[1]).toContain("mongosh-2.5.0-linux-x64.tgz");
+      expect(commands[1]).toContain("mongosh-2.5.5-linux-x64.tgz");
       expect(commands[0]).toContain("mongosh not found");
     });
 
@@ -57,7 +57,10 @@ describe("VCoreMongoShellHandler", () => {
     });
 
     it("should return the correct terminal suppressed data", () => {
-      expect(vcoreMongoShellHandler.getTerminalSuppressedData()).toBe("Warning: Non-Genuine MongoDB Detected");
+      expect(vcoreMongoShellHandler.getTerminalSuppressedData()).toEqual([
+        "Warning: Non-Genuine MongoDB Detected",
+        "Telemetry is now disabled.",
+      ]);
     });
   });
 });

src/Explorer/Tabs/CloudShellTab/ShellTypes/VCoreMongoShellHandler.tsx

@@ -1,8 +1,10 @@
 import { userContext } from "../../../../UserContext";
-import { AbstractShellHandler } from "./AbstractShellHandler";
+import { filterAndCleanTerminalOutput, getMongoShellRemoveInfoText } from "../Utils/CommonUtils";
+import { AbstractShellHandler, DISABLE_TELEMETRY_COMMAND } from "./AbstractShellHandler";
 
 export class VCoreMongoShellHandler extends AbstractShellHandler {
   private _endpoint: string | undefined;
+  private _removeInfoText: string[] = getMongoShellRemoveInfoText();
 
   constructor() {
     super();
@@ -23,10 +25,17 @@ export class VCoreMongoShellHandler extends AbstractShellHandler {
     }
 
     const userName = userContext.vcoreMongoConnectionParams.adminLogin;
-    return `mongosh "mongodb+srv://${userName}:@${this._endpoint}/?authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000&appName=${this.APP_NAME}"`;
+
+    const connectionUri = `mongodb+srv://${userName}:@${this._endpoint}/?authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000&appName=${this.APP_NAME}`;
+
+    return `${DISABLE_TELEMETRY_COMMAND} && mongosh "${connectionUri}"`;
   }
 
-  public getTerminalSuppressedData(): string {
-    return "Warning: Non-Genuine MongoDB Detected";
+  public getTerminalSuppressedData(): string[] {
+    return ["Warning: Non-Genuine MongoDB Detected", "Telemetry is now disabled."];
+  }
+
+  updateTerminalData(data: string): string {
+    return filterAndCleanTerminalOutput(data, this._removeInfoText);
   }
 }

src/Explorer/Tabs/CloudShellTab/Utils/AttachAddOn.tsx

@@ -135,11 +135,17 @@ export class AttachAddon implements ITerminalAddon {
         }
 
         if (this._allowTerminalWrite) {
-          const suppressedData = this._shellHandler?.getTerminalSuppressedData();
-          const hasSuppressedData = suppressedData && suppressedData.length > 0;
+          const updatedData =
+            typeof this._shellHandler?.updateTerminalData === "function"
+              ? this._shellHandler.updateTerminalData(data)
+              : data;
 
-          if (!hasSuppressedData || !data.includes(suppressedData)) {
-            terminal.write(data);
+          const suppressedData = this._shellHandler?.getTerminalSuppressedData();
+
+          const shouldNotWrite = suppressedData.filter(Boolean).some((item) => updatedData.includes(item));
+
+          if (!shouldNotWrite) {
+            terminal.write(updatedData);
           }
         }
 

src/Explorer/Tabs/CloudShellTab/Utils/CloudShellIPUtils.ts

@@ -0,0 +1,71 @@
+import { userContext } from "../../../../UserContext";
+
+export const CLOUDSHELL_IP_RECOMMENDATIONS = {
+  centralindia: [
+    { startIP: "4.247.135.109", endIP: "4.247.135.109" },
+    { startIP: "74.225.207.63", endIP: "74.225.207.63" },
+  ],
+  southeastasia: [{ startIP: "4.194.5.74", endIP: "4.194.213.10" }],
+  centraluseuap: [
+    { startIP: "52.158.186.182", endIP: "52.158.186.182" },
+    { startIP: "172.215.26.246", endIP: "172.215.26.246" },
+    { startIP: "134.138.154.177", endIP: "134.138.154.177" },
+    { startIP: "134.138.129.52", endIP: "134.138.129.52" },
+    { startIP: "172.215.31.177", endIP: "172.215.31.177" },
+  ],
+  eastus2euap: [
+    { startIP: "135.18.43.51", endIP: "135.18.43.51" },
+    { startIP: "20.252.175.33", endIP: "20.252.175.33" },
+    { startIP: "40.89.88.111", endIP: "40.89.88.111" },
+    { startIP: "135.18.17.187", endIP: "135.18.17.187" },
+    { startIP: "135.18.67.251", endIP: "135.18.67.251" },
+  ],
+  eastus: [
+    { startIP: "40.71.199.151", endIP: "40.71.199.151" },
+    { startIP: "20.42.18.188", endIP: "20.42.18.188" },
+    { startIP: "52.190.17.9", endIP: "52.190.17.9" },
+    { startIP: "20.120.96.152", endIP: "20.120.96.152" },
+  ],
+  northeurope: [
+    { startIP: "74.234.65.146", endIP: "74.234.65.146" },
+    { startIP: "52.169.70.113", endIP: "52.169.70.113" },
+  ],
+  southcentralus: [
+    { startIP: "4.151.247.81", endIP: "4.151.247.81" },
+    { startIP: "20.225.211.35", endIP: "20.225.211.35" },
+    { startIP: "4.151.48.133", endIP: "4.151.48.133" },
+    { startIP: "4.151.247.225", endIP: "4.151.247.225" },
+  ],
+  westeurope: [
+    { startIP: "52.166.126.216", endIP: "52.166.126.216" },
+    { startIP: "108.142.162.20", endIP: "108.142.162.20" },
+    { startIP: "52.178.13.125", endIP: "52.178.13.125" },
+    { startIP: "172.201.33.160", endIP: "172.201.33.160" },
+  ],
+  westus: [
+    { startIP: "20.245.161.131", endIP: "20.245.161.131" },
+    { startIP: "57.154.182.51", endIP: "57.154.182.51" },
+    { startIP: "40.118.133.244", endIP: "40.118.133.244" },
+    { startIP: "20.253.192.12", endIP: "20.253.192.12" },
+    { startIP: "20.43.245.209", endIP: "20.43.245.209" },
+    { startIP: "20.66.22.66", endIP: "20.66.22.66" },
+  ],
+} as const;
+
+export interface CloudShellIPRange {
+  startIP: string;
+  endIP: string;
+}
+
+export function getCloudShellIPsForRegion(region: string): readonly CloudShellIPRange[] {
+  const normalizedRegion = region.toLowerCase();
+  return CLOUDSHELL_IP_RECOMMENDATIONS[normalizedRegion as keyof typeof CLOUDSHELL_IP_RECOMMENDATIONS] || [];
+}
+
+export function getClusterRegion(): string {
+  const location = userContext?.databaseAccount?.location;
+  if (location) {
+    return location.toLowerCase();
+  }
+  return "";
+}

src/Explorer/Tabs/CloudShellTab/Utils/CommonUtils.tsx

@@ -50,3 +50,34 @@ export const getShellNameForDisplay = (terminalKind: TerminalKind): string => {
       return "";
   }
 };
+
+/**
+ * Get MongoDB shell information text that should be removed from terminal output
+ */
+export const getMongoShellRemoveInfoText = (): string[] => {
+  return [
+    "For mongosh info see: https://www.mongodb.com/docs/mongodb-shell/",
+    "disableTelemetry() command",
+    "https://www.mongodb.com/legal/privacy-policy",
+  ];
+};
+
+export const filterAndCleanTerminalOutput = (data: string, removeInfoText: string[]): string => {
+  if (!data || removeInfoText.length === 0) {
+    return data;
+  }
+
+  const lines = data.split("\n");
+  const filteredLines: string[] = [];
+
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const shouldRemove = removeInfoText.some((text) => line.includes(text));
+
+    if (!shouldRemove) {
+      filteredLines.push(line);
+    }
+  }
+
+  return filteredLines.join("\n").replace(/((\r\n)|\n|\r){2,}/g, "\r\n");
+};

src/Explorer/Tabs/CloudShellTab/Utils/RegionUtils.tsx

@@ -8,6 +8,8 @@ const validCloudShellRegions = new Set([
   "centralindia",
   "southeastasia",
   "westcentralus",
+  "usgovvirginia",
+  "usgovarizona",
 ]);
 
 /**

src/Explorer/Tabs/GraphTab.tsx

@@ -45,7 +45,7 @@ export interface IGraphConfig {
 
 interface GraphTabOptions extends ViewModels.TabOptions {
   account: DatabaseAccount;
-  masterKey: string;
+  password: string;
   collectionId: string;
   databaseId: string;
   collectionPartitionKeyProperty: string;
@@ -107,7 +107,7 @@ export default class GraphTab extends TabsBase {
       graphBackendEndpoint: GraphTab.getGremlinEndpoint(options.account),
       databaseId: options.databaseId,
       collectionId: options.collectionId,
-      masterKey: options.masterKey,
+      password: options.password,
       onLoadStartKey: options.onLoadStartKey,
       onLoadStartKeyChange: (onLoadStartKey: number): void => {
         if (onLoadStartKey === undefined) {

src/Explorer/Tabs/QueryTab/QueryTabComponent.tsx

@@ -55,8 +55,6 @@ import { BrowseQueriesPane } from "../../Panes/BrowseQueriesPane/BrowseQueriesPa
 import { SaveQueryPane } from "../../Panes/SaveQueryPane/SaveQueryPane";
 import TabsBase from "../TabsBase";
 import "./QueryTabComponent.less";
-import { useQueryMetadataStore } from "./useQueryMetadataStore"; // adjust path if needed
-
 
 enum ToggleState {
   Result,
@@ -198,10 +196,7 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
       enabled: !!this.state.sqlQueryEditorContent && this.state.sqlQueryEditorContent.length > 0,
       visible: true,
     };
-      // const query=this.state.sqlQueryEditorContent;
-      // const db = this.props.collection.databaseId;
-      // const container = this.props.collection.id();
-      
+
     const isSaveQueryBtnEnabled = userContext.apiType === "SQL" || userContext.apiType === "Gremlin";
     this.saveQueryButton = {
       enabled: isSaveQueryBtnEnabled,
@@ -265,10 +260,6 @@ class QueryTabComponentImpl extends React.Component<QueryTabComponentImplProps,
   }
 
   public onExecuteQueryClick = async (): Promise<void> => {
-      const query1=this.state.sqlQueryEditorContent;
-      const db = this.props.collection.databaseId;
-      const container = this.props.collection.id();
-    useQueryMetadataStore.getState().setMetadata(query1, db, container);
     this._iterator = undefined;
 
     setTimeout(async () => {

src/Explorer/Tabs/QueryTab/ResultsView.tsx

@@ -1,7 +1,5 @@
-import { FontIcon } from "@fluentui/react";
 import {
   Button,
-  Checkbox,
   DataGrid,
   DataGridBody,
   DataGridCell,
@@ -10,36 +8,26 @@ import {
   DataGridRow,
   SelectTabData,
   SelectTabEvent,
-  Spinner,
   Tab,
   TabList,
-  Table,
-  TableBody,
-  TableCell,
   TableColumnDefinition,
-  TableHeader,
-  TableRow,
-  createTableColumn
+  createTableColumn,
 } from "@fluentui/react-components";
-import { ArrowDownloadRegular, ChevronDown20Regular, ChevronRight20Regular, CircleFilled, CopyRegular } from "@fluentui/react-icons";
-import copy from "clipboard-copy";
+import { ArrowDownloadRegular, CopyRegular } from "@fluentui/react-icons";
 import { HttpHeaders } from "Common/Constants";
 import MongoUtility from "Common/MongoUtility";
 import { QueryMetrics } from "Contracts/DataModels";
 import { EditorReact } from "Explorer/Controls/Editor/EditorReact";
 import { IDocument } from "Explorer/Tabs/QueryTab/QueryTabComponent";
 import { useQueryTabStyles } from "Explorer/Tabs/QueryTab/Styles";
-import { useQueryMetadataStore } from "Explorer/Tabs/QueryTab/useQueryMetadataStore";
-import React, { useCallback, useEffect, useState } from "react";
 import { userContext } from "UserContext";
-import { logConsoleProgress } from "Utils/NotificationConsoleUtils";
-import { client } from "../../../Common/CosmosClient";
-import { handleError } from "../../../Common/ErrorHandlingUtils";
+import copy from "clipboard-copy";
+import React, { useCallback, useState } from "react";
 import { ResultsViewProps } from "./QueryResultSection";
+
 enum ResultsTabs {
   Results = "results",
   QueryStats = "queryStats",
-  IndexAdvisor = "indexadv",
 }
 
 const ResultsTab: React.FC<ResultsViewProps> = ({ queryResults, isMongoDB, executeQueryDocumentsPage }) => {
@@ -392,8 +380,9 @@ const QueryStatsTab: React.FC<Pick<ResultsViewProps, "queryResults">> = ({ query
         },
         {
           metric: "User defined function execution time",
-          value: `${aggregatedQueryMetrics.runtimeExecutionTimes?.userDefinedFunctionExecutionTime?.toString() || 0
-            } ms`,
+          value: `${
+            aggregatedQueryMetrics.runtimeExecutionTimes?.userDefinedFunctionExecutionTime?.toString() || 0
+          } ms`,
           toolTip: "Total time spent executing user-defined functions",
         },
         {
@@ -534,394 +523,6 @@ const QueryStatsTab: React.FC<Pick<ResultsViewProps, "queryResults">> = ({ query
   );
 };
 
-interface IIndexMetric {
-  index: string;
-  impact: string;
-  section: "Included" | "Not Included" | "Header";
-}
-const IndexAdvisorTab: React.FC = () => {
-  const { userQuery, databaseId, containerId } = useQueryMetadataStore();
-  const [loading, setLoading] = useState(true);
-  const [indexMetrics, setIndexMetrics] = useState<any>(null);
-  const [showIncluded, setShowIncluded] = useState(true);
-  const [showNotIncluded, setShowNotIncluded] = useState(true);
-  const [selectedIndexes, setSelectedIndexes] = useState<any[]>([]);
-  const [selectAll, setSelectAll] = useState(false);
-  const [updateMessageShown, setUpdateMessageShown] = useState(false);
-  const [included, setIncludedIndexes] = useState<IIndexMetric[]>([]);
-  const [notIncluded, setNotIncludedIndexes] = useState<IIndexMetric[]>([]);
-
-  useEffect(() => {
-    async function fetchIndexMetrics() {
-      const clearMessage = logConsoleProgress(`Querying items with IndexMetrics in container ${containerId}`);
-      try {
-        const querySpec = {
-          query: userQuery || "SELECT TOP 10 c.id FROM c WHERE c.Item = 'value1234' ",
-        };
-        const sdkResponse = await client()
-          .database(databaseId)
-          .container(containerId)
-          .items.query(querySpec, {
-            populateIndexMetrics: true,
-          })
-          .fetchAll();
-        setIndexMetrics(sdkResponse.indexMetrics);
-      } catch (error) {
-        handleError(error, "queryItemsWithIndexMetrics", `Error querying items from ${containerId}`);
-      } finally {
-        clearMessage();
-        setLoading(false);
-      }
-    }
-    if (userQuery && databaseId && containerId) {
-      fetchIndexMetrics();
-    }
-  }, [userQuery, databaseId, containerId]);
-
-  useEffect(() => {
-    if (!indexMetrics) return;
-
-    const included: any[] = [];
-    const notIncluded: any[] = [];
-    const lines = indexMetrics.split("\n").map((line: string) => line.trim()).filter(Boolean);
-    let currentSection = "";
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i];
-      if (line.startsWith("Utilized Single Indexes") || line.startsWith("Utilized Composite Indexes")) {
-        currentSection = "included";
-      } else if (line.startsWith("Potential Single Indexes") || line.startsWith("Potential Composite Indexes")) {
-        currentSection = "notIncluded";
-      } else if (line.startsWith("Index Spec:")) {
-        const index = line.replace("Index Spec:", "").trim();
-        const impactLine = lines[i + 1];
-        const impact = impactLine?.includes("Index Impact Score:") ? impactLine.split(":")[1].trim() : "Unknown";
-
-        const isComposite = index.includes(",");
-        const indexObj: any = { index, impact };
-        if (isComposite) {
-          indexObj.composite = index.split(",").map((part: string) => {
-            const [path, order] = part.trim().split(/\s+/);
-            return {
-              path: path.trim(),
-              order: order?.toLowerCase() === "desc" ? "descending" : "ascending",
-            };
-          });
-        } else {
-          let path = "/unknown/*";
-          const pathRegex = /\/[^\/\s*?]+(?:\/[^\/\s*?]+)*(\/\*|\?)/;
-          const match = index.match(pathRegex);
-          if (match) {
-            path = match[0];
-          } else {
-            const simplePathRegex = /\/[^\/\s]+/;
-            const simpleMatch = index.match(simplePathRegex);
-            if (simpleMatch) {
-              path = simpleMatch[0] + "/*";
-            }
-          }
-          indexObj.path = path;
-        }
-
-        if (currentSection === "included") {
-          included.push(indexObj);
-        } else if (currentSection === "notIncluded") {
-          notIncluded.push(indexObj);
-        }
-      }
-    }
-    setIncludedIndexes(included);
-    setNotIncludedIndexes(notIncluded);
-  }, [indexMetrics]);
-
-  useEffect(() => {
-    const allSelected = notIncluded.length > 0 && notIncluded.every((item) => selectedIndexes.some((s) => s.index === item.index));
-    setSelectAll(allSelected);
-  }, [selectedIndexes, notIncluded]);
-
-  const handleCheckboxChange = (indexObj: any, checked: boolean) => {
-    if (checked) {
-      setSelectedIndexes((prev) => [...prev, indexObj]);
-    } else {
-      setSelectedIndexes((prev) =>
-        prev.filter((item) => item.index !== indexObj.index)
-      );
-    }
-  };
-
-  const handleSelectAll = (checked: boolean) => {
-    setSelectAll(checked);
-    setSelectedIndexes(checked ? notIncluded : []);
-  };
-
-  const handleUpdatePolicy = async () => {
-    if (selectedIndexes.length === 0) {
-      console.log("No indexes selected for update");
-      return;
-    }
-    try {
-      const { resource: containerDef } = await client()
-        .database(databaseId)
-        .container(containerId)
-        .read();
-
-      const newIncludedPaths = selectedIndexes
-        .filter(index => !index.composite)
-        .map(index => {
-
-          return {
-            path: index.path,
-          };
-        });
-
-      const newCompositeIndexes = selectedIndexes
-        .filter(index => index.composite)
-        .map(index => index.composite);
-
-      const updatedPolicy = {
-        ...containerDef.indexingPolicy,
-        includedPaths: [
-          ...(containerDef.indexingPolicy?.includedPaths || []),
-          ...newIncludedPaths,
-        ],
-        compositeIndexes: [
-          ...(containerDef.indexingPolicy?.compositeIndexes || []),
-          ...newCompositeIndexes,
-        ],
-      };
-
-      await client()
-        .database(databaseId)
-        .container(containerId)
-        .replace({
-          id: containerId,
-          partitionKey: containerDef.partitionKey,
-          indexingPolicy: updatedPolicy,
-        });
-
-      const newIncluded = [...included, ...notIncluded.filter(item =>
-        selectedIndexes.find(s => s.index === item.index)
-      )];
-      const newNotIncluded = notIncluded.filter(item =>
-        !selectedIndexes.find(s => s.index === item.index)
-      );
-
-      setSelectedIndexes([]);
-      setSelectAll(false);
-      setIndexMetricsFromParsed(newIncluded, newNotIncluded);
-      setUpdateMessageShown(true);
-    } catch (err) {
-      console.error("Failed to update indexing policy:", err);
-    }
-  };
-
-  const setIndexMetricsFromParsed = (included: { index: string; impact: string }[], notIncluded: { index: string; impact: string }[]) => {
-    const serialize = (sectionTitle: string, items: { index: string; impact: string }[], isUtilized: boolean) =>
-      items.length
-        ? `${sectionTitle}\n` +
-        items
-          .map((item) => `Index Spec: ${item.index}\nIndex Impact Score: ${item.impact}`)
-          .join("\n") + "\n"
-        : "";
-    const composedMetrics =
-      serialize("Utilized Single Indexes", included, true) +
-      serialize("Potential Single Indexes", notIncluded, false);
-
-    setIndexMetrics(composedMetrics.trim());
-  };
-
-  const renderImpactDots = (impact: string) => {
-    let count = 0;
-    if (impact === "High") count = 3;
-    else if (impact === "Medium") count = 2;
-    else if (impact === "Low") count = 1;
-
-    return (
-      <div style={{ display: "flex", alignItems: "center", gap: "4px" }}>
-        {Array.from({ length: count }).map((_, i) => (
-          <CircleFilled
-            key={i}
-            style={{
-              color: "#0078D4",
-              fontSize: "12px",
-              display: "inline-flex",
-            }}
-          />
-        ))}
-      </div>
-    );
-  };
-
-  const renderRow = (item: IIndexMetric, index: number) => {
-    const isHeader = item.section === "Header";
-    const isNotIncluded = item.section === "Not Included";
-    const isIncluded = item.section === "Included";
-
-    return (
-      <TableRow key={index}>
-        <TableCell colSpan={2}>
-          <div
-            style={{
-              display: "grid",
-              gridTemplateColumns: "30px 30px 1fr 50px 120px",
-              alignItems: "center",
-              gap: "8px",
-            }}>
-            {isNotIncluded ? (
-              <Checkbox
-                checked={selectedIndexes.some((selected) => selected.index === item.index)}
-                onChange={(_, data) => handleCheckboxChange(item, data.checked === true)}
-              />
-            ) : isHeader && item.index === "Not Included in Current Policy" && notIncluded.length > 0 ? (
-              <Checkbox
-                checked={selectAll}
-                onChange={(_, data) => handleSelectAll(data.checked === true)}
-              />
-            ) : (
-              <div style={{ width: "18px", height: "18px" }}></div>
-            )}
-            {isHeader ? (
-              <span
-                style={{ cursor: "pointer" }}
-                onClick={() => {
-                  if (item.index === "Included in Current Policy") {
-                    setShowIncluded(!showIncluded);
-                  } else if (item.index === "Not Included in Current Policy") {
-                    setShowNotIncluded(!showNotIncluded);
-                  }
-                }}
-              >
-                {item.index === "Included in Current Policy"
-                  ? showIncluded
-                    ? <ChevronDown20Regular />
-                    : <ChevronRight20Regular />
-                  : showNotIncluded
-                    ? <ChevronDown20Regular />
-                    : <ChevronRight20Regular />
-                }
-              </span>
-            ) : (
-              <div style={{ width: "24px" }}></div>
-            )}
-            <div style={{ fontWeight: isHeader ? "bold" : "normal" }}>
-              {item.index}
-            </div>
-            <div style={{ fontSize: isHeader ? 0 : undefined }}>
-              {isHeader ? null : item.impact}
-            </div>
-            <div>
-              {isHeader ? null : renderImpactDots(item.impact)}
-            </div>
-          </div>
-        </TableCell>
-      </TableRow>
-    );
-  };
-  const generateIndexMetricItems = (
-
-    included: { index: string; impact: string }[],
-    notIncluded: { index: string; impact: string }[]
-  ): IIndexMetric[] => {
-    const items: IIndexMetric[] = [];
-
-    items.push({ index: "Not Included in Current Policy", impact: "", section: "Header" });
-    if (showNotIncluded) {
-      notIncluded.forEach((item) =>
-        items.push({ ...item, section: "Not Included" })
-      );
-    }
-    items.push({ index: "Included in Current Policy", impact: "", section: "Header" });
-    if (showIncluded) {
-      included.forEach((item) =>
-        items.push({ ...item, section: "Included" })
-      );
-    }
-    return items;
-  };
-
-  if (loading) {
-    return <div>
-      <Spinner
-        size="small"
-        style={{
-          '--spinner-size': '16px',
-          '--spinner-thickness': '2px',
-          '--spinner-color': '#0078D4',
-        } as React.CSSProperties} />
-    </div>;
-  }
-
-  return (
-    <div>
-      <div style={{ padding: "1rem", fontSize: "1.2rem", display: "flex", alignItems: "center", gap: "0.5rem" }}>
-        {updateMessageShown ? (
-          <>
-            <span
-              style={{
-                width: 18,
-                height: 18,
-                borderRadius: "50%",
-                backgroundColor: "#107C10",
-                display: "flex",
-                alignItems: "center",
-                justifyContent: "center",
-              }}>
-              <FontIcon iconName="CheckMark" style={{ color: "white", fontSize: 12 }} />
-            </span>
-            <span>
-              Your indexing policy has been updated with the new included paths. You may review the changes in Scale & Settings.
-            </span>
-          </>
-        ) : (
-          "Here is an analysis on the indexes utilized for executing the query. Based on the analysis, Cosmos DB recommends adding the selected indexes to your indexing policy to optimize the performance of this particular query."
-        )}
-      </div>
-      <div style={{ padding: "1rem", fontSize: "1.3rem", fontWeight: "bold" }}>Indexes analysis</div>
-      <Table style={{ display: "block", alignItems: "center", marginBottom: "7rem" }}>
-        <TableHeader>
-          <TableRow >
-            <TableCell colSpan={2}>
-              <div
-                style={{
-                  display: "grid",
-                  gridTemplateColumns: "30px 30px 1fr 50px 120px",
-                  alignItems: "center",
-                  gap: "8px",
-                  fontWeight: "bold",
-                }}
-              >
-                <div style={{ width: "18px", height: "18px" }}></div>
-                <div style={{ width: "24px" }}></div>
-                <div>Index</div>
-                <div><span style={{ whiteSpace: "nowrap" }}>Estimated Impact</span></div>
-              </div>
-            </TableCell>
-          </TableRow>
-        </TableHeader>
-        <TableBody>
-          {generateIndexMetricItems(included, notIncluded).map(renderRow)}
-        </TableBody>
-      </Table>
-      {selectedIndexes.length > 0 && (
-        <div style={{ padding: "1rem", marginTop: "-7rem", flexWrap: "wrap" }}>
-          <button
-            onClick={handleUpdatePolicy}
-            style={{
-              backgroundColor: "#0078D4",
-              color: "white",
-              padding: "8px 16px",
-              border: "none",
-              borderRadius: "4px",
-              cursor: "pointer",
-              marginTop: "1rem",
-            }}
-          >
-            Update Indexing Policy with selected index(es)
-          </button>
-        </div>
-      )}
-    </div>
-  );
-};
 export const ResultsView: React.FC<ResultsViewProps> = ({ isMongoDB, queryResults, executeQueryDocumentsPage }) => {
   const styles = useQueryTabStyles();
   const [activeTab, setActiveTab] = useState<ResultsTabs>(ResultsTabs.Results);
@@ -947,13 +548,6 @@ export const ResultsView: React.FC<ResultsViewProps> = ({ isMongoDB, queryResult
         >
           Query Stats
         </Tab>
-        <Tab
-          data-test="QueryTab/ResultsPane/ResultsView/IndexAdvisorTab"
-          id={ResultsTabs.IndexAdvisor}
-          value={ResultsTabs.IndexAdvisor}
-        >
-          Index Advisor
-        </Tab>
       </TabList>
       <div className={styles.queryResultsTabContentContainer}>
         {activeTab === ResultsTabs.Results && (
@@ -964,7 +558,6 @@ export const ResultsView: React.FC<ResultsViewProps> = ({ isMongoDB, queryResult
           />
         )}
         {activeTab === ResultsTabs.QueryStats && <QueryStatsTab queryResults={queryResults} />}
-        {activeTab === ResultsTabs.IndexAdvisor && <IndexAdvisorTab />}
       </div>
     </div>
   );

src/Explorer/Tabs/QueryTab/useQueryMetadataStore.ts

@@ -1,16 +0,0 @@
-import create from "zustand";
-
-interface QueryMetadataStore {
-  userQuery: string;
-  databaseId: string;
-  containerId: string;
-  setMetadata: (query1: string, db: string, container: string) => void;
-}
-
-export const useQueryMetadataStore = create<QueryMetadataStore>((set) => ({
-  userQuery: "",
-  databaseId: "",
-  containerId: "",
-  setMetadata: (query1, db, container) =>
-    set({ userQuery: query1, databaseId: db, containerId: container }),
-}));

src/Explorer/Tabs/Shared/CloudShellIPChecker.ts

@@ -0,0 +1,78 @@
+import { configContext } from "ConfigContext";
+import * as DataModels from "Contracts/DataModels";
+import { userContext } from "UserContext";
+import { armRequest } from "Utils/arm/request";
+import {
+  CloudShellIPRange,
+  getCloudShellIPsForRegion,
+  getClusterRegion,
+} from "../CloudShellTab/Utils/CloudShellIPUtils";
+import { getNormalizedRegion } from "../CloudShellTab/Utils/RegionUtils";
+
+// Constants
+const DEFAULT_CLOUDSHELL_REGION = "westus";
+
+/**
+ * Check if user has added all CloudShell IPs for their normalized region
+ * @param apiVersion - The API version to use for the ARM request
+ * @returns Promise<boolean> - true if all CloudShell IPs are configured (don't show screenshot), false if missing (show screenshot)
+ */
+export async function checkCloudShellIPsConfigured(apiVersion: string): Promise<boolean> {
+  const clusterRegion = getClusterRegion();
+
+  if (!clusterRegion) {
+    return false;
+  }
+
+  const normalizedRegion = getNormalizedRegion(clusterRegion, DEFAULT_CLOUDSHELL_REGION);
+  const cloudShellIPs = getCloudShellIPsForRegion(normalizedRegion);
+
+  if (cloudShellIPs.length === 0) {
+    return false;
+  }
+
+  const firewallRulesUri = `${userContext.databaseAccount.id}/firewallRules`;
+  const response: any = await armRequest({
+    host: configContext.ARM_ENDPOINT,
+    path: firewallRulesUri,
+    method: "GET",
+    apiVersion: apiVersion,
+  });
+
+  const firewallRules: DataModels.FirewallRule[] = response?.data?.value || response?.value || [];
+
+  const missingIPs: Array<{ startIP: string; endIP: string; reason?: string }> = [];
+  const foundIPs: Array<{ startIP: string; endIP: string; ruleName?: string }> = [];
+
+  for (const cloudShellIP of cloudShellIPs) {
+    const matchingRule = firewallRules.find((rule) => {
+      const startMatch = rule.properties.startIpAddress === cloudShellIP.startIP;
+      const endMatch = rule.properties.endIpAddress === cloudShellIP.endIP;
+      return startMatch && endMatch;
+    });
+
+    if (matchingRule) {
+      foundIPs.push({ ...cloudShellIP, ruleName: matchingRule.name });
+    } else {
+      missingIPs.push({ ...cloudShellIP, reason: "No exact IP match in firewall rules" });
+    }
+  }
+
+  const allConfigured = missingIPs.length === 0;
+  return allConfigured;
+}
+
+/**
+ * Get the normalized region and its CloudShell IPs for display in the guide
+ * @returns Object with region and IPs for the guide
+ */
+export function getCloudShellGuideInfo(): { region: string; cloudShellIPs: readonly CloudShellIPRange[] } {
+  const clusterRegion = getClusterRegion();
+  const normalizedRegion = getNormalizedRegion(clusterRegion || "", DEFAULT_CLOUDSHELL_REGION);
+  const cloudShellIPs = getCloudShellIPsForRegion(normalizedRegion);
+
+  return {
+    region: normalizedRegion,
+    cloudShellIPs: cloudShellIPs,
+  };
+}

src/Explorer/Tabs/ShellAdapters/BaseTerminalComponentAdapter.tsx

@@ -22,10 +22,22 @@ export abstract class BaseTerminalComponentAdapter implements ReactAdapter {
     protected getUsername: () => string,
     protected isAllPublicIPAddressesEnabled: ko.Observable<boolean>,
     protected kind: ViewModels.TerminalKind,
-  ) {}
+    protected isCloudShellIPsConfigured?: ko.Observable<boolean>,
+  ) { }
 
   public renderComponent(): JSX.Element {
-    if (!this.isAllPublicIPAddressesEnabled()) {
+    const publicIPEnabled = this.isAllPublicIPAddressesEnabled();
+    const cloudShellConfigured = this.isCloudShellIPsConfigured ? this.isCloudShellIPsConfigured() : true;
+    let shouldShowScreenshot: boolean;
+
+    if (this.isCloudShellIPsConfigured) {
+      shouldShowScreenshot = !cloudShellConfigured;
+
+    } else {
+      shouldShowScreenshot = !publicIPEnabled;
+    }
+
+    if (shouldShowScreenshot) {
       return (
         <QuickstartFirewallNotification
           messageType={this.getMessageType()}

src/Explorer/Tabs/TerminalTab.tsx

@@ -1,4 +1,5 @@
 import { checkFirewallRules } from "Explorer/Tabs/Shared/CheckFirewallRules";
+import { checkCloudShellIPsConfigured } from "Explorer/Tabs/Shared/CloudShellIPChecker";
 import { CloudShellTerminalComponentAdapter } from "Explorer/Tabs/ShellAdapters/CloudShellTerminalComponentAdapter";
 import * as ko from "knockout";
 import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
@@ -23,11 +24,13 @@ export default class TerminalTab extends TabsBase {
   private container: Explorer;
   private notebookTerminalComponentAdapter: ReactAdapter;
   private isAllPublicIPAddressesEnabled: ko.Observable<boolean>;
+  private isCloudShellIPsConfigured: ko.Observable<boolean>;
 
   constructor(options: TerminalTabOptions) {
     super(options);
     this.container = options.container;
     this.isAllPublicIPAddressesEnabled = ko.observable(true);
+    this.isCloudShellIPsConfigured = ko.observable(true); // Start optimistic, will be updated
 
     const commonArgs: [
       () => DataModels.DatabaseAccount,
@@ -36,18 +39,33 @@ export default class TerminalTab extends TabsBase {
       ko.Observable<boolean>,
       ViewModels.TerminalKind,
     ] = [
-      () => userContext?.databaseAccount,
-      () => this.tabId,
-      () => this.getUsername(),
-      this.isAllPublicIPAddressesEnabled,
-      options.kind,
-    ];
+        () => userContext?.databaseAccount,
+        () => this.tabId,
+        () => this.getUsername(),
+        this.isAllPublicIPAddressesEnabled,
+        options.kind,
+      ];
 
     if (userContext.features.enableCloudShell) {
-      this.notebookTerminalComponentAdapter = new CloudShellTerminalComponentAdapter(...commonArgs);
+      this.notebookTerminalComponentAdapter = new CloudShellTerminalComponentAdapter(
+        () => userContext?.databaseAccount,
+        () => this.tabId,
+        () => this.getUsername(),
+        this.isAllPublicIPAddressesEnabled,
+        options.kind,
+        this.isCloudShellIPsConfigured,
+      );
 
       this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
-        return this.isTemplateReady() && this.isAllPublicIPAddressesEnabled();
+        const cloudShellConfigured = this.isCloudShellIPsConfigured();
+        return this.isTemplateReady() && cloudShellConfigured;
+      });
+
+      checkCloudShellIPsConfigured("2023-03-01-preview").then(result => {
+        this.isCloudShellIPsConfigured(result);
+      }).catch(error => {
+        console.error(`CloudShell IP Check failed for ${ViewModels.TerminalKind[options.kind]} terminal:`, error);
+        this.isCloudShellIPsConfigured(false);
       });
     } else {
       this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
@@ -65,22 +83,25 @@ export default class TerminalTab extends TabsBase {
       });
     }
 
-    if (options.kind === ViewModels.TerminalKind.Postgres) {
-      checkFirewallRules(
-        "2022-11-08",
-        (rule) => rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255",
-        this.isAllPublicIPAddressesEnabled,
-      );
-    }
+    // Only run legacy firewall checks for NON-CloudShell terminals cloudShell terminals use the CloudShell IP checker instead
+    if (!userContext.features.enableCloudShell) {
+      if (options.kind === ViewModels.TerminalKind.Postgres) {
+        checkFirewallRules(
+          "2022-11-08",
+          (rule) => rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255",
+          this.isAllPublicIPAddressesEnabled,
+        );
+      }
 
-    if (options.kind === ViewModels.TerminalKind.VCoreMongo) {
-      checkFirewallRules(
-        "2023-03-01-preview",
-        (rule) =>
-          rule.name.startsWith("AllowAllAzureServicesAndResourcesWithinAzureIps") ||
-          (rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255"),
-        this.isAllPublicIPAddressesEnabled,
-      );
+      if (options.kind === ViewModels.TerminalKind.VCoreMongo) {
+        checkFirewallRules(
+          "2023-03-01-preview",
+          (rule) =>
+            rule.name.startsWith("AllowAllAzureServicesAndResourcesWithinAzureIps") ||
+            (rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255"),
+          this.isAllPublicIPAddressesEnabled,
+        );
+      }
     }
   }
 

src/Explorer/Tree/Collection.ts

@@ -8,6 +8,7 @@ import {
 import { useNotebook } from "Explorer/Notebook/useNotebook";
 import { DocumentsTabV2 } from "Explorer/Tabs/DocumentsTabV2/DocumentsTabV2";
 import { isFabricMirrored } from "Platform/Fabric/FabricUtil";
+import { useDataplaneRbacAuthorization } from "Utils/AuthorizationUtils";
 import * as ko from "knockout";
 import * as _ from "underscore";
 import * as Constants from "../../Common/Constants";
@@ -479,9 +480,8 @@ export default class Collection implements ViewModels.Collection {
         node: this,
         title: title,
         tabPath: "",
-
+        password: useDataplaneRbacAuthorization(userContext) ? userContext.aadToken : userContext.masterKey || "",
         collection: this,
-        masterKey: userContext.masterKey || "",
         collectionPartitionKeyProperty: this.partitionKeyProperties?.[0],
         collectionId: this.id(),
         databaseId: this.databaseId,
@@ -737,7 +737,7 @@ export default class Collection implements ViewModels.Collection {
       title: title,
       tabPath: "",
       collection: this,
-      masterKey: userContext.masterKey || "",
+      password: useDataplaneRbacAuthorization(userContext) ? userContext.aadToken : userContext.masterKey || "",
       collectionPartitionKeyProperty: this.partitionKeyProperties?.[0],
       collectionId: this.id(),
       databaseId: this.databaseId,

src/Explorer/Tree/__snapshots__/treeNodeUtil.test.ts.snap

@@ -8,6 +8,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Ca
         "children": [
           {
             "contextMenu": [
+              {
+                "iconSrc": {},
+                "label": "Open Cassandra Shell",
+                "onClick": [Function],
+              },
               {
                 "iconSrc": {},
                 "label": "Delete Table",
@@ -23,6 +28,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Ca
         ],
         "className": "collectionNode",
         "contextMenu": [
+          {
+            "iconSrc": {},
+            "label": "Open Cassandra Shell",
+            "onClick": [Function],
+          },
           {
             "iconSrc": {},
             "label": "Delete Table",
@@ -45,6 +55,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Ca
         "children": [
           {
             "contextMenu": [
+              {
+                "iconSrc": {},
+                "label": "Open Cassandra Shell",
+                "onClick": [Function],
+              },
               {
                 "iconSrc": {},
                 "label": "Delete Table",
@@ -65,6 +80,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Ca
         ],
         "className": "collectionNode",
         "contextMenu": [
+          {
+            "iconSrc": {},
+            "label": "Open Cassandra Shell",
+            "onClick": [Function],
+          },
           {
             "iconSrc": {},
             "label": "Delete Table",
@@ -123,6 +143,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Ca
         "children": [
           {
             "contextMenu": [
+              {
+                "iconSrc": {},
+                "label": "Open Cassandra Shell",
+                "onClick": [Function],
+              },
               {
                 "iconSrc": {},
                 "label": "Delete Table",
@@ -138,6 +163,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Ca
         ],
         "className": "collectionNode",
         "contextMenu": [
+          {
+            "iconSrc": {},
+            "label": "Open Cassandra Shell",
+            "onClick": [Function],
+          },
           {
             "iconSrc": {},
             "label": "Delete Table",
@@ -187,6 +217,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Ca
         "children": [
           {
             "contextMenu": [
+              {
+                "iconSrc": {},
+                "label": "Open Cassandra Shell",
+                "onClick": [Function],
+              },
               {
                 "iconSrc": {},
                 "label": "Delete Table",
@@ -257,6 +292,11 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Ca
         ],
         "className": "collectionNode",
         "contextMenu": [
+          {
+            "iconSrc": {},
+            "label": "Open Cassandra Shell",
+            "onClick": [Function],
+          },
           {
             "iconSrc": {},
             "label": "Delete Table",
@@ -323,7 +363,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
               },
               {
                 "iconSrc": {},
-                "label": "New Shell",
+                "label": "Open Mongo Shell",
                 "onClick": [Function],
               },
               {
@@ -354,7 +394,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
           },
           {
             "iconSrc": {},
-            "label": "New Shell",
+            "label": "Open Mongo Shell",
             "onClick": [Function],
           },
           {
@@ -386,7 +426,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
               },
               {
                 "iconSrc": {},
-                "label": "New Shell",
+                "label": "Open Mongo Shell",
                 "onClick": [Function],
               },
               {
@@ -422,7 +462,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
           },
           {
             "iconSrc": {},
-            "label": "New Shell",
+            "label": "Open Mongo Shell",
             "onClick": [Function],
           },
           {
@@ -490,7 +530,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
               },
               {
                 "iconSrc": {},
-                "label": "New Shell",
+                "label": "Open Mongo Shell",
                 "onClick": [Function],
               },
               {
@@ -521,7 +561,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
           },
           {
             "iconSrc": {},
-            "label": "New Shell",
+            "label": "Open Mongo Shell",
             "onClick": [Function],
           },
           {
@@ -580,7 +620,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
               },
               {
                 "iconSrc": {},
-                "label": "New Shell",
+                "label": "Open Mongo Shell",
                 "onClick": [Function],
               },
               {
@@ -666,7 +706,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
           },
           {
             "iconSrc": {},
-            "label": "New Shell",
+            "label": "Open Mongo Shell",
             "onClick": [Function],
           },
           {

src/HostedExplorer.tsx

@@ -34,7 +34,8 @@ const App: React.FunctionComponent = () => {
   const [isOpen, { setTrue: openPanel, setFalse: dismissPanel }] = useBoolean(false);
   const config = useConfig();
   const { isLoggedIn, armToken, graphToken, account, tenantId, logout, login, switchTenant, authFailure } =
-    useAADAuth();
+    useAADAuth(config);
+
   const [databaseAccount, setDatabaseAccount] = React.useState<DatabaseAccount>();
   const [authType, setAuthType] = React.useState<AuthType>(encryptedToken ? AuthType.EncryptedToken : undefined);
   const [connectionString, setConnectionString] = React.useState<string>();

src/Phoenix/PhoenixClient.ts

@@ -252,7 +252,7 @@ export class PhoenixClient {
 
   private getPhoenixControlPlanePathPrefix(): string {
     if (!this.armResourceId) {
-      throw new Error("The Phoenix client was not initialized properly: missing ARM resourcce id");
+      throw new Error("The Phoenix client was not initialized properly: missing ARM resource id");
     }
 
     const toolsEndpoint =

src/Platform/Hosted/extractFeatures.ts

@@ -111,7 +111,7 @@ export function extractFeatures(given = new URLSearchParams(window.location.sear
     copilotChatFixedMonacoEditorHeight: "true" === get("copilotchatfixedmonacoeditorheight"),
     enablePriorityBasedExecution: "true" === get("enableprioritybasedexecution"),
     disableConnectionStringLogin: "true" === get("disableconnectionstringlogin"),
-    enableCloudShell: "true" === get("enablecloudshell"),
+    enableCloudShell: true,
   };
 }
 

src/SelfServe/SqlX/SqlX.rp.ts

@@ -269,7 +269,7 @@ export const getOfferingIds = async (regions: Array<RegionItem>): Promise<Offeri
         host: configContext.CATALOG_ENDPOINT,
         path: getOfferingIdPathForRegion(),
         method: "GET",
-        apiVersion: "2023-05-01-preview",
+        apiVersion: configContext.CATALOG_API_VERSION,
         queryParams: {
           filter:
             "armRegionName eq '" +

src/Utils/APITypeUtils.ts

@@ -91,5 +91,5 @@ export const getItemName = (): string => {
 };
 
 export const isDataplaneRbacSupported = (apiType: string): boolean => {
-  return apiType === "SQL" || apiType === "Tables";
+  return apiType === "SQL" || apiType === "Tables" || apiType === "Gremlin";
 };

src/Utils/AuthorizationUtils.test.ts

@@ -1,10 +1,51 @@
 import { AuthType } from "../AuthType";
 import * as Constants from "../Common/Constants";
-import { updateUserContext } from "../UserContext";
+import { ApiType, updateUserContext, userContext } from "../UserContext";
 import * as AuthorizationUtils from "./AuthorizationUtils";
 jest.mock("../Explorer/Explorer");
 
 describe("AuthorizationUtils", () => {
+  const setAadDataPlane = (enabled: boolean) => {
+    updateUserContext({
+      features: {
+        enableAadDataPlane: enabled,
+        canExceedMaximumValue: false,
+        cosmosdb: false,
+        enableChangeFeedPolicy: false,
+        enableFixedCollectionWithSharedThroughput: false,
+        enableKOPanel: false,
+        enableNotebooks: false,
+        enableReactPane: false,
+        enableRightPanelV2: false,
+        enableSchema: false,
+        enableSDKoperations: false,
+        enableSpark: false,
+        enableTtl: false,
+        executeSproc: false,
+        enableResourceGraph: false,
+        enableKoResourceTree: false,
+        enableThroughputBuckets: false,
+        hostedDataExplorer: false,
+        sandboxNotebookOutputs: false,
+        showMinRUSurvey: false,
+        ttl90Days: false,
+        enableThroughputCap: false,
+        enableHierarchicalKeys: false,
+        enableCopilot: false,
+        disableCopilotPhoenixGateaway: false,
+        enableCopilotFullSchema: false,
+        copilotChatFixedMonacoEditorHeight: false,
+        enablePriorityBasedExecution: false,
+        disableConnectionStringLogin: false,
+        enableCloudShell: false,
+        autoscaleDefault: false,
+        partitionKeyDefault: false,
+        partitionKeyDefault2: false,
+        notebooksDownBanner: false,
+      },
+    });
+  };
+
   describe("getAuthorizationHeader()", () => {
     it("should return authorization header if authentication type is AAD", () => {
       updateUserContext({
@@ -54,4 +95,41 @@ describe("AuthorizationUtils", () => {
       ).toBeDefined();
     });
   });
+
+  describe("useDataplaneRbacAuthorization()", () => {
+    it("should return true if enableAadDataPlane feature flag is set", () => {
+      setAadDataPlane(true);
+      expect(AuthorizationUtils.useDataplaneRbacAuthorization(userContext)).toBe(true);
+    });
+
+    it("should return true if dataPlaneRbacEnabled is set to true and API supports RBAC", () => {
+      setAadDataPlane(false);
+      ["SQL", "Tables", "Gremlin"].forEach((type) => {
+        updateUserContext({
+          dataPlaneRbacEnabled: true,
+          apiType: type as ApiType,
+        });
+        expect(AuthorizationUtils.useDataplaneRbacAuthorization(userContext)).toBe(true);
+      });
+    });
+
+    it("should return false if dataPlaneRbacEnabled is set to true and API does not support RBAC", () => {
+      setAadDataPlane(false);
+      ["Mongo", "Cassandra", "Postgres", "VCoreMongo"].forEach((type) => {
+        updateUserContext({
+          dataPlaneRbacEnabled: true,
+          apiType: type as ApiType,
+        });
+        expect(AuthorizationUtils.useDataplaneRbacAuthorization(userContext)).toBe(false);
+      });
+    });
+
+    it("should return false if dataPlaneRbacEnabled is set to false", () => {
+      setAadDataPlane(false);
+      updateUserContext({
+        dataPlaneRbacEnabled: false,
+      });
+      expect(AuthorizationUtils.useDataplaneRbacAuthorization(userContext)).toBe(false);
+    });
+  });
 });

src/Utils/AuthorizationUtils.ts

@@ -1,5 +1,6 @@
 import * as msal from "@azure/msal-browser";
 import { Action, ActionModifiers } from "Shared/Telemetry/TelemetryConstants";
+import { isDataplaneRbacSupported } from "Utils/APITypeUtils";
 import { AuthType } from "../AuthType";
 import * as Constants from "../Common/Constants";
 import * as Logger from "../Common/Logger";
@@ -7,7 +8,7 @@ import { configContext } from "../ConfigContext";
 import { DatabaseAccount } from "../Contracts/DataModels";
 import * as ViewModels from "../Contracts/ViewModels";
 import { trace, traceFailure } from "../Shared/Telemetry/TelemetryProcessor";
-import { userContext } from "../UserContext";
+import { UserContext, userContext } from "../UserContext";
 
 export function getAuthorizationHeader(): ViewModels.AuthorizationTokenHeaderMetadata {
   if (userContext.authType === AuthType.EncryptedToken) {
@@ -179,3 +180,10 @@ export async function acquireTokenWithMsal(
     }
   }
 }
+
+export function useDataplaneRbacAuthorization(userContext: UserContext): boolean {
+  return (
+    userContext.features.enableAadDataPlane ||
+    (userContext.dataPlaneRbacEnabled && isDataplaneRbacSupported(userContext.apiType))
+  );
+}

src/Utils/AutoPilotUtils.ts

@@ -1,6 +1,7 @@
 export const autoPilotThroughput1K = 1000;
 export const autoPilotIncrementStep = 1000;
 export const autoPilotThroughput4K = 4000;
+export const autoPilotThroughput5K = 5000;
 export const autoPilotThroughput10K = 10000;
 
 export function isValidAutoPilotThroughput(maxThroughput: number): boolean {

src/Utils/CapabilityUtils.ts

@@ -1,3 +1,4 @@
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import * as Constants from "../Common/Constants";
 import { userContext } from "../UserContext";
 
@@ -18,5 +19,8 @@ export const isServerlessAccount = (): boolean => {
 };
 
 export const isVectorSearchEnabled = (): boolean => {
-  return userContext.apiType === "SQL" && isCapabilityEnabled(Constants.CapabilityNames.EnableNoSQLVectorSearch);
+  return (
+    userContext.apiType === "SQL" &&
+    (isCapabilityEnabled(Constants.CapabilityNames.EnableNoSQLVectorSearch) || isFabricNative())
+  );
 };

src/Utils/EndpointUtils.ts

@@ -45,32 +45,25 @@ export const defaultAllowedArmEndpoints: ReadonlyArray<string> = [
   "https://management.chinacloudapi.cn",
 ];
 
-export const allowedAadEndpoints: ReadonlyArray<string> = [
+export const defaultAllowedAadEndpoints: ReadonlyArray<string> = [
   "https://login.microsoftonline.com/",
   "https://login.microsoftonline.us/",
   "https://login.partner.microsoftonline.cn/",
 ];
 
+export const defaultAllowedGraphEndpoints: ReadonlyArray<string> = ["https://graph.microsoft.com"];
+
 export const defaultAllowedBackendEndpoints: ReadonlyArray<string> = [
-  "https://localhost:12901",
   "https://localhost:1234",
+  PortalBackendEndpoints.Development,
+  PortalBackendEndpoints.Mpac,
+  PortalBackendEndpoints.Prod,
+  PortalBackendEndpoints.Fairfax,
+  PortalBackendEndpoints.Mooncake,
 ];
 
-export const PortalBackendOutboundIPs: { [key: string]: string[] } = {
-  [PortalBackendEndpoints.Mpac]: ["13.91.105.215", "4.210.172.107"],
-  [PortalBackendEndpoints.Prod]: ["13.88.56.148", "40.91.218.243"],
-  [PortalBackendEndpoints.Fairfax]: ["52.247.163.6", "52.244.134.181"],
-  [PortalBackendEndpoints.Mooncake]: ["163.228.137.6", "143.64.170.142"],
-};
-
-export const MongoProxyOutboundIPs: { [key: string]: string[] } = {
-  [MongoProxyEndpoints.Mpac]: ["20.245.81.54", "40.118.23.126"],
-  [MongoProxyEndpoints.Prod]: ["40.80.152.199", "13.95.130.121"],
-  [MongoProxyEndpoints.Fairfax]: ["52.244.176.112", "52.247.148.42"],
-  [MongoProxyEndpoints.Mooncake]: ["52.131.240.99", "143.64.61.130"],
-};
-
 export const defaultAllowedMongoProxyEndpoints: ReadonlyArray<string> = [
+  "https://localhost:1234",
   MongoProxyEndpoints.Development,
   MongoProxyEndpoints.Mpac,
   MongoProxyEndpoints.Prod,
@@ -86,19 +79,8 @@ export const defaultAllowedCassandraProxyEndpoints: ReadonlyArray<string> = [
   CassandraProxyEndpoints.Mooncake,
 ];
 
-export const CassandraProxyOutboundIPs: { [key: string]: string[] } = {
-  [CassandraProxyEndpoints.Mpac]: ["40.113.96.14", "104.42.11.145"],
-  [CassandraProxyEndpoints.Prod]: ["137.117.230.240", "168.61.72.237"],
-  [CassandraProxyEndpoints.Fairfax]: ["52.244.50.101", "52.227.165.24"],
-  [CassandraProxyEndpoints.Mooncake]: ["40.73.99.146", "143.64.62.47"],
-};
-
 export const allowedEmulatorEndpoints: ReadonlyArray<string> = ["https://localhost:8081"];
 
-export const allowedMongoBackendEndpoints: ReadonlyArray<string> = ["https://localhost:1234"];
-
-export const allowedGraphEndpoints: ReadonlyArray<string> = ["https://graph.microsoft.com"];
-
 export const allowedArcadiaEndpoints: ReadonlyArray<string> = ["https://workspaceartifacts.projectarcadia.net"];
 
 export const allowedHostedExplorerEndpoints: ReadonlyArray<string> = ["https://cosmos.azure.com/"];

src/Utils/arm/generatedClients/cosmos/cassandraResources.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Lists the Cassandra keyspaces under an existing Azure Cosmos DB database account. */
 export async function listCassandraKeyspaces(

src/Utils/arm/generatedClients/cosmos/collection.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given database account and collection. */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/collectionPartition.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given collection, split by partition. */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/collectionPartitionRegion.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given collection and region, split by partition. */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/collectionRegion.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given database account, collection and region. */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/database.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given database account and database. */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/databaseAccountRegion.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given database account and region. */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/databaseAccounts.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the properties of an existing Azure Cosmos DB database account. */
 export async function get(

src/Utils/arm/generatedClients/cosmos/graphResources.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Lists the graphs under an existing Azure Cosmos DB database account. */
 export async function listGraphs(

src/Utils/arm/generatedClients/cosmos/gremlinResources.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Lists the Gremlin databases under an existing Azure Cosmos DB database account. */
 export async function listGremlinDatabases(

src/Utils/arm/generatedClients/cosmos/locations.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* List Cosmos DB locations and their properties */
 export async function list(subscriptionId: string): Promise<Types.LocationListResult | Types.CloudError> {

src/Utils/arm/generatedClients/cosmos/mongoDBResources.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Lists the MongoDB databases under an existing Azure Cosmos DB database account. */
 export async function listMongoDBDatabases(

src/Utils/arm/generatedClients/cosmos/operations.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Lists all of the available Cosmos DB Resource Provider operations. */
 export async function list(): Promise<Types.OperationListResult> {

src/Utils/arm/generatedClients/cosmos/partitionKeyRangeId.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given partition key range id. */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/partitionKeyRangeIdRegion.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given partition key range id and region. */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/percentile.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given database account. This url is only for PBS and Replication Latency data */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/percentileSourceTarget.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given account, source and target region. This url is only for PBS and Replication Latency data */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/percentileTarget.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Retrieves the metrics determined by the given filter for the given account target region. This url is only for PBS and Replication Latency data */
 export async function listMetrics(

src/Utils/arm/generatedClients/cosmos/sqlResources.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Lists the SQL databases under an existing Azure Cosmos DB database account. */
 export async function listSqlDatabases(

src/Utils/arm/generatedClients/cosmos/tableResources.ts

@@ -3,13 +3,13 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
-import { configContext } from "../../../../ConfigContext";
 import { armRequest } from "../../request";
 import * as Types from "./types";
-const apiVersion = "2024-12-01-preview";
+import { configContext } from "../../../../ConfigContext";
+const apiVersion = "2025-05-01-preview";
 
 /* Lists the Tables under an existing Azure Cosmos DB database account. */
 export async function listTables(

src/Utils/arm/generatedClients/cosmos/types.ts

@@ -3,7 +3,7 @@
   Run "npm run generateARMClients" to regenerate
   Edting this file directly should be done with extreme caution as not to diverge from ARM REST specs
 
-  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2024-12-01-preview/cosmos-db.json
+  Generated from: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/main/specification/cosmos-db/resource-manager/Microsoft.DocumentDB/preview/2025-05-01-preview/cosmos-db.json
 */
 
 /* The List operation response, that contains the client encryption keys and their properties. */
@@ -580,6 +580,8 @@ export interface DatabaseAccountGetProperties {
 
   /* Flag to indicate enabling/disabling of Per-Region Per-partition autoscale Preview feature on the account */
   enablePerRegionPerPartitionAutoscale?: boolean;
+  /* Flag to indicate if All Versions and Deletes Change feed feature is enabled on the account */
+  enableAllVersionsAndDeletesChangeFeed?: boolean;
 }
 
 /* Properties to create and update Azure Cosmos DB database accounts. */
@@ -682,6 +684,8 @@ export interface DatabaseAccountCreateUpdateProperties {
 
   /* Flag to indicate enabling/disabling of Per-Region Per-partition autoscale Preview feature on the account */
   enablePerRegionPerPartitionAutoscale?: boolean;
+  /* Flag to indicate if All Versions and Deletes Change feed feature is enabled on the account */
+  enableAllVersionsAndDeletesChangeFeed?: boolean;
 }
 
 /* Parameters to create and update Cosmos DB database accounts. */
@@ -787,6 +791,8 @@ export interface DatabaseAccountUpdateProperties {
 
   /* Flag to indicate enabling/disabling of Per-Region Per-partition autoscale Preview feature on the account */
   enablePerRegionPerPartitionAutoscale?: boolean;
+  /* Flag to indicate if All Versions and Deletes Change feed feature is enabled on the account */
+  enableAllVersionsAndDeletesChangeFeed?: boolean;
 }
 
 /* Parameters for patching Azure Cosmos DB database account properties. */
@@ -1216,6 +1222,8 @@ export interface PhysicalPartitionThroughputInfoResource {
   id: string;
   /* Throughput of a physical partition */
   throughput?: number;
+  /* Target throughput of a physical partition */
+  targetThroughput?: number;
 }
 
 /* Cosmos DB client encryption key resource object. */
@@ -1285,12 +1293,16 @@ export interface SqlContainerResource {
   /* The configuration for defining Materialized Views. This must be specified only for creating a Materialized View container. */
   materializedViewDefinition?: MaterializedViewDefinition;
 
+  /* Materialized Views defined on the container. */
+  materializedViews?: MaterializedViewDetails[];
+
   /* List of computed properties */
   computedProperties?: ComputedProperty[];
 
   /* The vector embedding policy for the container. */
   vectorEmbeddingPolicy?: VectorEmbeddingPolicy;
 
+  /* The FullText policy for the container. */
   fullTextPolicy?: FullTextPolicy;
 }
 
@@ -1323,6 +1335,14 @@ export interface VectorEmbeddingPolicy {
   vectorEmbeddings?: VectorEmbedding[];
 }
 
+/* Cosmos DB FullText Policy */
+export interface FullTextPolicy {
+  /* The default language for a full text paths. */
+  defaultLanguage?: string;
+  /* List of FullText Paths */
+  fullTextPaths?: FullTextPath[];
+}
+
 /* undocumented */
 export interface ExcludedPath {
   /* The path for which the indexing behavior applies to. Index paths typically start with root and end with wildcard (/path/*) */
@@ -1361,7 +1381,7 @@ export interface VectorEmbedding {
   /* The path to the vector field in the document. */
   path: string;
   /* Indicates the data type of vector. */
-  dataType: "float16" | "float32" | "uint8" | "int8";
+  dataType: "float32" | "uint8" | "int8";
 
   /* The distance function to use for distance calculation in between vectors. */
   distanceFunction: "euclidean" | "cosine" | "dotproduct";
@@ -1370,26 +1390,12 @@ export interface VectorEmbedding {
   dimensions: number;
 }
 
-export interface FullTextPolicy {
-  /**
-   * The default language for the full text .
-   */
-  defaultLanguage: string;
-  /**
-   * The paths to be indexed for full text search.
-   */
-  fullTextPaths: FullTextPath[];
-}
-
+/* Represents the full text path specification. */
 export interface FullTextPath {
-  /**
-   * The path to be indexed for full text search.
-   */
+  /* The path to the full text field in the document. */
   path: string;
-  /**
-   * The language for the full text path.
-   */
-  language: string;
+  /* The language of the full text field in the document. */
+  language?: string;
 }
 
 /* List of composite path */
@@ -1493,6 +1499,14 @@ export interface MaterializedViewDefinition {
   definition: string;
 }
 
+/* MaterializedViewDetails, contains Id & _rid fields of materialized view. */
+export interface MaterializedViewDetails {
+  /* Id field of Materialized container. */
+  id?: string;
+  /* _rid field of Materialized container. */
+  _rid?: string;
+}
+
 /* Cosmos DB SQL storedProcedure resource object */
 export interface SqlStoredProcedureResource {
   /* Name of the Cosmos DB SQL storedProcedure */

src/hooks/useAADAuth.ts

@@ -1,12 +1,9 @@
 import * as msal from "@azure/msal-browser";
 import { useBoolean } from "@fluentui/react-hooks";
 import * as React from "react";
-import { configContext } from "../ConfigContext";
+import { ConfigContext } from "../ConfigContext";
 import { acquireTokenWithMsal, getMsalInstance } from "../Utils/AuthorizationUtils";
 
-const msalInstance = await getMsalInstance();
-
-const cachedAccount = msalInstance.getAllAccounts()?.[0];
 const cachedTenantId = localStorage.getItem("cachedTenantId");
 
 interface ReturnType {
@@ -27,57 +24,97 @@ export interface AadAuthFailure {
   failureLinkAction?: () => void;
 }
 
-export function useAADAuth(): ReturnType {
-  const [isLoggedIn, { setTrue: setLoggedIn, setFalse: setLoggedOut }] = useBoolean(
-    Boolean(cachedAccount && cachedTenantId) || false,
-  );
-  const [account, setAccount] = React.useState<msal.AccountInfo>(cachedAccount);
+export function useAADAuth(config?: ConfigContext): ReturnType {
+  const [msalInstance, setMsalInstance] = React.useState<msal.PublicClientApplication | null>(null);
+  const [isLoggedIn, { setTrue: setLoggedIn, setFalse: setLoggedOut }] = useBoolean(false);
+  const [account, setAccount] = React.useState<msal.AccountInfo>(null);
   const [tenantId, setTenantId] = React.useState<string>(cachedTenantId);
   const [graphToken, setGraphToken] = React.useState<string>();
   const [armToken, setArmToken] = React.useState<string>();
   const [authFailure, setAuthFailure] = React.useState<AadAuthFailure>(undefined);
 
-  msalInstance.setActiveAccount(account);
-  const login = React.useCallback(async () => {
-    const response = await msalInstance.loginPopup({
-      redirectUri: configContext.msalRedirectURI,
-      scopes: [],
-    });
-    setLoggedIn();
-    setAccount(response.account);
-    setTenantId(response.tenantId);
-    localStorage.setItem("cachedTenantId", response.tenantId);
-  }, []);
-
-  const logout = React.useCallback(() => {
-    setLoggedOut();
-    localStorage.removeItem("cachedTenantId");
-    msalInstance.logoutRedirect();
-  }, []);
-
-  const switchTenant = React.useCallback(
-    async (id) => {
-      const response = await msalInstance.loginPopup({
-        redirectUri: configContext.msalRedirectURI,
-        authority: `${configContext.AAD_ENDPOINT}${id}`,
-        scopes: [],
+  // Initialize MSAL instance when config is available
+  React.useEffect(() => {
+    if (config && !msalInstance) {
+      getMsalInstance().then((instance) => {
+        setMsalInstance(instance);
+        const cachedAccount = instance.getAllAccounts()?.[0];
+        if (cachedAccount && cachedTenantId) {
+          setAccount(cachedAccount);
+          setLoggedIn();
+          instance.setActiveAccount(cachedAccount);
+        }
       });
-      setTenantId(response.tenantId);
-      setAccount(response.account);
-      localStorage.setItem("cachedTenantId", response.tenantId);
-    },
-    [account, tenantId],
-  );
+    }
+  }, [config, msalInstance]);
 
-  const acquireTokens = React.useCallback(async () => {
-    if (!(account && tenantId)) {
+  React.useEffect(() => {
+    if (msalInstance && account) {
+      msalInstance.setActiveAccount(account);
+    }
+  }, [msalInstance, account]);
+
+  const login = React.useCallback(async () => {
+    if (!msalInstance || !config) {
       return;
     }
 
+    try {
+      const response = await msalInstance.loginPopup({
+        redirectUri: config.msalRedirectURI,
+        scopes: [],
+      });
+      setLoggedIn();
+      setAccount(response.account);
+      setTenantId(response.tenantId);
+      localStorage.setItem("cachedTenantId", response.tenantId);
+    } catch (error) {
+      setAuthFailure({
+        failureMessage: `Login failed: ${JSON.stringify(error)}`,
+      });
+    }
+  }, [msalInstance, config]);
+
+  const logout = React.useCallback(() => {
+    if (!msalInstance) {
+      return;
+    }
+    setLoggedOut();
+    localStorage.removeItem("cachedTenantId");
+    msalInstance.logoutRedirect();
+  }, [msalInstance]);
+
+  const switchTenant = React.useCallback(
+    async (id) => {
+      if (!msalInstance || !config) {
+        return;
+      }
+      try {
+        const response = await msalInstance.loginPopup({
+          redirectUri: config.msalRedirectURI,
+          authority: `${config.AAD_ENDPOINT}${id}`,
+          scopes: [],
+        });
+        setTenantId(response.tenantId);
+        setAccount(response.account);
+        localStorage.setItem("cachedTenantId", response.tenantId);
+      } catch (error) {
+        setAuthFailure({
+          failureMessage: `Tenant switch failed: ${JSON.stringify(error)}`,
+        });
+      }
+    },
+    [msalInstance, config],
+  );
+
+  const acquireTokens = React.useCallback(async () => {
+    if (!(account && tenantId && msalInstance && config)) {
+      return;
+    }
     try {
       const armToken = await acquireTokenWithMsal(msalInstance, {
-        authority: `${configContext.AAD_ENDPOINT}${tenantId}`,
-        scopes: [`${configContext.ARM_ENDPOINT}/.default`],
+        authority: `${config.AAD_ENDPOINT}${tenantId}`,
+        scopes: [`${config.ARM_ENDPOINT}/.default`],
       });
 
       setArmToken(armToken);
@@ -105,8 +142,8 @@ export function useAADAuth(): ReturnType {
 
     try {
       const graphToken = await acquireTokenWithMsal(msalInstance, {
-        authority: `${configContext.AAD_ENDPOINT}${tenantId}`,
-        scopes: [`${configContext.GRAPH_ENDPOINT}/.default`],
+        authority: `${config.AAD_ENDPOINT}${tenantId}`,
+        scopes: [`${config.GRAPH_ENDPOINT}/.default`],
       });
 
       setGraphToken(graphToken);
@@ -115,7 +152,7 @@ export function useAADAuth(): ReturnType {
       // it's not critical if this fails.
       console.warn("Error acquiring graph token: " + error);
     }
-  }, [account, tenantId]);
+  }, [account, tenantId, msalInstance, config]);
 
   React.useEffect(() => {
     if (account && tenantId && !authFailure) {

src/hooks/useKnockoutExplorer.ts

@@ -64,7 +64,8 @@ import {
   getMsalInstance,
 } from "../Utils/AuthorizationUtils";
 import { isInvalidParentFrameOrigin, shouldProcessMessage } from "../Utils/MessageValidation";
-import { getReadOnlyKeys, listKeys } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
+import { get, getReadOnlyKeys, listKeys } from "../Utils/arm/generatedClients/cosmos/databaseAccounts";
+import * as Types from "../Utils/arm/generatedClients/cosmos/types";
 import { applyExplorerBindings } from "../applyExplorerBindings";
 
 // This hook will create a new instance of Explorer.ts and bind it to the DOM
@@ -346,6 +347,14 @@ async function configureHostedWithAAD(config: AAD): Promise<Explorer> {
     }
   }
   try {
+    // TO DO - Remove once we have ARG API support for enableMaterializedViews property
+    const databaseAccount: Types.DatabaseAccountGetResults = await get(
+      subscriptionId,
+      account.resourceGroup,
+      account.name,
+    );
+    config.databaseAccount.properties.enableMaterializedViews = databaseAccount.properties?.enableMaterializedViews;
+
     updateUserContext({
       databaseAccount: config.databaseAccount,
     });
@@ -885,6 +894,7 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) {
 
   const authorizationToken = inputs.authorizationToken || "";
   const databaseAccount = inputs.databaseAccount;
+  const aadToken = inputs.aadToken || "";
 
   updateConfigContext({
     ARM_ENDPOINT: normalizeArmEndpoint(inputs.csmEndpoint || configContext.ARM_ENDPOINT),
@@ -897,6 +907,7 @@ function updateContextsFromPortalMessage(inputs: DataExplorerInputsFrame) {
 
   updateUserContext({
     authorizationToken,
+    aadToken,
     databaseAccount,
     resourceGroup: inputs.resourceGroup,
     subscriptionId: inputs.subscriptionId,

src/setupTests.ts

@@ -47,3 +47,6 @@ require("jquery-ui-dist/jquery-ui");
   unobserve: jest.fn(),
   disconnect: jest.fn(),
 }));
+
+// The test environment Data Explorer uses does not have crypto.subtle implementation
+(<any>global).crypto.subtle = {};