Merge branch 'master' into missing_pk_fix

Handle UI errors caused by Catalog API calls returning no offering id.

less/Common/Constants.less

@@ -61,6 +61,8 @@
 
 @GalleryBackgroundColor: #fdfdfd;
 
+@LinkColor: #2d6da4;
+
 //Icons
 @InfoIconColor: #0072c6;
 @WarningIconColor: #db7500;
@@ -246,6 +248,10 @@
   outline: 1px dashed @FocusColor;
 }
 
+.focusedBorder() {
+  border: 1px dashed @FocusColor;
+}
+
 /************************************************************************************************
                                Common Toggle Switch
 *************************************************************************************************/

less/documentDB.less

@@ -1914,13 +1914,20 @@ input::-webkit-calendar-picker-indicator::after {
 }
 
 .nav-tabs-margin {
-  height: 32px;
   background-color: #f2f2f2;
 
   .nav-tabs {
     display: flex;
+    flex-wrap: wrap;
     align-items: flex-end;
     height: 100%;
+    margin-bottom: -0.5px;
+
+    li {
+      // Override the bootstrap defaults here to align with our layout constants.
+      margin-bottom: 0px;
+      height: 32px;
+    }
   }
 }
 

package-lock.json

@@ -51,7 +51,6 @@
         "@types/mkdirp": "1.0.1",
         "@types/node-fetch": "2.5.7",
         "@xmldom/xmldom": "0.7.13",
-        "@xterm/xterm": "5.5.0",
         "allotment": "1.20.2",
         "applicationinsights": "1.8.0",
         "bootstrap": "3.4.1",
@@ -87,7 +86,7 @@
         "mkdirp": "1.0.4",
         "monaco-editor": "0.44.0",
         "ms": "2.1.3",
-        "p-retry": "4.6.2",
+        "p-retry": "6.2.1",
         "patch-package": "8.0.0",
         "plotly.js-cartesian-dist-min": "1.52.3",
         "post-robot": "10.0.42",
@@ -12663,7 +12662,9 @@
       }
     },
     "node_modules/@types/retry": {
-      "version": "0.12.0",
+      "version": "0.12.2",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.2.tgz",
+      "integrity": "sha512-XISRgDJ2Tc5q4TRqvgJtzsRkFYNJzZrhTdtMoGVBttwzzQJkPnS3WWTFc7kuDRoPtPakl+T+OfdEUjYJj7Jbow==",
       "license": "MIT"
     },
     "node_modules/@types/sanitize-html": {
@@ -13239,11 +13240,6 @@
         "node": ">=10.0.0"
       }
     },
-    "node_modules/@xterm/xterm": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz",
-      "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A=="
-    },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "license": "BSD-3-Clause"
@@ -21805,6 +21801,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-network-error": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-network-error/-/is-network-error-1.1.0.tgz",
+      "integrity": "sha512-tUdRRAnhT+OtCZR/LxZelH/C7QtjtFrTu5tXCA8pl55eTUElUHT+GPYV8MBMBvea/j+NxQqVt3LbWMRir7Gx9g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
     "node_modules/is-number": {
       "version": "3.0.0",
       "license": "MIT",
@@ -30249,14 +30257,20 @@
       }
     },
     "node_modules/p-retry": {
-      "version": "4.6.2",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-6.2.1.tgz",
+      "integrity": "sha512-hEt02O4hUct5wtwg4H4KcWgDdm+l1bOaEy/hWzd8xtXB9BqxTWBBhb+2ImAtH4Cv4rPjV76xN3Zumqk3k3AhhQ==",
       "license": "MIT",
       "dependencies": {
-        "@types/retry": "0.12.0",
+        "@types/retry": "0.12.2",
+        "is-network-error": "^1.0.0",
         "retry": "^0.13.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
     "node_modules/p-try": {
@@ -36003,6 +36017,13 @@
         }
       }
     },
+    "node_modules/webpack-dev-server/node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/webpack-dev-server/node_modules/ajv": {
       "version": "8.12.0",
       "dev": true,
@@ -36050,6 +36071,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/webpack-dev-server/node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/webpack-dev-server/node_modules/rimraf": {
       "version": "3.0.2",
       "dev": true,

package.json

@@ -13,8 +13,8 @@
     "@babel/plugin-proposal-decorators": "7.12.12",
     "@fluentui/react": "8.119.0",
     "@fluentui/react-components": "9.54.2",
-    "@jupyterlab/terminal": "3.0.3",
     "@jupyterlab/services": "6.0.2",
+    "@jupyterlab/terminal": "3.0.3",
     "@microsoft/applicationinsights-web": "2.6.1",
     "@nteract/commutable": "7.5.1",
     "@nteract/connected-components": "6.8.2",
@@ -46,7 +46,6 @@
     "@types/mkdirp": "1.0.1",
     "@types/node-fetch": "2.5.7",
     "@xmldom/xmldom": "0.7.13",
-    "@xterm/xterm": "5.5.0",
     "allotment": "1.20.2",
     "applicationinsights": "1.8.0",
     "bootstrap": "3.4.1",
@@ -82,7 +81,7 @@
     "mkdirp": "1.0.4",
     "monaco-editor": "0.44.0",
     "ms": "2.1.3",
-    "p-retry": "4.6.2",
+    "p-retry": "6.2.1",
     "patch-package": "8.0.0",
     "plotly.js-cartesian-dist-min": "1.52.3",
     "post-robot": "10.0.42",

src/Common/Constants.ts

@@ -530,6 +530,10 @@ export class ariaLabelForLearnMoreLink {
   public static readonly AzureSynapseLink = "Learn more about Azure Synapse Link.";
 }
 
+export class FeedbackLabels {
+  public static readonly provideFeedback: string = "Provide feedback";
+}
+
 export const QueryCopilotSampleDatabaseId = "CopilotSampleDB";
 export const QueryCopilotSampleContainerId = "SampleContainer";
 

src/Common/CosmosClient.ts

@@ -1,13 +1,15 @@
 import * as Cosmos from "@azure/cosmos";
 import { getAuthorizationTokenUsingResourceTokens } from "Common/getAuthorizationTokenUsingResourceTokens";
+import { CosmosDbArtifactType } from "Contracts/FabricMessagesContract";
 import { AuthorizationToken } from "Contracts/FabricMessageTypes";
-import { checkDatabaseResourceTokensValidity } from "Platform/Fabric/FabricUtil";
+import { checkDatabaseResourceTokensValidity, isFabricMirroredKey } from "Platform/Fabric/FabricUtil";
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { AuthType } from "../AuthType";
 import { PriorityLevel } from "../Common/Constants";
 import * as Logger from "../Common/Logger";
 import { Platform, configContext } from "../ConfigContext";
-import { updateUserContext, userContext } from "../UserContext";
+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";
@@ -18,7 +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 && userContext.apiType === "SQL";
+  const dataPlaneRBACOptionEnabled = userContext.dataPlaneRbacEnabled && isDataplaneRbacSupported(userContext.apiType);
   if (userContext.features.enableAadDataPlane || dataPlaneRBACOptionEnabled) {
     Logger.logInfo(
       `AAD Data Plane Feature flag set to ${userContext.features.enableAadDataPlane} for account with disable local auth ${userContext.databaseAccount.properties.disableLocalAuth} `,
@@ -41,7 +43,7 @@ export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
     return decodeURIComponent(headers.authorization);
   }
 
-  if (configContext.platform === Platform.Fabric) {
+  if (isFabricMirroredKey()) {
     switch (requestInfo.resourceType) {
       case Cosmos.ResourceType.conflicts:
       case Cosmos.ResourceType.container:
@@ -53,8 +55,13 @@ export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
         // User resource tokens
         // TODO userContext.fabricContext.databaseConnectionInfo can be undefined
         headers[HttpHeaders.msDate] = new Date().toUTCString();
-        const resourceTokens = userContext.fabricContext.databaseConnectionInfo.resourceTokens;
-        checkDatabaseResourceTokensValidity(userContext.fabricContext.databaseConnectionInfo.resourceTokensTimestamp);
+        const resourceTokens = (
+          userContext.fabricContext.artifactInfo as FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY]
+        ).resourceTokenInfo.resourceTokens;
+        checkDatabaseResourceTokensValidity(
+          (userContext.fabricContext.artifactInfo as FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY])
+            .resourceTokenInfo.resourceTokensTimestamp,
+        );
         return getAuthorizationTokenUsingResourceTokens(resourceTokens, requestInfo.path, requestInfo.resourceId);
 
       case Cosmos.ResourceType.none:
@@ -65,7 +72,9 @@ export const tokenProvider = async (requestInfo: Cosmos.RequestInfo) => {
         // For now, these operations aren't used, so fetching the authorization token is commented out.
         // This provider must return a real token to pass validation by the client, so we return the cached resource token
         // (which is a valid token, but won't work for these operations).
-        const resourceTokens2 = userContext.fabricContext.databaseConnectionInfo.resourceTokens;
+        const resourceTokens2 = (
+          userContext.fabricContext.artifactInfo as FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY]
+        ).resourceTokenInfo.resourceTokens;
         return getAuthorizationTokenUsingResourceTokens(resourceTokens2, requestInfo.path, requestInfo.resourceId);
 
       /* ************** TODO: Uncomment this code if we need to support these operations **************

src/Common/StyleConstants.ts

@@ -1,10 +1,10 @@
-import { Platform, configContext } from "../ConfigContext";
+import { isFabric } from "Platform/Fabric/FabricUtil";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 export const StyleConstants = require("less-vars-loader!../../less/Common/Constants.less");
 
 export function updateStyles(): void {
-  if (configContext.platform === Platform.Fabric) {
+  if (isFabric()) {
     StyleConstants.AccentMediumHigh = StyleConstants.FabricAccentMediumHigh;
     StyleConstants.AccentMedium = StyleConstants.FabricAccentMedium;
     StyleConstants.AccentLight = StyleConstants.FabricAccentLight;

src/Common/dataAccess/createCollection.ts

@@ -1,4 +1,5 @@
 import { ContainerRequest, ContainerResponse, DatabaseRequest, DatabaseResponse, RequestOptions } from "@azure/cosmos";
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
 import { useDatabases } from "../../Explorer/useDatabases";
@@ -24,7 +25,7 @@ export const createCollection = async (params: DataModels.CreateCollectionParams
   );
   try {
     let collection: DataModels.Collection;
-    if (userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations) {
+    if (!isFabricNative() && userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations) {
       if (params.createNewDatabase) {
         const createDatabaseParams: DataModels.CreateDatabaseParams = {
           autoPilotMaxThroughput: params.autoPilotMaxThroughput,

src/Common/dataAccess/deleteCollection.ts

@@ -1,3 +1,4 @@
+import { isFabric } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import { userContext } from "../../UserContext";
 import { deleteCassandraTable } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
@@ -12,7 +13,7 @@ import { handleError } from "../ErrorHandlingUtils";
 export async function deleteCollection(databaseId: string, collectionId: string): Promise<void> {
   const clearMessage = logConsoleProgress(`Deleting container ${collectionId}`);
   try {
-    if (userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations && !isFabric()) {
       await deleteCollectionWithARM(databaseId, collectionId);
     } else {
       await client().database(databaseId).container(collectionId).delete();

src/Common/dataAccess/readCollections.ts

@@ -1,9 +1,10 @@
 import { ContainerResponse } from "@azure/cosmos";
 import { Queries } from "Common/Constants";
-import { Platform, configContext } from "ConfigContext";
+import { CosmosDbArtifactType } from "Contracts/FabricMessagesContract";
+import { isFabric, isFabricMirroredKey } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
-import { userContext } from "../../UserContext";
+import { FabricArtifactInfo, userContext } from "../../UserContext";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { listCassandraTables } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
 import { listGremlinGraphs } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
@@ -16,15 +17,13 @@ import { handleError } from "../ErrorHandlingUtils";
 export async function readCollections(databaseId: string): Promise<DataModels.Collection[]> {
   const clearMessage = logConsoleProgress(`Querying containers for database ${databaseId}`);
 
-  if (
-    configContext.platform === Platform.Fabric &&
-    userContext.fabricContext &&
-    userContext.fabricContext.databaseConnectionInfo.databaseId === databaseId
-  ) {
+  if (isFabricMirroredKey() && userContext.fabricContext?.databaseName === databaseId) {
     const collections: DataModels.Collection[] = [];
     const promises: Promise<ContainerResponse>[] = [];
 
-    for (const collectionResourceId in userContext.fabricContext.databaseConnectionInfo.resourceTokens) {
+    for (const collectionResourceId in (
+      userContext.fabricContext.artifactInfo as FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY]
+    ).resourceTokenInfo.resourceTokens) {
       // Dictionary key looks like this: dbs/SampleDB/colls/Container
       const resourceIdObj = collectionResourceId.split("/");
       const tokenDatabaseId = resourceIdObj[1];
@@ -56,7 +55,8 @@ export async function readCollections(databaseId: string): Promise<DataModels.Co
     if (
       userContext.authType === AuthType.AAD &&
       !userContext.features.enableSDKoperations &&
-      userContext.apiType !== "Tables"
+      userContext.apiType !== "Tables" &&
+      !isFabric()
     ) {
       return await readCollectionsWithARM(databaseId);
     }

src/Common/dataAccess/readDatabaseOffer.ts

@@ -1,4 +1,4 @@
-import { Platform, configContext } from "ConfigContext";
+import { isFabric, isFabricMirroredKey, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import { Offer, ReadDatabaseOfferParams } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
@@ -11,8 +11,9 @@ import { handleError } from "../ErrorHandlingUtils";
 import { readOfferWithSDK } from "./readOfferWithSDK";
 
 export const readDatabaseOffer = async (params: ReadDatabaseOfferParams): Promise<Offer> => {
-  if (configContext.platform === Platform.Fabric) {
-    // TODO This works, but is very slow, because it requests the token, so we skip for now
+  if (isFabricMirroredKey() || isFabricNative()) {
+    // For Fabric Mirroring, it is slow, because it requests the token and we don't need it.
+    // For Fabric Native, it is not supported.
     console.error("Skiping readDatabaseOffer for Fabric");
     return undefined;
   }
@@ -23,7 +24,8 @@ export const readDatabaseOffer = async (params: ReadDatabaseOfferParams): Promis
     if (
       userContext.authType === AuthType.AAD &&
       !userContext.features.enableSDKoperations &&
-      userContext.apiType !== "Tables"
+      userContext.apiType !== "Tables" &&
+      !isFabric()
     ) {
       return await readDatabaseOfferWithARM(params.databaseId);
     }

src/Common/dataAccess/readDatabases.ts

@@ -1,7 +1,8 @@
-import { Platform, configContext } from "ConfigContext";
+import { CosmosDbArtifactType } from "Contracts/FabricMessagesContract";
+import { isFabric, isFabricMirroredKey, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import * as DataModels from "../../Contracts/DataModels";
-import { userContext } from "../../UserContext";
+import { FabricArtifactInfo, userContext } from "../../UserContext";
 import { logConsoleProgress } from "../../Utils/NotificationConsoleUtils";
 import { listCassandraKeyspaces } from "../../Utils/arm/generatedClients/cosmos/cassandraResources";
 import { listGremlinDatabases } from "../../Utils/arm/generatedClients/cosmos/gremlinResources";
@@ -14,8 +15,13 @@ export async function readDatabases(): Promise<DataModels.Database[]> {
   let databases: DataModels.Database[];
   const clearMessage = logConsoleProgress(`Querying databases`);
 
-  if (configContext.platform === Platform.Fabric && userContext.fabricContext?.databaseConnectionInfo.resourceTokens) {
-    const tokensData = userContext.fabricContext.databaseConnectionInfo;
+  if (
+    isFabricMirroredKey() &&
+    (userContext.fabricContext?.artifactInfo as FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY]).resourceTokenInfo
+      .resourceTokens
+  ) {
+    const tokensData = (userContext.fabricContext.artifactInfo as FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY])
+      .resourceTokenInfo;
 
     const databaseIdsSet = new Set<string>(); // databaseId
 
@@ -46,13 +52,28 @@ export async function readDatabases(): Promise<DataModels.Database[]> {
       }));
     clearMessage();
     return databases;
+  } else if (isFabricNative() && userContext.fabricContext?.databaseName) {
+    const databaseId = userContext.fabricContext.databaseName;
+    databases = [
+      {
+        _rid: "",
+        _self: "",
+        _etag: "",
+        _ts: 0,
+        id: databaseId,
+        collections: [],
+      },
+    ];
+    clearMessage();
+    return databases;
   }
 
   try {
     if (
       userContext.authType === AuthType.AAD &&
       !userContext.features.enableSDKoperations &&
-      userContext.apiType !== "Tables"
+      userContext.apiType !== "Tables" &&
+      !isFabric()
     ) {
       databases = await readDatabasesWithARM();
     } else {

src/Common/dataAccess/updateCollection.ts

@@ -1,4 +1,5 @@
 import { ContainerDefinition, RequestOptions } from "@azure/cosmos";
+import { isFabric } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import { Collection } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
@@ -36,7 +37,8 @@ export async function updateCollection(
     if (
       userContext.authType === AuthType.AAD &&
       !userContext.features.enableSDKoperations &&
-      userContext.apiType !== "Tables"
+      userContext.apiType !== "Tables" &&
+      !isFabric()
     ) {
       collection = await updateCollectionWithARM(databaseId, collectionId, newCollection);
     } else {

src/Common/dataAccess/updateOffer.ts

@@ -1,4 +1,5 @@
 import { OfferDefinition, RequestOptions } from "@azure/cosmos";
+import { isFabric } from "Platform/Fabric/FabricUtil";
 import { AuthType } from "../../AuthType";
 import { Offer, SDKOfferDefinition, ThroughputBucket, UpdateOfferParams } from "../../Contracts/DataModels";
 import { userContext } from "../../UserContext";
@@ -56,7 +57,7 @@ export const updateOffer = async (params: UpdateOfferParams): Promise<Offer> =>
   const clearMessage = logConsoleProgress(`Updating offer for ${offerResourceText}`);
 
   try {
-    if (userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations) {
+    if (userContext.authType === AuthType.AAD && !userContext.features.enableSDKoperations && !isFabric()) {
       if (params.collectionId) {
         updatedOffer = await updateCollectionOfferWithARM(params);
       } else if (userContext.apiType === "Tables") {

src/Contracts/DataModels.ts

@@ -42,11 +42,6 @@ export interface DatabaseAccountExtendedProperties {
   publicNetworkAccess?: string;
   enablePriorityBasedExecution?: boolean;
   vcoreMongoEndpoint?: string;
-  virtualNetworkRules?: VNetRule[];
-}
-
-export interface VNetRule {
-  id: string;
 }
 
 export interface DatabaseAccountResponseLocation {

src/Contracts/FabricMessageTypes.ts

@@ -4,6 +4,7 @@
 export enum FabricMessageTypes {
   GetAuthorizationToken = "GetAuthorizationToken",
   GetAllResourceTokens = "GetAllResourceTokens",
+  GetAccessToken = "GetAccessToken",
   Ready = "Ready",
 }
 

src/Contracts/FabricMessagesContract.ts

@@ -1,47 +1,9 @@
-import { AuthorizationToken } from "Contracts/FabricMessageTypes";
+import { AuthorizationToken } from "./FabricMessageTypes";
 
 // This is the version of these messages
-export const FABRIC_RPC_VERSION = "2";
+export const FABRIC_RPC_VERSION = "FabricMessageV3";
 
 // Fabric to Data Explorer
-
-// TODO Deprecated. Remove this section once DE is updated
-export type FabricMessageV1 =
-  | {
-      type: "newContainer";
-      databaseName: string;
-    }
-  | {
-      type: "initialize";
-      message: {
-        endpoint: string | undefined;
-        databaseId: string | undefined;
-        resourceTokens: unknown | undefined;
-        resourceTokensTimestamp: number | undefined;
-        error: string | undefined;
-      };
-    }
-  | {
-      type: "authorizationToken";
-      message: {
-        id: string;
-        error: string | undefined;
-        data: AuthorizationToken | undefined;
-      };
-    }
-  | {
-      type: "allResourceTokens";
-      message: {
-        id: string;
-        error: string | undefined;
-        endpoint: string | undefined;
-        databaseId: string | undefined;
-        resourceTokens: unknown | undefined;
-        resourceTokensTimestamp: number | undefined;
-      };
-    };
-// -----------------------------
-
 export type FabricMessageV2 =
   | {
       type: "newContainer";
@@ -69,7 +31,7 @@ export type FabricMessageV2 =
       message: {
         id: string;
         error: string | undefined;
-        data: FabricDatabaseConnectionInfo | undefined;
+        data: ResourceTokenInfo | undefined;
       };
     }
   | {
@@ -79,17 +41,81 @@ export type FabricMessageV2 =
       };
     };
 
-export type CosmosDBTokenResponse = {
-  token: string;
-  date: string;
-};
+export type FabricMessageV3 =
+  | {
+      type: "newContainer";
+      databaseName: string;
+    }
+  | {
+      type: "initialize";
+      version: string;
+      id: string;
+      message: InitializeMessageV3<CosmosDbArtifactType>;
+    }
+  | {
+      type: "authorizationToken";
+      message: {
+        id: string;
+        error: string | undefined;
+        data: AuthorizationToken | undefined;
+      };
+    }
+  | {
+      type: "allResourceTokens_v2";
+      message: {
+        id: string;
+        error: string | undefined;
+        data: ResourceTokenInfo | undefined;
+      };
+    }
+  | {
+      type: "explorerVisible";
+      message: {
+        visible: boolean;
+      };
+    }
+  | {
+      type: "accessToken";
+      message: {
+        id: string;
+        error: string | undefined;
+        data: { accessToken: string };
+      };
+    };
 
-export type CosmosDBConnectionInfoResponse = {
+export enum CosmosDbArtifactType {
+  MIRRORED_KEY = "MIRRORED_KEY",
+  MIRRORED_AAD = "MIRRORED_AAD",
+  NATIVE = "NATIVE",
+}
+export interface ArtifactConnectionInfo {
+  [CosmosDbArtifactType.MIRRORED_KEY]: { connectionId: string };
+  [CosmosDbArtifactType.MIRRORED_AAD]: AccessTokenConnectionInfo;
+  [CosmosDbArtifactType.NATIVE]: AccessTokenConnectionInfo;
+}
+
+export interface AccessTokenConnectionInfo {
+  accessToken: string;
+  databaseName: string;
+  accountEndpoint: string;
+}
+
+export interface InitializeMessageV3<T extends CosmosDbArtifactType> {
+  connectionId: string;
+  isVisible: boolean;
+  isReadOnly: boolean;
+  artifactType: T;
+  artifactConnectionInfo: ArtifactConnectionInfo[T];
+}
+export interface CosmosDBConnectionInfoResponse {
   endpoint: string;
   databaseId: string;
-  resourceTokens: { [resourceId: string]: string };
-};
+  resourceTokens: Record<string, string> | undefined;
+  accessToken: string | undefined;
+  isReadOnly: boolean;
+  credentialType: "Key" | "OAuth2" | undefined;
+}
 
-export interface FabricDatabaseConnectionInfo extends CosmosDBConnectionInfoResponse {
+export interface ResourceTokenInfo extends CosmosDBConnectionInfoResponse {
   resourceTokensTimestamp: number;
 }

src/Explorer/ContextMenuButtonFactory.tsx

@@ -1,5 +1,7 @@
+import { configContext, Platform } from "ConfigContext";
 import { TreeNodeMenuItem } from "Explorer/Controls/TreeComponent/TreeNodeComponent";
 import { useDatabases } from "Explorer/useDatabases";
+import { isFabric, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { traceOpen } from "Shared/Telemetry/TelemetryProcessor";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
@@ -19,7 +21,6 @@ import * as ViewModels from "../Contracts/ViewModels";
 import { userContext } from "../UserContext";
 import { getCollectionName, getDatabaseName } from "../Utils/APITypeUtils";
 import { useSidePanel } from "../hooks/useSidePanel";
-import { Platform, configContext } from "./../ConfigContext";
 import Explorer from "./Explorer";
 import { useNotebook } from "./Notebook/useNotebook";
 import { DeleteCollectionConfirmationPane } from "./Panes/DeleteCollectionConfirmationPane/DeleteCollectionConfirmationPane";
@@ -41,7 +42,7 @@ export interface DatabaseContextMenuButtonParams {
  * New resource tree (in ReactJS)
  */
 export const createDatabaseContextMenu = (container: Explorer, databaseId: string): TreeNodeMenuItem[] => {
-  if (configContext.platform === Platform.Fabric && userContext.fabricContext?.isReadOnly) {
+  if (isFabric() && userContext.fabricContext?.isReadOnly) {
     return undefined;
   }
 
@@ -53,7 +54,7 @@ export const createDatabaseContextMenu = (container: Explorer, databaseId: strin
     },
   ];
 
-  if (userContext.apiType !== "Tables" || userContext.features.enableSDKoperations) {
+  if (!isFabricNative() && (userContext.apiType !== "Tables" || userContext.features.enableSDKoperations)) {
     items.push({
       iconSrc: DeleteDatabaseIcon,
       onClick: (lastFocusedElement?: React.RefObject<HTMLElement>) => {
@@ -96,17 +97,17 @@ export const createCollectionContextMenuButton = (
       iconSrc: HostedTerminalIcon,
       onClick: () => {
         const selectedCollection: ViewModels.Collection = useSelectedNode.getState().findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) {
+        if (useNotebook.getState().isShellEnabled) {
           container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
         }
       },
-      label: (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) ? "Open Mongo Shell" : "New Shell",
+      label: useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell",
     });
   }
 
-  if ((useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) && userContext.apiType === "Cassandra") {
+  if (useNotebook.getState().isShellEnabled && userContext.apiType === "Cassandra") {
     items.push({
       iconSrc: HostedTerminalIcon,
       onClick: () => {
@@ -145,7 +146,7 @@ export const createCollectionContextMenuButton = (
     });
   }
 
-  if (configContext.platform !== Platform.Fabric) {
+  if (!isFabric() || (isFabric() && !userContext.fabricContext?.isReadOnly)) {
     items.push({
       iconSrc: DeleteCollectionIcon,
       onClick: (lastFocusedElement?: React.RefObject<HTMLElement>) => {

src/Explorer/Controls/ThroughputInput/ThroughputInput.tsx

@@ -35,12 +35,20 @@ export const ThroughputInput: FunctionComponent<ThroughputInputProps> = ({
   setIsThroughputCapExceeded,
   onCostAcknowledgeChange,
 }: ThroughputInputProps) => {
-  const defaultThroughput: number =
+  let defaultThroughput: number;
+  const workloadType: Constants.WorkloadType = getWorkloadType();
+
+  if (
     isFreeTier ||
     isQuickstart ||
-    [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(getWorkloadType())
-      ? AutoPilotUtils.autoPilotThroughput1K
-      : AutoPilotUtils.autoPilotThroughput4K;
+    [Constants.WorkloadType.Learning, Constants.WorkloadType.DevelopmentTesting].includes(workloadType)
+  ) {
+    defaultThroughput = AutoPilotUtils.autoPilotThroughput1K;
+  } else if (workloadType === Constants.WorkloadType.Production) {
+    defaultThroughput = AutoPilotUtils.autoPilotThroughput10K;
+  } else {
+    defaultThroughput = AutoPilotUtils.autoPilotThroughput4K;
+  }
 
   const [isAutoscaleSelected, setIsAutoScaleSelected] = useState<boolean>(true);
   const [throughput, setThroughput] = useState<number>(defaultThroughput);

src/Explorer/Explorer.tsx

@@ -8,7 +8,7 @@ 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 { scheduleRefreshDatabaseResourceToken } from "Platform/Fabric/FabricUtil";
+import { isFabricMirrored, isFabricMirroredKey, scheduleRefreshFabricToken } from "Platform/Fabric/FabricUtil";
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { acquireMsalTokenForAccount } from "Utils/AuthorizationUtils";
 import { allowedNotebookServerUrls, validateEndpoint } from "Utils/EndpointUtils";
@@ -43,7 +43,7 @@ import { fromContentUri, toRawContentUri } from "../Utils/GitHubUtils";
 import * as NotificationConsoleUtils from "../Utils/NotificationConsoleUtils";
 import { logConsoleError, logConsoleInfo, logConsoleProgress } from "../Utils/NotificationConsoleUtils";
 import { useSidePanel } from "../hooks/useSidePanel";
-import { useTabs } from "../hooks/useTabs";
+import { ReactTabKind, useTabs } from "../hooks/useTabs";
 import "./ComponentRegisterer";
 import { DialogProps, useDialog } from "./Controls/Dialog";
 import { GalleryTab as GalleryTabKind } from "./Controls/NotebookGallery/GalleryViewerComponent";
@@ -187,6 +187,10 @@ export default class Explorer {
       useNotebook.getState().setNotebookBasePath(userContext.features.notebookBasePath);
     }
 
+    if (isFabricMirrored()) {
+      useTabs.getState().closeReactTab(ReactTabKind.Home);
+    }
+
     this.refreshExplorer();
   }
 
@@ -347,8 +351,8 @@ export default class Explorer {
   };
 
   public onRefreshResourcesClick = async (): Promise<void> => {
-    if (configContext.platform === Platform.Fabric) {
-      scheduleRefreshDatabaseResourceToken(true).then(() => this.refreshAllDatabases());
+    if (isFabricMirroredKey()) {
+      scheduleRefreshFabricToken(true).then(() => this.refreshAllDatabases());
       return;
     }
 
@@ -906,28 +910,25 @@ export default class Explorer {
   }
 
   public async openNotebookTerminal(kind: ViewModels.TerminalKind): Promise<void> {
-  
-    if (userContext.features.enableCloudShell || !useNotebook.getState().isPhoenixFeatures) {
-      this.connectToTerminal(kind);
-      return;
-    }
-  
-    await this.allocateContainer(PoolIdType.DefaultPoolId);
-    const notebookServerInfo = useNotebook.getState().notebookServerInfo;
-  
-    if (notebookServerInfo?.notebookServerEndpoint) {
-      this.connectToTerminal(kind);
+    if (useNotebook.getState().isPhoenixFeatures) {
+      await this.allocateContainer(PoolIdType.DefaultPoolId);
+      const notebookServerInfo = useNotebook.getState().notebookServerInfo;
+      if (notebookServerInfo && notebookServerInfo.notebookServerEndpoint !== undefined) {
+        this.connectToNotebookTerminal(kind);
+      } else {
+        useDialog
+          .getState()
+          .showOkModalDialog(
+            "Failed to connect",
+            "Failed to connect to temporary workspace. This could happen because of network issues. Please refresh the page and try again.",
+          );
+      }
     } else {
-      useDialog
-        .getState()
-        .showOkModalDialog(
-          "Failed to connect",
-          "Failed to connect to temporary workspace. This could happen because of network issues. Please refresh the page and try again."
-        );
+      this.connectToNotebookTerminal(kind);
     }
   }
 
-  private connectToTerminal(kind: ViewModels.TerminalKind): void {
+  private connectToNotebookTerminal(kind: ViewModels.TerminalKind): void {
     let title: string;
 
     switch (kind) {

src/Explorer/Graph/NewVertexComponent/NewVertexComponent.less

@@ -14,10 +14,6 @@
       .flex-direction(@direction: row);
       padding: 4px 5px;
 
-      label {
-        padding: 0px;
-      }
-
       .valueCol {
         flex-grow: 1;
         padding-right: 5px;
@@ -63,6 +59,10 @@
     height: 100%;
   }
 
+  .customTrashIcon {
+    padding-top: 33px;
+  }
+
   .rightPaneTrashIconImg {
     vertical-align: top;
   }

src/Explorer/Graph/NewVertexComponent/NewVertexComponent.tsx

@@ -142,10 +142,11 @@ export const NewVertexComponent: FunctionComponent<INewVertexComponentProps> = (
                 <div className="labelCol">
                   <TextField
                     className="edgeInput"
+                    label={index === 0 && "Key"}
                     type="text"
                     id="propertyKeyNewVertexPane"
                     componentRef={input}
-                    aria-required="true"
+                    required
                     placeholder="Key"
                     autoComplete="off"
                     aria-label={`Enter value for propery ${index + 1}`}
@@ -153,11 +154,11 @@ export const NewVertexComponent: FunctionComponent<INewVertexComponentProps> = (
                     onChange={(event: React.ChangeEvent<HTMLInputElement>) => onKeyChange(event, index)}
                   />
                 </div>
-                <span className="mandatoryStar">*&nbsp;</span>
 
                 <div className="valueCol">
                   <TextField
                     className="edgeInput"
+                    label={index === 0 && "Value"}
                     type="text"
                     placeholder="Value"
                     autoComplete="off"
@@ -169,6 +170,8 @@ export const NewVertexComponent: FunctionComponent<INewVertexComponentProps> = (
                 <div>
                   <Dropdown
                     role="combobox"
+                    label={index === 0 && "Type"}
+                    ariaLabel="Type"
                     placeholder="Select an option"
                     defaultSelectedKey={data.values[0].type}
                     style={{ width: 100 }}
@@ -181,7 +184,7 @@ export const NewVertexComponent: FunctionComponent<INewVertexComponentProps> = (
                 </div>
                 <div className="actionCol">
                   <div
-                    className="rightPaneTrashIcon rightPaneBtns"
+                    className={`rightPaneTrashIcon rightPaneBtns ${index === 0 && "customTrashIcon"}`}
                     tabIndex={0}
                     role="button"
                     aria-label={`Delete ${data.key}`}

src/Explorer/Menus/CommandBar/CommandBarComponentAdapter.tsx

@@ -6,12 +6,12 @@
 import { CommandBar as FluentCommandBar, ICommandBarItemProps } from "@fluentui/react";
 import { useNotebook } from "Explorer/Notebook/useNotebook";
 import { KeyboardActionGroup, useKeyboardActionGroup } from "KeyboardShortcuts";
+import { isFabric } from "Platform/Fabric/FabricUtil";
 import { userContext } from "UserContext";
 import * as React from "react";
 import create, { UseStore } from "zustand";
 import { ConnectionStatusType, PoolIdType } from "../../../Common/Constants";
 import { StyleConstants } from "../../../Common/StyleConstants";
-import { Platform, configContext } from "../../../ConfigContext";
 import { CommandButtonComponentProps } from "../../Controls/CommandButton/CommandButtonComponent";
 import Explorer from "../../Explorer";
 import { useSelectedNode } from "../../useSelectedNode";
@@ -93,19 +93,18 @@ export const CommandBar: React.FC<Props> = ({ container }: Props) => {
     );
   }
 
-  const rootStyle =
-    configContext.platform === Platform.Fabric
-      ? {
-          root: {
-            backgroundColor: "transparent",
-            padding: "2px 8px 0px 8px",
-          },
-        }
-      : {
-          root: {
-            backgroundColor: backgroundColor,
-          },
-        };
+  const rootStyle = isFabric()
+    ? {
+        root: {
+          backgroundColor: "transparent",
+          padding: "2px 8px 0px 8px",
+        },
+      }
+    : {
+        root: {
+          backgroundColor: backgroundColor,
+        },
+      };
 
   const allButtons = staticButtons.concat(contextButtons).concat(controlButtons);
   const keyboardHandlers = CommandBarUtil.createKeyboardHandlers(allButtons);

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.test.ts

@@ -37,21 +37,25 @@ describe("CommandBarComponentButtonFactory tests", () => {
       expect(enableAzureSynapseLinkBtn).toBeDefined();
     });
 
-    it("Button should not be visible for Tables API", () => {
-      updateUserContext({
-        databaseAccount: {
-          properties: {
-            capabilities: [{ name: "EnableTable" }],
-          },
-        } as DatabaseAccount,
-      });
-
-      const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
-      const enableAzureSynapseLinkBtn = buttons.find(
-        (button) => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel,
-      );
-      expect(enableAzureSynapseLinkBtn).toBeUndefined();
-    });
+    // TODO: Now that Tables API supports dataplane RBAC, calling createStaticCommandBarButtons will enable the
+    //       Entra ID Login button, which causes this test to fail due to "Invalid hook call.". This seems to be
+    //       unsupported in jest and needs to be tested with react-hooks-testing-library.
+    //
+    // it("Button should not be visible for Tables API", () => {
+    //   updateUserContext({
+    //     databaseAccount: {
+    //       properties: {
+    //         capabilities: [{ name: "EnableTable" }],
+    //       },
+    //     } as DatabaseAccount,
+    //   });
+    //
+    //   const buttons = CommandBarComponentButtonFactory.createStaticCommandBarButtons(mockExplorer, selectedNodeState);
+    //  const enableAzureSynapseLinkBtn = buttons.find(
+    //    (button) => button.commandButtonLabel === enableAzureSynapseLinkBtnLabel,
+    //  );
+    //  expect(enableAzureSynapseLinkBtn).toBeUndefined();
+    //});
 
     it("Button should not be visible for Cassandra API", () => {
       updateUserContext({

src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.tsx

@@ -1,4 +1,5 @@
 import { KeyboardAction } from "KeyboardShortcuts";
+import { isDataplaneRbacSupported } from "Utils/APITypeUtils";
 import * as React from "react";
 import { useEffect, useState } from "react";
 import AddSqlQueryIcon from "../../../../images/AddSqlQuery_16x16.svg";
@@ -61,7 +62,7 @@ export function createStaticCommandBarButtons(
     }
   }
 
-  if (userContext.apiType === "SQL") {
+  if (isDataplaneRbacSupported(userContext.apiType)) {
     const [loginButtonProps, setLoginButtonProps] = useState<CommandButtonComponentProps | undefined>(undefined);
     const dataPlaneRbacEnabled = useDataPlaneRbac((state) => state.dataPlaneRbacEnabled);
     const aadTokenUpdated = useDataPlaneRbac((state) => state.aadTokenUpdated);
@@ -125,13 +126,13 @@ export function createContextCommandBarButtons(
   const buttons: CommandButtonComponentProps[] = [];
 
   if (!selectedNodeState.isDatabaseNodeOrNoneSelected() && userContext.apiType === "Mongo") {
-    const label = (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) ? "Open Mongo Shell" : "New Shell";
+    const label = useNotebook.getState().isShellEnabled ? "Open Mongo Shell" : "New Shell";
     const newMongoShellBtn: CommandButtonComponentProps = {
       iconSrc: HostedTerminalIcon,
       iconAlt: label,
       onCommandClick: () => {
         const selectedCollection: ViewModels.Collection = selectedNodeState.findSelectedCollection();
-        if (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) {
+        if (useNotebook.getState().isShellEnabled) {
           container.openNotebookTerminal(ViewModels.TerminalKind.Mongo);
         } else {
           selectedCollection && selectedCollection.onNewMongoShellClick();
@@ -145,7 +146,7 @@ export function createContextCommandBarButtons(
   }
 
   if (
-    (useNotebook.getState().isShellEnabled || userContext.features.enableCloudShell) &&
+    useNotebook.getState().isShellEnabled &&
     !selectedNodeState.isDatabaseNodeOrNoneSelected() &&
     userContext.apiType === "Cassandra"
   ) {

src/Explorer/Menus/NotificationConsole/NotificationConsole.less

@@ -36,6 +36,10 @@
         &:active {
                 background-color:@NotificationHigh;
         }
+        
+        &:focus {
+            .focusedBorder();
+        }
 
         .statusBar {
             .dataTypeIcons {

src/Explorer/Menus/NotificationConsole/NotificationConsoleComponent.tsx

@@ -81,10 +81,6 @@ export class NotificationConsoleComponent extends React.Component<
     }
   }
 
-  public setElememntRef = (element: HTMLElement): void => {
-    this.consoleHeaderElement = element;
-  };
-
   public render(): JSX.Element {
     const numInProgress = this.state.allConsoleData.filter(
       (data: ConsoleData) => data.type === ConsoleDataType.InProgress,
@@ -101,7 +97,9 @@ export class NotificationConsoleComponent extends React.Component<
         <div
           className="notificationConsoleHeader"
           id="notificationConsoleHeader"
-          ref={this.setElememntRef}
+          role="button"
+          aria-label="Console"
+          aria-expanded={this.props.isConsoleExpanded}
           onClick={() => this.expandCollapseConsole()}
           onKeyDown={(event: React.KeyboardEvent<HTMLDivElement>) => this.onExpandCollapseKeyPress(event)}
           tabIndex={0}
@@ -109,15 +107,15 @@ export class NotificationConsoleComponent extends React.Component<
           <div className="statusBar">
             <span className="dataTypeIcons">
               <span className="notificationConsoleHeaderIconWithData">
-                <img src={LoadingIcon} alt="in progress items" />
+                <img src={LoadingIcon} alt="In progress items" />
                 <span className="numInProgress">{numInProgress}</span>
               </span>
               <span className="notificationConsoleHeaderIconWithData">
-                <img src={ErrorBlackIcon} alt="error items" />
+                <img src={ErrorBlackIcon} alt="Error items" />
                 <span className="numErroredItems">{numErroredItems}</span>
               </span>
               <span className="notificationConsoleHeaderIconWithData">
-                <img src={infoBubbleIcon} alt="info items" />
+                <img src={infoBubbleIcon} alt="Info items" />
                 <span className="numInfoItems">{numInfoItems}</span>
               </span>
             </span>
@@ -129,17 +127,10 @@ export class NotificationConsoleComponent extends React.Component<
               </span>
             </span>
           </div>
-          <div
-            className="expandCollapseButton"
-            data-test="NotificationConsole/ExpandCollapseButton"
-            role="button"
-            tabIndex={0}
-            aria-label={"console button" + (this.props.isConsoleExpanded ? " expanded" : " collapsed")}
-            aria-expanded={!this.props.isConsoleExpanded}
-          >
+          <div className="expandCollapseButton" data-test="NotificationConsole/ExpandCollapseButton">
             <img
               src={this.props.isConsoleExpanded ? ChevronDownIcon : ChevronUpIcon}
-              alt={this.props.isConsoleExpanded ? "ChevronDownIcon" : "ChevronUpIcon"}
+              alt={this.props.isConsoleExpanded ? "Collapse icon" : "Expand icon"}
             />
           </div>
         </div>
@@ -259,9 +250,6 @@ export class NotificationConsoleComponent extends React.Component<
   }
 
   private onConsoleWasExpanded = (): void => {
-    if (this.props.isConsoleExpanded && this.consoleHeaderElement) {
-      this.consoleHeaderElement.focus();
-    }
     useNotificationConsole.getState().setConsoleAnimationFinished(true);
   };
 

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

@@ -5,10 +5,13 @@ exports[`NotificationConsoleComponent renders the console 1`] = `
   className="notificationConsoleContainer"
 >
   <div
+    aria-expanded={false}
+    aria-label="Console"
     className="notificationConsoleHeader"
     id="notificationConsoleHeader"
     onClick={[Function]}
     onKeyDown={[Function]}
+    role="button"
     tabIndex={0}
   >
     <div
@@ -21,7 +24,7 @@ exports[`NotificationConsoleComponent renders the console 1`] = `
           className="notificationConsoleHeaderIconWithData"
         >
           <img
-            alt="in progress items"
+            alt="In progress items"
             src={{}}
           />
           <span
@@ -34,7 +37,7 @@ exports[`NotificationConsoleComponent renders the console 1`] = `
           className="notificationConsoleHeaderIconWithData"
         >
           <img
-            alt="error items"
+            alt="Error items"
             src={{}}
           />
           <span
@@ -47,7 +50,7 @@ exports[`NotificationConsoleComponent renders the console 1`] = `
           className="notificationConsoleHeaderIconWithData"
         >
           <img
-            alt="info items"
+            alt="Info items"
             src={{}}
           />
           <span
@@ -71,15 +74,11 @@ exports[`NotificationConsoleComponent renders the console 1`] = `
       </span>
     </div>
     <div
-      aria-expanded={true}
-      aria-label="console button collapsed"
       className="expandCollapseButton"
       data-test="NotificationConsole/ExpandCollapseButton"
-      role="button"
-      tabIndex={0}
     >
       <img
-        alt="ChevronUpIcon"
+        alt="Expand icon"
         src=""
       />
     </div>
@@ -176,10 +175,13 @@ exports[`NotificationConsoleComponent renders the console 2`] = `
   className="notificationConsoleContainer"
 >
   <div
+    aria-expanded={false}
+    aria-label="Console"
     className="notificationConsoleHeader"
     id="notificationConsoleHeader"
     onClick={[Function]}
     onKeyDown={[Function]}
+    role="button"
     tabIndex={0}
   >
     <div
@@ -192,7 +194,7 @@ exports[`NotificationConsoleComponent renders the console 2`] = `
           className="notificationConsoleHeaderIconWithData"
         >
           <img
-            alt="in progress items"
+            alt="In progress items"
             src={{}}
           />
           <span
@@ -205,7 +207,7 @@ exports[`NotificationConsoleComponent renders the console 2`] = `
           className="notificationConsoleHeaderIconWithData"
         >
           <img
-            alt="error items"
+            alt="Error items"
             src={{}}
           />
           <span
@@ -218,7 +220,7 @@ exports[`NotificationConsoleComponent renders the console 2`] = `
           className="notificationConsoleHeaderIconWithData"
         >
           <img
-            alt="info items"
+            alt="Info items"
             src={{}}
           />
           <span
@@ -244,15 +246,11 @@ exports[`NotificationConsoleComponent renders the console 2`] = `
       </span>
     </div>
     <div
-      aria-expanded={true}
-      aria-label="console button collapsed"
       className="expandCollapseButton"
       data-test="NotificationConsole/ExpandCollapseButton"
-      role="button"
-      tabIndex={0}
     >
       <img
-        alt="ChevronUpIcon"
+        alt="Expand icon"
         src=""
       />
     </div>

src/Explorer/Notebook/NotebookContainerClient.ts

@@ -2,7 +2,7 @@
  * Notebook container related stuff
  */
 import { useDialog } from "Explorer/Controls/Dialog";
-import promiseRetry, { AbortError } from "p-retry";
+import promiseRetry, { AbortError, Options } from "p-retry";
 import { PhoenixClient } from "Phoenix/PhoenixClient";
 import * as Constants from "../../Common/Constants";
 import { ConnectionStatusType, HttpHeaders, HttpStatusCodes, Notebook, PoolIdType } from "../../Common/Constants";
@@ -19,7 +19,7 @@ export class NotebookContainerClient {
   private clearReconnectionAttemptMessage? = () => {};
   private isResettingWorkspace: boolean;
   private phoenixClient: PhoenixClient;
-  private retryOptions: promiseRetry.Options;
+  private retryOptions: Options;
   private scheduleTimerId: NodeJS.Timeout;
 
   constructor(private onConnectionLost: () => void) {

src/Explorer/OpenActions/OpenActions.tsx

@@ -1,6 +1,6 @@
 // TODO convert this file to an action registry in order to have actions and their handlers be more tightly coupled.
-import { configContext, Platform } from "ConfigContext";
 import { useDatabases } from "Explorer/useDatabases";
+import { isFabricMirrored } from "Platform/Fabric/FabricUtil";
 import React from "react";
 import { ActionContracts } from "../../Contracts/ExplorerContracts";
 import * as ViewModels from "../../Contracts/ViewModels";
@@ -58,9 +58,9 @@ function openCollectionTab(
       }
 
       if (
-        configContext.platform === Platform.Fabric &&
+        isFabricMirrored() &&
         !(
-          // whitelist the tab kinds that are allowed to be opened in Fabric
+          // whitelist the tab kinds that are allowed to be opened in Fabric mirrored
           (
             action.tabKind === ActionContracts.TabKind.SQLDocuments ||
             action.tabKind === ActionContracts.TabKind.SQLQuery

src/Explorer/Panes/AddCollectionPanel.tsx

@@ -28,6 +28,7 @@ import {
 import { VectorEmbeddingPoliciesComponent } from "Explorer/Controls/VectorSearch/VectorEmbeddingPoliciesComponent";
 import { useSidePanel } from "hooks/useSidePanel";
 import { useTeachingBubble } from "hooks/useTeachingBubble";
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import React from "react";
 import { CollectionCreation } from "Shared/Constants";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
@@ -284,150 +285,152 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
         )}
 
         <div className="panelMainContent">
-          <Stack hidden={userContext.apiType === "Tables"}>
-            <Stack horizontal>
-              <span className="mandatoryStar">*&nbsp;</span>
-              <Text className="panelTextBold" variant="small">
-                Database {userContext.apiType === "Mongo" ? "name" : "id"}
-              </Text>
-              <TooltipHost
-                directionalHint={DirectionalHint.bottomLeftEdge}
-                content={`A database is analogous to a namespace. It is the unit of management for a set of ${getCollectionName(
-                  true,
-                ).toLocaleLowerCase()}.`}
-              >
-                <Icon
-                  iconName="Info"
-                  className="panelInfoIcon"
-                  tabIndex={0}
-                  ariaLabel={`A database is analogous to a namespace. It is the unit of management for a set of ${getCollectionName(
+          {!(isFabricNative() && this.props.databaseId !== undefined) && (
+            <Stack hidden={userContext.apiType === "Tables"}>
+              <Stack horizontal>
+                <span className="mandatoryStar">*&nbsp;</span>
+                <Text className="panelTextBold" variant="small">
+                  Database {userContext.apiType === "Mongo" ? "name" : "id"}
+                </Text>
+                <TooltipHost
+                  directionalHint={DirectionalHint.bottomLeftEdge}
+                  content={`A database is analogous to a namespace. It is the unit of management for a set of ${getCollectionName(
                     true,
                   ).toLocaleLowerCase()}.`}
-                />
-              </TooltipHost>
-            </Stack>
-
-            {configContext.platform !== Platform.Fabric && (
-              <Stack horizontal verticalAlign="center">
-                <div role="radiogroup">
-                  <input
-                    className="panelRadioBtn"
-                    checked={this.state.createNewDatabase}
-                    aria-label="Create new database"
-                    aria-checked={this.state.createNewDatabase}
-                    name="databaseType"
-                    type="radio"
-                    role="radio"
-                    id="databaseCreateNew"
+                >
+                  <Icon
+                    iconName="Info"
+                    className="panelInfoIcon"
                     tabIndex={0}
-                    onChange={this.onCreateNewDatabaseRadioBtnChange.bind(this)}
+                    ariaLabel={`A database is analogous to a namespace. It is the unit of management for a set of ${getCollectionName(
+                      true,
+                    ).toLocaleLowerCase()}.`}
                   />
-                  <span className="panelRadioBtnLabel">Create new</span>
-
-                  <input
-                    className="panelRadioBtn"
-                    checked={!this.state.createNewDatabase}
-                    aria-label="Use existing database"
-                    aria-checked={!this.state.createNewDatabase}
-                    name="databaseType"
-                    type="radio"
-                    role="radio"
-                    tabIndex={0}
-                    onChange={this.onUseExistingDatabaseRadioBtnChange.bind(this)}
-                  />
-                  <span className="panelRadioBtnLabel">Use existing</span>
-                </div>
+                </TooltipHost>
               </Stack>
-            )}
 
-            {this.state.createNewDatabase && (
-              <Stack className="panelGroupSpacing">
-                <input
-                  name="newDatabaseId"
-                  id="newDatabaseId"
-                  aria-required
-                  required
-                  type="text"
-                  autoComplete="off"
-                  pattern="[^/?#\\]*[^/?# \\]"
-                  title="May not end with space nor contain characters '\' '/' '#' '?'"
-                  placeholder="Type a new database id"
-                  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>) =>
-                    this.setState({ newDatabaseId: event.target.value })
-                  }
-                />
-
-                {!isServerlessAccount() && (
-                  <Stack horizontal>
-                    <Checkbox
-                      label={`Share throughput across ${getCollectionName(true).toLocaleLowerCase()}`}
-                      checked={this.state.isSharedThroughputChecked}
-                      styles={{
-                        text: { fontSize: 12 },
-                        checkbox: { width: 12, height: 12 },
-                        label: { padding: 0, alignItems: "center" },
-                      }}
-                      onChange={(ev: React.FormEvent<HTMLElement>, isChecked: boolean) =>
-                        this.setState({ isSharedThroughputChecked: isChecked })
-                      }
+              {configContext.platform !== Platform.Fabric && (
+                <Stack horizontal verticalAlign="center">
+                  <div role="radiogroup">
+                    <input
+                      className="panelRadioBtn"
+                      checked={this.state.createNewDatabase}
+                      aria-label="Create new database"
+                      aria-checked={this.state.createNewDatabase}
+                      name="databaseType"
+                      type="radio"
+                      role="radio"
+                      id="databaseCreateNew"
+                      tabIndex={0}
+                      onChange={this.onCreateNewDatabaseRadioBtnChange.bind(this)}
                     />
-                    <TooltipHost
-                      directionalHint={DirectionalHint.bottomLeftEdge}
-                      content={`Throughput configured at the database level will be shared across all ${getCollectionName(
-                        true,
-                      ).toLocaleLowerCase()} within the database.`}
-                    >
-                      <Icon
-                        iconName="Info"
-                        className="panelInfoIcon"
-                        tabIndex={0}
-                        ariaLabel={`Throughput configured at the database level will be shared across all ${getCollectionName(
+                    <span className="panelRadioBtnLabel">Create new</span>
+
+                    <input
+                      className="panelRadioBtn"
+                      checked={!this.state.createNewDatabase}
+                      aria-label="Use existing database"
+                      aria-checked={!this.state.createNewDatabase}
+                      name="databaseType"
+                      type="radio"
+                      role="radio"
+                      tabIndex={0}
+                      onChange={this.onUseExistingDatabaseRadioBtnChange.bind(this)}
+                    />
+                    <span className="panelRadioBtnLabel">Use existing</span>
+                  </div>
+                </Stack>
+              )}
+
+              {this.state.createNewDatabase && (
+                <Stack className="panelGroupSpacing">
+                  <input
+                    name="newDatabaseId"
+                    id="newDatabaseId"
+                    aria-required
+                    required
+                    type="text"
+                    autoComplete="off"
+                    pattern="[^/?#\\]*[^/?# \\]"
+                    title="May not end with space nor contain characters '\' '/' '#' '?'"
+                    placeholder="Type a new database id"
+                    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>) =>
+                      this.setState({ newDatabaseId: event.target.value })
+                    }
+                  />
+
+                  {!isServerlessAccount() && (
+                    <Stack horizontal>
+                      <Checkbox
+                        label={`Share throughput across ${getCollectionName(true).toLocaleLowerCase()}`}
+                        checked={this.state.isSharedThroughputChecked}
+                        styles={{
+                          text: { fontSize: 12 },
+                          checkbox: { width: 12, height: 12 },
+                          label: { padding: 0, alignItems: "center" },
+                        }}
+                        onChange={(ev: React.FormEvent<HTMLElement>, isChecked: boolean) =>
+                          this.setState({ isSharedThroughputChecked: isChecked })
+                        }
+                      />
+                      <TooltipHost
+                        directionalHint={DirectionalHint.bottomLeftEdge}
+                        content={`Throughput configured at the database level will be shared across all ${getCollectionName(
                           true,
                         ).toLocaleLowerCase()} within the database.`}
-                      />
-                    </TooltipHost>
-                  </Stack>
-                )}
+                      >
+                        <Icon
+                          iconName="Info"
+                          className="panelInfoIcon"
+                          tabIndex={0}
+                          ariaLabel={`Throughput configured at the database level will be shared across all ${getCollectionName(
+                            true,
+                          ).toLocaleLowerCase()} within the database.`}
+                        />
+                      </TooltipHost>
+                    </Stack>
+                  )}
 
-                {!isServerlessAccount() && this.state.isSharedThroughputChecked && (
-                  <ThroughputInput
-                    showFreeTierExceedThroughputTooltip={this.isFreeTierAccount() && !isFirstResourceCreated}
-                    isDatabase={true}
-                    isSharded={this.state.isSharded}
-                    isFreeTier={this.isFreeTierAccount()}
-                    isQuickstart={this.props.isQuickstart}
-                    setThroughputValue={(throughput: number) => (this.newDatabaseThroughput = throughput)}
-                    setIsAutoscale={(isAutoscale: boolean) => (this.isNewDatabaseAutoscale = isAutoscale)}
-                    setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) =>
-                      this.setState({ isThroughputCapExceeded })
-                    }
-                    onCostAcknowledgeChange={(isAcknowledge: boolean) => (this.isCostAcknowledged = isAcknowledge)}
-                  />
-                )}
-              </Stack>
-            )}
-            {!this.state.createNewDatabase && (
-              <Dropdown
-                ariaLabel="Choose an existing database"
-                styles={{ title: { height: 27, lineHeight: 27 }, dropdownItem: { fontSize: 12 } }}
-                style={{ width: 300, fontSize: 12 }}
-                placeholder="Choose an existing database"
-                options={this.getDatabaseOptions()}
-                onChange={(event: React.FormEvent<HTMLDivElement>, database: IDropdownOption) =>
-                  this.setState({ selectedDatabaseId: database.key as string })
-                }
-                defaultSelectedKey={this.props.databaseId}
-                responsiveMode={999}
-              />
-            )}
-            <Separator className="panelSeparator" />
-          </Stack>
+                  {!isServerlessAccount() && this.state.isSharedThroughputChecked && (
+                    <ThroughputInput
+                      showFreeTierExceedThroughputTooltip={this.isFreeTierAccount() && !isFirstResourceCreated}
+                      isDatabase={true}
+                      isSharded={this.state.isSharded}
+                      isFreeTier={this.isFreeTierAccount()}
+                      isQuickstart={this.props.isQuickstart}
+                      setThroughputValue={(throughput: number) => (this.newDatabaseThroughput = throughput)}
+                      setIsAutoscale={(isAutoscale: boolean) => (this.isNewDatabaseAutoscale = isAutoscale)}
+                      setIsThroughputCapExceeded={(isThroughputCapExceeded: boolean) =>
+                        this.setState({ isThroughputCapExceeded })
+                      }
+                      onCostAcknowledgeChange={(isAcknowledge: boolean) => (this.isCostAcknowledged = isAcknowledge)}
+                    />
+                  )}
+                </Stack>
+              )}
+              {!this.state.createNewDatabase && (
+                <Dropdown
+                  ariaLabel="Choose an existing database"
+                  styles={{ title: { height: 27, lineHeight: 27 }, dropdownItem: { fontSize: 12 } }}
+                  style={{ width: 300, fontSize: 12 }}
+                  placeholder="Choose an existing database"
+                  options={this.getDatabaseOptions()}
+                  onChange={(event: React.FormEvent<HTMLDivElement>, database: IDropdownOption) =>
+                    this.setState({ selectedDatabaseId: database.key as string })
+                  }
+                  defaultSelectedKey={this.props.databaseId}
+                  responsiveMode={999}
+                />
+              )}
+              <Separator className="panelSeparator" />
+            </Stack>
+          )}
 
           <Stack>
             <Stack horizontal>
@@ -666,7 +669,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
                     </Stack>
                   );
                 })}
-              {userContext.apiType === "SQL" && (
+              {!isFabricNative() && userContext.apiType === "SQL" && (
                 <Stack className="panelGroupSpacing">
                   <DefaultButton
                     styles={{ root: { padding: 0, width: 200, height: 30 }, label: { fontSize: 12 } }}
@@ -747,7 +750,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
             />
           )}
 
-          {userContext.apiType === "SQL" && (
+          {!isFabricNative() && userContext.apiType === "SQL" && (
             <Stack>
               <Stack horizontal>
                 <Text className="panelTextBold" variant="small">
@@ -937,7 +940,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
               </CollapsibleSectionComponent>
             </Stack>
           )}
-          {userContext.apiType !== "Tables" && (
+          {!isFabricNative() && userContext.apiType !== "Tables" && (
             <CollapsibleSectionComponent
               title="Advanced"
               isExpandedByDefault={false}
@@ -1260,7 +1263,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
   // }
 
   private shouldShowCollectionThroughputInput(): boolean {
-    if (isServerlessAccount()) {
+    if (isFabricNative() || isServerlessAccount()) {
       return false;
     }
 
@@ -1286,7 +1289,7 @@ export class AddCollectionPanel extends React.Component<AddCollectionPanelProps,
   }
 
   private shouldShowAnalyticalStoreOptions(): boolean {
-    if (configContext.platform === Platform.Emulator) {
+    if (isFabricNative() || configContext.platform === Platform.Emulator) {
       return false;
     }
 

src/Explorer/Panes/PanelComponent.less

@@ -94,6 +94,7 @@
     padding-left: @MediumSpace;
 
     .paneErrorLink {
+      color: @LinkColor;
       cursor: pointer;
       font-size: @mediumFontSize;
     }

src/Explorer/Panes/SettingsPane/SettingsPane.tsx

@@ -32,6 +32,7 @@ import {
 } from "Shared/StorageUtility";
 import * as StringUtility from "Shared/StringUtility";
 import { updateUserContext, userContext } from "UserContext";
+import { isDataplaneRbacSupported } from "Utils/APITypeUtils";
 import { acquireMsalTokenForAccount } from "Utils/AuthorizationUtils";
 import { logConsoleError, logConsoleInfo } from "Utils/NotificationConsoleUtils";
 import * as PriorityBasedExecutionUtils from "Utils/PriorityBasedExecutionUtils";
@@ -183,7 +184,7 @@ export const SettingsPane: FunctionComponent<{ explorer: Explorer }> = ({
   const shouldShowCrossPartitionOption = userContext.apiType !== "Gremlin" && !isEmulator;
   const shouldShowParallelismOption = userContext.apiType !== "Gremlin" && !isEmulator;
   const showEnableEntraIdRbac =
-    userContext.apiType === "SQL" &&
+    isDataplaneRbacSupported(userContext.apiType) &&
     userContext.authType === AuthType.AAD &&
     configContext.platform !== Platform.Fabric &&
     !isEmulator;

src/Explorer/QueryCopilot/QueryCopilotPromptbar.tsx

@@ -18,7 +18,7 @@ import {
   Text,
   TextField,
 } from "@fluentui/react";
-import { HttpStatusCodes, NormalizedEventKey } from "Common/Constants";
+import { FeedbackLabels, HttpStatusCodes, NormalizedEventKey } from "Common/Constants";
 import { handleError } from "Common/ErrorHandlingUtils";
 import QueryError, { QueryErrorSeverity } from "Common/QueryError";
 import { createUri } from "Common/UrlUtility";
@@ -393,8 +393,7 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
                 },
               }}
               disabled={isGeneratingQuery}
-              autoComplete="list"
-              aria-expanded={showSamplePrompts}
+              autoComplete="off"
               placeholder="Ask a question in natural language and we’ll generate the query for you."
               aria-labelledby="copilot-textfield-label"
               onRenderSuffix={() => {
@@ -580,7 +579,7 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
                 <Stack horizontal verticalAlign="center" style={{ maxHeight: 20 }}>
                   {userContext.feedbackPolicies?.policyAllowFeedback && (
                     <Stack horizontal verticalAlign="center">
-                      <Text style={{ fontSize: 12 }}>Provide feedback</Text>
+                      <Text style={{ fontSize: 12 }}>{FeedbackLabels.provideFeedback}</Text>
                       {showCallout && !hideFeedbackModalForLikedQueries && (
                         <Callout
                           role="status"
@@ -630,8 +629,9 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
                       <IconButton
                         id="likeBtn"
                         style={{ marginLeft: 10 }}
-                        aria-label="Like"
-                        role="toggle"
+                        aria-label={FeedbackLabels.provideFeedback}
+                        role="button"
+                        title="Like"
                         iconProps={{ iconName: likeQuery === true ? "LikeSolid" : "Like" }}
                         onClick={() => {
                           setShowCallout(!likeQuery);
@@ -649,8 +649,9 @@ export const QueryCopilotPromptbar: React.FC<QueryCopilotPromptProps> = ({
                       />
                       <IconButton
                         style={{ margin: "0 4px" }}
-                        role="toggle"
-                        aria-label="Dislike"
+                        role="button"
+                        aria-label={FeedbackLabels.provideFeedback}
+                        title="Dislike"
                         iconProps={{ iconName: dislikeQuery === true ? "DislikeSolid" : "Dislike" }}
                         onClick={() => {
                           let toggleStatusValue = "Unpressed";

src/Explorer/Sidebar.tsx

@@ -1,5 +1,6 @@
 import {
   Button,
+  makeStyles,
   Menu,
   MenuButton,
   MenuButtonProps,
@@ -7,13 +8,12 @@ import {
   MenuList,
   MenuPopover,
   MenuTrigger,
-  SplitButton,
-  makeStyles,
   mergeClasses,
   shorthands,
+  SplitButton,
 } from "@fluentui/react-components";
 import { Add16Regular, ArrowSync12Regular, ChevronLeft12Regular, ChevronRight12Regular } from "@fluentui/react-icons";
-import { Platform, configContext } from "ConfigContext";
+import { configContext, Platform } from "ConfigContext";
 import Explorer from "Explorer/Explorer";
 import { AddDatabasePanel } from "Explorer/Panes/AddDatabasePanel/AddDatabasePanel";
 import { Tabs } from "Explorer/Tabs/Tabs";
@@ -21,6 +21,7 @@ import { CosmosFluentProvider, cosmosShorthands, tokens } from "Explorer/Theme/T
 import { ResourceTree } from "Explorer/Tree/ResourceTree";
 import { useDatabases } from "Explorer/useDatabases";
 import { KeyboardAction, KeyboardActionGroup, KeyboardActionHandler, useKeyboardActionGroup } from "KeyboardShortcuts";
+import { isFabric, isFabricMirrored, isFabricNative } from "Platform/Fabric/FabricUtil";
 import { userContext } from "UserContext";
 import { getCollectionName, getDatabaseName } from "Utils/APITypeUtils";
 import { Allotment, AllotmentHandle } from "allotment";
@@ -123,7 +124,7 @@ const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
 
   const actions = useMemo<GlobalCommand[]>(() => {
     if (
-      configContext.platform === Platform.Fabric ||
+      (isFabric() && userContext.fabricContext?.isReadOnly) ||
       userContext.apiType === "Postgres" ||
       userContext.apiType === "VCoreMongo"
     ) {
@@ -137,12 +138,15 @@ const GlobalCommands: React.FC<GlobalCommandsProps> = ({ explorer }) => {
         id: "new_collection",
         label: `New ${getCollectionName()}`,
         icon: <Add16Regular />,
-        onClick: () => explorer.onNewCollectionClicked(),
+        onClick: () => {
+          const databaseId = isFabricNative() ? userContext.fabricContext?.databaseName : undefined;
+          explorer.onNewCollectionClicked({ databaseId });
+        },
         keyboardAction: KeyboardAction.NEW_COLLECTION,
       },
     ];
 
-    if (userContext.apiType !== "Tables") {
+    if (configContext.platform !== Platform.Fabric && userContext.apiType !== "Tables") {
       actions.push({
         id: "new_database",
         label: `New ${getDatabaseName()}`,
@@ -288,7 +292,7 @@ export const SidebarContainer: React.FC<SidebarProps> = ({ explorer }) => {
   }, [setLoading]);
 
   const hasGlobalCommands = !(
-    configContext.platform === Platform.Fabric ||
+    isFabricMirrored() ||
     userContext.apiType === "Postgres" ||
     userContext.apiType === "VCoreMongo"
   );

src/Explorer/SplashScreen/FabricHome.tsx

@@ -0,0 +1,173 @@
+/**
+ * Accordion top class
+ */
+import { Link, makeStyles, tokens } from "@fluentui/react-components";
+import { DocumentAddRegular, LinkMultipleRegular } from "@fluentui/react-icons";
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
+import * as React from "react";
+import { userContext } from "UserContext";
+import CosmosDbBlackIcon from "../../../images/CosmosDB_black.svg";
+import LinkIcon from "../../../images/Link_blue.svg";
+import Explorer from "../Explorer";
+
+export interface SplashScreenProps {
+  explorer: Explorer;
+}
+
+const useStyles = makeStyles({
+  homeContainer: {
+    width: "100%",
+    alignContent: "center",
+  },
+  title: {
+    textAlign: "center",
+    fontSize: "20px",
+    fontWeight: "bold",
+  },
+  buttonsContainer: {
+    width: "584px",
+    margin: "auto",
+    display: "grid",
+    padding: "16px",
+    gridTemplateColumns: "repeat(3, 1fr)",
+    gap: "10px",
+    gridAutoRows: "minmax(184px, auto)",
+  },
+  one: {
+    gridColumn: "1 / 3",
+    gridRow: "1 / 3",
+    "& svg": {
+      width: "48px",
+      height: "48px",
+      margin: "auto",
+    },
+  },
+  two: {
+    gridColumn: "3",
+    gridRow: "1",
+    "& img": {
+      width: "32px",
+      height: "32px",
+      margin: "auto",
+    },
+  },
+  three: {
+    gridColumn: "3",
+    gridRow: "2",
+    "& svg": {
+      width: "32px",
+      height: "32px",
+      margin: "auto",
+    },
+  },
+  buttonContainer: {
+    height: "100%",
+    display: "flex",
+    flexDirection: "column",
+    border: "1px solid #e0e0e0",
+    cursor: "pointer",
+    "&:hover": {
+      backgroundColor: tokens.colorNeutralBackground1Hover,
+      "border-color": tokens.colorNeutralStroke1Hover,
+    },
+  },
+  buttonUpperPart: {
+    textAlign: "center",
+    flexGrow: 1,
+    display: "flex",
+    backgroundColor: "#e3f7ef",
+  },
+  buttonLowerPart: {
+    borderTop: "1px solid #e0e0e0",
+    height: "76px",
+    padding: "8px",
+    "> div:nth-child(1)": {
+      fontWeight: "bold",
+    },
+    display: "flex",
+    flexDirection: "column",
+    justifyContent: "center",
+  },
+  footer: {
+    textAlign: "center",
+  },
+});
+
+interface FabricHomeScreenButtonProps {
+  title: string;
+  description: string;
+  icon: JSX.Element;
+  onClick?: () => void;
+}
+
+const FabricHomeScreenButton: React.FC<FabricHomeScreenButtonProps & { className: string }> = ({
+  title,
+  description,
+  icon,
+  className,
+  onClick,
+}) => {
+  const styles = useStyles();
+
+  // TODO Make this a11y copmliant: aria-label for icon
+  return (
+    <div role="button" className={`${styles.buttonContainer} ${className}`} onClick={onClick}>
+      <div className={styles.buttonUpperPart}>{icon}</div>
+      <div className={styles.buttonLowerPart}>
+        <div>{title}</div>
+        <div>{description}</div>
+      </div>
+    </div>
+  );
+};
+
+export const FabricHomeScreen: React.FC<SplashScreenProps> = (props: SplashScreenProps) => {
+  const styles = useStyles();
+  const getSplashScreenButtons = (): JSX.Element => {
+    const buttons: FabricHomeScreenButtonProps[] = [
+      {
+        title: "New container",
+        description: "Create a destination container to store your data",
+        icon: <DocumentAddRegular />,
+        onClick: () => {
+          const databaseId = isFabricNative() ? userContext.fabricContext?.databaseName : undefined;
+          props.explorer.onNewCollectionClicked({ databaseId });
+        },
+      },
+      {
+        title: "Sample data",
+        description: "Automatically load sample data in your database",
+        icon: <img src={CosmosDbBlackIcon} />,
+      },
+      {
+        title: "App development",
+        description: "Start here to use an SDK to build your apps",
+        icon: <LinkMultipleRegular />,
+      },
+    ];
+
+    return (
+      <div className={styles.buttonsContainer}>
+        <FabricHomeScreenButton className={styles.one} {...buttons[0]} />
+        <FabricHomeScreenButton className={styles.two} {...buttons[1]} />
+        <FabricHomeScreenButton className={styles.three} {...buttons[2]} />
+      </div>
+    );
+  };
+
+  const title = "Build your database";
+  return (
+    <div className={styles.homeContainer}>
+      <div className={styles.title} role="heading" aria-label={title}>
+        {title}
+      </div>
+      {getSplashScreenButtons()}
+      <div className={styles.footer}>
+        Need help?{" "}
+        <Link href="https://cosmos.azure.com/docs" target="_blank">
+          Learn more <img src={LinkIcon} alt="Learn more" />
+        </Link>
+      </div>
+    </div>
+  );
+};

src/Explorer/Tabs/CloudShellTab/AttachAddOn.tsx

@@ -1,126 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.  All rights reserved.
- */
-
-import { IDisposable, ITerminalAddon, Terminal } from 'xterm';
-
-interface IAttachOptions {
-    bidirectional?: boolean;
-}
-
-export class AttachAddon implements ITerminalAddon {
-    private _socket: WebSocket;
-    private _bidirectional: boolean;
-    private _disposables: IDisposable[] = [];
-    private _socketData: string;
-
-    constructor(socket: WebSocket, options?: IAttachOptions) {
-        this._socket = socket;
-        // always set binary type to arraybuffer, we do not handle blobs
-        this._socket.binaryType = 'arraybuffer';
-        this._bidirectional = !(options && options.bidirectional === false);
-        this._socketData = '';
-    }
-
-    public activate(terminal: Terminal): void {
-        this._disposables.push(
-            addSocketListener(this._socket, 'message', ev => {
-                let data: ArrayBuffer | string = ev.data;
-                const startStatusJson = 'ie_us';
-                const endStatusJson = 'ie_ue';
-
-                if (typeof data === 'object') {
-                    const enc = new TextDecoder("utf-8");
-                    data = enc.decode(ev.data as any);
-                }
-
-                // for example of json object look in TerminalHelper in the socket.onMessage
-                if (data.includes(startStatusJson) && data.includes(endStatusJson)) {
-                    // process as one line
-                    const statusData = data.split(startStatusJson)[1].split(endStatusJson)[0];
-                    data = data.replace(statusData, '');
-                    data = data.replace(startStatusJson, '');
-                    data = data.replace(endStatusJson, '');
-                } else if (data.includes(startStatusJson)) {
-                    // check for start
-                    const partialStatusData = data.split(startStatusJson)[1];
-                    this._socketData += partialStatusData;
-                    data = data.replace(partialStatusData, '');
-                    data = data.replace(startStatusJson, '');
-                } else if (data.includes(endStatusJson)) {
-                    // check for end and process the command
-                    const partialStatusData = data.split(endStatusJson)[0];
-                    this._socketData += partialStatusData;
-                    data = data.replace(partialStatusData, '');
-                    data = data.replace(endStatusJson, '');
-                    this._socketData = '';
-                } else if (this._socketData.length > 0) {
-                    // check if the line is all data then just concatenate
-                    this._socketData += data;
-                    data = '';
-                }
-                terminal.write(data);
-            })
-        );
-
-        if (this._bidirectional) {
-            this._disposables.push(terminal.onData(data => this._sendData(data)));
-            this._disposables.push(terminal.onBinary(data => this._sendBinary(data)));
-        }
-
-        this._disposables.push(addSocketListener(this._socket, 'close', () => this.dispose()));
-        this._disposables.push(addSocketListener(this._socket, 'error', () => this.dispose()));
-    }
-
-    public dispose(): void {
-        for (const d of this._disposables) {
-            d.dispose();
-        }
-    }
-
-    private _sendData(data: string): void {
-        if (!this._checkOpenSocket()) {
-            return;
-        }
-        this._socket.send(data);
-    }
-
-    private _sendBinary(data: string): void {
-        if (!this._checkOpenSocket()) {
-            return;
-        }
-        const buffer = new Uint8Array(data.length);
-        for (let i = 0; i < data.length; ++i) {
-            buffer[i] = data.charCodeAt(i) & 255;
-        }
-        this._socket.send(buffer);
-    }
-
-    private _checkOpenSocket(): boolean {
-        switch (this._socket.readyState) {
-            case WebSocket.OPEN:
-                return true;
-            case WebSocket.CONNECTING:
-                throw new Error('Attach addon was loaded before socket was open');
-            case WebSocket.CLOSING:
-                return false;
-            case WebSocket.CLOSED:
-                throw new Error('Attach addon socket is closed');
-            default:
-                throw new Error('Unexpected socket state');
-        }
-    }
-}
-
-function addSocketListener<K extends keyof WebSocketEventMap>(socket: WebSocket, type: K, handler: (this: WebSocket, ev: WebSocketEventMap[K]) => any): IDisposable {
-    socket.addEventListener(type, handler);
-    return {
-        dispose: () => {
-            if (!handler) {
-                // Already disposed
-                return;
-            }
-            socket.removeEventListener(type, handler);
-        }
-    };
-}

src/Explorer/Tabs/CloudShellTab/CloudShellTabComponent.tsx

@@ -1,76 +0,0 @@
-import React, { useEffect, useRef } from "react";
-import { Terminal } from "xterm";
-import { FitAddon } from 'xterm-addon-fit';
-import "xterm/css/xterm.css";
-import { TerminalKind } from "../../../Contracts/ViewModels";
-import { startCloudShellTerminal } from "./Core/CloudShellTerminalCore";
-
-export interface CloudShellTerminalProps {
-    shellType: TerminalKind;
-}
-
-export const CloudShellTerminalComponent: React.FC<CloudShellTerminalProps> = ({
-    shellType
-}: CloudShellTerminalProps) => {
-    const terminalRef = useRef(null); // Reference for terminal container
-    const xtermRef = useRef(null);    // Reference for XTerm instance
-    const socketRef = useRef(null);   // Reference for WebSocket
-    const fitAddon = new FitAddon();
-
-    useEffect(() => {
-        // Initialize XTerm instance
-        const term = new Terminal({
-            cursorBlink: true,
-            cursorStyle: 'bar',
-            fontFamily: 'monospace',
-            fontSize: 14,
-            theme: {
-                background: "#1e1e1e", 
-                foreground: "#d4d4d4", 
-                cursor: "#ffcc00"
-            },
-            scrollback: 1000
-        });
-
-        term.loadAddon(fitAddon);
-
-        // Attach terminal to the DOM
-        if (terminalRef.current) {
-            term.open(terminalRef.current);
-            xtermRef.current = term;
-        }
-        
-        if (fitAddon) {
-            fitAddon.fit();
-        }
-
-        // Adjust terminal size on window resize
-        const handleResize = () => fitAddon.fit();
-        window.addEventListener('resize', handleResize);
-
-        try {
-            socketRef.current = startCloudShellTerminal(term, shellType);
-            term.onData((data) => {
-                if (socketRef.current && socketRef.current.readyState === WebSocket.OPEN) {
-                    socketRef.current.send(data);
-                }
-            });
-        } catch (error) {
-            console.error("Failed to initialize CloudShell terminal:", error);
-            term.writeln(`\x1B[31mError initializing terminal: ${error.message}\x1B[0m`);
-        }
-
-        // Cleanup function to close WebSocket and dispose terminal
-        return () => {
-            if (!socketRef.current) return;
-            if (socketRef.current) {
-                socketRef.current.close(); // Close WebSocket connection
-            }
-            window.removeEventListener('resize', handleResize);
-            term.dispose(); // Clean up XTerm instance
-        };
-        
-    }, [shellType]);
-
-    return <div ref={terminalRef} style={{ width: "100%", height: "500px"}} />;
-};

src/Explorer/Tabs/CloudShellTab/Commands.tsx

@@ -1,152 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.  All rights reserved.
- */
-
-import { TerminalKind } from "../../../Contracts/ViewModels";
-import { userContext } from "../../../UserContext";
-
-export const getCommands = (terminalKind: TerminalKind, key: string) => {
-    let dbAccount = userContext.databaseAccount;
-    let endpoint;
-    switch (terminalKind) {
-        case TerminalKind.Postgres:
-            endpoint = dbAccount.properties.postgresqlEndpoint;
-            break;
-        case TerminalKind.Mongo:
-            endpoint = dbAccount.properties.mongoEndpoint;
-            break;
-        case TerminalKind.VCoreMongo:
-            endpoint = dbAccount.properties.vcoreMongoEndpoint;
-            break;
-        case TerminalKind.Cassandra:
-            endpoint = dbAccount.properties.cassandraEndpoint;
-            break;
-        default:
-            throw new Error("Unknown Terminal Kind");
-    }
-
-    let config = {
-        host: getHostFromUrl(endpoint),
-        name: dbAccount.name,
-        password: key,
-        endpoint: endpoint
-    };
-
-    return commands(terminalKind, config).join("\n").concat("\n");
-};
-
-export interface CommandConfig {
-    host: string,
-    name: string,
-    password: string,
-    endpoint: string
-}
-
-export const commands = (terminalKind: TerminalKind, config?: CommandConfig): string[] => {
-    switch (terminalKind) {
-        case TerminalKind.Postgres:
-            return [
-                // 1. Fetch and display location details in a readable format
-                "curl -s https://ipinfo.io | jq -r '\"Region: \" + .region + \" Country: \" + .country + \" City: \" + .city + \" IP Addr: \" + .ip'",
-                // 2. Check if psql is installed; if not, proceed with installation
-                "if ! command -v psql &> /dev/null; then echo '⚠️ psql not found. Installing...'; fi",
-                // 3. Download PostgreSQL if not installed
-                "if ! command -v psql &> /dev/null; then curl -LO https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2; fi",
-                // 4. Extract PostgreSQL package if not installed
-                "if ! command -v psql &> /dev/null; then tar -xvjf postgresql-15.2.tar.bz2; fi",
-                // 5. Create a directory for PostgreSQL installation if not installed
-                "if ! command -v psql &> /dev/null; then mkdir -p ~/pgsql; fi",
-                // 6. Download readline (dependency for PostgreSQL) if not installed
-                "if ! command -v psql &> /dev/null; then curl -LO https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz; fi",
-                // 7. Extract readline package if not installed
-                "if ! command -v psql &> /dev/null; then tar -xvzf readline-8.1.tar.gz; fi",
-                // 8. Configure readline if not installed
-                "if ! command -v psql &> /dev/null; then cd readline-8.1 && ./configure --prefix=$HOME/pgsql; fi",
-                // 9. Add PostgreSQL to PATH if not installed
-                "if ! command -v psql &> /dev/null; then echo 'export PATH=$HOME/pgsql/bin:$PATH' >> ~/.bashrc; fi",
-                // 10. Source .bashrc to update PATH (even if psql was already installed)
-                "source ~/.bashrc",
-                // 11. Verify PostgreSQL installation
-                "psql --version",
-                `psql 'read -p "Enter Database Name: " dbname && read -p "Enter Username: " username && host=${config.endpoint} port=5432 dbname=$dbname user=$username sslmode=require'`
-            ];
-        case TerminalKind.Mongo:
-            return [
-                // 1. Fetch and display location details in a readable format
-                "curl -s https://ipinfo.io | jq -r '\"Region: \" + .region + \" Country: \" + .country + \" City: \" + .city + \" IP Addr: \" + .ip'",
-                // 2. Check if mongosh is installed; if not, proceed with installation
-                "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
-                // 3. Download mongosh if not installed
-                "if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz; fi",
-                // 4. Extract mongosh package if not installed
-                "if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-2.3.8-linux-x64.tgz; fi",
-                // 5. Move mongosh binaries if not installed
-                "if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh && mv mongosh-2.3.8-linux-x64/* ~/mongosh/; fi",
-                // 6. Add mongosh to PATH if not installed
-                "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
-                // 7. Source .bashrc to update PATH (even if mongosh was already installed)
-                "source ~/.bashrc",
-                // 8. Verify mongosh installation
-                "mongosh --version",
-                // 9. Login to MongoDB
-                `mongosh --host ${config.host} --port 10255 --username ${config.name} --password ${config.password} --tls --tlsAllowInvalidCertificates`
-            ];   
-        case TerminalKind.VCoreMongo:
-            return [
-                // 1. Fetch and display location details in a readable format
-                "curl -s https://ipinfo.io | jq -r '\"Region: \" + .region + \" Country: \" + .country + \" City: \" + .city + \" IP Addr: \" + .ip'",
-                // 2. Check if mongosh is installed; if not, proceed with installation
-                "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
-                // 3. Download mongosh if not installed
-                "if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz; fi",
-                // 4. Extract mongosh package if not installed
-                "if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-2.3.8-linux-x64.tgz; fi",
-                // 5. Move mongosh binaries if not installed
-                "if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh && mv mongosh-2.3.8-linux-x64/* ~/mongosh/; fi",
-                // 6. Add mongosh to PATH if not installed
-                "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
-                // 7. Source .bashrc to update PATH (even if mongosh was already installed)
-                "source ~/.bashrc",
-                // 8. Verify mongosh installation
-                "mongosh --version",
-                // 10. Login to MongoDBmongosh mongodb+srv://<credentials>@neesharma-stage-mongo-vcore.mongocluster.cosmos.azure.com/?authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000\u0007
-                `read -p "Enter username: " username && mongosh "mongodb+srv://$username:@${config.endpoint}/?authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000" --tls --tlsAllowInvalidCertificates`
-            ];     
-        case TerminalKind.Cassandra:
-            return [
-                // 1. Fetch and display location details in a readable format
-                "curl -s https://ipinfo.io | jq -r '\"Region: \" + .region + \" Country: \" + .country + \" City: \" + .city + \" IP Addr: \" + .ip'",
-                // 2. Check if cqlsh is installed; if not, proceed with installation
-                "if ! command -v cqlsh &> /dev/null; then echo '⚠️ cqlsh not found. Installing...'; fi",
-                // 3. Download Cassandra if not installed
-                "if ! command -v cqlsh &> /dev/null; then curl -LO https://archive.apache.org/dist/cassandra/5.0.3/apache-cassandra-5.0.3-bin.tar.gz; fi",
-                // 4. Extract Cassandra package if not installed
-                "if ! command -v cqlsh &> /dev/null; then tar -xvzf apache-cassandra-5.0.3-bin.tar.gz; fi",
-                // 5. Move Cassandra binaries if not installed
-                "if ! command -v cqlsh &> /dev/null; then mkdir -p ~/cassandra && mv apache-cassandra-5.0.3/* ~/cassandra/; fi",
-                // 6. Add Cassandra to PATH if not installed
-                "if ! command -v cqlsh &> /dev/null; then echo 'export PATH=$HOME/cassandra/bin:$PATH' >> ~/.bashrc; fi",
-                // 7. Set environment variables for SSL
-                "if ! command -v cqlsh &> /dev/null; then echo 'export SSL_VERSION=TLSv1_2' >> ~/.bashrc; fi",
-                "if ! command -v cqlsh &> /dev/null; then echo 'export SSL_VALIDATE=false' >> ~/.bashrc; fi",
-                // 8. Source .bashrc to update PATH (even if cqlsh was already installed)
-                "source ~/.bashrc",
-                // 9. Verify cqlsh installation
-                "cqlsh --version",
-                // 10. Login to Cassandra
-                `cqlsh ${config.host} 10350 -u ${config.name} -p ${config.password} --ssl --protocol-version=4`
-            ];
-        default:
-            return ["echo Unknown Shell"];
-    }
-}
-
-const getHostFromUrl = (mongoEndpoint: string): string => {
-    try {
-        const url = new URL(mongoEndpoint);
-        return url.hostname;
-    } catch (error) {
-        console.error("Invalid Mongo Endpoint URL:", error);
-        return "";
-    }
-};

src/Explorer/Tabs/CloudShellTab/Core/CloudShellTerminalCore.tsx

@@ -1,393 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Core functionality for CloudShell terminal management
- */
-
-import { Terminal } from "xterm";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import {
-    authorizeSession,
-    connectTerminal,
-    provisionConsole,
-    putEphemeralUserSettings,
-    registerCloudShellProvider,
-    verifyCloudShellProviderRegistration
-} from "../Data/CloudShellApiClient";
-import { getNormalizedRegion } from "../Data/RegionUtils";
-import { ShellTypeHandler } from "../ShellTypes/ShellTypeFactory";
-import { AttachAddon } from "../Utils/AttachAddOn";
-import { wait } from "../Utils/CommonUtils";
-import { terminalLog } from "../Utils/LogFormatter";
-
-// Constants
-const DEFAULT_CLOUDSHELL_REGION = "westus";
-const POLLING_INTERVAL_MS = 5000;
-const MAX_RETRY_COUNT = 10;
-const MAX_PING_COUNT = 20 * 60; // 20 minutes (60 seconds/minute)
-
-/**
- * Main function to start a CloudShell terminal
- */
-export const startCloudShellTerminal = async (terminal: Terminal, shellType: TerminalKind) => {
-  // Get the shell handler for this type
-  const shellHandler = ShellTypeHandler.getHandler(shellType);
-  
-  terminal.writeln(terminalLog.header("Initializing Azure CloudShell"));
-  await ensureCloudShellProviderRegistered(terminal);
-
-  const { resolvedRegion, defaultCloudShellRegion } = determineCloudShellRegion(terminal);
-
-  // Ask for user consent for region
-  const consentGranted = await askForRegionConsent(terminal, resolvedRegion);
-  if (!consentGranted) {
-    return {}; // Exit if user declined
-  }
-
-  // Check network requirements for this shell type
-  const networkConfig = await shellHandler.configureNetworkAccess(terminal, resolvedRegion);
-
-  terminal.writeln("");
-  // Provision CloudShell session
-  terminal.writeln(terminalLog.cloudshell(`Provisioning Started....`));
-
-  let sessionDetails: {
-    socketUri?: string;
-    provisionConsoleResponse?: any;
-    targetUri?: string;
-  };
-
-  try {
-    sessionDetails = await provisionCloudShellSession(resolvedRegion, terminal, networkConfig.vNetSettings, networkConfig.isAllPublicAccessEnabled);
-  } catch (err) {
-    terminal.writeln(terminalLog.error(err));
-    terminal.writeln(terminalLog.error("Failed to provision in primary region"));
-    terminal.writeln(terminalLog.warning(`Attempting with fallback region: ${defaultCloudShellRegion}`));
-
-    sessionDetails = await provisionCloudShellSession(defaultCloudShellRegion, terminal, networkConfig.vNetSettings, networkConfig.isAllPublicAccessEnabled);
-  }
-
-  if (!sessionDetails.socketUri) {
-    terminal.writeln(terminalLog.error('Unable to provision console. Please try again later.'));
-    return {};
-  }
-
-  // Configure WebSocket connection with shell-specific commands
-  const socket = await establishTerminalConnection(
-    terminal,
-    shellHandler,
-    sessionDetails.socketUri,
-    sessionDetails.provisionConsoleResponse,
-    sessionDetails.targetUri
-  );
-
-  return socket;
-};
-
-/**
- * Ensures that the CloudShell provider is registered for the current subscription
- */
-export const ensureCloudShellProviderRegistered = async (terminal: Terminal): Promise<void> => {
-  try {
-    terminal.writeln(terminalLog.info("Verifying provider registration..."));
-    const response: any = await verifyCloudShellProviderRegistration(userContext.subscriptionId);
-
-    if (response.registrationState !== "Registered") {
-      terminal.writeln(terminalLog.warning("Registering CloudShell provider..."));
-      await registerCloudShellProvider(userContext.subscriptionId);
-      terminal.writeln(terminalLog.success("Provider registration successful"));
-    }
-  } catch (err) {
-    terminal.writeln(terminalLog.error("Unable to verify provider registration"));
-    throw err;
-  }
-};
-
-/**
- * Determines the appropriate CloudShell region
- */
-export const determineCloudShellRegion = (terminal: Terminal): { resolvedRegion: string; defaultCloudShellRegion: string } => {
-  const region = userContext.databaseAccount?.location;
-  const resolvedRegion = getNormalizedRegion(region, DEFAULT_CLOUDSHELL_REGION);
-
-  return { resolvedRegion, defaultCloudShellRegion: DEFAULT_CLOUDSHELL_REGION };
-};
-
-/**
- * Asks the user for consent to use the specified CloudShell region
- */
-export const askForRegionConsent = async (terminal: Terminal, resolvedRegion: string): Promise<boolean> => {
-  terminal.writeln(terminalLog.header("CloudShell Region Confirmation"));
-  terminal.writeln(terminalLog.info("The CloudShell container will be provisioned in a specific Azure region."));
-  // Data residency and compliance information
-  terminal.writeln(terminalLog.subheader("Important Information"));
-  const dbRegion = userContext.databaseAccount?.location || "unknown";
-  terminal.writeln(terminalLog.item("Database Region", dbRegion));
-  terminal.writeln(terminalLog.item("CloudShell Container Region", resolvedRegion));
-
-  terminal.writeln(terminalLog.subheader("What this means to you?"));
-  terminal.writeln(terminalLog.item("Data Residency", "Commands and query results will be processed in this region"));
-  terminal.writeln(terminalLog.item("Network", "Database connections will originate from this region"));
-
-  // Consent question
-  terminal.writeln("");
-  terminal.writeln(terminalLog.prompt("Would you like to provision Azure CloudShell in the '" + resolvedRegion + "' region?"));
-  terminal.writeln(terminalLog.prompt("Press 'Y' to continue or 'N' to cancel (Y/N)"));
-
-  return new Promise<boolean>((resolve) => {
-    const keyListener = terminal.onKey(({ key }: { key: string }) => {
-      keyListener.dispose();
-      terminal.writeln("");
-
-      if (key.toLowerCase() === 'y') {
-        terminal.writeln(terminalLog.success("Proceeding with CloudShell in " + resolvedRegion));
-        terminal.writeln(terminalLog.separator());
-        resolve(true);
-      } else {
-        terminal.writeln(terminalLog.error("CloudShell provisioning canceled"));
-        setTimeout(() => terminal.dispose(), 2000);
-        resolve(false);
-      }
-    });
-  });
-};
-
-/**
- * Provisions a CloudShell session
- */
-export const provisionCloudShellSession = async (
-  resolvedRegion: string,
-  terminal: Terminal,
-  vNetSettings: object,
-  isAllPublicAccessEnabled: boolean
-): Promise<{ socketUri?: string; provisionConsoleResponse?: any; targetUri?: string }> => {
-  return new Promise( async (resolve, reject) => {
-    try {
-      terminal.writeln(terminalLog.header("Configuring CloudShell Session"));
-      // Check if vNetSettings is available and not empty
-      const hasVNetSettings = vNetSettings && Object.keys(vNetSettings).length > 0;
-      if (hasVNetSettings) {
-        terminal.writeln(terminalLog.vnet("Enabling private network configuration"));
-        displayNetworkSettings(terminal, vNetSettings, resolvedRegion);
-      }
-      else {
-        terminal.writeln(terminalLog.warning("No VNet configuration provided"));
-        terminal.writeln(terminalLog.warning("CloudShell will be provisioned with public network access"));
-
-        if (!isAllPublicAccessEnabled) {
-          terminal.writeln(terminalLog.error("Warning: Your database has network restrictions"));
-          terminal.writeln(terminalLog.error("CloudShell may not be able to connect without proper VNet configuration"));
-        }
-      }
-      terminal.writeln(terminalLog.warning("Any previous VNet settings will be overridden"));
-
-       // Apply user settings
-      await putEphemeralUserSettings(userContext.subscriptionId, resolvedRegion, vNetSettings);
-      terminal.writeln(terminalLog.success("Session settings applied"));
-      
-      // Provision console
-      let provisionConsoleResponse;
-      let attemptCounter = 0;
-
-      do {
-        provisionConsoleResponse = await provisionConsole(userContext.subscriptionId, resolvedRegion);
-        terminal.writeln(terminalLog.progress("Provisioning", provisionConsoleResponse.properties.provisioningState));
-        
-        attemptCounter++;
-
-        if (provisionConsoleResponse.properties.provisioningState !== "Succeeded") {
-          await wait(POLLING_INTERVAL_MS);
-        }
-      } while (provisionConsoleResponse.properties.provisioningState !== "Succeeded" && attemptCounter < 10);
-
-      if (provisionConsoleResponse.properties.provisioningState !== "Succeeded") {
-        const errorMessage = `Provisioning failed: ${provisionConsoleResponse.properties.provisioningState}`;
-        terminal.writeln(terminalLog.error(errorMessage));
-        return reject(new Error(errorMessage));
-      }
-      
-      // Connect terminal
-      const connectTerminalResponse = await connectTerminal(
-        provisionConsoleResponse.properties.uri,
-        { rows: terminal.rows, cols: terminal.cols }
-      );
-
-      const targetUri = `${provisionConsoleResponse.properties.uri}/terminals?cols=${terminal.cols}&rows=${terminal.rows}&version=2019-01-01&shell=bash`;
-      const termId = connectTerminalResponse.id;
-
-      // Determine socket URI
-      let socketUri = connectTerminalResponse.socketUri.replace(":443/", "");
-      const targetUriBody = targetUri.replace('https://', '').split('?')[0];
-
-      if (socketUri.indexOf(targetUriBody) === -1) {
-        socketUri = `wss://${targetUriBody}/${termId}`;
-      }
-
-      if (targetUriBody.includes('servicebus')) {
-        const targetUriBodyArr = targetUriBody.split('/');
-        socketUri = `wss://${targetUriBodyArr[0]}/$hc/${targetUriBodyArr[1]}/terminals/${termId}`;
-      }
-
-      return resolve({ socketUri, provisionConsoleResponse, targetUri });
-    } catch (err) {
-      terminal.writeln(terminalLog.error(`Provisioning failed: ${err.message}`));
-      return reject(err);
-    }
-  });
-};
-
-/**
- * Display VNet settings in the terminal
- */
-const displayNetworkSettings = (terminal: Terminal, vNetSettings: any, resolvedRegion: string): void => {
-  if (vNetSettings.networkProfileResourceId) {
-    const profileName = vNetSettings.networkProfileResourceId.split('/').pop();
-    terminal.writeln(terminalLog.item("Network Profile", profileName));
-    
-    if (vNetSettings.relayNamespaceResourceId) {
-      const relayName = vNetSettings.relayNamespaceResourceId.split('/').pop();
-      terminal.writeln(terminalLog.item("Relay Namespace", relayName));
-    }
-          
-    terminal.writeln(terminalLog.item("Region", resolvedRegion));
-    terminal.writeln(terminalLog.success("CloudShell will use this VNet to connect to your database"));
-  }
-};
-
-/**
- * Establishes a terminal connection via WebSocket
- */
-export const establishTerminalConnection = async (
-  terminal: Terminal,
-  shellHandler: any,
-  socketUri: string,
-  provisionConsoleResponse: any,
-  targetUri: string
-): Promise<WebSocket> => {
-  let socket = new WebSocket(socketUri);
-
-  // Get shell-specific initial commands 
-  const initCommands = await shellHandler.getInitialCommands();
-
-  // Configure the socket
-  socket = configureSocketConnection(socket, socketUri, terminal, initCommands, 0);
-
-  // Attach the terminal addon
-  const attachAddon = new AttachAddon(socket);
-  terminal.loadAddon(attachAddon);
-  terminal.writeln(terminalLog.success("Connection established"));
-
-  // Authorize the session
-  try {
-    const authorizeResponse = await authorizeSession(provisionConsoleResponse.properties.uri);
-    const cookieToken = authorizeResponse.token;
-
-    // Load auth token with a hidden image
-    const img = document.createElement("img");
-    img.src = `${targetUri}&token=${encodeURIComponent(cookieToken)}`;
-    terminal.focus();
-  } catch (err) {
-    terminal.writeln(terminalLog.error("Authorization failed"));
-    socket.close();
-    throw err;
-  }
-
-  return socket;
-};
-
-/**
- * Configures a WebSocket connection for the terminal
- */
-export const configureSocketConnection = (
-  socket: WebSocket,
-  uri: string,
-  terminal: Terminal,
-  initCommands: string,
-  socketRetryCount: number
-): WebSocket => {
-  let jsonData = '';
-  let keepAliveID: NodeJS.Timeout = null;
-  let pingCount = 0;
-
-  sendTerminalStartupCommands(socket, initCommands);
-
-  socket.onclose = () => {
-    if (keepAliveID) {
-      clearTimeout(keepAliveID);
-      pingCount = 0;
-    }
-    terminal.writeln(terminalLog.warning("Session terminated. Refresh the page to start a new session."));
-  };
-
-  socket.onerror = () => {
-    if (socketRetryCount < MAX_RETRY_COUNT && socket.readyState !== WebSocket.CLOSED) {
-      configureSocketConnection(socket, uri, terminal, initCommands, socketRetryCount + 1);
-    } else {
-      socket.close();
-    }
-  };
-
-  socket.onmessage = (event: MessageEvent<string>) => {
-    pingCount = 0; // Reset ping count on message receipt
-
-    let eventData = '';
-    if (typeof event.data === "object") {
-      try {
-        const enc = new TextDecoder("utf-8");
-        eventData = enc.decode(event.data as any);
-      } catch (e) {
-        // Not an array buffer, ignore
-      }
-    }
-
-    if (typeof event.data === 'string') {
-      eventData = event.data;
-    }
-
-    // Process event data
-    if (eventData.includes("ie_us") && eventData.includes("ie_ue")) {
-      const statusData = eventData.split('ie_us')[1].split('ie_ue')[0];
-      console.log(statusData);
-    } else if (eventData.includes("ie_us")) {
-      jsonData += eventData.split('ie_us')[1];
-    } else if (eventData.includes("ie_ue")) {
-      jsonData += eventData.split('ie_ue')[0];
-      console.log(jsonData);
-      jsonData = '';
-    } else if (jsonData.length > 0) {
-      jsonData += eventData;
-    }
-  };
-
-  return socket;
-};
-
-/**
- * Sends startup commands to the terminal
- */
-export const sendTerminalStartupCommands = (socket: WebSocket, initCommands: string): void => {
-  let keepAliveID: NodeJS.Timeout = null;
-  let pingCount = 0;
-
-  if (socket && socket.readyState === WebSocket.OPEN) {
-    socket.send(initCommands);
-  } else {
-    socket.onopen = () => {
-      socket.send(initCommands);
-
-      const keepSocketAlive = (socket: WebSocket) => {
-        if (socket.readyState === WebSocket.OPEN) {
-          if (pingCount >= MAX_PING_COUNT) {
-            socket.close();
-          } else {
-            socket.send('');
-            pingCount++;
-            keepAliveID = setTimeout(() => keepSocketAlive(socket), 1000);
-          }
-        }
-      };
-
-      keepSocketAlive(socket);
-    };
-  }
-};

src/Explorer/Tabs/CloudShellTab/Data.tsx

@@ -1,320 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.  All rights reserved.
- */
-
-import { ApiVersionsConfig, ResourceType } from "Explorer/Tabs/CloudShellTab/DataModels";
-import { v4 as uuidv4 } from 'uuid';
-import { configContext } from "../../../ConfigContext";
-import { TerminalKind } from "../../../Contracts/ViewModels";
-import { userContext } from '../../../UserContext';
-import { armRequest } from "../../../Utils/arm/request";
-import { Authorization, ConnectTerminalResponse, NetworkType, OsType, ProvisionConsoleResponse, SessionType, Settings, ShellType } from "./DataModels";
-
-/**
- * API version configuration by terminal type and resource type
- */
-const API_VERSIONS : ApiVersionsConfig = {
-    // Default version for fallback
-    DEFAULT: "2024-07-01",
-    
-    // Resource type specific defaults
-    RESOURCE_DEFAULTS: {
-      [ResourceType.NETWORK]: "2023-05-01",
-      [ResourceType.DATABASE]: "2024-07-01",
-      [ResourceType.VNET]: "2023-05-01",
-      [ResourceType.SUBNET]: "2023-05-01",
-      [ResourceType.RELAY]: "2024-01-01",
-      [ResourceType.ROLE]: "2022-04-01"
-    },
-    
-    // Shell-type specific versions with resource overrides
-    SHELL_TYPES: {
-      [TerminalKind.Mongo]: {
-        [ResourceType.DATABASE]: "2024-11-15"
-      },
-      [TerminalKind.VCoreMongo]: {
-        [ResourceType.DATABASE]: "2024-07-01"
-      },
-      [TerminalKind.Cassandra]: {
-        [ResourceType.DATABASE]: "2024-11-15"
-      }
-    }
-  };
-
-export const validateUserSettings = (userSettings: Settings) => {
-    if (userSettings.sessionType !== SessionType.Ephemeral && userSettings.osType !== OsType.Linux) {
-        return false;
-    } else {
-        return true;
-    }
-}
-
-// Current shell type context
-let currentShellType: TerminalKind | null = null;
-
-/**
- * Set the active shell type to determine API version
- */
-export const setShellType = (shellType: TerminalKind): void => {
-  currentShellType = shellType;
-};
-
-/**
- * Get the appropriate API version based on shell type and resource type
- * Uses a cascading fallback approach for maximum flexibility
- */
-export const getApiVersion = (resourceType?: ResourceType): string => {
-    // If no shell type is set, fallback to resource default or global default
-    if (!currentShellType) {
-      return resourceType ? 
-        (API_VERSIONS.RESOURCE_DEFAULTS[resourceType] || API_VERSIONS.DEFAULT) : 
-        API_VERSIONS.DEFAULT;
-    }
-    
-    // Shell type is set, try to get specific version in this priority:
-    // 1. Shell-specific + resource-specific
-    if (resourceType && 
-        API_VERSIONS.SHELL_TYPES[currentShellType]) {
-      const shellTypeConfig = API_VERSIONS.SHELL_TYPES[currentShellType];
-      if (resourceType in shellTypeConfig) {
-        return shellTypeConfig[resourceType] as string;
-      }
-    }
-
-    // 2. Resource-specific default
-    if (resourceType && resourceType in API_VERSIONS.RESOURCE_DEFAULTS) {
-      return API_VERSIONS.RESOURCE_DEFAULTS[resourceType];
-    }
-    
-    // 3. Global default
-    return API_VERSIONS.DEFAULT;
-};
-
-export const getUserRegion = async (subscriptionId: string, resourceGroup: string, accountName: string) => {
-    return await armRequest({
-        host: configContext.ARM_ENDPOINT,
-        path: `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}`,
-        method: "GET",
-        apiVersion: "2022-12-01"
-      });
-
-};
-
-export const deleteUserSettings = async (): Promise<void> => {
-    await armRequest<void>({
-        host: configContext.ARM_ENDPOINT,
-        path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
-        method: "DELETE",
-        apiVersion: "2023-02-01-preview"
-      });
-};
-
-export const getUserSettings = async (): Promise<Settings> => {
-    const resp = await armRequest<any>({
-        host: configContext.ARM_ENDPOINT,
-        path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
-        method: "GET",
-        apiVersion: "2023-02-01-preview"
-      });
-
-    return resp;
-};
-
-export const putEphemeralUserSettings = async (userSubscriptionId: string, userRegion: string, vNetSettings?: object) => {
-    const ephemeralSettings = {
-        properties: {
-            preferredOsType: OsType.Linux,
-            preferredShellType: ShellType.Bash,
-            preferredLocation: userRegion,
-            networkType: (!vNetSettings || Object.keys(vNetSettings).length === 0) ? NetworkType.Default : (vNetSettings ? NetworkType.Isolated : NetworkType.Default),
-            sessionType: SessionType.Ephemeral,
-            userSubscription: userSubscriptionId,
-            vnetSettings: vNetSettings ?? {}
-        }
-    };
-
-    return await armRequest({
-        host: configContext.ARM_ENDPOINT,
-        path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
-        method: "PUT",
-        apiVersion: "2023-02-01-preview",
-        body: ephemeralSettings
-      });
-};
-
-export const verifyCloudShellProviderRegistration = async(subscriptionId: string) => {
-    return await armRequest({
-        host: configContext.ARM_ENDPOINT,
-        path: `/subscriptions/${subscriptionId}/providers/Microsoft.CloudShell`,
-        method: "GET",
-        apiVersion: "2022-12-01"
-      });
-};
-
-export const registerCloudShellProvider = async (subscriptionId: string) => {
-    return await armRequest({
-        host: configContext.ARM_ENDPOINT,
-        path: `/subscriptions/${subscriptionId}/providers/Microsoft.CloudShell/register`,
-        method: "POST",
-        apiVersion: "2022-12-01"
-      });
-};
-
-export const provisionConsole = async (subscriptionId: string, location: string): Promise<ProvisionConsoleResponse> => {
-    const data = {
-        properties: {
-            osType: OsType.Linux
-        }
-    };
-
-    return await armRequest<any>({
-        host: configContext.ARM_ENDPOINT,
-        path: `providers/Microsoft.Portal/consoles/default`,
-        method: "PUT",
-        apiVersion: "2023-02-01-preview",
-        customHeaders: {
-            'x-ms-console-preferred-location': location
-        },
-        body: data,
-      });
-};
-
-export const connectTerminal = async (consoleUri: string, size: { rows: number, cols: number }): Promise<ConnectTerminalResponse> => {
-    const targetUri = consoleUri + `/terminals?cols=${size.cols}&rows=${size.rows}&version=2019-01-01&shell=bash`;
-    const resp = await fetch(targetUri, {
-        method: "POST",
-        headers: {
-            'Accept': 'application/json',
-            'Content-Type': 'application/json',
-            'Content-Length': '2',
-            'Authorization': userContext.authorizationToken,
-            'x-ms-client-request-id': uuidv4(),
-            'Accept-Language': getLocale(),
-        },
-        body: "{}" // empty body is necessary
-    });
-    return resp.json();
-};
-
-export const authorizeSession = async (consoleUri: string): Promise<Authorization> => {
-    const targetUri = consoleUri + "/authorize";
-    const resp = await fetch(targetUri, {
-        method: "POST",
-        headers: {
-            'Accept': 'application/json',
-            'Authorization': userContext.authorizationToken,
-            'Accept-Language': getLocale(),
-            "Content-Type": 'application/json'
-        },
-        body: "{}" // empty body is necessary
-    });
-    return resp.json();
-};
-
-export const getLocale = () => {
-    const langLocale = navigator.language;
-    return (langLocale && langLocale.length === 2 ? langLocale[1] : 'en-us');
-};
-
-const validCloudShellRegions = new Set(["westus", "southcentralus", "eastus", "northeurope", "westeurope", "centralindia", "southeastasia", "westcentralus"]);
-
-export const getNormalizedRegion = (region: string, defaultCloudshellRegion: string) => {
-    if (!region) return defaultCloudshellRegion;
-    
-    const regionMap: Record<string, string> = {
-      "centralus": "westcentralus",
-      "eastus2": "eastus"
-    };
-    
-    const normalizedRegion = regionMap[region.toLowerCase()] || region;
-    return validCloudShellRegions.has(normalizedRegion.toLowerCase()) ? normalizedRegion : defaultCloudshellRegion;
-};
-  
-export async function getNetworkProfileInfo<T>(networkProfileResourceId: string, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.NETWORK);
-    return await GetARMCall<T>(networkProfileResourceId, apiVersion);
-}
-
-export async function getAccountDetails<T>(databaseAccountId: string, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.DATABASE);
-    return await GetARMCall<T>(databaseAccountId, apiVersion);
-}
-
-export async function getVnetInformation<T>(vnetId: string, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.VNET);
-    return await GetARMCall<T>(vnetId, apiVersion);
-}
-
-export async function getSubnetInformation<T>(subnetId: string, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.SUBNET);
-    return await GetARMCall<T>(subnetId, apiVersion);
-}
-
-export async function updateSubnetInformation<T>(subnetId: string, request: object, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.SUBNET);
-    return await PutARMCall(subnetId, request, apiVersion);
-}
-
-export async function updateDatabaseAccount<T>(accountId: string, request: object, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.DATABASE);
-    return await PutARMCall(accountId, request, apiVersion);
-}
-
-export async function getDatabaseOperations<T>(accountId: string, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.DATABASE);
-    return await GetARMCall<T>(`${accountId}/operations`, apiVersion);  
-}
-
-export async function updateVnet<T>(vnetId: string, request: object, apiVersionOverride?: string) {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.VNET);
-    return await PutARMCall<T>(vnetId, request, apiVersion);
-}
-
-export async function getVnet<T>(vnetId: string, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.VNET);
-    return await GetARMCall<T>(vnetId, apiVersion);  
-}
-
-export async function createNetworkProfile<T>(networkProfileId: string, request: object, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.NETWORK);
-    return await PutARMCall<T>(networkProfileId, request, apiVersion);
-}
-
-export async function createRelay<T>(relayId: string, request: object, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.RELAY);
-    return await PutARMCall<T>(relayId, request, apiVersion);
-}
-
-export async function getRelay<T>(relayId: string, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.RELAY);
-    return await GetARMCall<T>(relayId, apiVersion);
-}
-
-export async function createRoleOnNetworkProfile<T>(roleid: string, request: object, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.ROLE);
-    return await PutARMCall<T>(roleid, request, apiVersion); 
-}
-
-export async function createRoleOnRelay<T>(roleid: string, request: object, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.ROLE);
-    return await PutARMCall<T>(roleid, request, apiVersion); 
-}
-
-export async function GetARMCall<T>(path: string, apiVersion: string = API_VERSIONS.DEFAULT): Promise<T> {
-    return await armRequest<T>({
-        host: configContext.ARM_ENDPOINT,
-        path: path,
-        method: "GET",
-        apiVersion: apiVersion
-    });
-}
-
-export async function PutARMCall<T>(path: string, request: object, apiVersion: string = API_VERSIONS.DEFAULT): Promise<T> {
-    return await armRequest<T>({
-        host: configContext.ARM_ENDPOINT,
-        path: path,
-        method: "PUT",
-        apiVersion: apiVersion,
-        body: request
-    });
-}

src/Explorer/Tabs/CloudShellTab/Data/CloudShellApiClient.tsx

@@ -1,263 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.  All rights reserved.
- * CloudShell API client for various operations
- */
-
-import { v4 as uuidv4 } from 'uuid';
-import { configContext } from "../../../../ConfigContext";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { userContext } from '../../../../UserContext';
-import { armRequest } from "../../../../Utils/arm/request";
-import { ApiVersionsConfig, DEFAULT_API_VERSIONS } from "../Models/ApiVersions";
-import { Authorization, ConnectTerminalResponse, NetworkType, OsType, ProvisionConsoleResponse, ResourceType, SessionType, Settings, ShellType } from "../Models/DataModels";
-import { getLocale } from '../Data/LocalizationUtils';
-
-// Current shell type context
-let currentShellType: TerminalKind | null = null;
-
-/**
- * Set the active shell type to determine API version
- */
-export const setShellType = (shellType: TerminalKind): void => {
-  currentShellType = shellType;
-};
-
-/**
- * Get the appropriate API version based on shell type and resource type
- */
-export const getApiVersion = (resourceType?: ResourceType, apiVersions?: ApiVersionsConfig): string => {
-  if (!apiVersions) {
-    apiVersions = DEFAULT_API_VERSIONS; // Default fallback
-  }
-
-  // Shell type is set, try to get specific version in this priority:
-  // 1. Shell-specific + resource-specific
-  if (resourceType && 
-      apiVersions.SHELL_TYPES[currentShellType]) {
-    const shellTypeConfig = apiVersions.SHELL_TYPES[currentShellType];
-    if (resourceType in shellTypeConfig) {
-      return shellTypeConfig[resourceType] as string;
-    }
-  }
-
-  // 2. Resource-specific default
-  if (resourceType && resourceType in apiVersions.RESOURCE_DEFAULTS) {
-    return apiVersions.RESOURCE_DEFAULTS[resourceType];
-  }
-  
-  // 3. Global default
-  return apiVersions.DEFAULT;
-};
-
-export const getUserRegion = async (subscriptionId: string, resourceGroup: string, accountName: string) => {
-  return await armRequest({
-      host: configContext.ARM_ENDPOINT,
-      path: `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.DocumentDB/databaseAccounts/${accountName}`,
-      method: "GET",
-      apiVersion: "2022-12-01"
-    });
-};
-
-export const deleteUserSettings = async (): Promise<void> => {
-  await armRequest<void>({
-      host: configContext.ARM_ENDPOINT,
-      path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
-      method: "DELETE",
-      apiVersion: "2023-02-01-preview"
-    });
-};
-
-export const getUserSettings = async (): Promise<Settings> => {
-  const resp = await armRequest<any>({
-      host: configContext.ARM_ENDPOINT,
-      path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
-      method: "GET",
-      apiVersion: "2023-02-01-preview"
-    });
-  return resp;
-};
-
-export const putEphemeralUserSettings = async (userSubscriptionId: string, userRegion: string, vNetSettings?: object) => {
-  const ephemeralSettings = {
-      properties: {
-          preferredOsType: OsType.Linux,
-          preferredShellType: ShellType.Bash,
-          preferredLocation: userRegion,
-          networkType: (!vNetSettings || Object.keys(vNetSettings).length === 0) ? NetworkType.Default : (vNetSettings ? NetworkType.Isolated : NetworkType.Default),
-          sessionType: SessionType.Ephemeral,
-          userSubscription: userSubscriptionId,
-          vnetSettings: vNetSettings ?? {}
-      }
-  };
-
-  return await armRequest({
-      host: configContext.ARM_ENDPOINT,
-      path: `/providers/Microsoft.Portal/userSettings/cloudconsole`,
-      method: "PUT",
-      apiVersion: "2023-02-01-preview",
-      body: ephemeralSettings
-    });
-};
-
-export const verifyCloudShellProviderRegistration = async(subscriptionId: string) => {
-  return await armRequest({
-      host: configContext.ARM_ENDPOINT,
-      path: `/subscriptions/${subscriptionId}/providers/Microsoft.CloudShell`,
-      method: "GET",
-      apiVersion: "2022-12-01"
-    });
-};
-
-export const registerCloudShellProvider = async (subscriptionId: string) => {
-  return await armRequest({
-      host: configContext.ARM_ENDPOINT,
-      path: `/subscriptions/${subscriptionId}/providers/Microsoft.CloudShell/register`,
-      method: "POST",
-      apiVersion: "2022-12-01"
-    });
-};
-
-export const provisionConsole = async (subscriptionId: string, location: string): Promise<ProvisionConsoleResponse> => {
-  const data = {
-      properties: {
-          osType: OsType.Linux
-      }
-  };
-
-  return await armRequest<any>({
-      host: configContext.ARM_ENDPOINT,
-      path: `providers/Microsoft.Portal/consoles/default`,
-      method: "PUT",
-      apiVersion: "2023-02-01-preview",
-      customHeaders: {
-          'x-ms-console-preferred-location': location
-      },
-      body: data,
-    });
-};
-
-export const connectTerminal = async (consoleUri: string, size: { rows: number, cols: number }): Promise<ConnectTerminalResponse> => {
-  const targetUri = consoleUri + `/terminals?cols=${size.cols}&rows=${size.rows}&version=2019-01-01&shell=bash`;
-  const resp = await fetch(targetUri, {
-      method: "POST",
-      headers: {
-          'Accept': 'application/json',
-          'Content-Type': 'application/json',
-          'Content-Length': '2',
-          'Authorization': userContext.authorizationToken,
-          'x-ms-client-request-id': uuidv4(),
-          'Accept-Language': getLocale(),
-      },
-      body: "{}" // empty body is necessary
-  });
-  return resp.json();
-};
-
-export const authorizeSession = async (consoleUri: string): Promise<Authorization> => {
-  const targetUri = consoleUri + "/authorize";
-  const resp = await fetch(targetUri, {
-      method: "POST",
-      headers: {
-          'Accept': 'application/json',
-          'Authorization': userContext.authorizationToken,
-          'Accept-Language': getLocale(),
-          "Content-Type": 'application/json'
-      },
-      body: "{}" // empty body is necessary
-  });
-  return resp.json();
-};
-
-export async function getNetworkProfileInfo<T>(networkProfileResourceId: string, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.NETWORK);
-  return await GetARMCall<T>(networkProfileResourceId, apiVersion);
-}
-
-export async function getAccountDetails<T>(databaseAccountId: string, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.DATABASE);
-  return await GetARMCall<T>(databaseAccountId, apiVersion);
-}
-
-export async function getVnetInformation<T>(vnetId: string, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.VNET);
-  return await GetARMCall<T>(vnetId, apiVersion);
-}
-
-export async function getSubnetInformation<T>(subnetId: string, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.SUBNET);
-  return await GetARMCall<T>(subnetId, apiVersion);
-}
-
-export async function updateSubnetInformation<T>(subnetId: string, request: object, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.SUBNET);
-  return await PutARMCall<T>(subnetId, request, apiVersion);
-}
-
-export async function updateDatabaseAccount<T>(accountId: string, request: object, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.DATABASE);
-  return await PutARMCall<T>(accountId, request, apiVersion);
-}
-
-export async function getDatabaseOperations<T>(accountId: string, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.DATABASE);
-  return await GetARMCall<T>(`${accountId}/operations`, apiVersion);  
-}
-
-export async function updateVnet<T>(vnetId: string, request: object, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.VNET);
-  return await PutARMCall<T>(vnetId, request, apiVersion);
-}
-
-export async function getVnet<T>(vnetId: string, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.VNET);
-  return await GetARMCall<T>(vnetId, apiVersion);  
-}
-
-export async function createNetworkProfile<T>(networkProfileId: string, request: object, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.NETWORK);
-  return await PutARMCall<T>(networkProfileId, request, apiVersion);
-}
-
-export async function createRelay<T>(relayId: string, request: object, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.RELAY);
-  return await PutARMCall<T>(relayId, request, apiVersion);
-}
-
-export async function getRelay<T>(relayId: string, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.RELAY);
-  return await GetARMCall<T>(relayId, apiVersion);
-}
-
-export async function createRoleOnNetworkProfile<T>(roleId: string, request: object, apiVersionOverride?: string): Promise<T> {
-const apiVersion = apiVersionOverride || getApiVersion(ResourceType.ROLE);
-  return await PutARMCall<T>(roleId, request, apiVersion); 
-}
-
-export async function createRoleOnRelay<T>(roleId: string, request: object, apiVersionOverride?: string): Promise<T> {
-  const apiVersion = apiVersionOverride || getApiVersion(ResourceType.ROLE);
-  return await PutARMCall<T>(roleId, request, apiVersion); 
-}
-
-export async function createPrivateEndpoint<T>(privateEndpointId: string, request: object, apiVersionOverride?: string): Promise<T> {
-    const apiVersion = apiVersionOverride || getApiVersion(ResourceType.NETWORK);
-    return await PutARMCall<T>(privateEndpointId, request, apiVersion);
-}
-
-export async function GetARMCall<T>(path: string, apiVersion: string = '2024-07-01'): Promise<T> {
-  return await armRequest<T>({
-      host: configContext.ARM_ENDPOINT,
-      path: path,
-      method: "GET",
-      apiVersion: apiVersion
-  });
-}
-
-export async function PutARMCall<T>(path: string, request: object, apiVersion: string = '2024-07-01'): Promise<T> {
-  return await armRequest<T>({
-      host: configContext.ARM_ENDPOINT,
-      path: path,
-      method: "PUT",
-      apiVersion: apiVersion,
-      body: request
-  });
-}

src/Explorer/Tabs/CloudShellTab/Data/LocalizationUtils.tsx

@@ -1,12 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.  All rights reserved.
- * Localization utilities for CloudShell
- */
-
-/**
- * Gets the current locale for API requests
- */
-export const getLocale = (): string => {
-  const langLocale = navigator.language;
-  return (langLocale && langLocale.length > 2 ? langLocale : 'en-us');
-};

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

@@ -1,37 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.  All rights reserved.
- * Region utilities for CloudShell
- */
-
-export const getLocale = () => {
-  const langLocale = navigator.language;
-  return (langLocale && langLocale.length === 2 ? langLocale[1] : 'en-us');
-};
-
-const validCloudShellRegions = new Set([
-  "westus", 
-  "southcentralus", 
-  "eastus", 
-  "northeurope", 
-  "westeurope", 
-  "centralindia", 
-  "southeastasia", 
-  "westcentralus"
-]);
-
-/**
- * Normalizes a region name to a valid CloudShell region
- * @param region The region to normalize
- * @param defaultCloudshellRegion Default region to use if the provided region is not supported
- */
-export const getNormalizedRegion = (region: string, defaultCloudshellRegion: string) => {
-  if (!region) return defaultCloudshellRegion;
-  
-  const regionMap: Record<string, string> = {
-    "centralus": "westcentralus",
-    "eastus2": "eastus"
-  };
-  
-  const normalizedRegion = regionMap[region.toLowerCase()] || region;
-  return validCloudShellRegions.has(normalizedRegion.toLowerCase()) ? normalizedRegion : defaultCloudshellRegion;
-};

src/Explorer/Tabs/CloudShellTab/DataModels.tsx

@@ -1,185 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.  All rights reserved.
- */
-import { TerminalKind } from "../../../Contracts/ViewModels";
-
-export const enum OsType {
-    Linux = "linux",
-    Windows = "windows"
-}
-
-export const enum ShellType {
-    Bash = "bash",
-    PowerShellCore = "pwsh"
-}
-  
-export const enum NetworkType {
-    Default = "Default",
-    Isolated = "Isolated"
-}
-
-export const enum SessionType {
-    Mounted = "Mounted",
-    Ephemeral = "Ephemeral"
-}
-
-export const enum UserInputs {
-    NoReset = "1",
-    ConfigureVNet = "2",
-    ResetVNet = "3"
-};
-
-export type Settings = {
-    properties: UserSettingProperties
-};
-
-export type UserSettingProperties = {
-    networkType: string;  
-    preferredLocation: string;
-    preferredOsType: OsType;
-    preferredShellType: ShellType;
-    userSubscription: string;
-    sessionType: SessionType;
-    vnetSettings: VnetSettings; 
-}
-
-export type VnetSettings = {
-    networkProfileResourceId?: string;
-    relayNamespaceResourceId?: string;
-    location?: string;
-}
-
-export type ProvisionConsoleResponse = {
-    properties: {
-        osType: OsType;
-        provisioningState: string;
-        uri: string;
-    };
-};
-
-export type Authorization = {
-    token: string;
-};
-
-export type ConnectTerminalResponse = {
-    id: string;
-    idleTimeout: string;
-    rootDirectory: string;
-    socketUri: string;
-    tokenUpdated: boolean;
-};
-
-export type VnetModel = {
-    name: string;
-    id: string;
-    etag: string;
-    type: string;
-    location: string;
-    tags: Record<string, string>;
-    properties: {
-        provisioningState: string;
-        resourceGuid: string;
-        addressSpace: {
-            addressPrefixes: string[];
-        };
-        encryption: {
-            enabled: boolean;
-            enforcement: string;
-        };
-        privateEndpointVNetPolicies: string;
-        subnets: Array<{
-            name: string;
-            id: string;
-            etag: string;
-            type: string;
-            properties: {
-                provisioningState: string;
-                addressPrefixes?: string[];
-                addressPrefix?: string;
-                networkSecurityGroup?: { id: string };
-                ipConfigurations?: { id: string }[];
-                ipConfigurationProfiles?: { id: string }[];
-                privateEndpoints?: { id: string }[];
-                serviceEndpoints?: Array<{
-                    provisioningState: string;
-                    service: string;
-                    locations: string[];
-                }>;
-                delegations?: Array<{
-                    name: string;
-                    id: string;
-                    etag: string;
-                    type: string;
-                    properties: {
-                        provisioningState: string;
-                        serviceName: string;
-                        actions: string[];
-                    };
-                }>;
-                purpose?: string;
-                privateEndpointNetworkPolicies?: string;
-                privateLinkServiceNetworkPolicies?: string;
-            };
-        }>;
-        virtualNetworkPeerings: any[];
-        enableDdosProtection: boolean;
-    };
-};
-
-export type RelayNamespace = {
-    id: string;
-    name: string;
-    type: string;
-    location: string;
-    tags: Record<string, string>;
-    properties: {
-        metricId: string;
-        serviceBusEndpoint: string;
-        provisioningState: string;
-        status: string;
-        createdAt: string;
-        updatedAt: string;
-    };
-    sku: {
-        name: string;
-        tier: string;
-    };
-};
-
-export type RelayNamespaceResponse = {
-    value: RelayNamespace[];
-};
-
-/**
- * Resource types for API versioning
- */
-export enum ResourceType {
-    NETWORK = "NETWORK",
-    DATABASE = "DATABASE",
-    VNET = "VNET",
-    SUBNET = "SUBNET",
-    RELAY = "RELAY",
-    ROLE = "ROLE"
-  }
-
-// Type definition for API_VERSIONS configuration
-export type ApiVersionsConfig = {
-    // Global default API version
-    DEFAULT: string;
-    
-    // Resource-specific default API versions
-    RESOURCE_DEFAULTS: {
-      [key in ResourceType]: string;
-    };
-    
-    // Shell-type specific configurations
-    SHELL_TYPES: {
-      [key in TerminalKind]?: {
-        // Resource-specific overrides for this shell type
-        [key in ResourceType]?: string;
-      };
-    };
-  };
-  
-
-

src/Explorer/Tabs/CloudShellTab/LogFormatter.tsx

@@ -1,29 +0,0 @@
-
-/**
- * Standardized terminal logging functions for consistent formatting
- */
-export const terminalLog = {
-  // Section headers
-  header: (message: string) => `\n\x1B[1;34m┌─ ${message} ${"─".repeat(Math.max(45 - message.length, 0))}\x1B[0m`,
-  subheader: (message: string) => `\x1B[1;36m├ ${message}\x1B[0m`,
-  sectionEnd: () => `\x1B[1;34m└${"─".repeat(50)}\x1B[0m\n`,
-  
-  // Status messages
-  success: (message: string) => `\x1B[32m✓ ${message}\x1B[0m`,
-  warning: (message: string) => `\x1B[33m⚠ ${message}\x1B[0m`,
-  error: (message: string) => `\x1B[31m✗ ${message}\x1B[0m`,
-  info: (message: string) => `\x1B[34m${message}\x1B[0m`,
-  
-  // Resource information
-  database: (message: string) => `\x1B[35m🔶  Database: ${message}\x1B[0m`,
-  vnet: (message: string) => `\x1B[36m🔷  Network: ${message}\x1B[0m`,
-  cloudshell: (message: string) => `\x1B[32m🔷  CloudShell: ${message}\x1B[0m`,
-  
-  // Data formatting
-  item: (label: string, value: string) => `  • ${label}: \x1B[32m${value}\x1B[0m`,
-  progress: (operation: string, status: string) => `\x1B[34m${operation}: \x1B[36m${status}\x1B[0m`,
-  
-  // User interaction
-  prompt: (message: string) => `\x1B[1;37m${message}\x1B[0m`,
-  separator: () => `\x1B[30;1m${"─".repeat(50)}\x1B[0m`
-};

src/Explorer/Tabs/CloudShellTab/Models/ApiVersions.ts

@@ -1,74 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.  All rights reserved.
- * API versions configuration for CloudShell
- */
-
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { ResourceType } from "./DataModels";
-
-/**
- * Configuration for API versions used by the CloudShell
- */
-export type ApiVersionsConfig = {
-    DEFAULT: string;
-    RESOURCE_DEFAULTS: Record<ResourceType, string>;
-    SHELL_TYPES: Record<TerminalKind, Record<ResourceType, string>>;
-}
-
-/**
- * Default API versions configuration
- */
-export const DEFAULT_API_VERSIONS: ApiVersionsConfig = {
-    DEFAULT: '2024-07-01',
-    RESOURCE_DEFAULTS: {
-      [ResourceType.DATABASE]: '2024-11-15',
-      [ResourceType.NETWORK]: '2024-07-01',
-      [ResourceType.VNET]: '2024-07-01',
-      [ResourceType.SUBNET]: '2024-07-01',
-      [ResourceType.RELAY]: '2022-10-01',
-      [ResourceType.ROLE]: '2022-04-01',
-    },
-    SHELL_TYPES: {
-      [TerminalKind.Mongo]: {
-        [ResourceType.DATABASE]: '2024-11-15',
-        [ResourceType.NETWORK]: '2024-07-01',
-        [ResourceType.VNET]: '2024-07-01',
-        [ResourceType.SUBNET]: '2024-07-01',
-        [ResourceType.RELAY]: '2024-01-01',
-        [ResourceType.ROLE]: '2022-04-01',
-      },
-      [TerminalKind.VCoreMongo]: {
-        [ResourceType.DATABASE]: '2024-07-01',
-        [ResourceType.NETWORK]: '2024-07-01',
-        [ResourceType.VNET]: '2024-07-01',
-        [ResourceType.SUBNET]: '2024-07-01',
-        [ResourceType.RELAY]: '2024-01-01',
-        [ResourceType.ROLE]: '2022-04-01',
-      },
-      [TerminalKind.Postgres]: {
-        [ResourceType.DATABASE]: '2024-11-15',
-        [ResourceType.NETWORK]: '2024-07-01',
-        [ResourceType.VNET]: '2024-07-01',
-        [ResourceType.SUBNET]: '2024-07-01',
-        [ResourceType.RELAY]: '2024-01-01',
-        [ResourceType.ROLE]: '2022-04-01',
-      },
-      [TerminalKind.Cassandra]: {
-        [ResourceType.DATABASE]: '2024-11-15',
-        [ResourceType.NETWORK]: '2024-07-01',
-        [ResourceType.VNET]: '2024-07-01',
-        [ResourceType.SUBNET]: '2024-07-01',
-        [ResourceType.RELAY]: '2024-01-01',
-        [ResourceType.ROLE]: '2022-04-01',
-      },
-      [TerminalKind.Default]: {
-        [ResourceType.DATABASE]: undefined,
-        [ResourceType.NETWORK]: undefined,
-        [ResourceType.VNET]: undefined,
-        [ResourceType.SUBNET]: undefined,
-        [ResourceType.RELAY]: undefined,
-        [ResourceType.ROLE]: undefined,
-      },
-    },
-  };
-  

src/Explorer/Tabs/CloudShellTab/Models/DataModels.tsx

@@ -1,163 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation.  All rights reserved.
- * Data models for CloudShell
- */
-
-export const enum OsType {
-    Linux = "linux",
-    Windows = "windows"
-}
-
-export const enum ShellType {
-    Bash = "bash",
-    PowerShellCore = "pwsh"
-}
-  
-export const enum NetworkType {
-    Default = "Default",
-    Isolated = "Isolated"
-}
-
-export const enum SessionType {
-    Mounted = "Mounted",
-    Ephemeral = "Ephemeral"
-}
-
-export const enum UserInputs {
-    NoReset = "1",
-    ConfigureVNet = "2",
-    ResetVNet = "3"
-};
-
-export type Settings = {
-    properties: UserSettingProperties
-};
-
-export type UserSettingProperties = {
-    networkType: string;  
-    preferredLocation: string;
-    preferredOsType: OsType;
-    preferredShellType: ShellType;
-    userSubscription: string;
-    sessionType: SessionType;
-    vnetSettings: VnetSettings; 
-}
-
-export type VnetSettings = {
-    networkProfileResourceId?: string;
-    relayNamespaceResourceId?: string;
-    location?: string;
-}
-
-export type ProvisionConsoleResponse = {
-    properties: {
-        osType: OsType;
-        provisioningState: string;
-        uri: string;
-    };
-};
-
-export type Authorization = {
-    token: string;
-};
-
-export type ConnectTerminalResponse = {
-    id: string;
-    idleTimeout: string;
-    rootDirectory: string;
-    socketUri: string;
-    tokenUpdated: boolean;
-};
-
-export type VnetModel = {
-    name: string;
-    id: string;
-    etag: string;
-    type: string;
-    location: string;
-    tags: Record<string, string>;
-    properties: {
-        provisioningState: string;
-        resourceGuid: string;
-        addressSpace: {
-            addressPrefixes: string[];
-        };
-        encryption: {
-            enabled: boolean;
-            enforcement: string;
-        };
-        privateEndpointVNetPolicies: string;
-        subnets: Array<{
-            name: string;
-            id: string;
-            etag: string;
-            type: string;
-            properties: {
-                provisioningState: string;
-                addressPrefixes?: string[];
-                addressPrefix?: string;
-                networkSecurityGroup?: { id: string };
-                ipConfigurations?: { id: string }[];
-                ipConfigurationProfiles?: { id: string }[];
-                privateEndpoints?: { id: string }[];
-                serviceEndpoints?: Array<{
-                    provisioningState: string;
-                    service: string;
-                    locations: string[];
-                }>;
-                delegations?: Array<{
-                    name: string;
-                    id: string;
-                    etag: string;
-                    type: string;
-                    properties: {
-                        provisioningState: string;
-                        serviceName: string;
-                        actions: string[];
-                    };
-                }>;
-                purpose?: string;
-                privateEndpointNetworkPolicies?: string;
-                privateLinkServiceNetworkPolicies?: string;
-            };
-        }>;
-        virtualNetworkPeerings: any[];
-        enableDdosProtection: boolean;
-    };
-};
-
-export type RelayNamespace = {
-    id: string;
-    name: string;
-    type: string;
-    location: string;
-    tags: Record<string, string>;
-    properties: {
-        metricId: string;
-        serviceBusEndpoint: string;
-        provisioningState: string;
-        status: string;
-        createdAt: string;
-        updatedAt: string;
-    };
-    sku: {
-        name: string;
-        tier: string;
-    };
-};
-
-export type RelayNamespaceResponse = {
-    value: RelayNamespace[];
-};
-
-/**
- * Resource types for API versioning
- */
-export enum ResourceType {
-    NETWORK = "NETWORK",
-    DATABASE = "DATABASE",
-    VNET = "VNET",
-    SUBNET = "SUBNET",
-    RELAY = "RELAY",
-    ROLE = "ROLE"
-}

src/Explorer/Tabs/CloudShellTab/Network/FirewallHandler.tsx

@@ -1,94 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Firewall handling functionality for CloudShell
- */
-
-import { Terminal } from "xterm";
-import { userContext } from "../../../../UserContext";
-import { hasFirewallRestrictions } from "../../Shared/CheckFirewallRules";
-import { getAccountDetails, updateDatabaseAccount } from "../Data/CloudShellApiClient";
-import { askConfirmation } from "../Utils/CommonUtils";
-import { terminalLog } from "../Utils/LogFormatter";
-
-export class FirewallHandler {
-  /**
-   * Checks if firewall configuration is needed for CloudShell
-   */
-  public static async checkFirewallConfiguration(terminal: Terminal): Promise<boolean> {
-    if (!hasFirewallRestrictions()) {
-      return false; // No firewall rules to configure
-    }
-
-    terminal.writeln(terminalLog.header("Database Firewall Configuration"));
-    terminal.writeln(terminalLog.warning("Your database has firewall restrictions enabled"));
-    terminal.writeln(terminalLog.warning("CloudShell might need access through these restrictions"));
-
-    const shouldConfigureFirewall = await askConfirmation(
-      terminal, 
-      "Would you like to check and configure firewall settings?"
-    );
-
-    if (!shouldConfigureFirewall) {
-      terminal.writeln(terminalLog.info("Skipping firewall configuration"));
-      return false;
-    }
-
-    return await this.configureFirewallForCloudShell(terminal);
-  }
-
-  /**
-   * Configures firewall for CloudShell access
-   */
-  private static async configureFirewallForCloudShell(terminal: Terminal): Promise<boolean> {
-    try {
-      // Get current database account details
-      terminal.writeln(terminalLog.database("Retrieving current firewall configuration..."));
-      const dbAccount = userContext.databaseAccount;
-      const currentDbAccount = await getAccountDetails(dbAccount.id);
-      
-      // Check if "Allow Azure Services" is already enabled
-      const ipRules = currentDbAccount.properties.ipRules || [];
-      const azureServicesEnabled = currentDbAccount.properties.publicNetworkAccess === "Enabled";
-      
-      if (azureServicesEnabled) {
-        terminal.writeln(terminalLog.success("Azure services access is already enabled"));
-        return true;
-      }
-      
-      // Ask user to enable Azure services access
-      terminal.writeln(terminalLog.warning("Azure services access is not enabled"));
-      terminal.writeln(terminalLog.info("CloudShell requires 'Allow Azure Services' to be enabled"));
-      
-      const enableAzureServices = await askConfirmation(
-        terminal,
-        "Enable 'Allow Azure Services' for this database?"
-      );
-      
-      if (!enableAzureServices) {
-        terminal.writeln(terminalLog.warning("CloudShell may not be able to connect without enabling Azure services access"));
-        return false;
-      }
-      
-      // Update database account to enable Azure services access
-      terminal.writeln(terminalLog.info("Updating database firewall configuration..."));
-      
-      // Create update payload - only modify firewall-related properties
-      const updatePayload = {
-        ...currentDbAccount,
-        properties: {
-          ...currentDbAccount.properties,
-          publicNetworkAccess: "Enabled"
-        }
-      };
-      
-      await updateDatabaseAccount(dbAccount.id, updatePayload);
-      terminal.writeln(terminalLog.success("Database firewall updated successfully"));
-      terminal.writeln(terminalLog.success("Azure services access is now enabled"));
-      
-      return true;
-    } catch (error) {
-      terminal.writeln(terminalLog.error(`Error configuring firewall: ${error.message}`));
-      return false;
-    }
-  }
-}

src/Explorer/Tabs/CloudShellTab/Network/NetworkAccessHandler.tsx

@@ -1,99 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Network access configuration handler for CloudShell
- */
-
-import { Terminal } from "xterm";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { IsPublicAccessAvailable } from "../../Shared/CheckFirewallRules";
-import { getUserSettings } from "../Data/CloudShellApiClient";
-import { VnetSettings } from "../Models/DataModels";
-import { terminalLog } from "../Utils/LogFormatter";
-import { VNetHandler } from "./VNetHandler";
-
-export class NetworkAccessHandler {
-  /**
-   * Configures network access for the CloudShell based on shell type and network restrictions
-   */
-  public static async configureNetworkAccess(
-    terminal: Terminal, 
-    region: string, 
-    shellType: TerminalKind
-  ): Promise<{
-    vNetSettings: any;
-    isAllPublicAccessEnabled: boolean;
-  }> {
-    // Check if public access is available for this shell type
-    const isAllPublicAccessEnabled = await IsPublicAccessAvailable(shellType);
-
-    // If public access is enabled, no need for VNet configuration
-    if (isAllPublicAccessEnabled) {
-      terminal.writeln(terminalLog.database("Public access enabled. Skipping VNet configuration."));
-      return {
-        vNetSettings: {},
-        isAllPublicAccessEnabled: true
-      };
-    }
-
-    // Public access is restricted, we need to configure a VNet or use existing one
-    terminal.writeln(terminalLog.database("Network restrictions detected"));
-    terminal.writeln(terminalLog.info("Loading CloudShell configuration..."));
-
-    // Get existing settings if available
-    const settings = await getUserSettings();
-    if (!settings) {
-      terminal.writeln(terminalLog.warning("No existing user settings found."));
-    }
-
-    // Retrieve CloudShell VNet settings if available
-    let cloudShellVnetSettings: VnetSettings | undefined;
-    if (settings) {
-      cloudShellVnetSettings = await VNetHandler.retrieveCloudShellVnetSettings(settings, terminal);
-    }
-
-    // If CloudShell has VNet settings, check with database config
-    let finalVNetSettings = {};
-    if (cloudShellVnetSettings && cloudShellVnetSettings.networkProfileResourceId) {
-      // Check if we should use existing VNet settings
-      const isContinueWithSameVnet = await VNetHandler.askForVNetConfigConsent(terminal, shellType);
-      
-      if (isContinueWithSameVnet) {
-        // Check if the VNet is already configured in the database
-        const isVNetInDatabaseConfig = await VNetHandler.isCloudShellVNetInDatabaseConfig(cloudShellVnetSettings, terminal);
-
-        if (!isVNetInDatabaseConfig) {
-          terminal.writeln(terminalLog.warning("CloudShell VNet is not configured in database access list"));
-          const addToDatabase = await VNetHandler.askToAddVNetToDatabase(terminal, cloudShellVnetSettings);
-
-          if (addToDatabase) {
-            await VNetHandler.addCloudShellVNetToDatabase(cloudShellVnetSettings, terminal);
-            finalVNetSettings = cloudShellVnetSettings;
-          } else {
-            // User declined to add VNet to database, need to recreate
-            terminal.writeln(terminalLog.warning("Will configure new VNet..."));
-            cloudShellVnetSettings = undefined;
-          }
-        } else {
-          terminal.writeln(terminalLog.success("CloudShell VNet is already in database configuration"));
-          finalVNetSettings = cloudShellVnetSettings;
-        }
-      } else {
-        cloudShellVnetSettings = undefined; // User declined to use existing VNet settings
-      }
-    }
-
-    // If we don't have valid VNet settings, create new ones
-    if (!cloudShellVnetSettings || !cloudShellVnetSettings.networkProfileResourceId) {
-      terminal.writeln(terminalLog.subheader("Configuring network infrastructure"));
-      finalVNetSettings = await VNetHandler.configureCloudShellVNet(terminal, region);
-      
-      // Add the new VNet to the database
-      await VNetHandler.addCloudShellVNetToDatabase(finalVNetSettings as VnetSettings, terminal);
-    }
-
-    return {
-      vNetSettings: finalVNetSettings,
-      isAllPublicAccessEnabled: false
-    };
-  }
-}

src/Explorer/Tabs/CloudShellTab/Network/VNetHandler.tsx

@@ -1,894 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * VNet handling functionality for CloudShell
- */
-
-import { v4 as uuidv4 } from 'uuid';
-import { Terminal } from "xterm";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import { hasPrivateEndpointsRestrictions } from "../../Shared/CheckFirewallRules";
-import {
-  createNetworkProfile,
-  createPrivateEndpoint,
-  createRelay,
-  createRoleOnNetworkProfile,
-  createRoleOnRelay,
-  getAccountDetails,
-  getDatabaseOperations,
-  getNetworkProfileInfo,
-  getRelay,
-  getSubnetInformation,
-  getVnet,
-  getVnetInformation,
-  updateDatabaseAccount,
-  updateSubnetInformation,
-  updateVnet
-} from "../Data/CloudShellApiClient";
-import { Settings, VnetSettings } from "../Models/DataModels";
-import { askConfirmation, askQuestion, wait } from "../Utils/CommonUtils";
-import { terminalLog } from "../Utils/LogFormatter";
-
-// Constants for VNet configuration
-const POLLING_INTERVAL_MS = 5000;
-const MAX_RETRY_COUNT = 10;
-const STANDARD_SKU = "Standard";
-const DEFAULT_VNET_ADDRESS_PREFIX = "10.0.0.0/16";
-const DEFAULT_SUBNET_ADDRESS_PREFIX = "10.0.1.0/24";
-const DEFAULT_CONTAINER_INSTANCE_OID = "88536fb9-d60a-4aee-8195-041425d6e927";
-
-export class VNetHandler {
-  /**
-   * Retrieves CloudShell VNet settings from user settings
-   */
-  public static async retrieveCloudShellVnetSettings(settings: Settings, terminal: Terminal): Promise<VnetSettings> {
-    if (settings?.properties?.vnetSettings && Object.keys(settings.properties.vnetSettings).length > 0) {
-      try {
-        const netProfileInfo = await getNetworkProfileInfo<any>(settings.properties.vnetSettings.networkProfileResourceId);
-
-        terminal.writeln(terminalLog.header("Existing Network Configuration"));
-
-        const subnetId = netProfileInfo.properties.containerNetworkInterfaceConfigurations[0]
-        .properties.ipConfigurations[0].properties.subnet.id;
-        const vnetResourceId = subnetId.replace(/\/subnets\/[^/]+$/, '');
-
-        terminal.writeln(terminalLog.item("VNet", vnetResourceId));
-        terminal.writeln(terminalLog.item("Subnet", subnetId));
-        terminal.writeln(terminalLog.item("Location", settings.properties.vnetSettings.location));
-        terminal.writeln(terminalLog.item("Network Profile", settings.properties.vnetSettings.networkProfileResourceId));
-        terminal.writeln(terminalLog.item("Relay Namespace", settings.properties.vnetSettings.relayNamespaceResourceId));
-
-        return {
-          networkProfileResourceId: settings.properties.vnetSettings.networkProfileResourceId,
-          relayNamespaceResourceId: settings.properties.vnetSettings.relayNamespaceResourceId,
-          location: settings.properties.vnetSettings.location
-        };
-      } catch (err) {
-        terminal.writeln(terminalLog.warning("Error retrieving network profile. Will configure new network."));
-        return undefined;
-      }
-    }
-
-    return undefined;
-  }
-
-  /**
-   * Asks the user if they want to use existing network configuration (VNet or private endpoint)
-   */
-  public static async askForVNetConfigConsent(terminal: Terminal, shellType: TerminalKind = null): Promise<boolean> {
-    // Check if this shell type supports only private endpoints
-    const isPrivateEndpointOnlyShell = shellType === TerminalKind.VCoreMongo;
-    // Check if the database has private endpoints configured
-    const hasPrivateEndpoints = hasPrivateEndpointsRestrictions();
-    
-    // Determine which network type to mention based on shell type and database configuration
-    const networkType = isPrivateEndpointOnlyShell || hasPrivateEndpoints ? "private endpoint" : "network";
-    
-    // Ask for consent
-    terminal.writeln("");
-    terminal.writeln(terminalLog.prompt(`Use this existing ${networkType} configuration?`));
-    terminal.writeln(terminalLog.info(`Answering 'N' will configure a new ${networkType} for CloudShell`));
-
-    return await askConfirmation(terminal, `Press Y/N to continue...`);
-  }
-
-  /**
-   * Checks if the CloudShell VNet is already in the database configuration
-   */
-  public static async isCloudShellVNetInDatabaseConfig(vNetSettings: VnetSettings, terminal: Terminal): Promise<boolean> {
-    try {
-      terminal.writeln(terminalLog.subheader("Verifying if CloudShell VNet is configured in database"));
-
-      // Get the subnet ID from the CloudShell Network Profile
-      const netProfileInfo = await getNetworkProfileInfo<any>(vNetSettings.networkProfileResourceId);
-
-      if (!netProfileInfo?.properties?.containerNetworkInterfaceConfigurations?.[0]
-        ?.properties?.ipConfigurations?.[0]?.properties?.subnet?.id) {
-        terminal.writeln(terminalLog.warning("Could not retrieve subnet ID from CloudShell VNet"));
-        return false;
-      }
-
-      const cloudShellSubnetId = netProfileInfo.properties.containerNetworkInterfaceConfigurations[0]
-        .properties.ipConfigurations[0].properties.subnet.id;
-
-      terminal.writeln(terminalLog.item("CloudShell Subnet", cloudShellSubnetId.split('/').pop() || ""));
-
-      // Check if this subnet ID is in the database VNet rules
-      const dbAccount = userContext.databaseAccount;
-      if (!dbAccount?.properties?.virtualNetworkRules) {
-        return false;
-      }
-
-      const vnetRules = dbAccount.properties.virtualNetworkRules;
-
-      // Check if the CloudShell subnet is already in the rules
-      return vnetRules.some(rule => rule.id === cloudShellSubnetId);
-
-    } catch (err) {
-      terminal.writeln(terminalLog.error("Error checking database VNet configuration"));
-      return false;
-    }
-  }
-
-  /**
-   * Asks the user if they want to add the CloudShell VNet to the database configuration
-   */
-  public static async askToAddVNetToDatabase(terminal: Terminal, vNetSettings: VnetSettings): Promise<boolean> {
-    terminal.writeln("");
-    terminal.writeln(terminalLog.header("Network Configuration Mismatch"));
-    terminal.writeln(terminalLog.warning("Your CloudShell VNet is not in your database's allowed networks"));
-    terminal.writeln(terminalLog.warning("To connect from CloudShell, this VNet must be added to your database"));
-    
-    return await askConfirmation(terminal, "Add CloudShell VNet to database configuration?");
-  }
-
- /**
- * Adds the CloudShell VNet to the database configuration
- * Now supports both VNet rules and private endpoints
- */
-public static async addCloudShellVNetToDatabase(vNetSettings: VnetSettings, terminal: Terminal): Promise<void> {
-  try {
-    terminal.writeln(terminalLog.header("Updating database network configuration"));
-
-    // Step 1: Get the subnet ID from CloudShell Network Profile
-    const { cloudShellSubnetId, cloudShellVnetId } = await this.getCloudShellNetworkIds(vNetSettings, terminal);
-
-    // Step 2: Get current database account details
-    const { currentDbAccount } = await this.getDatabaseAccountDetails(terminal);
-
-    // Step 3: Determine if database uses private endpoints
-    const usesPrivateEndpoints = hasPrivateEndpointsRestrictions() || 
-                                (currentDbAccount.properties.privateEndpointConnections?.length > 0);
-    
-    // Log which networking mode we're using
-    if (usesPrivateEndpoints) {
-      terminal.writeln(terminalLog.info("Database is configured with private endpoints"));
-    } else {
-      terminal.writeln(terminalLog.info("Database is configured with VNet rules"));
-    }
-
-    // Step 4: Check if connection is already configured
-    if (usesPrivateEndpoints) {
-      if (await this.isPrivateEndpointAlreadyConfigured(cloudShellVnetId, currentDbAccount, terminal)) {
-        return;
-      }
-    } else {
-      if (await this.isVNetAlreadyConfigured(cloudShellSubnetId, currentDbAccount, terminal)) {
-        return;
-      }
-    }
-
-    // Step 5: Check network resource statuses and ongoing operations
-    const { vnetInfo, subnetInfo, operationInProgress } =
-      await this.checkNetworkResourceStatuses(cloudShellSubnetId, cloudShellVnetId, currentDbAccount.id, terminal);
-
-    // Step 6: If no operation in progress, update the configuration
-    if (!operationInProgress) {
-      if (usesPrivateEndpoints) {
-        // Create or update private endpoint configuration
-        await this.configurePrivateEndpoint(
-          cloudShellSubnetId, 
-          vnetInfo.location, 
-          currentDbAccount.id, 
-          terminal
-        );
-      } else {
-        // Enable CosmosDB service endpoint on subnet if needed (for VNet rules)
-        await this.enableCosmosDBServiceEndpoint(cloudShellSubnetId, subnetInfo, terminal);
-
-        // Update database account with VNet rule
-        await this.updateDatabaseWithVNetRule(currentDbAccount, cloudShellSubnetId, currentDbAccount.id, terminal);
-      }
-    } else {
-      terminal.writeln(terminalLog.info("Monitoring existing network operation..."));
-      // Step 7: Monitor the update progress
-      await this.monitorVNetAdditionProgress(cloudShellSubnetId, currentDbAccount.id, terminal);
-    }
-
-  } catch (err) {
-    terminal.writeln(terminalLog.error(`Error updating database network configuration: ${err.message}`));
-    throw err;
-  }
-}
-
-/**
- * Checks if a private endpoint is already configured for the CloudShell VNet
- */
-private static async isPrivateEndpointAlreadyConfigured(
-  cloudShellVnetId: string, 
-  currentDbAccount: any, 
-  terminal: Terminal
-): Promise<boolean> {
-  // Check if private endpoints exist and are properly configured for this VNet
-  const hasConfiguredEndpoint = currentDbAccount.properties.privateEndpointConnections?.some(
-    (connection: any) => {
-      const isApproved = connection.properties.privateLinkServiceConnectionState.status === 'Approved';
-      // We would need to check if the endpoint is in the CloudShell VNet
-      // For simplicity, we're assuming connection.properties.networkInterface contains this info
-      const endpointVNetId = connection.properties.networkInterface?.id?.split('/subnets/')[0];
-      return isApproved && endpointVNetId === cloudShellVnetId;
-    }
-  );
-
-  if (hasConfiguredEndpoint) {
-    terminal.writeln(terminalLog.success("CloudShell private endpoint is already configured"));
-    return true;
-  }
-
-  return false;
-}
-
-/**
- * Configures a private endpoint for the CloudShell VNet to connect to the database
- */
-private static async configurePrivateEndpoint(
-  cloudShellSubnetId: string,
-  vnetLocation: any,
-  dbAccountId: string,
-  terminal: Terminal
-): Promise<void> {
-  // Extract necessary information from IDs
-  const subnetIdParts = cloudShellSubnetId.split('/');
-  const subnetIndex = subnetIdParts.indexOf('subnets');
-  
-  const subnetName = subnetIdParts[subnetIndex + 1];
-  const resourceGroup = subnetIdParts[4];
-  const subscriptionId = subnetIdParts[2];
-  
-  // Generate a unique name for the private endpoint
-  const privateEndpointName = `pe-cloudshell-cosmos-${Math.floor(10000 + Math.random() * 90000)}`;
-  
-  terminal.writeln(terminalLog.subheader("Creating private endpoint for CloudShell"));
-  terminal.writeln(terminalLog.item("Private Endpoint Name", privateEndpointName));
-  terminal.writeln(terminalLog.item("Target Subnet", subnetName));
-  
-  // Construct the private endpoint creation payload
-  const privateEndpointPayload = {
-    location: vnetLocation,
-    properties: {
-      privateLinkServiceConnections: [
-        {
-          name: privateEndpointName,
-          properties: {
-            privateLinkServiceId: dbAccountId,
-            groupIds: [
-                "MongoDB"
-            ],
-            requestMessage: "CloudShell connectivity request"
-          },
-          type: "Microsoft.Network/privateEndpoints/privateLinkServiceConnections"
-        }
-      ],
-      subnet: {
-        id: cloudShellSubnetId
-      }
-    }
-  };
-  
-  // Send the request to create the private endpoint
-  // Note: This is a placeholder - we would need to implement this API call
-  terminal.writeln(terminalLog.info("Submitting private endpoint creation request"));
-  
-  try {
-    const privateEndpointUrl = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.Network/privateEndpoints/${privateEndpointName}`;
-    
-    await createPrivateEndpoint(privateEndpointUrl, privateEndpointPayload, "2024-05-01");
-    
-    terminal.writeln(terminalLog.success("Private endpoint creation request submitted"));
-    terminal.writeln(terminalLog.warning("Please approve the private endpoint connection in the Azure portal"));
-    terminal.writeln(terminalLog.info("Note: Private endpoint operations may take several minutes to complete"));
-  } catch (err) {
-    terminal.writeln(terminalLog.error(`Failed to create private endpoint: ${err.message}`));
-    throw err;
-  }
-}
-  /**
-   * Gets the subnet and VNet IDs from CloudShell Network Profile
-   */
-  private static async getCloudShellNetworkIds(vNetSettings: VnetSettings, terminal: Terminal): Promise<{ cloudShellSubnetId: string; cloudShellVnetId: string }> {
-    const netProfileInfo = await getNetworkProfileInfo<any>(vNetSettings.networkProfileResourceId);
-
-    if (!netProfileInfo?.properties?.containerNetworkInterfaceConfigurations?.[0]
-      ?.properties?.ipConfigurations?.[0]?.properties?.subnet?.id) {
-      throw new Error("Could not retrieve subnet ID from CloudShell VNet");
-    }
-
-    const cloudShellSubnetId = netProfileInfo.properties.containerNetworkInterfaceConfigurations[0]
-      .properties.ipConfigurations[0].properties.subnet.id;
-
-    // Extract VNet ID from subnet ID
-    const cloudShellVnetId = cloudShellSubnetId.substring(0, cloudShellSubnetId.indexOf('/subnets/'));
-
-    terminal.writeln(terminalLog.subheader("Identified CloudShell network resources"));
-    terminal.writeln(terminalLog.item("Subnet", cloudShellSubnetId.split('/').pop() || ""));
-    terminal.writeln(terminalLog.item("VNet", cloudShellVnetId.split('/').pop() || ""));
-
-    return { cloudShellSubnetId, cloudShellVnetId };
-  }
-
-  /**
-   * Gets the database account details
-   */
-  private static async getDatabaseAccountDetails(terminal: Terminal): Promise<{ currentDbAccount: any }> {
-    const dbAccount = userContext.databaseAccount;
-    terminal.writeln(terminalLog.database("Verifying current configuration"));
-    const currentDbAccount = await getAccountDetails(dbAccount.id);
-
-    return { currentDbAccount };
-  }
-
-  /**
-   * Checks if the VNet is already configured in the database
-   */
-  private static async isVNetAlreadyConfigured(cloudShellSubnetId: string, currentDbAccount: any, terminal: Terminal): Promise<boolean> {
-    const vnetAlreadyConfigured = currentDbAccount.properties.virtualNetworkRules &&
-      currentDbAccount.properties.virtualNetworkRules.some(
-        (rule: any) => rule.id === cloudShellSubnetId
-      );
-
-    if (vnetAlreadyConfigured) {
-      terminal.writeln(terminalLog.success("CloudShell VNet is already in database configuration"));
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Checks the status of network resources and ongoing operations
-   */
-  private static async checkNetworkResourceStatuses(
-    cloudShellSubnetId: string,
-    cloudShellVnetId: string,
-    dbAccountId: string,
-    terminal: Terminal
-  ): Promise<{ vnetInfo: any; subnetInfo: any; operationInProgress: boolean }> {
-    terminal.writeln(terminalLog.subheader("Checking network resource status"));
-
-    let operationInProgress = false;
-    let vnetInfo: any = null;
-    let subnetInfo: any = null;
-
-    if (cloudShellVnetId && cloudShellSubnetId) {
-      // Get VNet and subnet resource status
-      vnetInfo = await getVnetInformation<any>(cloudShellVnetId);
-      subnetInfo = await getSubnetInformation<any>(cloudShellSubnetId);
-
-      // Check if there's an ongoing operation on the VNet or subnet
-      const vnetProvisioningState = vnetInfo?.properties?.provisioningState;
-      const subnetProvisioningState = subnetInfo?.properties?.provisioningState;
-
-      if (vnetProvisioningState !== 'Succeeded' && vnetProvisioningState !== 'Failed') {
-        terminal.writeln(terminalLog.warning(`VNet operation in progress: ${vnetProvisioningState}`));
-        operationInProgress = true;
-      }
-
-      if (subnetProvisioningState !== 'Succeeded' && subnetProvisioningState !== 'Failed') {
-        terminal.writeln(terminalLog.warning(`Subnet operation in progress: ${subnetProvisioningState}`));
-        operationInProgress = true;
-      }
-
-      // Also check database operations
-      const latestDbAccount = await getAccountDetails<any>(dbAccountId);
-
-      if (latestDbAccount.properties.virtualNetworkRules) {
-        const isPendingAdd = latestDbAccount.properties.virtualNetworkRules.some(
-          (rule: any) => rule.id === cloudShellSubnetId && rule.status === 'Updating'
-        );
-
-        if (isPendingAdd) {
-          terminal.writeln(terminalLog.warning("CloudShell VNet addition to database is already in progress"));
-          operationInProgress = true;
-        }
-      }
-    }
-
-    return { vnetInfo, subnetInfo, operationInProgress };
-  }
-
-  /**
-   * Enables the CosmosDB service endpoint on a subnet if needed
-   */
-  private static async enableCosmosDBServiceEndpoint(cloudShellSubnetId: string, subnetInfo: any, terminal: Terminal): Promise<void> {
-    if (!subnetInfo) {
-      terminal.writeln(terminalLog.warning("Unable to check subnet endpoint configuration"));
-      return;
-    }
-
-    terminal.writeln(terminalLog.subheader("Checking and configuring CosmosDB service endpoint"));
-
-    // Parse the subnet ID to get resource information
-    const subnetIdParts = cloudShellSubnetId.split('/');
-    const subnetIndex = subnetIdParts.indexOf('subnets');
-    if (subnetIndex > 0) {
-      const subnetName = subnetIdParts[subnetIndex + 1];
-      const vnetName = subnetIdParts[subnetIndex - 1];
-      const resourceGroup = subnetIdParts[4];
-      const subscriptionId = subnetIdParts[2];
-
-      // Get the subnet URL
-      const subnetUrl = `/subscriptions/${subscriptionId}/resourceGroups/${resourceGroup}/providers/Microsoft.Network/virtualNetworks/${vnetName}/subnets/${subnetName}`;
-
-      // Check if CosmosDB service endpoint is already enabled
-      const hasCosmosDBEndpoint = subnetInfo.properties.serviceEndpoints &&
-        subnetInfo.properties.serviceEndpoints.some(
-          (endpoint: any) => endpoint.service === 'Microsoft.AzureCosmosDB'
-        );
-
-      if (!hasCosmosDBEndpoint) {
-        terminal.writeln(terminalLog.warning("Enabling CosmosDB service endpoint on subnet..."));
-
-        // Create update payload with CosmosDB service endpoint
-        const serviceEndpoints = [
-          ...(subnetInfo.properties.serviceEndpoints || []),
-          { service: 'Microsoft.AzureCosmosDB' }
-        ];
-
-        // Update the subnet configuration while preserving existing properties
-        const subnetUpdatePayload = {
-          ...subnetInfo,
-          properties: {
-            ...subnetInfo.properties,
-            serviceEndpoints: serviceEndpoints
-          }
-        };
-
-        // Apply the subnet update
-        await updateSubnetInformation(subnetUrl, subnetUpdatePayload);
-
-        // Wait for the subnet update to complete
-        let subnetUpdateComplete = false;
-        let subnetRetryCount = 0;
-
-        while (!subnetUpdateComplete && subnetRetryCount < MAX_RETRY_COUNT) {
-          const updatedSubnet = await getSubnetInformation<any>(subnetUrl);
-
-          const endpointEnabled = updatedSubnet.properties.serviceEndpoints &&
-            updatedSubnet.properties.serviceEndpoints.some(
-              (endpoint: any) => endpoint.service === 'Microsoft.AzureCosmosDB'
-            );
-
-          if (endpointEnabled && updatedSubnet.properties.provisioningState === 'Succeeded') {
-            subnetUpdateComplete = true;
-            terminal.writeln(terminalLog.success("CosmosDB service endpoint enabled successfully"));
-          } else {
-            subnetRetryCount++;
-            terminal.writeln(terminalLog.progress("Subnet update", `Waiting (${subnetRetryCount}/${MAX_RETRY_COUNT})`));
-            await wait(POLLING_INTERVAL_MS);
-          }
-        }
-
-        if (!subnetUpdateComplete) {
-          throw new Error("Failed to enable CosmosDB service endpoint on subnet");
-        }
-      } else {
-        terminal.writeln(terminalLog.success("CosmosDB service endpoint is already enabled"));
-      }
-    }
-  }
-
-  /**
-   * Updates the database account with a new VNet rule
-   */
-  private static async updateDatabaseWithVNetRule(currentDbAccount: any, cloudShellSubnetId: string, dbAccountId: string, terminal: Terminal): Promise<void> {
-    // Create a deep copy of the current database account
-    const updatePayload = JSON.parse(JSON.stringify(currentDbAccount));
-
-    // Update only the network-related properties
-    updatePayload.properties.virtualNetworkRules = [
-      ...(currentDbAccount.properties.virtualNetworkRules || []),
-      { id: cloudShellSubnetId, ignoreMissingVNetServiceEndpoint: false }
-    ];
-    updatePayload.properties.isVirtualNetworkFilterEnabled = true;
-
-    // Update the database account
-    terminal.writeln(terminalLog.subheader("Submitting VNet update request to database"));
-    await updateDatabaseAccount(dbAccountId, updatePayload);
-    terminal.writeln(terminalLog.success("Updated Database account with Cloud Shell Vnet"));
-  }
-
-  /**
-   * Monitors the progress of adding a VNet to the database account
-   */
-  private static async monitorVNetAdditionProgress(cloudShellSubnetId: string, dbAccountId: string, terminal: Terminal): Promise<void> {
-    let updateComplete = false;
-    let retryCount = 0;
-    let lastStatus = "";
-    let lastProgress = 0;
-    let lastOpId = "";
-
-    terminal.writeln(terminalLog.subheader("Monitoring database update progress"));
-
-    while (!updateComplete && retryCount < MAX_RETRY_COUNT) {
-      // Check if the VNet is now in the database account 
-      const updatedDbAccount = await getAccountDetails<any>(dbAccountId);
-      
-      const isVNetAdded = updatedDbAccount.properties.virtualNetworkRules?.some(
-        (rule: any) => rule.id === cloudShellSubnetId && (!rule.status || rule.status === 'Succeeded')
-      );
-      
-      if (isVNetAdded) {
-        updateComplete = true;
-        terminal.writeln(terminalLog.success("CloudShell VNet successfully added to database configuration"));
-        break;
-      }
-      
-      // If not yet added, check for operation progress
-      const operations = await getDatabaseOperations<any>(dbAccountId);
-      
-      // Find network-related operations
-      const networkOps = operations.value?.filter(
-        (op: any) => 
-        (op.properties.description?.toLowerCase().includes('network') ||
-          op.properties.description?.toLowerCase().includes('vnet'))
-      ) || [];
-      
-      // Find active operations
-      const activeOp = networkOps.find((op: any) => op.properties.status === 'InProgress');
-      
-      if (activeOp) {
-        // Show progress details if available
-        const currentStatus = activeOp.properties.status;
-        const progress = activeOp.properties.percentComplete || 0;
-        const opId = activeOp.name;
-        
-        // Only update the terminal if something has changed
-        if (currentStatus !== lastStatus || progress !== lastProgress || opId !== lastOpId) {
-          // Create a progress bar
-          const progressBarLength = 20;
-          const filledLength = Math.floor(progress / 100 * progressBarLength);
-          const progressBar = "█".repeat(filledLength) + "░".repeat(progressBarLength - filledLength);
-          
-          terminal.writeln(`\x1B[34m  [${progressBar}] ${progress}% - ${currentStatus}\x1B[0m`);
-          lastStatus = currentStatus;
-          lastProgress = progress;
-          lastOpId = opId;
-        }
-      } else if (networkOps.length > 0) {
-        // If there are completed operations, show their status
-        const lastCompletedOp = networkOps[0];
-        
-        if (lastCompletedOp.properties.status !== lastStatus) {
-          terminal.writeln(terminalLog.progress("Operation status", lastCompletedOp.properties.status));
-          lastStatus = lastCompletedOp.properties.status;
-        }
-      }
-      
-      retryCount++;
-      await wait(POLLING_INTERVAL_MS);
-    }
-    
-    if (!updateComplete) {
-      terminal.writeln(terminalLog.warning("Database update timed out. Please check the Azure portal."));
-    }
-  }
-
-  /**
-   * Configures a new VNet for CloudShell
-   */
-  public static async configureCloudShellVNet(terminal: Terminal, resolvedRegion: string): Promise<VnetSettings> {
-    // Use professional and shorter names for resources
-    const randomSuffix = Math.floor(10000 + Math.random() * 90000);
-
-    const subnetName = `cloudshell-subnet-${randomSuffix}`;
-    const vnetName = `cloudshell-vnet-${randomSuffix}`;
-    const networkProfileName = `cloudshell-network-profile-${randomSuffix}`;
-    const relayName = `cloudshell-relay-${randomSuffix}`;
-
-    terminal.writeln(terminalLog.header("Network Resource Configuration"));
-
-    const azureContainerInstanceOID = await askQuestion(
-      terminal,
-      "Enter Azure Container Instance OID (Refer. https://learn.microsoft.com/en-us/azure/cloud-shell/vnet/deployment#get-the-azure-container-instance-id)",
-      DEFAULT_CONTAINER_INSTANCE_OID
-    );
-
-    const vNetSubscriptionId = await askQuestion(
-      terminal,
-      "Enter Virtual Network Subscription ID",
-      userContext.subscriptionId
-    );
-
-    const vNetResourceGroup = await askQuestion(
-      terminal,
-      "Enter Virtual Network Resource Group",
-      userContext.resourceGroup
-    );
-
-    // Step 1: Create VNet with Subnet
-    terminal.writeln(terminalLog.header("Deploying Network Resources"));
-    const vNetConfigPayload = await this.createCloudShellVnet(
-      resolvedRegion,
-      subnetName,
-      terminal,
-      vnetName,
-      vNetSubscriptionId,
-      vNetResourceGroup
-    );
-
-    // Step 2: Create Network Profile
-    await this.createNetworkProfileWithVnet(
-      vNetSubscriptionId,
-      vNetResourceGroup,
-      vnetName,
-      subnetName,
-      resolvedRegion,
-      terminal,
-      networkProfileName
-    );
-
-    // Step 3: Create Network Relay
-    await this.createNetworkRelay(
-      resolvedRegion,
-      terminal,
-      relayName,
-      vNetSubscriptionId,
-      vNetResourceGroup
-    );
-
-    // Step 4: Assign Roles
-    terminal.writeln(terminalLog.header("Configuring Security Permissions"));
-    await this.assignRoleToNetworkProfile(
-      azureContainerInstanceOID,
-      vNetSubscriptionId,
-      terminal,
-      networkProfileName,
-      vNetResourceGroup
-    );
-
-    await this.assignRoleToRelay(
-      azureContainerInstanceOID,
-      vNetSubscriptionId,
-      terminal,
-      relayName,
-      vNetResourceGroup
-    );
-
-    // Step 5: Create and return VNet settings
-    const networkProfileResourceId = `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Network/networkProfiles/${networkProfileName.replace(/[\n\r]/g, "")}`;
-    const relayResourceId = `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Relay/namespaces/${relayName.replace(/[\n\r]/g, "")}`;
-
-    terminal.writeln(terminalLog.success("Network configuration complete"));
-
-    return {
-      networkProfileResourceId,
-      relayNamespaceResourceId: relayResourceId,
-      location: vNetConfigPayload.location
-    };
-  }
-
-  /**
-   * Creates a VNet for CloudShell
-   */
-  private static async createCloudShellVnet(
-    resolvedRegion: string,
-    subnetName: string,
-    terminal: Terminal,
-    vnetName: string,
-    vNetSubscriptionId: string,
-    vNetResourceGroup: string
-  ): Promise<any> {
-    const vNetConfigPayload = {
-      location: resolvedRegion,
-      properties: {
-        addressSpace: {
-          addressPrefixes: [DEFAULT_VNET_ADDRESS_PREFIX],
-        },
-        subnets: [
-          {
-            name: subnetName,
-            properties: {
-              addressPrefix: DEFAULT_SUBNET_ADDRESS_PREFIX,
-              delegations: [
-                {
-                  name: "CloudShellDelegation",
-                  properties: {
-                    serviceName: "Microsoft.ContainerInstance/containerGroups"
-                  }
-                }
-              ],
-            },
-          },
-        ],
-      },
-    };
-
-    terminal.writeln(terminalLog.vnet(`Creating VNet: ${vnetName}`));
-    let vNetResponse = await updateVnet<any>(
-      `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Network/virtualNetworks/${vnetName}`,
-      vNetConfigPayload
-    );
-
-    while (vNetResponse?.properties?.provisioningState !== "Succeeded") {
-      vNetResponse = await getVnet<any>(
-        `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Network/virtualNetworks/${vnetName}`
-      );
-
-      const vNetState = vNetResponse?.properties?.provisioningState;
-      if (vNetState !== "Succeeded" && vNetState !== "Failed") {
-        await wait(POLLING_INTERVAL_MS);
-        terminal.writeln(terminalLog.progress("VNet deployment", vNetState));
-      } else {
-        break;
-      }
-    }
-
-    terminal.writeln(terminalLog.success("VNet created successfully"));
-    return vNetConfigPayload;
-  }
-
-  /**
-   * Creates a Network Profile for CloudShell
-   */
-  private static async createNetworkProfileWithVnet(
-    vNetSubscriptionId: string,
-    vNetResourceGroup: string,
-    vnetName: string,
-    subnetName: string,
-    resolvedRegion: string,
-    terminal: Terminal,
-    networkProfileName: string
-  ): Promise<void> {
-    const subnetId = `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Network/virtualNetworks/${vnetName}/subnets/${subnetName}`;
-
-    const createNetworkProfilePayload = {
-      location: resolvedRegion,
-      properties: {
-        containerNetworkInterfaceConfigurations: [
-          {
-            name: 'defaultContainerNicConfig',
-            properties: {
-              ipConfigurations: [
-                {
-                  name: 'defaultContainerIpConfig',
-                  properties: {
-                    subnet: {
-                      id: subnetId,
-                    }
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    };
-
-    terminal.writeln(terminalLog.vnet("Creating Network Profile"));
-    let networkProfileResponse = await createNetworkProfile<any>(
-      `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Network/networkProfiles/${networkProfileName}`,
-      createNetworkProfilePayload
-    );
-
-    while (networkProfileResponse?.properties?.provisioningState !== "Succeeded") {
-      networkProfileResponse = await getNetworkProfileInfo<any>(
-        `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Network/networkProfiles/${networkProfileName}`
-      );
-
-      const networkProfileState = networkProfileResponse?.properties?.provisioningState;
-      if (networkProfileState !== "Succeeded" && networkProfileState !== "Failed") {
-        await wait(POLLING_INTERVAL_MS);
-        terminal.writeln(terminalLog.progress("Network Profile", networkProfileState));
-      } else {
-        break;
-      }
-    }
-
-    terminal.writeln(terminalLog.success("Network Profile created successfully"));
-  }
-
-  /**
-   * Creates a Network Relay for CloudShell
-   */
-  private static async createNetworkRelay(
-    resolvedRegion: string,
-    terminal: Terminal,
-    relayName: string,
-    vNetSubscriptionId: string,
-    vNetResourceGroup: string
-  ): Promise<void> {
-    const relayPayload = {
-      location: resolvedRegion,
-      sku: {
-        name: STANDARD_SKU,
-        tier: STANDARD_SKU,
-      }
-    };
-
-    terminal.writeln(terminalLog.vnet("Creating Relay Namespace"));
-    let relayResponse = await createRelay<any>(
-      `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Relay/namespaces/${relayName}`,
-      relayPayload
-    );
-
-    while (relayResponse?.properties?.provisioningState !== "Succeeded") {
-      relayResponse = await getRelay<any>(
-        `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Relay/namespaces/${relayName}`
-      );
-
-      const relayState = relayResponse?.properties?.provisioningState;
-      if (relayState !== "Succeeded" && relayState !== "Failed") {
-        await wait(POLLING_INTERVAL_MS);
-        terminal.writeln(terminalLog.progress("Relay Namespace", relayState));
-      } else {
-        break;
-      }
-    }
-
-    terminal.writeln(terminalLog.success("Relay Namespace created successfully"));
-  }
-
-  /**
-   * Assigns a role to a Network Profile
-   */
-  private static async assignRoleToNetworkProfile(
-    azureContainerInstanceOID: string,
-    vNetSubscriptionId: string,
-    terminal: Terminal,
-    networkProfileName: string,
-    vNetResourceGroup: string
-  ): Promise<void> {
-    const nfRoleName = uuidv4();
-    const networkProfileRoleAssignmentPayload = {
-      properties: {
-        principalId: azureContainerInstanceOID,
-        roleDefinitionId: `/subscriptions/${vNetSubscriptionId}/providers/Microsoft.Authorization/roleDefinitions/4d97b98b-1d4f-4787-a291-c67834d212e7`
-      }
-    };
-
-    terminal.writeln(terminalLog.info("Assigning permissions to Network Profile"));
-    await createRoleOnNetworkProfile<any>(
-      `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Network/networkProfiles/${networkProfileName}/providers/Microsoft.Authorization/roleAssignments/${nfRoleName}`,
-      networkProfileRoleAssignmentPayload
-    );
-
-    terminal.writeln(terminalLog.success("Network Profile permissions assigned"));
-  }
-
-  /**
-   * Assigns a role to a Network Relay
-   */
-  private static async assignRoleToRelay(
-    azureContainerInstanceOID: string,
-    vNetSubscriptionId: string,
-    terminal: Terminal,
-    relayName: string,
-    vNetResourceGroup: string
-  ): Promise<void> {
-    const relayRoleName = uuidv4();
-    const relayRoleAssignmentPayload = {
-      properties: {
-        principalId: azureContainerInstanceOID,
-        roleDefinitionId: `/subscriptions/${vNetSubscriptionId}/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c`,
-      }
-    };
-
-    terminal.writeln(terminalLog.info("Assigning permissions to Relay Namespace"));
-    await createRoleOnRelay<any>(
-      `/subscriptions/${vNetSubscriptionId}/resourceGroups/${vNetResourceGroup}/providers/Microsoft.Relay/namespaces/${relayName}/providers/Microsoft.Authorization/roleAssignments/${relayRoleName}`,
-      relayRoleAssignmentPayload
-    );
-
-    terminal.writeln(terminalLog.success("Relay Namespace permissions assigned"));
-  }
-}

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

@@ -1,80 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Cassandra shell type handler
- */
-
-import { Terminal } from "xterm";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import { listKeys } from "../../../../Utils/arm/generatedClients/cosmos/databaseAccounts";
-import { setShellType } from "../Data/CloudShellApiClient";
-import { NetworkAccessHandler } from "../Network/NetworkAccessHandler";
-import { getHostFromUrl } from "../Utils/CommonUtils";
-import { ShellTypeConfig } from "./ShellTypeFactory";
-
-export class CassandraShellHandler implements ShellTypeConfig {
-  private shellType: TerminalKind = TerminalKind.Cassandra;
-
-  constructor() {
-    setShellType(this.shellType);
-  }
-
-  public getShellName(): string {
-    return "Cassandra";
-  }
-
-  public async getInitialCommands(): Promise<string> {
-    const dbAccount = userContext.databaseAccount;
-    const endpoint = dbAccount.properties.cassandraEndpoint;
-    
-    // Get database key
-    const dbName = dbAccount.name;
-    let key = "";
-    if (dbName) {
-      const keys = await listKeys(userContext.subscriptionId, userContext.resourceGroup, dbName);
-      key = keys?.primaryMasterKey || "";
-    }
-
-    const config = {
-      host: getHostFromUrl(endpoint),
-      name: dbAccount.name,
-      password: key,
-      endpoint: endpoint
-    };
-
-    return this.getCommands(config).join("\n").concat("\n");
-  }
-
-  public async configureNetworkAccess(terminal: Terminal, region: string): Promise<{
-    vNetSettings: any;
-    isAllPublicAccessEnabled: boolean;
-  }> {
-    return await NetworkAccessHandler.configureNetworkAccess(terminal, region, this.shellType);
-  }
-
-  private getCommands(config: any): string[] {
-    return [
-      // 1. Fetch and display location details in a readable format
-      "curl -s https://ipinfo.io | jq -r '\"Region: \" + .region + \" Country: \" + .country + \" City: \" + .city + \" IP Addr: \" + .ip'",
-      // 2. Check if cqlsh is installed; if not, proceed with installation
-      "if ! command -v cqlsh &> /dev/null; then echo '⚠️ cqlsh not found. Installing...'; fi",
-      // 3. Download Cassandra if not installed
-      "if ! command -v cqlsh &> /dev/null; then curl -LO https://archive.apache.org/dist/cassandra/5.0.3/apache-cassandra-5.0.3-bin.tar.gz; fi",
-      // 4. Extract Cassandra package if not installed
-      "if ! command -v cqlsh &> /dev/null; then tar -xvzf apache-cassandra-5.0.3-bin.tar.gz; fi",
-      // 5. Move Cassandra binaries if not installed
-      "if ! command -v cqlsh &> /dev/null; then mkdir -p ~/cassandra && mv apache-cassandra-5.0.3/* ~/cassandra/; fi",
-      // 6. Add Cassandra to PATH if not installed
-      "if ! command -v cqlsh &> /dev/null; then echo 'export PATH=$HOME/cassandra/bin:$PATH' >> ~/.bashrc; fi",
-      // 7. Set environment variables for SSL
-      "if ! command -v cqlsh &> /dev/null; then echo 'export SSL_VERSION=TLSv1_2' >> ~/.bashrc; fi",
-      "if ! command -v cqlsh &> /dev/null; then echo 'export SSL_VALIDATE=false' >> ~/.bashrc; fi",
-      // 8. Source .bashrc to update PATH (even if cqlsh was already installed)
-      "source ~/.bashrc",
-      // 9. Verify cqlsh installation
-      "cqlsh --version",
-      // 10. Login to Cassandra
-      `cqlsh ${config.host} 10350 -u ${config.name} -p ${config.password} --ssl --protocol-version=4`
-    ];
-  }
-}

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

@@ -1,77 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Mongo shell type handler
- */
-
-import { Terminal } from "xterm";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import { listKeys } from "../../../../Utils/arm/generatedClients/cosmos/databaseAccounts";
-import { setShellType } from "../Data/CloudShellApiClient";
-import { NetworkAccessHandler } from "../Network/NetworkAccessHandler";
-import { getHostFromUrl } from "../Utils/CommonUtils";
-import { ShellTypeConfig } from "./ShellTypeFactory";
-
-export class MongoShellHandler implements ShellTypeConfig {
-  private shellType: TerminalKind = TerminalKind.Mongo;
-
-  constructor() {
-    setShellType(this.shellType);
-  }
-
-  public getShellName(): string {
-    return "MongoDB";
-  }
-
-  public async getInitialCommands(): Promise<string> {
-    const dbAccount = userContext.databaseAccount;
-    const endpoint = dbAccount.properties.mongoEndpoint;
-    
-    // Get database key
-    const dbName = dbAccount.name;
-    let key = "";
-    if (dbName) {
-      const keys = await listKeys(userContext.subscriptionId, userContext.resourceGroup, dbName);
-      key = keys?.primaryMasterKey || "";
-    }
-
-    const config = {
-      host: getHostFromUrl(endpoint),
-      name: dbAccount.name,
-      password: key,
-      endpoint: endpoint
-    };
-
-    return this.getCommands(config).join("\n").concat("\n");
-  }
-
-  public async configureNetworkAccess(terminal: Terminal, region: string): Promise<{
-    vNetSettings: any;
-    isAllPublicAccessEnabled: boolean;
-  }> {
-    return await NetworkAccessHandler.configureNetworkAccess(terminal, region, this.shellType);
-  }
-
-  private getCommands(config: any): string[] {
-    return [
-      // 1. Fetch and display location details in a readable format
-      "curl -s https://ipinfo.io | jq -r '\"Region: \" + .region + \" Country: \" + .country + \" City: \" + .city + \" IP Addr: \" + .ip'",
-      // 2. Check if mongosh is installed; if not, proceed with installation
-      "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
-      // 3. Download mongosh if not installed
-      "if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz; fi",
-      // 4. Extract mongosh package if not installed
-      "if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-2.3.8-linux-x64.tgz; fi",
-      // 5. Move mongosh binaries if not installed
-      "if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh && mv mongosh-2.3.8-linux-x64/* ~/mongosh/; fi",
-      // 6. Add mongosh to PATH if not installed
-      "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
-      // 7. Source .bashrc to update PATH (even if mongosh was already installed)
-      "source ~/.bashrc",
-      // 8. Verify mongosh installation
-      "mongosh --version",
-      // 9. Login to MongoDB
-      `mongosh --host ${config.host} --port 10255 --username ${config.name} --password ${config.password} --tls --tlsAllowInvalidCertificates`
-    ];
-  }
-}

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

@@ -1,82 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * PostgreSQL shell type handler
- */
-
-import { Terminal } from "xterm";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import { listKeys } from "../../../../Utils/arm/generatedClients/cosmos/databaseAccounts";
-import { setShellType } from "../Data/CloudShellApiClient";
-import { NetworkAccessHandler } from "../Network/NetworkAccessHandler";
-import { getHostFromUrl } from "../Utils/CommonUtils";
-import { ShellTypeConfig } from "./ShellTypeFactory";
-
-export class PostgresShellHandler implements ShellTypeConfig {
-  private shellType: TerminalKind = TerminalKind.Postgres;
-
-  constructor() {
-    setShellType(this.shellType);
-  }
-
-  public getShellName(): string {
-    return "PostgreSQL";
-  }
-
-  public async getInitialCommands(): Promise<string> {
-    const dbAccount = userContext.databaseAccount;
-    const endpoint = dbAccount.properties.postgresqlEndpoint;
-    
-    // Get database key
-    const dbName = dbAccount.name;
-    let key = "";
-    if (dbName) {
-      const keys = await listKeys(userContext.subscriptionId, userContext.resourceGroup, dbName);
-      key = keys?.primaryMasterKey || "";
-    }
-
-    const config = {
-      host: getHostFromUrl(endpoint),
-      name: dbAccount.name,
-      password: key,
-      endpoint: endpoint
-    };
-
-    return this.getCommands(config).join("\n").concat("\n");
-  }
-
-  public async configureNetworkAccess(terminal: Terminal, region: string): Promise<{
-    vNetSettings: any;
-    isAllPublicAccessEnabled: boolean;
-  }> {
-    return await NetworkAccessHandler.configureNetworkAccess(terminal, region, this.shellType);
-  }
-
-  private getCommands(config: any): string[] {
-    return [
-      // 1. Fetch and display location details in a readable format
-      "curl -s https://ipinfo.io | jq -r '\"Region: \" + .region + \" Country: \" + .country + \" City: \" + .city + \" IP Addr: \" + .ip'",
-      // 2. Check if psql is installed; if not, proceed with installation
-      "if ! command -v psql &> /dev/null; then echo '⚠️ psql not found. Installing...'; fi",
-      // 3. Download PostgreSQL if not installed
-      "if ! command -v psql &> /dev/null; then curl -LO https://ftp.postgresql.org/pub/source/v15.2/postgresql-15.2.tar.bz2; fi",
-      // 4. Extract PostgreSQL package if not installed
-      "if ! command -v psql &> /dev/null; then tar -xvjf postgresql-15.2.tar.bz2; fi",
-      // 5. Create a directory for PostgreSQL installation if not installed
-      "if ! command -v psql &> /dev/null; then mkdir -p ~/pgsql; fi",
-      // 6. Download readline (dependency for PostgreSQL) if not installed
-      "if ! command -v psql &> /dev/null; then curl -LO https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz; fi",
-      // 7. Extract readline package if not installed
-      "if ! command -v psql &> /dev/null; then tar -xvzf readline-8.1.tar.gz; fi",
-      // 8. Configure readline if not installed
-      "if ! command -v psql &> /dev/null; then cd readline-8.1 && ./configure --prefix=$HOME/pgsql; fi",
-      // 9. Add PostgreSQL to PATH if not installed
-      "if ! command -v psql &> /dev/null; then echo 'export PATH=$HOME/pgsql/bin:$PATH' >> ~/.bashrc; fi",
-      // 10. Source .bashrc to update PATH (even if psql was already installed)
-      "source ~/.bashrc",
-      // 11. Verify PostgreSQL installation
-      "psql --version",
-      `psql 'read -p "Enter Database Name: " dbname && read -p "Enter Username: " username && host=${config.endpoint} port=5432 dbname=$dbname user=$username sslmode=require'`
-    ];
-  }
-}

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

@@ -1,57 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Factory for creating shell type handlers
- */
-
-import { Terminal } from "xterm";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { CassandraShellHandler } from "./CassandraShellHandler";
-import { MongoShellHandler } from "./MongoShellHandler";
-import { PostgresShellHandler } from "./PostgresShellHandler";
-import { VCoreMongoShellHandler } from "./VCoreMongoShellHandler";
-
-export interface ShellTypeConfig {
-  getShellName(): string;
-  getInitialCommands(): Promise<string>;
-  configureNetworkAccess(terminal: Terminal, region: string): Promise<{
-    vNetSettings: any;
-    isAllPublicAccessEnabled: boolean;
-  }>;
-}
-
-export class ShellTypeHandler {
-  /**
-   * Gets the appropriate handler for the given shell type
-   */
-  public static getHandler(shellType: TerminalKind): ShellTypeConfig {
-    switch (shellType) {
-      case TerminalKind.Postgres:
-        return new PostgresShellHandler();
-      case TerminalKind.Mongo:
-        return new MongoShellHandler();
-      case TerminalKind.VCoreMongo:
-        return new VCoreMongoShellHandler();
-      case TerminalKind.Cassandra:
-        return new CassandraShellHandler();
-      default:
-        throw new Error(`Unsupported shell type: ${shellType}`);
-    }
-  }
-
-  /**
-   * Gets the display name for a shell type
-   */
-  public static getShellNameForDisplay(terminalKind: TerminalKind): string {
-    switch (terminalKind) {
-      case TerminalKind.Postgres:
-        return "PostgreSQL";
-      case TerminalKind.Mongo:
-      case TerminalKind.VCoreMongo:
-        return "MongoDB";
-      case TerminalKind.Cassandra:
-        return "Cassandra";
-      default:
-        return "";
-    }
-  }
-}

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

@@ -1,78 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * VCore MongoDB shell type handler
- */
-
-import { Terminal } from "xterm";
-import { TerminalKind } from "../../../../Contracts/ViewModels";
-import { userContext } from "../../../../UserContext";
-import { listKeys } from "../../../../Utils/arm/generatedClients/cosmos/databaseAccounts";
-import { setShellType } from "../Data/CloudShellApiClient";
-import { NetworkAccessHandler } from "../Network/NetworkAccessHandler";
-import { getHostFromUrl } from "../Utils/CommonUtils";
-import { ShellTypeConfig } from "./ShellTypeFactory";
-
-export class VCoreMongoShellHandler implements ShellTypeConfig {
-  private shellType: TerminalKind = TerminalKind.VCoreMongo;
-
-  constructor() {
-    setShellType(this.shellType);
-  }
-
-  public getShellName(): string {
-    return "MongoDB VCore";
-  }
-
-  public async getInitialCommands(): Promise<string> {
-    const dbAccount = userContext.databaseAccount;
-    const endpoint = dbAccount.properties.vcoreMongoEndpoint;
-    
-    // Get database key
-    const dbName = dbAccount.name;
-    let key = "";
-    if (dbName) {
-      const keys = await listKeys(userContext.subscriptionId, userContext.resourceGroup, dbName);
-      key = keys?.primaryMasterKey || "";
-    }
-
-    const config = {
-      host: getHostFromUrl(endpoint),
-      name: dbAccount.name,
-      password: key,
-      endpoint: endpoint
-    };
-
-    return this.getCommands(config).join("\n").concat("\n");
-  }
-
-  public async configureNetworkAccess(terminal: Terminal, region: string): Promise<{
-    vNetSettings: any;
-    isAllPublicAccessEnabled: boolean;
-  }> {
-    // VCore MongoDB uses private endpoints
-    return await NetworkAccessHandler.configureNetworkAccess(terminal, region, this.shellType);
-  }
-
-  private getCommands(config: any): string[] {
-    return [
-      // 1. Fetch and display location details in a readable format
-      "curl -s https://ipinfo.io | jq -r '\"Region: \" + .region + \" Country: \" + .country + \" City: \" + .city + \" IP Addr: \" + .ip'",
-      // 2. Check if mongosh is installed; if not, proceed with installation
-      "if ! command -v mongosh &> /dev/null; then echo '⚠️ mongosh not found. Installing...'; fi",
-      // 3. Download mongosh if not installed
-      "if ! command -v mongosh &> /dev/null; then curl -LO https://downloads.mongodb.com/compass/mongosh-2.3.8-linux-x64.tgz; fi",
-      // 4. Extract mongosh package if not installed
-      "if ! command -v mongosh &> /dev/null; then tar -xvzf mongosh-2.3.8-linux-x64.tgz; fi",
-      // 5. Move mongosh binaries if not installed
-      "if ! command -v mongosh &> /dev/null; then mkdir -p ~/mongosh && mv mongosh-2.3.8-linux-x64/* ~/mongosh/; fi",
-      // 6. Add mongosh to PATH if not installed
-      "if ! command -v mongosh &> /dev/null; then echo 'export PATH=$HOME/mongosh/bin:$PATH' >> ~/.bashrc; fi",
-      // 7. Source .bashrc to update PATH (even if mongosh was already installed)
-      "source ~/.bashrc",
-      // 8. Verify mongosh installation
-      "mongosh --version",
-      // 9. Login to MongoDB
-      `read -p "Enter username: " username && mongosh "mongodb+srv://$username:@${config.endpoint}/?authMechanism=SCRAM-SHA-256&retrywrites=false&maxIdleTimeMS=120000" --tls --tlsAllowInvalidCertificates`
-    ];
-  }
-}

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

@@ -1,123 +0,0 @@
-
-import { IDisposable, ITerminalAddon, Terminal } from 'xterm';
-
-interface IAttachOptions {
-    bidirectional?: boolean;
-}
-
-export class AttachAddon implements ITerminalAddon {
-    private _socket: WebSocket;
-    private _bidirectional: boolean;
-    private _disposables: IDisposable[] = [];
-    private _socketData: string;
-
-    constructor(socket: WebSocket, options?: IAttachOptions) {
-        this._socket = socket;
-        // always set binary type to arraybuffer, we do not handle blobs
-        this._socket.binaryType = 'arraybuffer';
-        this._bidirectional = !(options && options.bidirectional === false);
-        this._socketData = '';
-    }
-
-    public activate(terminal: Terminal): void {
-        this._disposables.push(
-            addSocketListener(this._socket, 'message', ev => {
-                let data: ArrayBuffer | string = ev.data;
-                const startStatusJson = 'ie_us';
-                const endStatusJson = 'ie_ue';
-
-                if (typeof data === 'object') {
-                    const enc = new TextDecoder("utf-8");
-                    data = enc.decode(ev.data as any);
-                }
-
-                // for example of json object look in TerminalHelper in the socket.onMessage
-                if (data.includes(startStatusJson) && data.includes(endStatusJson)) {
-                    // process as one line
-                    const statusData = data.split(startStatusJson)[1].split(endStatusJson)[0];
-                    data = data.replace(statusData, '');
-                    data = data.replace(startStatusJson, '');
-                    data = data.replace(endStatusJson, '');
-                } else if (data.includes(startStatusJson)) {
-                    // check for start
-                    const partialStatusData = data.split(startStatusJson)[1];
-                    this._socketData += partialStatusData;
-                    data = data.replace(partialStatusData, '');
-                    data = data.replace(startStatusJson, '');
-                } else if (data.includes(endStatusJson)) {
-                    // check for end and process the command
-                    const partialStatusData = data.split(endStatusJson)[0];
-                    this._socketData += partialStatusData;
-                    data = data.replace(partialStatusData, '');
-                    data = data.replace(endStatusJson, '');
-                    this._socketData = '';
-                } else if (this._socketData.length > 0) {
-                    // check if the line is all data then just concatenate
-                    this._socketData += data;
-                    data = '';
-                }
-                terminal.write(data);
-            })
-        );
-
-        if (this._bidirectional) {
-            this._disposables.push(terminal.onData(data => this._sendData(data)));
-            this._disposables.push(terminal.onBinary(data => this._sendBinary(data)));
-        }
-
-        this._disposables.push(addSocketListener(this._socket, 'close', () => this.dispose()));
-        this._disposables.push(addSocketListener(this._socket, 'error', () => this.dispose()));
-    }
-
-    public dispose(): void {
-        for (const d of this._disposables) {
-            d.dispose();
-        }
-    }
-
-    private _sendData(data: string): void {
-        if (!this._checkOpenSocket()) {
-            return;
-        }
-        this._socket.send(data);
-    }
-
-    private _sendBinary(data: string): void {
-        if (!this._checkOpenSocket()) {
-            return;
-        }
-        const buffer = new Uint8Array(data.length);
-        for (let i = 0; i < data.length; ++i) {
-            buffer[i] = data.charCodeAt(i) & 255;
-        }
-        this._socket.send(buffer);
-    }
-
-    private _checkOpenSocket(): boolean {
-        switch (this._socket.readyState) {
-            case WebSocket.OPEN:
-                return true;
-            case WebSocket.CONNECTING:
-                throw new Error('Attach addon was loaded before socket was open');
-            case WebSocket.CLOSING:
-                return false;
-            case WebSocket.CLOSED:
-                throw new Error('Attach addon socket is closed');
-            default:
-                throw new Error('Unexpected socket state');
-        }
-    }
-}
-
-function addSocketListener<K extends keyof WebSocketEventMap>(socket: WebSocket, type: K, handler: (this: WebSocket, ev: WebSocketEventMap[K]) => any): IDisposable {
-    socket.addEventListener(type, handler);
-    return {
-        dispose: () => {
-            if (!handler) {
-                // Already disposed
-                return;
-            }
-            socket.removeEventListener(type, handler);
-        }
-    };
-}

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

@@ -1,84 +0,0 @@
-/**
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Common utility functions for CloudShell
- */
-
-import { Terminal } from "xterm";
-import { terminalLog } from "./LogFormatter";
-
-/**
- * Utility function to wait for a specified duration
- */
-export const wait = (ms: number): Promise<void> => new Promise(resolve => setTimeout(resolve, ms));
-
-/**
- * Utility function to ask a question in the terminal
- */
-export const askQuestion = (terminal: Terminal, question: string, defaultAnswer: string = ""): Promise<string> => {
-  return new Promise<string>((resolve) => {
-    const prompt = terminalLog.prompt(`${question} (${defaultAnswer}): `);
-    terminal.writeln(prompt);
-    terminal.focus();
-    let response = "";
-
-    const dataListener = terminal.onData((data: string) => {
-      if (data === "\r") { // Enter key pressed
-        terminal.writeln(""); // Move to a new line
-        dataListener.dispose();
-        if (response.trim() === "") {
-          response = defaultAnswer; // Use default answer if no input
-        }
-        return resolve(response.trim());
-      } else if (data === "\u007F" || data === "\b") { // Handle backspace
-        if (response.length > 0) {
-          response = response.slice(0, -1);
-          terminal.write("\x1B[D \x1B[D"); // Move cursor back, clear character
-        }
-      } else if (data.charCodeAt(0) >= 32) { // Ignore control characters
-        response += data;
-        terminal.write(data); // Display typed characters
-      }
-    });
-
-    // Prevent cursor movement beyond the prompt
-    terminal.onKey(({ domEvent }: { domEvent: KeyboardEvent }) => {
-      if (domEvent.key === "ArrowLeft" && response.length === 0) {
-        domEvent.preventDefault(); // Stop moving left beyond the question
-      }
-    });
-  });
-};
-
-/**
- * Utility function to ask for yes/no confirmation
- */
-export const askConfirmation = async (terminal: Terminal, question: string): Promise<boolean> => {
-  terminal.writeln("");
-  terminal.writeln(terminalLog.prompt(`${question} (Y/N)`));
-  terminal.focus();
-  return new Promise<boolean>((resolve) => {
-    const keyListener = terminal.onKey(({ key }: { key: string }) => {
-      keyListener.dispose();
-      terminal.writeln("");
-
-      if (key.toLowerCase() === 'y') {
-        resolve(true);
-      } else {
-        resolve(false);
-      }
-    });
-  });
-};
-
-/**
- * Extract host from a URL
- */
-export const getHostFromUrl = (url: string): string => {
-  try {
-    const urlObj = new URL(url);
-    return urlObj.hostname;
-  } catch (error) {
-    console.error("Invalid URL:", error);
-    return "";
-  }
-};

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

@@ -1,28 +0,0 @@
-/**
- * Standardized terminal logging functions for consistent formatting
- */
-export const terminalLog = {
-  // Section headers
-  header: (message: string) => `\n\x1B[1;34m┌─ ${message} ${"─".repeat(Math.max(45 - message.length, 0))}\x1B[0m`,
-  subheader: (message: string) => `\x1B[1;36m├ ${message}\x1B[0m`,
-  sectionEnd: () => `\x1B[1;34m└${"─".repeat(50)}\x1B[0m\n`,
-  
-  // Status messages
-  success: (message: string) => `\x1B[32m✓ ${message}\x1B[0m`,
-  warning: (message: string) => `\x1B[33m⚠ ${message}\x1B[0m`,
-  error: (message: string) => `\x1B[31m✗ ${message}\x1B[0m`,
-  info: (message: string) => `\x1B[34m${message}\x1B[0m`,
-  
-  // Resource information
-  database: (message: string) => `\x1B[35m🔶  Database: ${message}\x1B[0m`,
-  vnet: (message: string) => `\x1B[36m🔷  Network: ${message}\x1B[0m`,
-  cloudshell: (message: string) => `\x1B[32m🔷  CloudShell: ${message}\x1B[0m`,
-  
-  // Data formatting
-  item: (label: string, value: string) => `  • ${label}: \x1B[32m${value}\x1B[0m`,
-  progress: (operation: string, status: string) => `\x1B[34m${operation}: \x1B[36m${status}\x1B[0m`,
-  
-  // User interaction
-  prompt: (message: string) => `\x1B[1;37m${message}\x1B[0m`,
-  separator: () => `\x1B[30;1m${"─".repeat(50)}\x1B[0m`
-};

src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.test.tsx

@@ -2,6 +2,7 @@ import { FeedResponse, ItemDefinition, Resource } from "@azure/cosmos";
 import { waitFor } from "@testing-library/react";
 import { deleteDocuments } from "Common/dataAccess/deleteDocument";
 import { Platform, updateConfigContext } from "ConfigContext";
+import { CosmosDbArtifactType } from "Contracts/FabricMessagesContract";
 import { useDialog } from "Explorer/Controls/Dialog";
 import { EditorReactProps } from "Explorer/Controls/Editor/EditorReact";
 import { ProgressModalDialog } from "Explorer/Controls/ProgressModalDialog";
@@ -341,10 +342,15 @@ describe("Documents tab (noSql API)", () => {
     updateConfigContext({ platform: Platform.Fabric });
     updateUserContext({
       fabricContext: {
-        connectionId: "test",
-        databaseConnectionInfo: undefined,
+        databaseName: "database",
+        artifactInfo: {
+          connectionId: "test",
+          resourceTokenInfo: undefined,
+        },
+        artifactType: CosmosDbArtifactType.MIRRORED_KEY,
         isReadOnly: true,
         isVisible: true,
+        fabricClientRpcVersion: "rpcVersion",
       },
     });
 

src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx

@@ -20,7 +20,6 @@ import {
 import { queryDocuments } from "Common/dataAccess/queryDocuments";
 import { readDocument } from "Common/dataAccess/readDocument";
 import { updateDocument } from "Common/dataAccess/updateDocument";
-import { Platform, configContext } from "ConfigContext";
 import { ActionType, OpenCollectionTab, TabKind } from "Contracts/ActionContracts";
 import { CommandButtonComponentProps } from "Explorer/Controls/CommandButton/CommandButtonComponent";
 import { useDialog } from "Explorer/Controls/Dialog";
@@ -43,6 +42,7 @@ import { usePrevious } from "Explorer/Tabs/DocumentsTabV2/SelectionHelper";
 import { CosmosFluentProvider, LayoutConstants, cosmosShorthands, tokens } from "Explorer/Theme/ThemeUtil";
 import { useSelectedNode } from "Explorer/useSelectedNode";
 import { KeyboardAction, KeyboardActionGroup, useKeyboardActionGroup } from "KeyboardShortcuts";
+import { isFabric } from "Platform/Fabric/FabricUtil";
 import { QueryConstants } from "Shared/Constants";
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
@@ -344,7 +344,7 @@ export const getTabsButtons = ({
   onRevertExistingDocumentClick,
   onDeleteExistingDocumentsClick,
 }: ButtonsDependencies): CommandButtonComponentProps[] => {
-  if (configContext.platform === Platform.Fabric && userContext.fabricContext?.isReadOnly) {
+  if (isFabric() && userContext.fabricContext?.isReadOnly) {
     // All the following buttons require write access
     return [];
   }
@@ -1028,6 +1028,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
     );
 
     const selectedDocumentId = documentIds[clickedRowIndex as number];
+    const originalPartitionKeyValue = selectedDocumentId.partitionKeyValue;
     selectedDocumentId.partitionKeyValue = partitionKeyValueArray;
 
     onExecutionErrorChange(false);
@@ -1063,9 +1064,14 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
           setColumnDefinitionsFromDocument(documentContent);
         },
         (error) => {
+          // in case of any kind of failures of accidently changing partition key, restore the original
+          // so that when user navigates away from current document and comes back,
+          // it doesnt fail to load due to using the invalid partition keys
+          selectedDocumentId.partitionKeyValue = originalPartitionKeyValue;
           onExecutionErrorChange(true);
           const errorMessage = getErrorMessage(error);
           useDialog.getState().showOkModalDialog("Update document failed", errorMessage);
+
           TelemetryProcessor.traceFailure(
             Action.UpdateDocument,
             {
@@ -2136,8 +2142,7 @@ export const DocumentsTabComponent: React.FunctionComponent<IDocumentsTabCompone
                     selectedColumnIds={selectedColumnIds}
                     columnDefinitions={columnDefinitions}
                     isRowSelectionDisabled={
-                      isBulkDeleteDisabled ||
-                      (configContext.platform === Platform.Fabric && userContext.fabricContext?.isReadOnly)
+                      isBulkDeleteDisabled || (isFabric() && userContext.fabricContext?.isReadOnly)
                     }
                     onColumnSelectionChange={onColumnSelectionChange}
                     defaultColumnSelection={getInitialColumnSelection()}

src/Explorer/Tabs/Shared/CheckFirewallRules.ts

@@ -1,6 +1,5 @@
 import { configContext } from "ConfigContext";
 import * as DataModels from "Contracts/DataModels";
-import * as ViewModels from "Contracts/ViewModels";
 import { userContext } from "UserContext";
 import { armRequest } from "Utils/arm/request";
 
@@ -11,8 +10,16 @@ export async function checkFirewallRules(
   setMessageFunc?: (message: string) => void,
   message?: string,
 ): Promise<void> {
-
-  const isEnabled = await callFirewallAPis(apiVersion, firewallRulesPredicate);
+  const firewallRulesUri = `${userContext.databaseAccount.id}/firewallRules`;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  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 isEnabled = firewallRules.some(firewallRulesPredicate);
 
   if (isAllPublicIPAddressesEnabled) {
     isAllPublicIPAddressesEnabled(isEnabled);
@@ -35,89 +42,3 @@ export async function checkFirewallRules(
     );
   }
 }
-
-export async function callFirewallAPis(
-  apiVersion: string,
-  firewallRulesPredicate: (rule: DataModels.FirewallRule) => unknown): 
-    Promise<boolean> {  
-  const firewallRulesUri = `${userContext.databaseAccount.id}/firewallRules`;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  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 isEnabled = firewallRules.some(firewallRulesPredicate);
-
-  return isEnabled;
-}
-
-export async function checkNetworkRules(kind: ViewModels.TerminalKind, isPublicAccessEnabledFlag: ko.Observable<boolean> | React.Dispatch<React.SetStateAction<boolean>>): Promise<void> {
-  if (kind === ViewModels.TerminalKind.Postgres) {
-    await checkFirewallRules(
-      "2022-11-08",
-      (rule) => rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255",
-      isPublicAccessEnabledFlag,
-    );
-  }
-
-  if (kind === ViewModels.TerminalKind.VCoreMongo) {
-    await checkFirewallRules(
-      "2023-03-01-preview",
-      (rule) =>
-        rule.name.startsWith("AllowAllAzureServicesAndResourcesWithinAzureIps") ||
-        (rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255"),
-        isPublicAccessEnabledFlag,
-    );
-  }
-}
-
-export async function IsPublicAccessAvailable(kind: ViewModels.TerminalKind): Promise<boolean> {
-  if (kind === ViewModels.TerminalKind.Postgres) {
-    return await callFirewallAPis(
-      "2022-11-08",
-      (rule) => rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255"
-    );
-  }
-
-  if (kind === ViewModels.TerminalKind.VCoreMongo) {
-    return await callFirewallAPis(
-      "2023-03-01-preview",
-      (rule) =>
-        rule.name.startsWith("AllowAllAzureServicesAndResourcesWithinAzureIps") ||
-        (rule.properties.startIpAddress === "0.0.0.0" && rule.properties.endIpAddress === "255.255.255.255")
-    );
-  }
-
-  return !hasDatabaseNetworkRestrictions();
-}
-
-/**
- * Checks if the database account has network restrictions
- */
-const hasDatabaseNetworkRestrictions = (): boolean => {
-  return hasVNetRestrictions() || hasFirewallRestrictions() || hasPrivateEndpointsRestrictions();
-};
-
-/**
- * Checks if the database account has Private Endpoint restrictions
- */
-export const hasPrivateEndpointsRestrictions = (): boolean => {
-  return userContext.databaseAccount.properties.privateEndpointConnections && userContext.databaseAccount.properties.privateEndpointConnections.length > 0;
-};
-
-/**
- * Checks if the database account has Firewall restrictions
- */
-export const hasFirewallRestrictions = (): boolean => {
-  return userContext.databaseAccount.properties.isVirtualNetworkFilterEnabled;;
-};
-
-/**
- * Checks if the database account has VNet restrictions
- */
-export const hasVNetRestrictions = (): boolean => {
-  return userContext.databaseAccount.properties.virtualNetworkRules && userContext.databaseAccount.properties.virtualNetworkRules.length > 0
-};

src/Explorer/Tabs/Tabs.tsx

@@ -2,6 +2,7 @@ import { CollectionTabKind } from "Contracts/ViewModels";
 import Explorer from "Explorer/Explorer";
 import { useCommandBar } from "Explorer/Menus/CommandBar/CommandBarComponentAdapter";
 import { QueryCopilotTab } from "Explorer/QueryCopilot/QueryCopilotTab";
+import { FabricHomeScreen } from "Explorer/SplashScreen/FabricHome";
 import { SplashScreen } from "Explorer/SplashScreen/SplashScreen";
 import { ConnectTab } from "Explorer/Tabs/ConnectTab";
 import { PostgresConnectTab } from "Explorer/Tabs/PostgresConnectTab";
@@ -9,6 +10,7 @@ import { QuickstartTab } from "Explorer/Tabs/QuickstartTab";
 import { VcoreMongoConnectTab } from "Explorer/Tabs/VCoreMongoConnectTab";
 import { VcoreMongoQuickstartTab } from "Explorer/Tabs/VCoreMongoQuickstartTab";
 import { KeyboardAction, KeyboardActionGroup, useKeyboardActionGroup } from "KeyboardShortcuts";
+import { isFabricNative } from "Platform/Fabric/FabricUtil";
 import { userContext } from "UserContext";
 import { useTeachingBubble } from "hooks/useTeachingBubble";
 import ko from "knockout";
@@ -271,7 +273,11 @@ const getReactTabContent = (activeReactTab: ReactTabKind, explorer: Explorer): J
         <ConnectTab />
       );
     case ReactTabKind.Home:
-      return <SplashScreen explorer={explorer} />;
+      if (isFabricNative()) {
+        return <FabricHomeScreen explorer={explorer} />;
+      } else {
+        return <SplashScreen explorer={explorer} />;
+      }
     case ReactTabKind.Quickstart:
       return userContext.apiType === "VCoreMongo" ? (
         <VcoreMongoQuickstartTab explorer={explorer} />

src/Explorer/Tabs/TerminalTab.tsx

@@ -1,10 +1,11 @@
 import { Spinner, SpinnerSize } from "@fluentui/react";
 import { MessageTypes } from "Contracts/ExplorerContracts";
 import { QuickstartFirewallNotification } from "Explorer/Quickstart/QuickstartFirewallNotification";
-import { checkNetworkRules } from "Explorer/Tabs/Shared/CheckFirewallRules";
+import { checkFirewallRules } from "Explorer/Tabs/Shared/CheckFirewallRules";
 import * as ko from "knockout";
 import * as React from "react";
 import FirewallRuleScreenshot from "../../../images/firewallRule.png";
+import VcoreFirewallRuleScreenshot from "../../../images/vcoreMongoFirewallRule.png";
 import { ReactAdapter } from "../../Bindings/ReactBindingHandler";
 import * as DataModels from "../../Contracts/DataModels";
 import * as ViewModels from "../../Contracts/ViewModels";
@@ -13,10 +14,8 @@ import { CommandButtonComponentProps } from "../Controls/CommandButton/CommandBu
 import { NotebookTerminalComponent } from "../Controls/Notebook/NotebookTerminalComponent";
 import Explorer from "../Explorer";
 import { useNotebook } from "../Notebook/useNotebook";
-import { CloudShellTerminalComponent } from "./CloudShellTab/CloudShellTabComponent";
 import TabsBase from "./TabsBase";
 
-
 export interface TerminalTabOptions extends ViewModels.TabOptions {
   account: DataModels.DatabaseAccount;
   container: Explorer;
@@ -44,99 +43,86 @@ class NotebookTerminalComponentAdapter implements ReactAdapter {
       return (
         <QuickstartFirewallNotification
           messageType={MessageTypes.OpenPostgresNetworkingBlade}
-          screenshot={FirewallRuleScreenshot}
-          shellName={getShellNameForDisplay(this.kind)}
+          screenshot={
+            this.kind === ViewModels.TerminalKind.Mongo || this.kind === ViewModels.TerminalKind.VCoreMongo
+              ? VcoreFirewallRuleScreenshot
+              : FirewallRuleScreenshot
+          }
+          shellName={this.getShellNameForDisplay(this.kind)}
         />
       );
     }
+
     return this.parameters() ? (
       <NotebookTerminalComponent
         notebookServerInfo={this.getNotebookServerInfo()}
         databaseAccount={this.getDatabaseAccount()}
         tabId={this.getTabId()}
         username={this.getUsername()}
-      />): (
-      <Spinner styles={{ root: { marginTop: 10 } }} size={SpinnerSize.large}></Spinner>
-    );
-  }
-}
-
-/**
- * CloudShell terminal tab
- */
-class CloudShellTerminalComponentAdapter implements ReactAdapter {
-
-  // parameters: true: show, false: hide
-  public parameters: ko.Computed<boolean>;
-  constructor(
-    private kind: ViewModels.TerminalKind,
-  ) {}
-
-  public renderComponent(): JSX.Element {
-
-    console.log("this.parameters() " + this.parameters() );
-    return this.parameters() ? (
-      <CloudShellTerminalComponent 
-        shellType={this.kind}/>
+      />
     ) : (
       <Spinner styles={{ root: { marginTop: 10 } }} size={SpinnerSize.large}></Spinner>
     );
   }
-}
 
-export const getShellNameForDisplay = (terminalKind: ViewModels.TerminalKind): string => {
-  switch (terminalKind) {
-    case ViewModels.TerminalKind.Postgres:
-      return "PostgreSQL";
-    case ViewModels.TerminalKind.Mongo:
-    case ViewModels.TerminalKind.VCoreMongo:
-      return "MongoDB";
-    default:
-      return "";
+  private getShellNameForDisplay(terminalKind: ViewModels.TerminalKind): string {
+    switch (terminalKind) {
+      case ViewModels.TerminalKind.Postgres:
+        return "PostgreSQL";
+      case ViewModels.TerminalKind.Mongo:
+      case ViewModels.TerminalKind.VCoreMongo:
+        return "MongoDB";
+      default:
+        return "";
+    }
   }
 }
 
 export default class TerminalTab extends TabsBase {
-  public readonly html = '<div style="height: 100%" data-bind="react: terminalComponentAdapter"></div>';
+  public readonly html = '<div style="height: 100%" data-bind="react:notebookTerminalComponentAdapter"></div>  ';
   private container: Explorer;
-  private terminalComponentAdapter: any;
+  private notebookTerminalComponentAdapter: NotebookTerminalComponentAdapter;
   private isAllPublicIPAddressesEnabled: ko.Observable<boolean>;
 
-  constructor (options: TerminalTabOptions) {
+  constructor(options: TerminalTabOptions) {
     super(options);
     this.container = options.container;
     this.isAllPublicIPAddressesEnabled = ko.observable(true);
-    
-    checkNetworkRules(options.kind, this.isAllPublicIPAddressesEnabled);
-    
-    this.initializeNotebookTerminalAdapter(options);
-  }
-
-  private async initializeNotebookTerminalAdapter(options: TerminalTabOptions): Promise<void> {
-    if (userContext.features.enableCloudShell) {
-      this.terminalComponentAdapter = new CloudShellTerminalComponentAdapter(
-        options.kind
-      );
-
-      this.terminalComponentAdapter.parameters = ko.computed<boolean>(() =>
-        this.isTemplateReady()
-      );
-    }
-    else {
-      this.terminalComponentAdapter = new NotebookTerminalComponentAdapter(
-        () => this.getNotebookServerInfo(options),
-        () => userContext?.databaseAccount,
-        () => this.tabId,
-        () => this.getUsername(),
-        this.isAllPublicIPAddressesEnabled,
-        options.kind
-      );
-
-      this.terminalComponentAdapter.parameters = ko.computed<boolean>(() =>
+    this.notebookTerminalComponentAdapter = new NotebookTerminalComponentAdapter(
+      () => this.getNotebookServerInfo(options),
+      () => userContext?.databaseAccount,
+      () => this.tabId,
+      () => this.getUsername(),
+      this.isAllPublicIPAddressesEnabled,
+      options.kind,
+    );
+    this.notebookTerminalComponentAdapter.parameters = ko.computed<boolean>(() => {
+      if (
         this.isTemplateReady() &&
         useNotebook.getState().isNotebookEnabled &&
         useNotebook.getState().notebookServerInfo?.notebookServerEndpoint &&
         this.isAllPublicIPAddressesEnabled()
+      ) {
+        return true;
+      }
+      return false;
+    });
+
+    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,
       );
     }
   }

src/Explorer/Tree/Collection.ts

@@ -1,6 +1,7 @@
 import { Resource, StoredProcedureDefinition, TriggerDefinition, UserDefinedFunctionDefinition } from "@azure/cosmos";
 import { useNotebook } from "Explorer/Notebook/useNotebook";
 import { DocumentsTabV2 } from "Explorer/Tabs/DocumentsTabV2/DocumentsTabV2";
+import { isFabricMirrored } from "Platform/Fabric/FabricUtil";
 import * as ko from "knockout";
 import * as _ from "underscore";
 import * as Constants from "../../Common/Constants";
@@ -34,7 +35,6 @@ import QueryTablesTab from "../Tabs/QueryTablesTab";
 import { CollectionSettingsTabV2 } from "../Tabs/SettingsTabV2";
 import { useDatabases } from "../useDatabases";
 import { useSelectedNode } from "../useSelectedNode";
-import { Platform, configContext } from "./../../ConfigContext";
 import ConflictId from "./ConflictId";
 import DocumentId from "./DocumentId";
 import StoredProcedure from "./StoredProcedure";
@@ -210,7 +210,7 @@ export default class Collection implements ViewModels.Collection {
     });
 
     const showScriptsMenus: boolean =
-      configContext.platform != Platform.Fabric && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin");
+      !isFabricMirrored() && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin");
     this.showStoredProcedures = ko.observable<boolean>(showScriptsMenus);
     this.showTriggers = ko.observable<boolean>(showScriptsMenus);
     this.showUserDefinedFunctions = ko.observable<boolean>(showScriptsMenus);

src/Explorer/Tree/ResourceTree.tsx

@@ -1,7 +1,6 @@
 import { Tree, TreeItemValue, TreeOpenChangeData, TreeOpenChangeEvent } from "@fluentui/react-components";
 import { Home16Regular } from "@fluentui/react-icons";
 import { AuthType } from "AuthType";
-import { Platform, configContext } from "ConfigContext";
 import { useTreeStyles } from "Explorer/Controls/TreeComponent/Styles";
 import { TreeNode, TreeNodeComponent } from "Explorer/Controls/TreeComponent/TreeNodeComponent";
 import {
@@ -11,6 +10,7 @@ import {
 } from "Explorer/Tree/treeNodeUtil";
 import { useDatabases } from "Explorer/useDatabases";
 import { useSelectedNode } from "Explorer/useSelectedNode";
+import { isFabricMirrored } from "Platform/Fabric/FabricUtil";
 import { userContext } from "UserContext";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
@@ -76,23 +76,22 @@ export const ResourceTree: React.FC<ResourceTreeProps> = ({ explorer }: Resource
       : [];
   }, [isSampleDataEnabled, sampleDataResourceTokenCollection]);
 
-  const headerNodes: TreeNode[] =
-    configContext.platform === Platform.Fabric
-      ? []
-      : [
-          {
-            id: "home",
-            iconSrc: <Home16Regular />,
-            label: "Home",
-            isSelected: () =>
-              useSelectedNode.getState().selectedNode === undefined &&
-              useTabs.getState().activeReactTab === ReactTabKind.Home,
-            onClick: () => {
-              useSelectedNode.getState().setSelectedNode(undefined);
-              useTabs.getState().openAndActivateReactTab(ReactTabKind.Home);
-            },
+  const headerNodes: TreeNode[] = isFabricMirrored()
+    ? []
+    : [
+        {
+          id: "home",
+          iconSrc: <Home16Regular />,
+          label: "Home",
+          isSelected: () =>
+            useSelectedNode.getState().selectedNode === undefined &&
+            useTabs.getState().activeReactTab === ReactTabKind.Home,
+          onClick: () => {
+            useSelectedNode.getState().setSelectedNode(undefined);
+            useTabs.getState().openAndActivateReactTab(ReactTabKind.Home);
           },
-        ];
+        },
+      ];
 
   const rootNodes: TreeNode[] = useMemo(() => {
     if (sampleDataNodes.length > 0) {

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

@@ -740,7 +740,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the Mo
 ]
 `;
 
-exports[`createDatabaseTreeNodes generates the correct tree structure for the SQL API, on Fabric 1`] = `
+exports[`createDatabaseTreeNodes generates the correct tree structure for the SQL API, on Fabric non read-only 1`] = `
 [
   {
     "children": [
@@ -753,6 +753,12 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
             "label": "New SQL Query",
             "onClick": [Function],
           },
+          {
+            "iconSrc": {},
+            "label": "Delete Container",
+            "onClick": [Function],
+            "styleClass": "deleteCollectionMenuItem",
+          },
         ],
         "iconSrc": <DocumentMultipleRegular
           fontSize={16}
@@ -774,6 +780,12 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
             "label": "New SQL Query",
             "onClick": [Function],
           },
+          {
+            "iconSrc": {},
+            "label": "Delete Container",
+            "onClick": [Function],
+            "styleClass": "deleteCollectionMenuItem",
+          },
         ],
         "iconSrc": <DocumentMultipleRegular
           fontSize={16}
@@ -822,6 +834,12 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
             "label": "New SQL Query",
             "onClick": [Function],
           },
+          {
+            "iconSrc": {},
+            "label": "Delete Container",
+            "onClick": [Function],
+            "styleClass": "deleteCollectionMenuItem",
+          },
         ],
         "iconSrc": <DocumentMultipleRegular
           fontSize={16}
@@ -870,6 +888,12 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
             "label": "New SQL Query",
             "onClick": [Function],
           },
+          {
+            "iconSrc": {},
+            "label": "Delete Container",
+            "onClick": [Function],
+            "styleClass": "deleteCollectionMenuItem",
+          },
         ],
         "iconSrc": <DocumentMultipleRegular
           fontSize={16}
@@ -915,6 +939,145 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
 ]
 `;
 
+exports[`createDatabaseTreeNodes generates the correct tree structure for the SQL API, on Fabric read-only 1`] = `
+[
+  {
+    "children": [
+      {
+        "children": undefined,
+        "className": "collectionNode",
+        "contextMenu": [
+          {
+            "iconSrc": {},
+            "label": "New SQL Query",
+            "onClick": [Function],
+          },
+        ],
+        "iconSrc": <DocumentMultipleRegular
+          fontSize={16}
+        />,
+        "isExpanded": true,
+        "isSelected": [Function],
+        "label": "standardCollection",
+        "onClick": [Function],
+        "onCollapsed": [Function],
+        "onContextMenuOpen": [Function],
+        "onExpanded": [Function],
+      },
+      {
+        "children": undefined,
+        "className": "collectionNode",
+        "contextMenu": [
+          {
+            "iconSrc": {},
+            "label": "New SQL Query",
+            "onClick": [Function],
+          },
+        ],
+        "iconSrc": <DocumentMultipleRegular
+          fontSize={16}
+        />,
+        "isExpanded": true,
+        "isSelected": [Function],
+        "label": "conflictsCollection",
+        "onClick": [Function],
+        "onCollapsed": [Function],
+        "onContextMenuOpen": [Function],
+        "onExpanded": [Function],
+      },
+    ],
+    "className": "databaseNode",
+    "contextMenu": undefined,
+    "iconSrc": <DatabaseRegular
+      fontSize={16}
+    />,
+    "isExpanded": true,
+    "isSelected": [Function],
+    "label": "standardDb",
+    "onCollapsed": [Function],
+    "onContextMenuOpen": [Function],
+    "onExpanded": [Function],
+  },
+  {
+    "children": [
+      {
+        "children": undefined,
+        "className": "collectionNode",
+        "contextMenu": [
+          {
+            "iconSrc": {},
+            "label": "New SQL Query",
+            "onClick": [Function],
+          },
+        ],
+        "iconSrc": <DocumentMultipleRegular
+          fontSize={16}
+        />,
+        "isExpanded": true,
+        "isSelected": [Function],
+        "label": "sampleItemsCollection",
+        "onClick": [Function],
+        "onCollapsed": [Function],
+        "onContextMenuOpen": [Function],
+        "onExpanded": [Function],
+      },
+    ],
+    "className": "databaseNode",
+    "contextMenu": undefined,
+    "iconSrc": <DatabaseRegular
+      fontSize={16}
+    />,
+    "isExpanded": true,
+    "isSelected": [Function],
+    "label": "sharedDatabase",
+    "onCollapsed": [Function],
+    "onContextMenuOpen": [Function],
+    "onExpanded": [Function],
+  },
+  {
+    "children": [
+      {
+        "children": undefined,
+        "className": "collectionNode",
+        "contextMenu": [
+          {
+            "iconSrc": {},
+            "label": "New SQL Query",
+            "onClick": [Function],
+          },
+        ],
+        "iconSrc": <DocumentMultipleRegular
+          fontSize={16}
+        />,
+        "isExpanded": true,
+        "isSelected": [Function],
+        "label": "schemaCollection",
+        "onClick": [Function],
+        "onCollapsed": [Function],
+        "onContextMenuOpen": [Function],
+        "onExpanded": [Function],
+      },
+      {
+        "className": "loadMoreNode",
+        "label": "load more",
+        "onClick": [Function],
+      },
+    ],
+    "className": "databaseNode",
+    "contextMenu": undefined,
+    "iconSrc": <DatabaseRegular
+      fontSize={16}
+    />,
+    "isExpanded": true,
+    "isSelected": [Function],
+    "label": "giganticDatabase",
+    "onCollapsed": [Function],
+    "onContextMenuOpen": [Function],
+    "onExpanded": [Function],
+  },
+]
+`;
+
 exports[`createDatabaseTreeNodes generates the correct tree structure for the SQL API, on Portal 1`] = `
 [
   {
@@ -972,7 +1135,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
                   },
                 ],
                 "isSelected": [Function],
-                "label": "mockSproc3",
+                "label": "mockSproc4",
                 "onClick": [Function],
               },
             ],
@@ -990,7 +1153,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
                   },
                 ],
                 "isSelected": [Function],
-                "label": "mockUdf3",
+                "label": "mockUdf4",
                 "onClick": [Function],
               },
             ],
@@ -1008,7 +1171,7 @@ exports[`createDatabaseTreeNodes generates the correct tree structure for the SQ
                   },
                 ],
                 "isSelected": [Function],
-                "label": "mockTrigger3",
+                "label": "mockTrigger4",
                 "onClick": [Function],
               },
             ],

src/Explorer/Tree/treeNodeUtil.test.ts

@@ -1,5 +1,6 @@
 import { CapabilityNames } from "Common/Constants";
 import { Platform, updateConfigContext } from "ConfigContext";
+import { CosmosDbArtifactType } from "Contracts/FabricMessagesContract";
 import { TreeNode } from "Explorer/Controls/TreeComponent/TreeNodeComponent";
 import Explorer from "Explorer/Explorer";
 import { useCommandBar } from "Explorer/Menus/CommandBar/CommandBarComponentAdapter";
@@ -16,7 +17,7 @@ import {
 } from "Explorer/Tree/treeNodeUtil";
 import { useDatabases } from "Explorer/useDatabases";
 import { useSelectedNode } from "Explorer/useSelectedNode";
-import { updateUserContext } from "UserContext";
+import { FabricContext, updateUserContext, UserContext } from "UserContext";
 import PromiseSource from "Utils/PromiseSource";
 import { useSidePanel } from "hooks/useSidePanel";
 import { useTabs } from "hooks/useTabs";
@@ -360,9 +361,30 @@ describe("createDatabaseTreeNodes", () => {
     });
   });
 
-  it.each<[string, Platform, boolean, Partial<DataModels.DatabaseAccountExtendedProperties>]>([
-    ["the SQL API, on Fabric", Platform.Fabric, false, { capabilities: [], enableMultipleWriteLocations: true }],
-    ["the SQL API, on Portal", Platform.Portal, false, { capabilities: [], enableMultipleWriteLocations: true }],
+  it.each<[string, Platform, boolean, Partial<DataModels.DatabaseAccountExtendedProperties>, Partial<UserContext>]>([
+    [
+      "the SQL API, on Fabric read-only",
+      Platform.Fabric,
+      false,
+      { capabilities: [], enableMultipleWriteLocations: true },
+      { fabricContext: { isReadOnly: true } as FabricContext<CosmosDbArtifactType> },
+    ],
+    [
+      "the SQL API, on Fabric non read-only",
+      Platform.Fabric,
+      false,
+      { capabilities: [], enableMultipleWriteLocations: true },
+      { fabricContext: { isReadOnly: false } as FabricContext<CosmosDbArtifactType> },
+    ],
+    [
+      "the SQL API, on Portal",
+      Platform.Portal,
+      false,
+      { capabilities: [], enableMultipleWriteLocations: true },
+      {
+        fabricContext: undefined,
+      },
+    ],
     [
       "the Cassandra API, serverless, on Hosted",
       Platform.Hosted,
@@ -373,6 +395,7 @@ describe("createDatabaseTreeNodes", () => {
           { name: CapabilityNames.EnableServerless, description: "" },
         ],
       },
+      { fabricContext: undefined },
     ],
     [
       "the Mongo API, with Notebooks and Phoenix features, on Emulator",
@@ -381,26 +404,31 @@ describe("createDatabaseTreeNodes", () => {
       {
         capabilities: [{ name: CapabilityNames.EnableMongo, description: "" }],
       },
+      { fabricContext: undefined },
     ],
-  ])("generates the correct tree structure for %s", (_, platform, isNotebookEnabled, dbAccountProperties) => {
-    useNotebook.setState({ isPhoenixFeatures: isNotebookEnabled });
-    updateConfigContext({ platform });
-    updateUserContext({
-      databaseAccount: {
-        properties: {
-          enableMultipleWriteLocations: true,
-          ...dbAccountProperties,
-        },
-      } as unknown as DataModels.DatabaseAccount,
-    });
-    const nodes = createDatabaseTreeNodes(
-      explorer,
-      isNotebookEnabled,
-      useDatabases.getState().databases,
-      refreshActiveTab,
-    );
-    expect(nodes).toMatchSnapshot();
-  });
+  ])(
+    "generates the correct tree structure for %s",
+    (_, platform, isNotebookEnabled, dbAccountProperties, userContext) => {
+      useNotebook.setState({ isPhoenixFeatures: isNotebookEnabled });
+      updateConfigContext({ platform });
+      updateUserContext({
+        ...userContext,
+        databaseAccount: {
+          properties: {
+            enableMultipleWriteLocations: true,
+            ...dbAccountProperties,
+          },
+        } as unknown as DataModels.DatabaseAccount,
+      });
+      const nodes = createDatabaseTreeNodes(
+        explorer,
+        isNotebookEnabled,
+        useDatabases.getState().databases,
+        refreshActiveTab,
+      );
+      expect(nodes).toMatchSnapshot();
+    },
+  );
 
   // The above tests focused on the tree structure. The below tests focus on some core behaviors of the nodes.
   // They are not exhaustive, because exhaustive tests here require a lot of mocking and can become very brittle.
@@ -551,7 +579,18 @@ describe("createDatabaseTreeNodes", () => {
       });
 
       it.each([
-        ["in Fabric", () => updateConfigContext({ platform: Platform.Fabric })],
+        [
+          "in Fabric",
+          () => {
+            updateConfigContext({ platform: Platform.Fabric });
+            updateUserContext({
+              fabricContext: {
+                artifactType: CosmosDbArtifactType.MIRRORED_KEY,
+                isReadOnly: true,
+              } as FabricContext<CosmosDbArtifactType>,
+            });
+          },
+        ],
         [
           "for Cassandra API",
           () =>

src/Explorer/Tree/treeNodeUtil.tsx

@@ -6,6 +6,7 @@ import StoredProcedure from "Explorer/Tree/StoredProcedure";
 import Trigger from "Explorer/Tree/Trigger";
 import UserDefinedFunction from "Explorer/Tree/UserDefinedFunction";
 import { useDatabases } from "Explorer/useDatabases";
+import { isFabricMirrored } from "Platform/Fabric/FabricUtil";
 import { getItemName } from "Utils/APITypeUtils";
 import { isServerlessAccount } from "Utils/CapabilityUtils";
 import { useTabs } from "hooks/useTabs";
@@ -22,9 +23,7 @@ import { useNotebook } from "../Notebook/useNotebook";
 import { useSelectedNode } from "../useSelectedNode";
 
 export const shouldShowScriptNodes = (): boolean => {
-  return (
-    configContext.platform !== Platform.Fabric && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin")
-  );
+  return !isFabricMirrored() && (userContext.apiType === "SQL" || userContext.apiType === "Gremlin");
 };
 
 const TreeDatabaseIcon = <DatabaseRegular fontSize={16} />;

src/Phoenix/PhoenixClient.ts

@@ -4,7 +4,7 @@ import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { userContext } from "UserContext";
 import { allowedJunoOrigins, validateEndpoint } from "Utils/EndpointUtils";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
-import promiseRetry, { AbortError } from "p-retry";
+import promiseRetry, { AbortError, Options } from "p-retry";
 import {
   Areas,
   ConnectionStatusType,
@@ -35,21 +35,26 @@ import { getAuthorizationHeader } from "../Utils/AuthorizationUtils";
 export class PhoenixClient {
   private armResourceId: string;
   private containerHealthHandler: NodeJS.Timeout;
-  private retryOptions: promiseRetry.Options = {
+  private retryOptions: Options = {
     retries: Notebook.retryAttempts,
     maxTimeout: Notebook.retryAttemptDelayMs,
     minTimeout: Notebook.retryAttemptDelayMs,
   };
+  private abortController: AbortController;
+  private abortSignal: AbortSignal;
 
   constructor(armResourceId: string) {
     this.armResourceId = armResourceId;
   }
 
   public async allocateContainer(provisionData: IProvisionData): Promise<IResponse<IPhoenixServiceInfo>> {
+    this.initializeCancelEventListener();
+
     return promiseRetry(() => this.executeContainerAssignmentOperation(provisionData, "allocate"), {
       retries: 4,
       maxTimeout: 20000,
       minTimeout: 20000,
+      signal: this.abortSignal,
     });
   }
 
@@ -270,6 +275,17 @@ export class PhoenixClient {
     };
   }
 
+  private initializeCancelEventListener(): void {
+    this.abortController = new AbortController();
+    this.abortSignal = this.abortController.signal;
+
+    document.addEventListener("keydown", (event: KeyboardEvent) => {
+      if (event.ctrlKey && (event.key === "c" || event.key === "z")) {
+        this.abortController.abort(new AbortError("Request canceled"));
+      }
+    });
+  }
+
   public ConvertToForbiddenErrorString(jsonData: IPhoenixError): string {
     const errInfo = jsonData;
     switch (errInfo?.type) {

src/Platform/Fabric/FabricUtil.ts

@@ -1,56 +1,112 @@
 import { sendCachedDataMessage } from "Common/MessageHandler";
+import { configContext, Platform } from "ConfigContext";
 import { FabricMessageTypes } from "Contracts/FabricMessageTypes";
-import { FabricDatabaseConnectionInfo } from "Contracts/FabricMessagesContract";
-import { updateUserContext, userContext } from "UserContext";
+import { CosmosDbArtifactType, ResourceTokenInfo } from "Contracts/FabricMessagesContract";
+import { FabricArtifactInfo, updateUserContext, userContext } from "UserContext";
 import { logConsoleError } from "Utils/NotificationConsoleUtils";
 
 const TOKEN_VALIDITY_MS = (3600 - 600) * 1000; // 1 hour minus 10 minutes to be safe
 const DEBOUNCE_DELAY_MS = 1000 * 20; // 20 second
-let timeoutId: NodeJS.Timeout;
+let timeoutId: NodeJS.Timeout | undefined;
 
 // Prevents multiple parallel requests during DEBOUNCE_DELAY_MS
-let lastRequestTimestamp: number = undefined;
+let lastRequestTimestamp: number | undefined = undefined;
 
-const requestDatabaseResourceTokens = async (): Promise<void> => {
+/**
+ * Request fabric token:
+ * - Mirrored key and AAD: Database Resource Tokens
+ * - Native: AAD token
+ * @returns
+ */
+const requestFabricToken = async (): Promise<void> => {
   if (lastRequestTimestamp !== undefined && lastRequestTimestamp + DEBOUNCE_DELAY_MS > Date.now()) {
     return;
   }
 
   lastRequestTimestamp = Date.now();
   try {
-    const fabricDatabaseConnectionInfo = await sendCachedDataMessage<FabricDatabaseConnectionInfo>(
-      FabricMessageTypes.GetAllResourceTokens,
-      [],
-      userContext.fabricContext.connectionId,
-    );
-
-    if (!userContext.databaseAccount.properties.documentEndpoint) {
-      userContext.databaseAccount.properties.documentEndpoint = fabricDatabaseConnectionInfo.endpoint;
+    if (isFabricMirrored()) {
+      await requestAndStoreDatabaseResourceTokens();
+    } else if (isFabricNative()) {
+      await requestAndStoreAccessToken();
     }
 
-    updateUserContext({
-      fabricContext: {
-        ...userContext.fabricContext,
-        databaseConnectionInfo: fabricDatabaseConnectionInfo,
-        isReadOnly: true,
-      },
-      databaseAccount: { ...userContext.databaseAccount },
-    });
-    scheduleRefreshDatabaseResourceToken();
+    scheduleRefreshFabricToken();
   } catch (error) {
-    logConsoleError(error);
+    logConsoleError(error as string);
     throw error;
   } finally {
     lastRequestTimestamp = undefined;
   }
 };
 
+const requestAndStoreDatabaseResourceTokens = async (): Promise<void> => {
+  if (!userContext.fabricContext || !userContext.databaseAccount) {
+    // This should not happen
+    logConsoleError("Fabric context or database account is missing: cannot request tokens");
+    return;
+  }
+
+  const resourceTokenInfo = await sendCachedDataMessage<ResourceTokenInfo>(
+    FabricMessageTypes.GetAllResourceTokens,
+    [],
+    userContext.fabricContext.artifactInfo?.connectionId,
+  );
+
+  if (!userContext.databaseAccount.properties.documentEndpoint) {
+    userContext.databaseAccount.properties.documentEndpoint = resourceTokenInfo.endpoint;
+  }
+
+  if (resourceTokenInfo.credentialType === "OAuth2") {
+    // Mirrored AAD
+    updateUserContext({
+      fabricContext: {
+        ...userContext.fabricContext,
+        databaseName: resourceTokenInfo.databaseId,
+        artifactInfo: undefined,
+        isReadOnly: resourceTokenInfo.isReadOnly ?? userContext.fabricContext.isReadOnly,
+      },
+      databaseAccount: { ...userContext.databaseAccount },
+      aadToken: resourceTokenInfo.accessToken,
+    });
+  } else {
+    // TODO: In Fabric contract V2, credentialType is undefined. For V3, it is "Key". Check for "Key" when V3 is supported for Fabric Mirroring Key
+    // Mirrored key
+    updateUserContext({
+      fabricContext: {
+        ...userContext.fabricContext,
+        databaseName: resourceTokenInfo.databaseId,
+        artifactInfo: {
+          ...(userContext.fabricContext.artifactInfo as FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY]),
+          resourceTokenInfo,
+        },
+        isReadOnly: resourceTokenInfo.isReadOnly ?? userContext.fabricContext.isReadOnly,
+      },
+      databaseAccount: { ...userContext.databaseAccount },
+    });
+  }
+};
+
+const requestAndStoreAccessToken = async (): Promise<void> => {
+  if (!userContext.fabricContext || !userContext.databaseAccount) {
+    // This should not happen
+    logConsoleError("Fabric context or database account is missing: cannot request tokens");
+    return;
+  }
+
+  const accessTokenInfo = await sendCachedDataMessage<{ accessToken: string }>(FabricMessageTypes.GetAccessToken, []);
+
+  updateUserContext({
+    aadToken: accessTokenInfo.accessToken,
+  });
+};
+
 /**
  * Check token validity and schedule a refresh if necessary
  * @param tokenTimestamp
  * @returns
  */
-export const scheduleRefreshDatabaseResourceToken = (refreshNow?: boolean): Promise<void> => {
+export const scheduleRefreshFabricToken = (refreshNow?: boolean): Promise<void> => {
   return new Promise((resolve) => {
     if (timeoutId !== undefined) {
       clearTimeout(timeoutId);
@@ -59,7 +115,7 @@ export const scheduleRefreshDatabaseResourceToken = (refreshNow?: boolean): Prom
 
     timeoutId = setTimeout(
       () => {
-        requestDatabaseResourceTokens().then(resolve);
+        requestFabricToken().then(resolve);
       },
       refreshNow ? 0 : TOKEN_VALIDITY_MS,
     );
@@ -68,6 +124,15 @@ export const scheduleRefreshDatabaseResourceToken = (refreshNow?: boolean): Prom
 
 export const checkDatabaseResourceTokensValidity = (tokenTimestamp: number): void => {
   if (tokenTimestamp + TOKEN_VALIDITY_MS < Date.now()) {
-    scheduleRefreshDatabaseResourceToken(true);
+    scheduleRefreshFabricToken(true);
   }
 };
+
+export const isFabric = (): boolean => configContext.platform === Platform.Fabric;
+export const isFabricMirroredKey = (): boolean =>
+  isFabric() && userContext.fabricContext?.artifactType === CosmosDbArtifactType.MIRRORED_KEY;
+export const isFabricMirroredAAD = (): boolean =>
+  isFabric() && userContext.fabricContext?.artifactType === CosmosDbArtifactType.MIRRORED_AAD;
+export const isFabricMirrored = (): boolean => isFabricMirroredKey() || isFabricMirroredAAD();
+export const isFabricNative = (): boolean =>
+  isFabric() && userContext.fabricContext?.artifactType === CosmosDbArtifactType.NATIVE;

src/Platform/Hosted/extractFeatures.ts

@@ -39,7 +39,6 @@ export type Features = {
   readonly copilotChatFixedMonacoEditorHeight: boolean;
   readonly enablePriorityBasedExecution: boolean;
   readonly disableConnectionStringLogin: boolean;
-  readonly enableCloudShell: boolean;
 
   // can be set via both flight and feature flag
   autoscaleDefault: boolean;
@@ -111,7 +110,6 @@ 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"),
   };
 }
 

src/SelfServe/SelfServe.tsx

@@ -41,13 +41,13 @@ const getDescriptor = async (selfServeType: SelfServeType): Promise<SelfServeDes
     case SelfServeType.example: {
       const SelfServeExample = await import(/* webpackChunkName: "SelfServeExample" */ "./Example/SelfServeExample");
       const selfServeExample = new SelfServeExample.default();
-      await loadTranslations(selfServeExample.constructor.name);
+      await loadTranslations(selfServeType);
       return selfServeExample.toSelfServeDescriptor();
     }
     case SelfServeType.sqlx: {
       const SqlX = await import(/* webpackChunkName: "SqlX" */ "./SqlX/SqlX");
       const sqlX = new SqlX.default();
-      await loadTranslations(sqlX.constructor.name);
+      await loadTranslations(selfServeType);
       return sqlX.toSelfServeDescriptor();
     }
     case SelfServeType.graphapicompute: {
@@ -55,7 +55,7 @@ const getDescriptor = async (selfServeType: SelfServeType): Promise<SelfServeDes
         /* webpackChunkName: "GraphAPICompute" */ "./GraphAPICompute/GraphAPICompute"
       );
       const graphAPICompute = new GraphAPICompute.default();
-      await loadTranslations(graphAPICompute.constructor.name);
+      await loadTranslations(selfServeType);
       return graphAPICompute.toSelfServeDescriptor();
     }
     case SelfServeType.materializedviewsbuilder: {
@@ -63,7 +63,7 @@ const getDescriptor = async (selfServeType: SelfServeType): Promise<SelfServeDes
         /* webpackChunkName: "MaterializedViewsBuilder" */ "./MaterializedViewsBuilder/MaterializedViewsBuilder"
       );
       const materializedViewsBuilder = new MaterializedViewsBuilder.default();
-      await loadTranslations(materializedViewsBuilder.constructor.name);
+      await loadTranslations(selfServeType);
       return materializedViewsBuilder.toSelfServeDescriptor();
     }
     default:
@@ -103,7 +103,7 @@ const handleMessage = async (event: MessageEvent): Promise<void> => {
 
   const urlSearchParams = new URLSearchParams(window.location.search);
   const selfServeTypeText = urlSearchParams.get("selfServeType") || inputs.selfServeType;
-  const selfServeType = SelfServeType[selfServeTypeText?.toLowerCase() as keyof typeof SelfServeType];
+  const selfServeType = SelfServeType[selfServeTypeText.toLocaleLowerCase() as keyof typeof SelfServeType];
   if (
     !inputs.subscriptionId ||
     !inputs.resourceGroup ||

src/SelfServe/SelfServeComponent.tsx

@@ -10,7 +10,7 @@ import {
   Text,
 } from "@fluentui/react";
 import { TFunction } from "i18next";
-import promiseRetry, { AbortError } from "p-retry";
+import promiseRetry, { AbortError, Options } from "p-retry";
 import React from "react";
 import { WithTranslation } from "react-i18next";
 import * as _ from "underscore";
@@ -80,7 +80,7 @@ export class SelfServeComponent extends React.Component<SelfServeComponentProps,
   private static readonly defaultRetryIntervalInMs = 30000;
   private smartUiGeneratorClassName: string;
   private retryIntervalInMs: number;
-  private retryOptions: promiseRetry.Options;
+  private retryOptions: Options;
   private translationFunction: TFunction;
 
   componentDidMount(): void {

src/SelfServe/SelfServeUtils.tsx

@@ -29,10 +29,11 @@ export enum SelfServeType {
   // Unsupported self serve type passed as feature flag
   invalid = "invalid",
   // Add your self serve types here
-  example = "example",
-  sqlx = "sqlx",
-  graphapicompute = "graphapicompute",
-  materializedviewsbuilder = "materializedviewsbuilder",
+  // NOTE: text and casing of the enum's value must match the corresponding file in Localization\en\
+  example = "SelfServeExample",
+  sqlx = "SqlX",
+  graphapicompute = "GraphAPICompute",
+  materializedviewsbuilder = "MaterializedViewsBuilder",
 }
 
 /**

src/SelfServe/SqlX/SqlX.rp.ts

@@ -197,6 +197,11 @@ export const getPriceMapAndCurrencyCode = async (map: OfferingIdMap): Promise<Pr
     const priceMap = new Map<string, Map<string, number>>();
     let billingCurrency;
     for (const region of map.keys()) {
+      // if no offering id is found for that region, skipping calling price API
+      const subMap = map.get(region);
+      if (!subMap || subMap.size === 0) {
+        continue;
+      }
       const regionPriceMap = new Map<string, number>();
       const regionShortName = await getRegionShortName(region);
       const requestBody: OfferingIdRequest = {
@@ -237,7 +242,7 @@ export const getPriceMapAndCurrencyCode = async (map: OfferingIdMap): Promise<Pr
   } catch (err) {
     const failureTelemetry = { err, selfServeClassName: SqlX.name };
     selfServeTraceFailure(failureTelemetry, getPriceMapAndCurrencyCodeTimestamp);
-    return { priceMap: undefined, billingCurrency: undefined };
+    return { priceMap: new Map<string, Map<string, number>>(), billingCurrency: undefined };
   }
 };
 
@@ -286,6 +291,6 @@ export const getOfferingIds = async (regions: Array<RegionItem>): Promise<Offeri
   } catch (err) {
     const failureTelemetry = { err, selfServeClassName: SqlX.name };
     selfServeTraceFailure(failureTelemetry, getOfferingIdsCodeTimestamp);
-    return undefined;
+    return new Map<string, Map<string, string>>();
   }
 };

src/SelfServe/SqlX/SqlX.tsx

@@ -227,11 +227,13 @@ const calculateCost = (skuName: string, instanceCount: number): Description => {
     let costPerHour = 0;
     let costBreakdown = "";
     for (const regionItem of regions) {
-      const incrementalCost = priceMap.get(regionItem.locationName).get(skuName.replace("Cosmos.", ""));
+      const incrementalCost = priceMap?.get(regionItem.locationName)?.get(skuName.replace("Cosmos.", ""));
       if (incrementalCost === undefined) {
         throw new Error(`${regionItem.locationName} not found in price map.`);
       } else if (incrementalCost === 0) {
         throw new Error(`${regionItem.locationName} cost per hour = 0`);
+      } else if (currencyCode === undefined) {
+        throw new Error(`Currency code not found in price map.`);
       }
 
       let regionalInstanceCount = instanceCount;

src/Terminal/JupyterLabAppFactory.ts

@@ -17,7 +17,7 @@ export class JupyterLabAppFactory {
     if (userContext.apiType === "VCoreMongo" && content?.includes("MongoServerError: Invalid key")) {
       this.restartShell = true;
     }
-    return content?.includes("cosmosuser@");
+    return content?.includes("cosmosshelluser@");
   }
 
   private isMongoShellStarted(content: string | undefined) {
@@ -68,7 +68,6 @@ export class JupyterLabAppFactory {
     const session = await manager.startNew();
     session.messageReceived.connect(async (_, message: IMessage) => {
       const content = message.content && message.content[0]?.toString();
-
       if (this.checkShellStarted && message.type == "stdout") {
         //Close the terminal tab once the shell closed messages are received
         if (!this.isShellStarted) {
@@ -114,6 +113,13 @@ export class JupyterLabAppFactory {
       panel.dispose();
     });
 
+    // Close terminal when Ctrl key is pressed
+    term.node.addEventListener("keydown", (event: KeyboardEvent) => {
+      if (event.ctrlKey) {
+        this.onShellExited(false);
+      }
+    });
+
     return session;
   }
 }

src/UserContext.ts

@@ -1,4 +1,4 @@
-import { FabricDatabaseConnectionInfo } from "Contracts/FabricMessagesContract";
+import { CosmosDbArtifactType, ResourceTokenInfo } from "Contracts/FabricMessagesContract";
 import { ParsedResourceTokenConnectionString } from "Platform/Hosted/Helpers/ResourceTokenUtils";
 import { Action } from "Shared/Telemetry/TelemetryConstants";
 import { traceOpen } from "Shared/Telemetry/TelemetryProcessor";
@@ -47,11 +47,21 @@ export interface VCoreMongoConnectionParams {
   connectionString: string;
 }
 
-interface FabricContext {
-  connectionId: string;
-  databaseConnectionInfo: FabricDatabaseConnectionInfo | undefined;
+export interface FabricArtifactInfo {
+  [CosmosDbArtifactType.MIRRORED_KEY]: {
+    connectionId: string;
+    resourceTokenInfo: ResourceTokenInfo | undefined;
+  };
+  [CosmosDbArtifactType.MIRRORED_AAD]: undefined;
+  [CosmosDbArtifactType.NATIVE]: undefined;
+}
+export interface FabricContext<T extends CosmosDbArtifactType> {
+  fabricClientRpcVersion: string;
   isReadOnly: boolean;
   isVisible: boolean;
+  databaseName: string;
+  artifactType: CosmosDbArtifactType;
+  artifactInfo: FabricArtifactInfo[T];
 }
 
 export type AdminFeedbackControlPolicy =
@@ -70,7 +80,7 @@ export type AdminFeedbackPolicySettings = {
 };
 
 export interface UserContext {
-  readonly fabricContext?: FabricContext;
+  readonly fabricContext?: FabricContext<CosmosDbArtifactType>;
   readonly authType?: AuthType;
   readonly masterKey?: string;
   readonly subscriptionId?: string;

src/Utils/APITypeUtils.ts

@@ -89,3 +89,7 @@ export const getItemName = (): string => {
       return "Items";
   }
 };
+
+export const isDataplaneRbacSupported = (apiType: string): boolean => {
+  return apiType === "SQL" || apiType === "Tables";
+};

src/Utils/AuthorizationUtils.ts

@@ -46,14 +46,14 @@ export function decryptJWTToken(token: string) {
   return JSON.parse(tokenPayload);
 }
 
-export async function getMsalInstance(clientId: string = "203f1145-856a-4232-83d4-a43568fba23d"){
+export async function getMsalInstance() {
   const msalConfig: msal.Configuration = {
     cache: {
       cacheLocation: "localStorage",
     },
     auth: {
       authority: `${configContext.AAD_ENDPOINT}organizations`,
-      clientId: clientId,
+      clientId: "203f1145-856a-4232-83d4-a43568fba23d",
     },
   };
 
@@ -68,8 +68,7 @@ export async function getMsalInstance(clientId: string = "203f1145-856a-4232-83d
 export async function acquireMsalTokenForAccount(
   account: DatabaseAccount,
   silent: boolean = false,
-  clientId: string = "203f1145-856a-4232-83d4-a43568fba23d",
-  user_hint?: string
+  user_hint?: string,
 ) {
   if (userContext.databaseAccount.properties?.documentEndpoint === undefined) {
     throw new Error("Database account has no document endpoint defined");
@@ -78,7 +77,7 @@ export async function acquireMsalTokenForAccount(
     /\/+$/,
     "/.default",
   );
-  const msalInstance = await getMsalInstance(clientId);
+  const msalInstance = await getMsalInstance();
   const knownAccounts = msalInstance.getAllAccounts();
   // If user_hint is provided, we will try to use it to find the account.
   // If no account is found, we will use the current active account or first account in the list.

src/Utils/AutoPilotUtils.ts

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

src/Utils/QueryUtils.test.ts

@@ -35,6 +35,13 @@ describe("Query Utils", () => {
       version: 2,
     };
   };
+  const generatePartitionKeysForPaths = (paths: string[]): DataModels.PartitionKey => {
+    return {
+      paths: paths,
+      kind: "Hash",
+      version: 2,
+    };
+  };
 
   describe("buildDocumentsQueryPartitionProjections()", () => {
     it("should return empty string if partition key is undefined", () => {
@@ -89,6 +96,18 @@ describe("Query Utils", () => {
 
       expect(query).toContain("c.id");
     });
+
+    it("should always include {} for any missing partition keys", () => {
+      const query = QueryUtils.buildDocumentsQuery(
+        "",
+        ["a", "b", "c"],
+        generatePartitionKeysForPaths(["/a", "/b", "/c"]),
+        [],
+      );
+      expect(query).toContain('IIF(IS_DEFINED(c["a"]), c["a"], {})');
+      expect(query).toContain('IIF(IS_DEFINED(c["b"]), c["b"], {})');
+      expect(query).toContain('IIF(IS_DEFINED(c["c"]), c["c"], {})');
+    });
   });
 
   describe("queryPagesUntilContentPresent()", () => {
@@ -201,18 +220,6 @@ describe("Query Utils", () => {
       expect(expectedPartitionKeyValues).toContain(documentContent["Category"]);
     });
 
-    it("should extract no partition key values in the case nested partition key", () => {
-      const singlePartitionKeyDefinition: PartitionKeyDefinition = {
-        kind: PartitionKeyKind.Hash,
-        paths: ["/Location.type"],
-      };
-      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
-        documentContent,
-        singlePartitionKeyDefinition,
-      );
-      expect(partitionKeyValues.length).toBe(0);
-    });
-
     it("should extract all partition key values for hierarchical and nested partition keys", () => {
       const mixedPartitionKeyDefinition: PartitionKeyDefinition = {
         kind: PartitionKeyKind.MultiHash,
@@ -225,5 +232,52 @@ describe("Query Utils", () => {
       expect(partitionKeyValues.length).toBe(2);
       expect(partitionKeyValues).toEqual(["United States", "Point"]);
     });
+
+    it("if any partition key is null or empty string, the partitionKeyValues shall match", () => {
+      const newDocumentContent = {
+        ...documentContent,
+        ...{
+          Country: null,
+          Location: {
+            type: "",
+            coordinates: [-121.49, 46.206],
+          },
+        },
+      };
+
+      const mixedPartitionKeyDefinition: PartitionKeyDefinition = {
+        kind: PartitionKeyKind.MultiHash,
+        paths: ["/Country", "/Location/type"],
+      };
+      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
+        newDocumentContent,
+        mixedPartitionKeyDefinition,
+      );
+      expect(partitionKeyValues.length).toBe(2);
+      expect(partitionKeyValues).toEqual([null, ""]);
+    });
+
+    it("if any partition key doesn't exist, it should still set partitionkey value as {}", () => {
+      const newDocumentContent = {
+        ...documentContent,
+        ...{
+          Country: null,
+          Location: {
+            coordinates: [-121.49, 46.206],
+          },
+        },
+      };
+
+      const mixedPartitionKeyDefinition: PartitionKeyDefinition = {
+        kind: PartitionKeyKind.MultiHash,
+        paths: ["/Country", "/Location/type"],
+      };
+      const partitionKeyValues: PartitionKey[] = extractPartitionKeyValues(
+        newDocumentContent,
+        mixedPartitionKeyDefinition,
+      );
+      expect(partitionKeyValues.length).toBe(2);
+      expect(partitionKeyValues).toEqual([null, {}]);
+    });
   });
 });

src/Utils/QueryUtils.ts

@@ -61,8 +61,9 @@ export function buildDocumentsQueryPartitionProjections(
         projectedProperty += `[${projection}]`;
       }
     });
-
-    projections.push(`${collectionAlias}${projectedProperty}`);
+    const fullAccess = `${collectionAlias}${projectedProperty}`;
+    const wrappedProjection = `IIF(IS_DEFINED(${fullAccess}), ${fullAccess}, {})`;
+    projections.push(wrappedProjection);
   }
 
   return projections.join(",");
@@ -130,6 +131,8 @@ export const extractPartitionKeyValues = (
 
     if (value !== undefined) {
       partitionKeyValues.push(value);
+    } else {
+      partitionKeyValues.push({});
     }
   });
 

src/Utils/WindowUtils.ts

@@ -1,3 +1,4 @@
+import { isFabric } from "Platform/Fabric/FabricUtil";
 import { Platform, configContext } from "./../ConfigContext";
 
 export const getDataExplorerWindow = (currentWindow: Window): Window | undefined => {
@@ -7,7 +8,7 @@ export const getDataExplorerWindow = (currentWindow: Window): Window | undefined
       if (currentWindow.parent === currentWindow) {
         return undefined;
       }
-      if (configContext.platform === Platform.Fabric && currentWindow.parent.parent === currentWindow.top) {
+      if (isFabric() && currentWindow.parent.parent === currentWindow.top) {
         // in Fabric data explorer is inside an extension iframe, so we have two parent iframes
         return currentWindow;
       }

src/Utils/arm/request.ts

@@ -47,7 +47,6 @@ interface Options {
   body?: unknown;
   queryParams?: ARMQueryParams;
   contentType?: string;
-  customHeaders?: Record<string, string>;
 }
 
 export async function armRequestWithoutPolling<T>({
@@ -58,7 +57,6 @@ export async function armRequestWithoutPolling<T>({
   body: requestBody,
   queryParams,
   contentType,
-  customHeaders
 }: Options): Promise<{ result: T; operationStatusUrl: string }> {
   const url = new URL(path, host);
   url.searchParams.append("api-version", configContext.armAPIVersion || apiVersion);
@@ -67,7 +65,7 @@ export async function armRequestWithoutPolling<T>({
     queryParams.metricNames && url.searchParams.append("metricnames", queryParams.metricNames);
   }
 
-  if (!userContext.authorizationToken && !customHeaders["Authorization"]) {
+  if (!userContext.authorizationToken) {
     throw new Error("No authority token provided");
   }
 
@@ -76,7 +74,6 @@ export async function armRequestWithoutPolling<T>({
     headers: {
       Authorization: userContext.authorizationToken,
       [HttpHeaders.contentType]: contentType || "application/json",
-      ...customHeaders
     },
     body: requestBody ? JSON.stringify(requestBody) : undefined,
   });
@@ -99,15 +96,8 @@ export async function armRequestWithoutPolling<T>({
   }
 
   const operationStatusUrl = (response.headers && response.headers.get("location")) || "";
-  if(!response || response.status === 204) {
-    return { result: {} as T, operationStatusUrl: operationStatusUrl };
-  }
-
-  const responseBody = await response.json().catch((error) => {
-    console.error("armRequestWithoutPolling: Error parsing JSON response:", error);
-    return response.text; // Return an empty object if JSON parsing fails
-  });
-  return { result: responseBody as T, operationStatusUrl: operationStatusUrl };
+  const responseBody = (await response.json()) as T;
+  return { result: responseBody, operationStatusUrl: operationStatusUrl };
 }
 
 // TODO: This is very similar to what is happening in ResourceProviderClient.ts. Should probably merge them.
@@ -119,7 +109,6 @@ export async function armRequest<T>({
   body: requestBody,
   queryParams,
   contentType,
-  customHeaders
 }: Options): Promise<T> {
   const armRequestResult = await armRequestWithoutPolling<T>({
     host,
@@ -129,7 +118,6 @@ export async function armRequest<T>({
     body: requestBody,
     queryParams,
     contentType,
-    customHeaders
   });
   const operationStatusUrl = armRequestResult.operationStatusUrl;
   if (operationStatusUrl) {
@@ -218,14 +206,6 @@ export async function getOfferingIdsRequest<T>({
   }
 
   const operationStatusUrl = (response.headers && response.headers.get("location")) || "";
-  if(!response || response.status === 204) {
-    return { result: {} as T, operationStatusUrl: operationStatusUrl };
-  }
-
-  const responseBody = await response.json().catch((error) => {
-    console.error("getOfferingIdsRequest: Error parsing JSON response:", error);
-    return response.text; // Return an empty object if JSON parsing fails
-  });
-
-  return { result: responseBody as T, operationStatusUrl: operationStatusUrl };
+  const responseBody = (await response.json()) as T;
+  return { result: responseBody, operationStatusUrl: operationStatusUrl };
 }

src/hooks/useKnockoutExplorer.ts

@@ -2,17 +2,26 @@ import * as Constants from "Common/Constants";
 import { createUri } from "Common/UrlUtility";
 import { DATA_EXPLORER_RPC_VERSION } from "Contracts/DataExplorerMessagesContract";
 import { FabricMessageTypes } from "Contracts/FabricMessageTypes";
-import { FABRIC_RPC_VERSION, FabricMessageV2 } from "Contracts/FabricMessagesContract";
+import {
+  ArtifactConnectionInfo,
+  CosmosDbArtifactType,
+  FABRIC_RPC_VERSION,
+  FabricMessageV2,
+  FabricMessageV3,
+  InitializeMessageV3,
+} from "Contracts/FabricMessagesContract";
+import { useDialog } from "Explorer/Controls/Dialog";
 import Explorer from "Explorer/Explorer";
 import { useDataPlaneRbac } from "Explorer/Panes/SettingsPane/SettingsPane";
 import { useSelectedNode } from "Explorer/useSelectedNode";
-import { scheduleRefreshDatabaseResourceToken } from "Platform/Fabric/FabricUtil";
+import { isFabricMirroredKey, scheduleRefreshFabricToken } from "Platform/Fabric/FabricUtil";
 import {
   AppStateComponentNames,
   OPEN_TABS_SUBCOMPONENT_NAME,
   readSubComponentState,
 } from "Shared/AppStatePersistenceUtility";
 import { LocalStorageUtility, StorageKey } from "Shared/StorageUtility";
+import { isDataplaneRbacSupported } from "Utils/APITypeUtils";
 import { logConsoleError } from "Utils/NotificationConsoleUtils";
 import { useQueryCopilot } from "hooks/useQueryCopilot";
 import { ReactTabKind, useTabs } from "hooks/useTabs";
@@ -22,7 +31,7 @@ import { AccountKind, Flights } from "../Common/Constants";
 import { normalizeArmEndpoint } from "../Common/EnvironmentUtility";
 import * as Logger from "../Common/Logger";
 import { handleCachedDataMessage, sendMessage, sendReadyMessage } from "../Common/MessageHandler";
-import { Platform, configContext, updateConfigContext } from "../ConfigContext";
+import { configContext, Platform, updateConfigContext } from "../ConfigContext";
 import { ActionType, DataExplorerAction, TabKind } from "../Contracts/ActionContracts";
 import { MessageTypes } from "../Contracts/ExplorerContracts";
 import { DataExplorerInputsFrame } from "../Contracts/ViewModels";
@@ -43,7 +52,7 @@ import {
 } from "../Platform/Hosted/HostedUtils";
 import { extractFeatures } from "../Platform/Hosted/extractFeatures";
 import { DefaultExperienceUtility } from "../Shared/DefaultExperienceUtility";
-import { Node, PortalEnv, updateUserContext, userContext } from "../UserContext";
+import { FabricArtifactInfo, Node, PortalEnv, updateUserContext, userContext } from "../UserContext";
 import {
   acquireMsalTokenForAccount,
   acquireTokenWithMsal,
@@ -103,7 +112,7 @@ export function useKnockoutExplorer(platform: Platform): Explorer {
 
 async function configureFabric(): Promise<Explorer> {
   // These are the versions of Fabric that Data Explorer supports.
-  const SUPPORTED_FABRIC_VERSIONS = [FABRIC_RPC_VERSION];
+  const SUPPORTED_FABRIC_VERSIONS = ["2", FABRIC_RPC_VERSION];
 
   let firstContainerOpened = false;
   let explorer: Explorer;
@@ -119,7 +128,7 @@ async function configureFabric(): Promise<Explorer> {
           return;
         }
 
-        const data: FabricMessageV2 = event.data?.data;
+        const data: FabricMessageV2 | FabricMessageV3 = event.data?.data;
         if (!data) {
           return;
         }
@@ -128,38 +137,77 @@ async function configureFabric(): Promise<Explorer> {
           case "initialize": {
             const fabricVersion = data.version;
             if (!SUPPORTED_FABRIC_VERSIONS.includes(fabricVersion)) {
-              // TODO Surface error to user
+              // TODO Surface error to user and log to telemetry
+              useDialog
+                .getState()
+                .showOkModalDialog("Unsupported Fabric version", `Unsupported Fabric version: ${fabricVersion}`);
+              Logger.logError(`Unsupported Fabric version: ${fabricVersion}`, "Explorer/configureFabric");
               console.error(`Unsupported Fabric version: ${fabricVersion}`);
               return;
             }
 
-            explorer = createExplorerFabric(data.message);
-            await scheduleRefreshDatabaseResourceToken(true);
-            resolve(explorer);
-            await explorer.refreshAllDatabases();
-            if (userContext.fabricContext.isVisible) {
-              firstContainerOpened = true;
-              openFirstContainer(explorer, userContext.fabricContext.databaseConnectionInfo.databaseId);
+            if (fabricVersion === "2") {
+              // ----------------- TODO: Remove this when FabricMessageV2 is deprecated -----------------
+              const initializationMessage = data.message as {
+                connectionId: string;
+                isVisible: boolean;
+              };
+
+              explorer = createExplorerFabricLegacy(initializationMessage, data.version);
+              await scheduleRefreshFabricToken(true);
+              resolve(explorer);
+              await explorer.refreshAllDatabases();
+              if (userContext.fabricContext.isVisible) {
+                firstContainerOpened = true;
+                openFirstContainer(explorer, userContext.fabricContext.databaseName);
+              }
+              // -----------------------------------------------------------------------------------------
+            } else if (fabricVersion === FABRIC_RPC_VERSION) {
+              const initializationMessage = data.message as InitializeMessageV3<CosmosDbArtifactType>;
+              explorer = createExplorerFabric(initializationMessage, data.version);
+
+              if (initializationMessage.artifactType === CosmosDbArtifactType.MIRRORED_KEY) {
+                // Do not show Home tab for Mirrored
+                useTabs.getState().closeReactTab(ReactTabKind.Home);
+              }
+
+              // All tokens used in fabric expire, so schedule a refresh
+              // For Mirrored key, we need the token right away to get the database and containers list.
+              if (isFabricMirroredKey()) {
+                await scheduleRefreshFabricToken(true);
+              } else {
+                scheduleRefreshFabricToken(false);
+              }
+
+              resolve(explorer);
+              await explorer.refreshAllDatabases();
+
+              const { databaseName } = userContext.fabricContext;
+              if (userContext.fabricContext.isVisible && databaseName) {
+                firstContainerOpened = true;
+                openFirstContainer(explorer, databaseName);
+              }
             }
+
             break;
           }
           case "newContainer":
             explorer.onNewCollectionClicked();
             break;
           case "authorizationToken":
-          case "allResourceTokens_v2": {
+          case "allResourceTokens_v2":
+          case "accessToken": {
             handleCachedDataMessage(data);
             break;
           }
           case "explorerVisible": {
             userContext.fabricContext.isVisible = data.message.visible;
-            if (
-              userContext.fabricContext.isVisible &&
-              !firstContainerOpened &&
-              userContext?.fabricContext?.databaseConnectionInfo?.databaseId !== undefined
-            ) {
-              firstContainerOpened = true;
-              openFirstContainer(explorer, userContext.fabricContext.databaseConnectionInfo.databaseId);
+            if (userContext.fabricContext.isVisible && !firstContainerOpened) {
+              const { databaseName } = userContext.fabricContext;
+              if (databaseName !== undefined) {
+                firstContainerOpened = true;
+                openFirstContainer(explorer, databaseName);
+              }
             }
             break;
           }
@@ -299,7 +347,7 @@ async function configureHostedWithAAD(config: AAD): Promise<Explorer> {
     );
     if (!userContext.features.enableAadDataPlane) {
       Logger.logInfo(`AAD Feature flag is not enabled for account ${account.name}`, "Explorer/configureHostedWithAAD");
-      if (userContext.apiType === "SQL") {
+      if (isDataplaneRbacSupported(userContext.apiType)) {
         if (LocalStorageUtility.hasItem(StorageKey.DataPlaneRbacEnabled)) {
           const isDataPlaneRbacSetting = LocalStorageUtility.getEntryString(StorageKey.DataPlaneRbacEnabled);
           Logger.logInfo(
@@ -419,13 +467,29 @@ function configureHostedWithResourceToken(config: ResourceToken): Explorer {
   return explorer;
 }
 
-function createExplorerFabric(params: { connectionId: string; isVisible: boolean }): Explorer {
+/**
+ * Initialization for FabricMessageV2
+ * TODO: delete when FabricMessageV2 is deprecated
+ * @param params
+ * @returns
+ */
+function createExplorerFabricLegacy(
+  params: { connectionId: string; isVisible: boolean },
+  fabricClientRpcVersion: string,
+): Explorer {
+  const artifactInfo: FabricArtifactInfo[CosmosDbArtifactType.MIRRORED_KEY] = {
+    connectionId: params.connectionId,
+    resourceTokenInfo: undefined,
+  };
+
   updateUserContext({
     fabricContext: {
-      connectionId: params.connectionId,
-      databaseConnectionInfo: undefined,
+      fabricClientRpcVersion,
       isReadOnly: true,
       isVisible: params.isVisible ?? true,
+      databaseName: undefined,
+      artifactType: CosmosDbArtifactType.MIRRORED_KEY,
+      artifactInfo,
     },
     authType: AuthType.ConnectionString,
     databaseAccount: {
@@ -439,11 +503,102 @@ function createExplorerFabric(params: { connectionId: string; isVisible: boolean
       },
     },
   });
-  useTabs.getState().closeAllTabs();
   const explorer = new Explorer();
   return explorer;
 }
 
+/**
+ * Initialization for FabricMessageV3 and above
+ * @param params
+ * @returns
+ */
+const createExplorerFabric = (
+  params: InitializeMessageV3<CosmosDbArtifactType>,
+  fabricClientRpcVersion: string,
+): Explorer => {
+  updateUserContext({
+    fabricContext: {
+      fabricClientRpcVersion,
+      databaseName: undefined,
+      isVisible: params.isVisible,
+      isReadOnly: params.isReadOnly,
+      artifactType: params.artifactType,
+      artifactInfo: undefined,
+    },
+  });
+
+  if (params.artifactType === CosmosDbArtifactType.MIRRORED_KEY) {
+    updateUserContext({
+      authType: AuthType.ConnectionString, // TODO: will need its own type
+      databaseAccount: {
+        id: "",
+        location: "",
+        type: "",
+        name: "Mounted", // TODO: not used?
+        kind: AccountKind.Default,
+        properties: {
+          documentEndpoint: undefined,
+        },
+      },
+      fabricContext: {
+        ...userContext.fabricContext,
+        artifactInfo: {
+          connectionId: (params.artifactConnectionInfo as ArtifactConnectionInfo[CosmosDbArtifactType.MIRRORED_KEY])
+            .connectionId,
+          resourceTokenInfo: undefined,
+        },
+      },
+    });
+  } else if (params.artifactType === CosmosDbArtifactType.MIRRORED_AAD) {
+    updateUserContext({
+      databaseAccount: {
+        id: "",
+        location: "",
+        type: "",
+        name: "Mounted", // TODO: not used?
+        kind: AccountKind.Default,
+        properties: {
+          documentEndpoint: undefined,
+        },
+      },
+      authType: AuthType.AAD,
+      dataPlaneRbacEnabled: true,
+      aadToken: undefined,
+      masterKey: undefined,
+      fabricContext: {
+        ...userContext.fabricContext,
+        artifactInfo: undefined,
+      },
+    });
+  } else if (params.artifactType === CosmosDbArtifactType.NATIVE) {
+    const nativeParams = params as InitializeMessageV3<CosmosDbArtifactType.NATIVE>;
+    // Make it behave like Hosted/AAD/RBAC
+    updateUserContext({
+      databaseAccount: {
+        id: "",
+        location: "",
+        type: "",
+        name: "Native", // TODO: not used?
+        kind: AccountKind.Default,
+        properties: {
+          documentEndpoint: nativeParams.artifactConnectionInfo.accountEndpoint,
+        },
+      },
+      authType: AuthType.AAD,
+      dataPlaneRbacEnabled: true,
+      aadToken: nativeParams.artifactConnectionInfo.accessToken,
+      masterKey: undefined,
+      fabricContext: {
+        ...userContext.fabricContext,
+        databaseName: nativeParams.artifactConnectionInfo.databaseName,
+      },
+    });
+  }
+
+  const explorer = new Explorer();
+  return explorer;
+};
+
 function configureWithEncryptedToken(config: EncryptedToken): Explorer {
   const apiExperience = DefaultExperienceUtility.getDefaultExperienceFromApiKind(config.encryptedTokenMetadata.apiKind);
   updateUserContext({
@@ -552,7 +707,7 @@ async function configurePortal(): Promise<Explorer> {
           const { databaseAccount: account, subscriptionId, resourceGroup } = userContext;
 
           let dataPlaneRbacEnabled;
-          if (userContext.apiType === "SQL") {
+          if (isDataplaneRbacSupported(userContext.apiType)) {
             if (LocalStorageUtility.hasItem(StorageKey.DataPlaneRbacEnabled)) {
               const isDataPlaneRbacSetting = LocalStorageUtility.getEntryString(StorageKey.DataPlaneRbacEnabled);
               Logger.logInfo(

src/hooks/useTabs.ts

@@ -1,6 +1,7 @@
 import { clamp } from "@fluentui/react";
 import { OpenTab } from "Contracts/ActionContracts";
 import { useSelectedNode } from "Explorer/useSelectedNode";
+import { isFabricMirrored } from "Platform/Fabric/FabricUtil";
 import {
   AppStateComponentNames,
   OPEN_TABS_SUBCOMPONENT_NAME,
@@ -11,7 +12,6 @@ import * as ViewModels from "../Contracts/ViewModels";
 import { CollectionTabKind } from "../Contracts/ViewModels";
 import NotebookTabV2 from "../Explorer/Tabs/NotebookV2Tab";
 import TabsBase from "../Explorer/Tabs/TabsBase";
-import { Platform, configContext } from "./../ConfigContext";
 
 export interface TabsState {
   openedTabs: TabsBase[];
@@ -51,22 +51,11 @@ export enum ReactTabKind {
   QueryCopilot,
 }
 
-// HACK: using this const when the configuration context is not initialized yet.
-// Since Fabric is always setting the url param, use that instead of the regular config.
-const isPlatformFabric = (() => {
-  const params = new URLSearchParams(window.location.search);
-  if (params.has("platform")) {
-    const platform = params.get("platform");
-    return platform === Platform.Fabric;
-  }
-  return false;
-})();
-
 export const useTabs: UseStore<TabsState> = create((set, get) => ({
-  openedTabs: [],
-  openedReactTabs: !isPlatformFabric ? [ReactTabKind.Home] : [],
-  activeTab: undefined,
-  activeReactTab: !isPlatformFabric ? ReactTabKind.Home : undefined,
+  openedTabs: [] as TabsBase[],
+  openedReactTabs: [ReactTabKind.Home],
+  activeTab: undefined as TabsBase,
+  activeReactTab: ReactTabKind.Home,
   queryCopilotTabInitialInput: "",
   isTabExecuting: false,
   isQueryErrorThrown: false,
@@ -122,7 +111,7 @@ export const useTabs: UseStore<TabsState> = create((set, get) => ({
       }
       return true;
     });
-    if (updatedTabs.length === 0 && configContext.platform !== Platform.Fabric) {
+    if (updatedTabs.length === 0 && !isFabricMirrored()) {
       set({ activeTab: undefined, activeReactTab: undefined });
     }
 
@@ -162,7 +151,7 @@ export const useTabs: UseStore<TabsState> = create((set, get) => ({
         }
       });
 
-      if (get().openedTabs.length === 0 && configContext.platform !== Platform.Fabric) {
+      if (get().openedTabs.length === 0 && !isFabricMirrored()) {
         set({ activeTab: undefined, activeReactTab: undefined });
       }
     }